Skip to content

Commit 187e486

Browse files
azchohfiazchohfi
committed
Updated to ProjectReunion 0.5.
1 parent 1021d30 commit 187e486

6 files changed

Lines changed: 36 additions & 17 deletions

File tree

‎ColorCode.WinUI/ColorCode.WinUI.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">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0-windows10.0.18362.0</TargetFramework>
4+
<TargetFramework>net5.0-windows10.0.19041.0</TargetFramework>
55
<SupportedOSPlatformVersion>$(TargetPlatformMinVersion)</SupportedOSPlatformVersion>
66
<RootNamespace>ColorCode</RootNamespace>
77
<AssemblyName>ColorCode.WinUI</AssemblyName>

‎Directory.Build.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<IsWinUIProject>$(MSBuildProjectName.Contains('WinUI'))</IsWinUIProject>
1212
<IsTestProject>$(MSBuildProjectName.Contains('Test'))</IsTestProject>
1313
<!-- UWP Config -->
14-
<TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
15-
<TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
14+
<TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
15+
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
1616
<SupportedOSPlatformVersion>$(TargetPlatformMinVersion)</SupportedOSPlatformVersion>
1717

1818
</PropertyGroup>
@@ -38,9 +38,9 @@
3838
<Choose>
3939
<When Condition="'$(IsWinUIProject)' == 'true' or '$(IsWinUIProject)' == 'true'">
4040
<ItemGroup>
41-
<PackageReference Include="Microsoft.WinUI">
42-
<Version>3.0.0-preview4.210210.4</Version>
43-
</PackageReference>
41+
<PackageReference Include="Microsoft.ProjectReunion" Version="0.5.0-prerelease" />
42+
<PackageReference Include="Microsoft.ProjectReunion.Foundation" Version="0.5.0-prerelease" />
43+
<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="0.5.0-prerelease" />
4444
</ItemGroup>
4545
</When>
4646
</Choose>

