Skip to content

Commit a5c6d1d

Browse files
Upgrade to .NET 10 SDK and update libraries (#511)
* init * Migrate to Central Package Management (CPM) - Add Directory.Packages.props to centrally manage NuGet package versions - Remove Version attributes from all PackageReference elements across projects - Update Microsoft.SourceLink.GitHub from 1.1.1 to 8.0.0 - Enable ManagePackageVersionsCentrally property - Consolidate package version management for Core, Platform (WPF/Blazor), and Test projects This change improves maintainability by managing all package versions in a single location. パッケージバージョンの中央管理を導入 すべてのプロジェクトファイルから`<PackageReference>`の`Version`属性を削除し、`Directory.Packages.props`ファイルを追加してパッケージバージョンを一元管理しました。これにより、`ManagePackageVersionsCentrally`プロパティが有効になり、依存関係のバージョン管理が簡素化されました。また、`Microsoft.SourceLink.GitHub`のバージョン指定も削除されました。 * ターゲットフレームワークをnet10.0に更新し構造を整理 プロジェクト全体のターゲットフレームワークを`net10.0`に更新。 依存関係のバージョン指定を簡素化し、条件付きバージョンを追加。 新しいパッケージ(`MahApps.Metro`、`Prism.Unity`、`Prism.Wpf`)を導入。 ソリューションファイル形式を`.slnx`に移行し、フォルダ構造を整理。 名前空間変更(`Prism.Regions`→`Prism.Navigation.Regions`)を適用。 * Update .NET version to 10.0.x in workflow files * Update workflow files to use ReactiveProperty.slnx for dependency installation and testing --------- Co-authored-by: Kazuki Ota <117221407+kaota_microsoft@users.noreply.github.com>
1 parent 73b9c64 commit a5c6d1d

File tree

26 files changed

+207
-565
lines changed

26 files changed

+207
-565
lines changed

.github/workflows/build-and-publish.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- 'v*'
77

88
env:
9-
DOTNET_VERSION: 9.0.x
9+
DOTNET_VERSION: 10.0.x
1010

1111
jobs:
1212
build:
@@ -32,11 +32,11 @@ jobs:
3232
$doc = [XML](Get-Content 'Source\Directory.Build.props')
3333
echo "version=$($doc.Project.PropertyGroup.Version)" >> $Env:GITHUB_OUTPUT
3434
- name: Install dependencies
35-
run: dotnet restore ReactiveProperty.sln
35+
run: dotnet restore ReactiveProperty.slnx
3636
- name: Build
37-
run: dotnet build ReactiveProperty.sln -c Release --no-restore /p:ContinuousIntegrationBuild=True /p:EmbedUntrackedSources=True
37+
run: dotnet build ReactiveProperty.slnx -c Release --no-restore /p:ContinuousIntegrationBuild=True /p:EmbedUntrackedSources=True
3838
- name: Test
39-
run: dotnet test ReactiveProperty.sln --no-restore --verbosity normal
39+
run: dotnet test ReactiveProperty.slnx --no-restore --verbosity normal
4040
- name: Copy package files
4141
run: |
4242
mkdir dist

.github/workflows/deploy-document.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Use Node.js ${{ matrix.node-version }}
1919
uses: actions/setup-node@v1
2020
with:
21-
node-version: '12.x'
21+
node-version: '22.x'
2222
registry-url: 'https://registry.npmjs.org'
2323
- run: |
2424
npm install

.github/workflows/dotnet-core-unit-testing.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches: [ main ]
66

77
env:
8-
DOTNET_VERSION: 9.0.x
8+
DOTNET_VERSION: 10.0.x
99

1010
jobs:
1111
build:
@@ -19,6 +19,6 @@ jobs:
1919
with:
2020
dotnet-version: ${{ env.DOTNET_VERSION }}
2121
- name: Install dependencies
22-
run: dotnet restore ReactiveProperty.sln
22+
run: dotnet restore ReactiveProperty.slnx
2323
- name: Test
24-
run: dotnet test ReactiveProperty.sln --no-restore --verbosity normal
24+
run: dotnet test ReactiveProperty.slnx --no-restore --verbosity normal

Directory.Packages.props

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
</PropertyGroup>
5+
<ItemGroup>
6+
<!-- Core Dependencies -->
7+
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
8+
<PackageVersion Include="System.Reactive" Version="6.1.0" />
9+
<!-- Platform Dependencies -->
10+
<PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
11+
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="8.0.22" Condition="'$(TargetFramework)' == 'net8.0'" />
12+
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="9.0.8" Condition="'$(TargetFramework)' == 'net9.0'" />
13+
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="10.0.0" Condition="'$(TargetFramework)' == 'net10.0'" />
14+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.22" Condition="'$(TargetFramework)' == 'net8.0'" />
15+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.8" Condition="'$(TargetFramework)' == 'net9.0'" />
16+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.0" Condition="'$(TargetFramework)' == 'net10.0'" />
17+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.22" Condition="'$(TargetFramework)' == 'net8.0'" />
18+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.8" Condition="'$(TargetFramework)' == 'net9.0'" />
19+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.0" Condition="'$(TargetFramework)' == 'net10.0'" />
20+
<PackageVersion Include="MahApps.Metro" Version="2.4.11" />
21+
<PackageVersion Include="Prism.Unity" Version="9.0.537" />
22+
<PackageVersion Include="Prism.Wpf" Version="9.0.537" />
23+
24+
<!-- Test Dependencies -->
25+
<PackageVersion Include="bunit" Version="1.40.0" />
26+
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
27+
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
28+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
29+
<PackageVersion Include="Microsoft.Reactive.Testing" Version="6.1.0" />
30+
<PackageVersion Include="Moq" Version="4.20.72" />
31+
<PackageVersion Include="MSTest.TestAdapter" Version="3.11.0" />
32+
<PackageVersion Include="MSTest.TestFramework" Version="3.11.0" />
33+
<!-- Build and Source Control -->
34+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
35+
</ItemGroup>
36+
</Project>

README.md

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

33
# ReactiveProperty
44

5-
ReactiveProperty provides MVVM and asynchronous support features under Reactive Extensions. Target framework is .NET 6.0+, .NET Framework 4.7.2 and .NET Standard 2.0.
5+
ReactiveProperty provides MVVM and asynchronous support features under Reactive Extensions. Target framework is .NET 8.0+, .NET Framework 4.7.2 and .NET Standard 2.0.
66

77
![](https://img.shields.io/nuget/v/ReactiveProperty.svg)
88
![](https://img.shields.io/nuget/dt/ReactiveProperty.svg)

ReactiveProperty-Samples.sln

Lines changed: 0 additions & 125 deletions
This file was deleted.

ReactiveProperty-Samples.slnx

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<Solution>
2+
<Folder Name="/BasicSample/">
3+
<Project Path="Samples/ReactivePropertyCoreSample.WPF/ReactivePropertyCoreSample.WPF.csproj" />
4+
<Project Path="Samples/ReactivePropertySamples.Shared/ReactivePropertySamples.Shared.csproj" />
5+
<Project Path="Samples/ReactivePropertySamples.WPF/ReactivePropertySamples.WPF.csproj" />
6+
</Folder>
7+
<Folder Name="/Blazor/">
8+
<Project Path="Samples/Blazor/BlazorSample.Shared/BlazorSample.Shared.csproj" />
9+
<Project Path="Samples/Blazor/BlazorSample/BlazorSample.Client/BlazorSample.Client.csproj" />
10+
<Project Path="Samples/Blazor/BlazorSample/BlazorSample/BlazorSample.csproj" />
11+
</Folder>
12+
<Folder Name="/Libraries/">
13+
<Project Path="Source/ReactiveProperty.Core/ReactiveProperty.Core.csproj" />
14+
<Project Path="Source/ReactiveProperty.NETStandard/ReactiveProperty.NETStandard.csproj" />
15+
<Project Path="Source/ReactiveProperty.Platform.Blazor/ReactiveProperty.Platform.Blazor.csproj" />
16+
<Project Path="Source/ReactiveProperty.Platform.WPF/ReactiveProperty.Platform.WPF.csproj" />
17+
</Folder>
18+
<Folder Name="/MultiUIThread/">
19+
<Project Path="Samples/MultiUIThreadApp/MultiUIThreadApp.csproj" />
20+
</Folder>
21+
<Folder Name="/WithPrism/">
22+
<Project Path="Samples/Reactive.Todo.Main/Reactive.Todo.Main.csproj" />
23+
<Project Path="Samples/Reactive.Todo/Reactive.Todo.csproj" />
24+
</Folder>
25+
</Solution>

0 commit comments

Comments
 (0)