Skip to content

Commit 6f6f76e

Browse files
committed
ターゲットフレームワークをnet10.0に更新し構造を整理
プロジェクト全体のターゲットフレームワークを`net10.0`に更新。 依存関係のバージョン指定を簡素化し、条件付きバージョンを追加。 新しいパッケージ(`MahApps.Metro`、`Prism.Unity`、`Prism.Wpf`)を導入。 ソリューションファイル形式を`.slnx`に移行し、フォルダ構造を整理。 名前空間変更(`Prism.Regions`→`Prism.Navigation.Regions`)を適用。
1 parent 7c116db commit 6f6f76e

File tree

15 files changed

+151
-520
lines changed

15 files changed

+151
-520
lines changed

Directory.Packages.props

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,19 @@
88
<PackageVersion Include="System.Reactive" Version="6.1.0" />
99
<!-- Platform Dependencies -->
1010
<PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
11-
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="8.0.7" />
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+
1224
<!-- Test Dependencies -->
1325
<PackageVersion Include="bunit" Version="1.40.0" />
1426
<PackageVersion Include="coverlet.collector" Version="6.0.4" />

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)