‎Tests/ColorCode.WinUITests (Package)/ColorCode.WinUITests (Package).wapproj‎

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,11 @@
3636
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
3737
<PropertyGroup>
3838
<ProjectGuid>dd20d31a-915e-43a2-b819-3a7ae39ca25c</ProjectGuid>
39-
<TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
40-
<TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
39+
<TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
40+
<TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
4141
<DefaultLanguage>en-US</DefaultLanguage>
4242
<AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
4343
<AppxTargetsLocation Condition="'$(AppxTargetsLocation)'==''">$(MSBuildThisFileDirectory)build\</AppxTargetsLocation>
44-
<EntryPointProjectUniqueName>..\ColorCode.WinUITests\ColorCode.WinUITests.csproj</EntryPointProjectUniqueName>
4544
</PropertyGroup>
4645
<ItemGroup>
4746
<AppxManifest Include="Package.appxmanifest">
@@ -63,6 +62,27 @@
6362
<PublishProfile>Properties\PublishProfiles\win10-$(Platform).pubxml</PublishProfile>
6463
</ProjectReference>
6564
</ItemGroup>
65+
<PropertyGroup>
66+
<!--PackageReference.GeneratePathProperty does not support NUGET_PACKAGES env var...-->
67+
<NuGetPackageRoot Condition="'$(NuGetPackageRoot)'==''">$(NUGET_PACKAGES)</NuGetPackageRoot>
68+
<NuGetPackageRoot Condition="'$(NuGetPackageRoot)'==''">$(UserProfile)\.nuget\packages</NuGetPackageRoot>
69+
<PkgMicrosoft_ProjectReunion Condition="'$(PkgMicrosoft_ProjectReunion)'==''">$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'Microsoft.ProjectReunion', '0.5.0-prerelease'))</PkgMicrosoft_ProjectReunion>
70+
<PkgMicrosoft_ProjectReunion Condition="!Exists($(PkgMicrosoft_ProjectReunion))">$(SolutionDir)packages\Microsoft.ProjectReunion.0.5.0-prerelease\</PkgMicrosoft_ProjectReunion>
71+
<PkgMicrosoft_ProjectReunion_WinUI Condition="'$(PkgMicrosoft_ProjectReunion_WinUI)'==''">$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'Microsoft.ProjectReunion.WinUI', '0.5.0-prerelease'))</PkgMicrosoft_ProjectReunion_WinUI>
72+
<PkgMicrosoft_ProjectReunion_WinUI Condition="!Exists($(PkgMicrosoft_ProjectReunion_WinUI))">$(SolutionDir)packages\Microsoft.ProjectReunion.WinUI.0.5.0-prerelease\</PkgMicrosoft_ProjectReunion_WinUI>
73+
<Microsoft_ProjectReunion_AppXReference_props>$([MSBuild]::NormalizeDirectory('$(PkgMicrosoft_ProjectReunion)', 'build'))Microsoft.ProjectReunion.AppXReference.props</Microsoft_ProjectReunion_AppXReference_props>
74+
<Microsoft_WinUI_AppX_targets>$([MSBuild]::NormalizeDirectory('$(PkgMicrosoft_ProjectReunion_WinUI)', 'build'))Microsoft.WinUI.AppX.targets</Microsoft_WinUI_AppX_targets>
75+
<EntryPointProjectUniqueName>..\ColorCode.WinUITests\ColorCode.WinUITests.csproj</EntryPointProjectUniqueName>
76+
</PropertyGroup>
77+
<ItemGroup>
78+
<PackageReference Include="Microsoft.ProjectReunion" Version="[0.5.0-prerelease]" GeneratePathProperty="true">
79+
<ExcludeAssets>all</ExcludeAssets>
80+
</PackageReference>
81+
<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="[0.5.0-prerelease]" GeneratePathProperty="true">
82+
<ExcludeAssets>all</ExcludeAssets>
83+
</PackageReference>
84+
</ItemGroup>
6685
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
67-
<Import Project="$(AppxTargetsLocation)Microsoft.WinUI.AppX.targets" />
86+
<Import Project="$(Microsoft_ProjectReunion_AppXReference_props)" />
87+
<Import Project="$(Microsoft_WinUI_AppX_targets)" />
6888
</Project>

‎Tests/ColorCode.WinUITests (Package)/Package.appxmanifest‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</Properties>
1919

2020
<Dependencies>
21-
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
22-
<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14393.0" MaxVersionTested="10.0.14393.0" />
21+
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
22+
<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
2323
</Dependencies>
2424

2525
<Resources>
@@ -43,7 +43,6 @@
4343
</Applications>
4444

4545
<Capabilities>
46-
<Capability Name="internetClient" />
4746
<rescap:Capability Name="runFullTrust" />
4847
</Capabilities>
4948
</Package>

‎Tests/ColorCode.WinUITests/ColorCode.WinUITests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>WinExe</OutputType>
4-
<TargetFramework>net5.0-windows10.0.18362.0</TargetFramework>
5-
<TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
4+
<TargetFramework>net5.0-windows10.0.19041.0</TargetFramework>
5+
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
66
<RootNamespace>ColorCode.WinUITests</RootNamespace>
77
<ApplicationManifest>app.manifest</ApplicationManifest>
88
<Platforms>x86;x64;arm64</Platforms>

‎build/build.cake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#module nuget:?package=Cake.LongPath.Module&version=1.0.0
22

3-
#addin nuget:?package=Cake.FileHelpers&version=3.3.0
4-
#addin nuget:?package=Cake.Powershell&version=0.4.8
3+
#addin nuget:?package=Cake.FileHelpers&version=4.0.0
4+
#addin nuget:?package=Cake.Powershell&version=1.0.0
55

66
#tool nuget:?package=vswhere&version=2.8.4
77

0 commit comments

Comments
 (0)