Skip to content

Commit 1606433

Browse files
guuskuiperguuskuiper
authored
Merge pull request #12 from DEMCON/dotnet10
.NET 10
2 parents 7f558fc + 022368e commit 1606433

11 files changed

Lines changed: 30 additions & 75 deletions

File tree

‎.github/workflows/dotnet.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Setup .NET
2222
uses: actions/setup-dotnet@v3
2323
with:
24-
dotnet-version: 9.0.x
24+
dotnet-version: 10.0.x
2525

2626
- name: Restore dependencies
2727
run: dotnet restore

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Setup .NET
2525
uses: actions/setup-dotnet@v3
2626
with:
27-
dotnet-version: 9.0.x
27+
dotnet-version: 10.0.x
2828

2929
- name: Restore dependencies
3030
run: dotnet restore

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
3+
<TargetFrameworks>net10.0;net9.0</TargetFrameworks>
44
<ImplicitUsings>enable</ImplicitUsings>
55
<Nullable>enable</Nullable>
66
<IsPackable>false</IsPackable>

‎examples/Arq/LibStored.Net.Arq.AppHost/LibStored.Net.Arq.AppHost.csproj‎

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

3-
<Sdk Name="Aspire.AppHost.Sdk" Version="9.5.1" />
3+
<Sdk Name="Aspire.AppHost.Sdk" Version="13.0.0" />
44

55
<PropertyGroup>
66
<OutputType>Exe</OutputType>
7-
<TargetFramework>net9.0</TargetFramework>
87
<ImplicitUsings>enable</ImplicitUsings>
98
<Nullable>enable</Nullable>
109
<UserSecretsId>d0c7426e-ff4f-42e0-bd7a-b3f6358f193d</UserSecretsId>
1110
</PropertyGroup>
1211

1312
<ItemGroup>
14-
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.5.1" />
13+
<PackageReference Include="Aspire.Hosting.AppHost" Version="13.0.0" />
1514
</ItemGroup>
1615

1716
<ItemGroup>

‎examples/Arq/LibStored.Net.Arq.Console/LibStored.Net.Arq.Console.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net9.0</TargetFramework>
65
<ImplicitUsings>enable</ImplicitUsings>
76
<Nullable>enable</Nullable>
87
</PropertyGroup>

‎examples/Arq/LibStored.Net.Arq.ServiceDefaults/LibStored.Net.Arq.ServiceDefaults.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
54
<ImplicitUsings>enable</ImplicitUsings>
65
<Nullable>enable</Nullable>
76
<IsAspireSharedProject>true</IsAspireSharedProject>

‎examples/Sync/LibStored.Net.Example.AppHost/LibStored.Net.Example.AppHost.csproj‎

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

3-
<Sdk Name="Aspire.AppHost.Sdk" Version="9.5.1" />
3+
<Sdk Name="Aspire.AppHost.Sdk" Version="13.0.0" />
44

55
<PropertyGroup>
66
<OutputType>Exe</OutputType>
7-
<TargetFramework>net9.0</TargetFramework>
87
<NoWarn>CS1591</NoWarn>
98
<IsAspireHost>true</IsAspireHost>
109
<UserSecretsId>d11b339a-7d36-4112-8969-2ebfad7419e0</UserSecretsId>
1110
</PropertyGroup>
1211

1312
<ItemGroup>
14-
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.5.1" />
15-
<PackageReference Include="Aspire.Hosting.Docker" Version="9.5.1-preview.1.25502.11" />
16-
<PackageReference Include="Aspire.Hosting.Python" Version="9.5.1" />
13+
<PackageReference Include="Aspire.Hosting.AppHost" Version="13.0.0" />
14+
<PackageReference Include="Aspire.Hosting.Docker" Version="13.0.0-preview.1.25560.3" />
15+
<PackageReference Include="Aspire.Hosting.Python" Version="13.0.0" />
1716
</ItemGroup>
1817

1918
<ItemGroup>
2019
<ProjectReference Include="..\LibStored.Net.Example.Console\LibStored.Net.Example.Console.csproj" />
2120
</ItemGroup>
2221

