Skip to content

Commit a7683b8

Browse files
committed
samples: Add 'Official' solution configuration, remove all but AnyCPU
On Rider, this was needed to actually run the samples with 'Official' configuration. Only Debug/Release were shown.
1 parent 896f765 commit a7683b8

File tree

5 files changed

+19
-17
lines changed

5 files changed

+19
-17
lines changed

Samples/MvvmSample.Wpf/MvvmSample.Wpf/MvvmSample.Wpf.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
77
<UseWPF>true</UseWPF>
88
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
9+
<Configurations>Debug;Release;Official</Configurations>
10+
<Platforms>AnyCPU</Platforms>
911
</PropertyGroup>
1012
<ItemGroup>
1113
<PackageReference Include="Prism.Unity" />
@@ -20,7 +22,6 @@
2022
</ItemGroup>
2123

2224
<ItemGroup Condition="'$(Configuration)' != 'Official'">
23-
<!-- <PackageReference Include="UnitsNet" VersionOverride="5.75.0" /> -->
2425
<PackageReference Include="UnitsNet" VersionOverride="6.0.0-pre019" />
2526
</ItemGroup>
2627

Samples/Samples.slnx

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
11
<Solution>
22
<Configurations>
3-
<Platform Name="Any CPU" />
4-
<Platform Name="ARM" />
5-
<Platform Name="x64" />
6-
<Platform Name="x86" />
3+
<BuildType Name="Debug" />
4+
<BuildType Name="Official" />
5+
<BuildType Name="Release" />
76
</Configurations>
87
<Folder Name="/_Files/">
98
<File Path="build.bat" />
109
<File Path="Directory.Packages.props" />
1110
<File Path="msbuild.cmd" />
1211
</Folder>
13-
<Project Path="MvvmSample.Wpf/MvvmSample.Wpf/MvvmSample.Wpf.csproj">
14-
<Build Solution="*|ARM" Project="false" />
15-
</Project>
12+
<Project Path="MvvmSample.Wpf/MvvmSample.Wpf/MvvmSample.Wpf.csproj" />
1613
<Project Path="UnitConverter.Console/UnitConverter.Console.csproj" />
17-
<Project Path="UnitConverter.Wpf/UnitConverter.Wpf/UnitConverter.Wpf.csproj">
18-
<Build Solution="*|ARM" Project="false" />
14+
<Project Path="UnitConverter.Wpf/UnitConverter.Wpf/UnitConverter.Wpf.csproj" />
15+
<Project Path="UnitsNetSetup.Configuration/UnitsNetSetup.Configuration.csproj">
16+
<Configuration Solution="Official|Any CPU" Project="Official|Any CPU|NoBuild" />
1917
</Project>
20-
<Project Path="UnitsNetSetup.Configuration/UnitsNetSetup.Configuration.csproj" />
21-
</Solution>
18+
</Solution>

Samples/UnitConverter.Console/UnitConverter.Console.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,16 @@
55
<TargetFramework>net9.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
8+
<Configurations>Debug;Release;Official</Configurations>
9+
<Platforms>AnyCPU</Platforms>
810
</PropertyGroup>
911

1012
<ItemGroup Condition="'$(Configuration)' != 'Official'">
1113
<PackageReference Include="UnitsNet" VersionOverride="6.0.0-pre019" />
1214
</ItemGroup>
1315

1416
<ItemGroup Condition="'$(Configuration)' == 'Official'">
15-
<PackageReference Include="UnitsNet" VersionOverride="5.75.0" />
17+
<PackageReference Include="UnitsNet" />
1618
</ItemGroup>
1719

1820
</Project>

Samples/UnitConverter.Wpf/UnitConverter.Wpf/UnitConverter.Wpf.csproj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
77
<UseWPF>true</UseWPF>
88
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
9+
<Configurations>Debug;Release;Official</Configurations>
10+
<Platforms>AnyCPU</Platforms>
911
</PropertyGroup>
1012
<PropertyGroup>
1113
<ApplicationIcon>logo-512.ico</ApplicationIcon>
@@ -24,12 +26,11 @@
2426
</ItemGroup>
2527

2628

27-
<ItemGroup Condition="'$(Configuration)' != 'Release'">
28-
<!-- <PackageReference Include="UnitsNet" VersionOverride="5.75.0" /> -->
29+
<ItemGroup Condition="'$(Configuration)' != 'Official'">
2930
<PackageReference Include="UnitsNet" VersionOverride="6.0.0-pre019" />
3031
</ItemGroup>
3132

32-
<ItemGroup Condition="'$(Configuration)' == 'Release'">
33+
<ItemGroup Condition="'$(Configuration)' == 'Official'">
3334
<PackageReference Include="UnitsNet" />
3435
</ItemGroup>
3536

Samples/UnitsNetSetup.Configuration/UnitsNetSetup.Configuration.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
<TargetFramework>net9.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
8+
<Configurations>Debug;Release;Official</Configurations>
9+
<Platforms>AnyCPU</Platforms>
810
</PropertyGroup>
911

1012
<ItemGroup Condition="'$(Configuration)' != 'Official'">
11-
<!-- <PackageReference Include="UnitsNet" VersionOverride="5.75.0" /> -->
1213
<PackageReference Include="UnitsNet" VersionOverride="6.0.0-pre019" />
1314
</ItemGroup>
1415

0 commit comments

Comments
 (0)