Skip to content

Commit 7fbbeb0

Browse files
codebytescodebytes
committed
Update project files to target .NET 10.0 and add configuration for new projects
1 parent a074c00 commit 7fbbeb0

12 files changed

Lines changed: 128 additions & 24 deletions

File tree

‎aspire-sample/aspire-sample.ApiService/aspire-sample.ApiService.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>

‎aspire-sample/aspire-sample.AppHost/aspire-sample.AppHost.csproj‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
1+
<Project Sdk="Aspire.AppHost.Sdk/13.2.3">
32
<PropertyGroup>
43
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
65
<ImplicitUsings>enable</ImplicitUsings>
76
<Nullable>enable</Nullable>
87
<IsAspireHost>true</IsAspireHost>
@@ -14,8 +13,4 @@
1413
<ProjectReference Include="..\aspire-sample.Web\aspire-sample.Web.csproj" />
1514
</ItemGroup>
1615

17-
<ItemGroup>
18-
<PackageReference Include="Aspire.Hosting.AppHost" Version="8.2.0" />
19-
</ItemGroup>
20-
2116
</Project>

‎aspire-sample/aspire-sample.ServiceDefaults/aspire-sample.ServiceDefaults.csproj‎

Lines changed: 8 additions & 8 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+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<IsAspireSharedProject>true</IsAspireSharedProject>
@@ -10,13 +10,13 @@
1010
<ItemGroup>
1111
<FrameworkReference Include="Microsoft.AspNetCore.App" />
1212

13-
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="8.8.0" />
14-
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="8.2.0" />
15-
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
16-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
17-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
18-
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
19-
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
13+
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.5.0" />
14+
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="10.5.0" />
15+
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
16+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.15.3" />
17+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
18+
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.15.1" />
19+
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.15.1" />
2020
</ItemGroup>
2121

2222
</Project>

‎aspire-sample/aspire-sample.Web/aspire-sample.Web.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>

‎aspire-sample/aspire.config.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"appHost": {
3+
"path": "aspire-sample.AppHost/aspire-sample.AppHost.csproj"
4+
}
5+
}

‎dotnet-sample/dotnet-sample.sln‎