23-
<!-- Example to automatically install the python venv from https://github.com/dotnet/aspire-samples/tree/main/samples/AspireWithPython -->
24-
<!-- Properties, Items, and targets to ensure Python apps are initialized -->
25-
<PropertyGroup>
26-
<PythonVirtualEnvironmentName>.venv</PythonVirtualEnvironmentName>
27-
</PropertyGroup>
28-
29-
<ItemGroup>
30-
<PipRequirementsTxt Include="python\requirements.txt" />
31-
</ItemGroup>
32-
33-
<Target Name="SetPipInstallSentinelFilePath">
34-
<PropertyGroup>
35-
<PipInstallSentinelFilePath>$(IntermediateOutputPath)piprestored.sentinel</PipInstallSentinelFilePath>
36-
</PropertyGroup>
37-
</Target>
38-
39-
<Target Name="CreatePythonVirtualEnvironments">
40-
<PropertyGroup>
41-
<PipRequirementsTxtDir>%(PipRequirementsTxt.RootDir)%(PipRequirementsTxt.Directory)</PipRequirementsTxtDir>
42-
<VenvDir>$(PipRequirementsTxtDir)$(PythonVirtualEnvironmentName)/</VenvDir>
43-
<CreateVenv Condition="!Exists('$(VenvDir)')">True</CreateVenv>
44-
</PropertyGroup>
45-
46-
<Message Importance="Normal" Text="Initializing virtual environment for $(PipRequirementsTxtDir)" />
47-
48-
<Exec Command="python -m venv $(VenvDir)" WorkingDirectory="$(PipRequirementsTxtDir)" Condition=" '$(CreateVenv)' == 'True' " />
49-
</Target>
50-
51-
<Target Name="PipInstall" AfterTargets="PrepareForBuild" DependsOnTargets="SetPipInstallSentinelFilePath;CreatePythonVirtualEnvironments" Condition=" '$(DesignTimeBuild)' != 'True' " Inputs="@(PipRequirementsTxt)" Outputs="$(PipInstallSentinelFilePath)">
52-
<PropertyGroup>
53-
<PipRequirementsTxtDir>%(PipRequirementsTxt.RootDir)%(PipRequirementsTxt.Directory)</PipRequirementsTxtDir>
54-
<PipCmd Condition=" '$(OS)' == 'Windows_NT' ">pip</PipCmd>
55-
<PipCmd Condition=" '$(OS)' != 'Windows_NT' ">python -m pip</PipCmd>
56-
<PipInstallCmd>$(PipCmd) install -r %(PipRequirementsTxt.Filename)%(PipRequirementsTxt.Extension)</PipInstallCmd>
57-
<RestoreCmd Condition=" '$(OS)' == 'Windows_NT' ">call $(PythonVirtualEnvironmentName)\Scripts\activate.bat &amp;&amp; $(PipInstallCmd)</RestoreCmd>
58-
<RestoreCmd Condition=" '$(OS)' != 'Windows_NT' ">. ./$(PythonVirtualEnvironmentName)/bin/activate &amp;&amp; $(PipInstallCmd)</RestoreCmd>
59-
</PropertyGroup>
60-
61-
<Message Importance="Normal" Text="Restoring packages for $(PipRequirementsTxtDir)" />
62-
63-
<Exec Command="$(RestoreCmd)" WorkingDirectory="$(PipRequirementsTxtDir)" />
64-
65-
<Touch Files="$(PipInstallSentinelFilePath)" AlwaysCreate="True" />
66-
67-
<ItemGroup>
68-
<FileWrites Include="$(PipInstallSentinelFilePath)" />
69-
</ItemGroup>
70-
</Target>
71-
7222
</Project>

‎examples/Sync/LibStored.Net.Example.AppHost/Program.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-FileCopyrightText: 2025 Guus Kuiper
2-
//
2+
//
33
// SPDX-License-Identifier: MIT
44

55
// ReSharper disable SuggestVarOrType_SimpleTypes
@@ -37,19 +37,19 @@
3737
.WithEndpoint(targetPort: 6666, name: "debug", env: "NETMQ_DEBUG")
3838
;
3939

40-
#pragma warning disable ASPIREHOSTINGPYTHON001
41-
var py1 = builder.AddPythonApp("libstored-gui-container", "python", "-m", ["libstored.gui"])
40+
var py1 = builder.AddPythonModule("libstored-gui-container", "python", "libstored.gui")
4241
.WaitFor(sync)
42+
.WithPip()
4343
.WithPortArgFromEndpoint(sync, "debug")
4444
.ExcludeFromManifest()
4545
;
4646

47-
var py2 = builder.AddPythonApp("libstored-gui-cs", "python", "-m", ["libstored.gui"])
47+
var py2 = builder.AddPythonModule("libstored-gui-cs", "python", "libstored.gui")
4848
.WaitFor(client)
49+
.WaitFor(py1) // don't start and install at the same time
50+
.WithPip(false)
4951
.WithPortArgFromEndpoint(client, "debug")
5052
.ExcludeFromManifest()
5153
;
5254

53-
#pragma warning restore ASPIREHOSTINGPYTHON001
54-
5555
builder.Build().Run();

‎examples/Sync/LibStored.Net.Example.ServiceDefaults/LibStored.Net.Example.ServiceDefaults.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<FrameworkReference Include="Microsoft.AspNetCore.App" />
1010

1111
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.2.0" />
12-
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.1.0" />
12+
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.5.1" />
1313
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
1414
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
1515
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />

‎src/LibStored.Net.Generator/LibStored.Net.Generator.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<!-- 👇 Source generators must target netstandard 2.0 -->
5-
<TargetFramework>netstandard2.0</TargetFramework>
5+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
66
<Nullable>enable</Nullable>
77
<ImplicitUsings>true</ImplicitUsings>
88
<LangVersion>Latest</LangVersion>

0 commit comments

Comments
 (0)