Skip to content

Commit c2c9393

Browse files
author
sametbrr
committed
restructure project directory and initialize API and testing projects
1 parent 4bca81a commit c2c9393

22 files changed

Lines changed: 31 additions & 30 deletions

.github/workflows/publish-nuget.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches: [master]
66
paths:
7-
- src/EnvironmentConfigurator/EnvironmentConfigurator.csproj
7+
- EnvironmentConfigurator/EnvironmentConfigurator.csproj
88
workflow_dispatch:
99

1010
jobs:
@@ -25,7 +25,7 @@ jobs:
2525
- name: Read version from csproj
2626
id: version
2727
run: |
28-
RAW=$(grep -m1 '<Version>' src/EnvironmentConfigurator/EnvironmentConfigurator.csproj \
28+
RAW=$(grep -m1 '<Version>' EnvironmentConfigurator/EnvironmentConfigurator.csproj \
2929
| sed -E 's/.*<Version>([^<]+)<\/Version>.*/\1/')
3030
echo "version=${RAW}" >> "$GITHUB_OUTPUT"
3131
echo "tag=v${RAW}" >> "$GITHUB_OUTPUT"
@@ -46,7 +46,7 @@ jobs:
4646

4747
- name: Pack
4848
if: steps.tag_check.outputs.exists == 'false'
49-
run: dotnet pack src/EnvironmentConfigurator -c Release -o ./artifacts
49+
run: dotnet pack EnvironmentConfigurator -c Release -o ./artifacts
5050

5151
- name: Push to NuGet
5252
if: steps.tag_check.outputs.exists == 'false'

tests/EnvironmentConfigurator.Tests/EnvironmentConfigurator.Tests.csproj renamed to EnvironmentConfigurator.Tests/EnvironmentConfigurator.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<ProjectReference Include="..\..\src\EnvironmentConfigurator\EnvironmentConfigurator.csproj" />
17+
<ProjectReference Include="..\EnvironmentConfigurator\EnvironmentConfigurator.csproj" />
1818
</ItemGroup>
1919

2020
</Project>

tests/EnvironmentConfigurator.Tests/EnvironmentConfiguratorExtensionsTests.cs renamed to EnvironmentConfigurator.Tests/EnvironmentConfiguratorExtensionsTests.cs

File renamed without changes.

EnvironmentConfigurator.sln

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
44
VisualStudioVersion = 17.12.35506.116
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvironmentConfigurator", "EnvironmentConfigurator\EnvironmentConfigurator.csproj", "{849C5EDB-6127-40D0-974A-27E842A00799}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvironmentConfigurator", "src\EnvironmentConfigurator\EnvironmentConfigurator.csproj", "{849C5EDB-6127-40D0-974A-27E842A00799}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvironmentConfigurator.Tests", "EnvironmentConfigurator.Tests\EnvironmentConfigurator.Tests.csproj", "{1CC7AB3B-87FD-484F-B1B4-2FFCF76076FF}"
99
EndProject
10-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0AB3BF05-4346-4AA6-1389-037BE0695223}"
11-
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvironmentConfigurator.Tests", "tests\EnvironmentConfigurator.Tests\EnvironmentConfigurator.Tests.csproj", "{1CC7AB3B-87FD-484F-B1B4-2FFCF76076FF}"
13-
EndProject
14-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{5D20AA90-6969-D8BD-9DCD-8634F4692FDA}"
15-
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvironmentConfiguratorApi", "samples\EnvironmentConfiguratorApi\EnvironmentConfiguratorApi.csproj", "{E54342FD-25FB-4C68-AD89-D4D590D31942}"
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvironmentConfiguratorApi", "EnvironmentConfiguratorApi\EnvironmentConfiguratorApi.csproj", "{E54342FD-25FB-4C68-AD89-D4D590D31942}"
1711
EndProject
1812
Global
1913
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -65,9 +59,4 @@ Global
6559
GlobalSection(SolutionProperties) = preSolution
6660
HideSolutionNode = FALSE
6761
EndGlobalSection
68-
GlobalSection(NestedProjects) = preSolution
69-
{849C5EDB-6127-40D0-974A-27E842A00799} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
70-
{1CC7AB3B-87FD-484F-B1B4-2FFCF76076FF} = {0AB3BF05-4346-4AA6-1389-037BE0695223}
71-
{E54342FD-25FB-4C68-AD89-D4D590D31942} = {5D20AA90-6969-D8BD-9DCD-8634F4692FDA}
72-
EndGlobalSection
7362
EndGlobal

src/EnvironmentConfigurator/EnvironmentConfigurator.csproj renamed to EnvironmentConfigurator/EnvironmentConfigurator.csproj

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<RootNamespace>EnvironmentConfigurator</RootNamespace>
@@ -11,23 +11,35 @@
1111

1212
<PropertyGroup>
1313
<PackageId>EnvironmentConfigurator</PackageId>
14-
<Version>1.0.5</Version>
14+
<Version>1.1.0</Version>
1515
<Authors>sametbrr</Authors>
1616
<Description>Environment-aware configuration for ASP.NET Core. Adds appsettings.{Environment}.json loading via a single builder call and auto-scaffolds publish profiles, web.config and per-environment appsettings into the consuming project on first build.</Description>
17-
<PackageTags>aspnetcore;configuration;environment;appsettings;webdeploy;publish;dotnet8;iis;web.config;scaffolding;pubxml;launchsettings;dotnet</PackageTags>
17+
<PackageTags>aspnetcore;configuration;environment;appsettings;webdeploy;publish;dotnet8;dotnet9;dotnet10;iis;web.config;scaffolding;pubxml;launchsettings;dotnet</PackageTags>
1818
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1919
<PackageReadmeFile>README.md</PackageReadmeFile>
2020
<RepositoryUrl>https://github.com/sametbrr/EnvironmentConfigurator</RepositoryUrl>
2121
<RepositoryType>git</RepositoryType>
2222
<PackageProjectUrl>https://github.com/sametbrr/EnvironmentConfigurator</PackageProjectUrl>
2323
</PropertyGroup>
2424

25-
<ItemGroup>
25+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
2626
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
2727
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
2828
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
2929
</ItemGroup>
3030

31+
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
32+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
33+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
34+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0" />
35+
</ItemGroup>
36+
37+
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
38+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.0" />
39+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0" />
40+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0" />
41+
</ItemGroup>
42+
3143
<!-- Package payload: build target + scaffold templates -->
3244
<ItemGroup>
3345
<None Include="build/EnvironmentConfigurator.targets" Pack="true" PackagePath="build/" />

src/EnvironmentConfigurator/EnvironmentConfiguratorExtensions.cs renamed to EnvironmentConfigurator/EnvironmentConfiguratorExtensions.cs

File renamed without changes.

src/EnvironmentConfigurator/EnvironmentConfiguratorOptions.cs renamed to EnvironmentConfigurator/EnvironmentConfiguratorOptions.cs

File renamed without changes.
File renamed without changes.

src/EnvironmentConfigurator/build/EnvironmentConfigurator.targets renamed to EnvironmentConfigurator/build/EnvironmentConfigurator.targets

File renamed without changes.

samples/EnvironmentConfiguratorApi/appsettings.Beta.json renamed to EnvironmentConfigurator/templates/appsettings.Beta.json

File renamed without changes.

0 commit comments

Comments
 (0)