Lines changed: 40 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,58 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
4-
VisualStudioVersion = 17.5.002.0
4+
VisualStudioVersion = 17.5.2.0
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-sample", "dotnet-sample.csproj", "{9F64ACA8-AC68-4997-8BCB-9DDC42A84792}"
6+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}"
7+
EndProject
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-sample", "src\dotnet-sample.csproj", "{A4A6F055-4A12-41AF-A3A1-FFAAEE63A22E}"
9+
EndProject
10+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{0C88DD14-F956-CE84-757C-A364CCF449FC}"
11+
EndProject
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-sample.Tests", "test\dotnet-sample.Tests.csproj", "{50C13B46-EF65-4C17-B89B-66603CCDD8CB}"
713
EndProject
814
Global
915
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1016
Debug|Any CPU = Debug|Any CPU
17+
Debug|x64 = Debug|x64
18+
Debug|x86 = Debug|x86
1119
Release|Any CPU = Release|Any CPU
20+
Release|x64 = Release|x64
21+
Release|x86 = Release|x86
1222
EndGlobalSection
1323
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14-
{9F64ACA8-AC68-4997-8BCB-9DDC42A84792}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15-
{9F64ACA8-AC68-4997-8BCB-9DDC42A84792}.Debug|Any CPU.Build.0 = Debug|Any CPU
16-
{9F64ACA8-AC68-4997-8BCB-9DDC42A84792}.Release|Any CPU.ActiveCfg = Release|Any CPU
17-
{9F64ACA8-AC68-4997-8BCB-9DDC42A84792}.Release|Any CPU.Build.0 = Release|Any CPU
24+
{A4A6F055-4A12-41AF-A3A1-FFAAEE63A22E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
25+
{A4A6F055-4A12-41AF-A3A1-FFAAEE63A22E}.Debug|Any CPU.Build.0 = Debug|Any CPU
26+
{A4A6F055-4A12-41AF-A3A1-FFAAEE63A22E}.Debug|x64.ActiveCfg = Debug|Any CPU
27+
{A4A6F055-4A12-41AF-A3A1-FFAAEE63A22E}.Debug|x64.Build.0 = Debug|Any CPU
28+
{A4A6F055-4A12-41AF-A3A1-FFAAEE63A22E}.Debug|x86.ActiveCfg = Debug|Any CPU
29+
{A4A6F055-4A12-41AF-A3A1-FFAAEE63A22E}.Debug|x86.Build.0 = Debug|Any CPU
30+
{A4A6F055-4A12-41AF-A3A1-FFAAEE63A22E}.Release|Any CPU.ActiveCfg = Release|Any CPU
31+
{A4A6F055-4A12-41AF-A3A1-FFAAEE63A22E}.Release|Any CPU.Build.0 = Release|Any CPU
32+
{A4A6F055-4A12-41AF-A3A1-FFAAEE63A22E}.Release|x64.ActiveCfg = Release|Any CPU
33+
{A4A6F055-4A12-41AF-A3A1-FFAAEE63A22E}.Release|x64.Build.0 = Release|Any CPU
34+
{A4A6F055-4A12-41AF-A3A1-FFAAEE63A22E}.Release|x86.ActiveCfg = Release|Any CPU
35+
{A4A6F055-4A12-41AF-A3A1-FFAAEE63A22E}.Release|x86.Build.0 = Release|Any CPU
36+
{50C13B46-EF65-4C17-B89B-66603CCDD8CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
37+
{50C13B46-EF65-4C17-B89B-66603CCDD8CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
38+
{50C13B46-EF65-4C17-B89B-66603CCDD8CB}.Debug|x64.ActiveCfg = Debug|Any CPU
39+
{50C13B46-EF65-4C17-B89B-66603CCDD8CB}.Debug|x64.Build.0 = Debug|Any CPU
40+
{50C13B46-EF65-4C17-B89B-66603CCDD8CB}.Debug|x86.ActiveCfg = Debug|Any CPU
41+
{50C13B46-EF65-4C17-B89B-66603CCDD8CB}.Debug|x86.Build.0 = Debug|Any CPU
42+
{50C13B46-EF65-4C17-B89B-66603CCDD8CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
43+
{50C13B46-EF65-4C17-B89B-66603CCDD8CB}.Release|Any CPU.Build.0 = Release|Any CPU
44+
{50C13B46-EF65-4C17-B89B-66603CCDD8CB}.Release|x64.ActiveCfg = Release|Any CPU
45+
{50C13B46-EF65-4C17-B89B-66603CCDD8CB}.Release|x64.Build.0 = Release|Any CPU
46+
{50C13B46-EF65-4C17-B89B-66603CCDD8CB}.Release|x86.ActiveCfg = Release|Any CPU
47+
{50C13B46-EF65-4C17-B89B-66603CCDD8CB}.Release|x86.Build.0 = Release|Any CPU
1848
EndGlobalSection
1949
GlobalSection(SolutionProperties) = preSolution
2050
HideSolutionNode = FALSE
2151
EndGlobalSection
52+
GlobalSection(NestedProjects) = preSolution
53+
{A4A6F055-4A12-41AF-A3A1-FFAAEE63A22E} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
54+
{50C13B46-EF65-4C17-B89B-66603CCDD8CB} = {0C88DD14-F956-CE84-757C-A364CCF449FC}
55+
EndGlobalSection
2256
GlobalSection(ExtensibilityGlobals) = postSolution
2357
SolutionGuid = {0C410A2A-5BA9-41BD-AFC4-220FD9EA110F}
2458
EndGlobalSection

dotnet-sample/Program.cs renamed to dotnet-sample/src/Program.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@
44
app.MapGet("/", () => "Hello PowerShell + DevOps Summit!");
55

66
app.Run();
7+
8+
// Make Program accessible for integration tests (WebApplicationFactory<Program>)
9+
public partial class Program { }

dotnet-sample/appsettings.Development.json renamed to dotnet-sample/src/appsettings.Development.json

File renamed without changes.

dotnet-sample/appsettings.json renamed to dotnet-sample/src/appsettings.json

File renamed without changes.

dotnet-sample/dotnet-sample.csproj renamed to dotnet-sample/src/dotnet-sample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<RootNamespace>dotnet_sample</RootNamespace>

0 commit comments

Comments
 (0)