Skip to content

Commit 529f68d

Browse files
mattleibowmattleibow
authored
Unify WinUI versions (#604)
1 parent ac9b087 commit 529f68d

File tree

6 files changed

+35
-16
lines changed

6 files changed

+35
-16
lines changed

‎.nuspec/Microsoft.Maui.Controls.MultiTargeting.targets

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@
8181
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
8282
</PropertyGroup>
8383
<ItemGroup Condition="$(TargetFramework.Contains('-windows')) == true ">
84-
<PackageReference Include="Microsoft.ProjectReunion" Version="0.5.0-prerelease" />
85-
<PackageReference Include="Microsoft.ProjectReunion.Foundation" Version="0.5.0-prerelease" />
86-
<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="0.5.0-prerelease" />
84+
<PackageReference Include="Microsoft.ProjectReunion" />
85+
<PackageReference Include="Microsoft.ProjectReunion.Foundation" />
86+
<PackageReference Include="Microsoft.ProjectReunion.WinUI" />
8787
</ItemGroup>
8888
<Target Name="Net6WinUIWorkaround" BeforeTargets="_GetSdkToolsPathsFromSdk" Condition="$(TargetFramework.Contains('-windows')) == true ">
8989
<PropertyGroup>

‎eng/Microsoft.Extensions.targets

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
<_MicrosoftHostingVersion>5.0.0</_MicrosoftHostingVersion>
88
<_MicrosoftDependencyInjectionVersion>5.0.1</_MicrosoftDependencyInjectionVersion>
99
</PropertyGroup>
10+
<PropertyGroup>
11+
<_MicrosoftProjectReunionVersion>0.5.0-prerelease</_MicrosoftProjectReunionVersion>
12+
</PropertyGroup>
1013
<ItemGroup>
1114
<PackageReference
1215
Update="Microsoft.Extensions.Configuration"
@@ -28,6 +31,17 @@
2831
Update="Microsoft.Extensions.Logging"
2932
Version="$(_MicrosoftHostingVersion)"
3033
/>
31-
34+
<PackageReference
35+
Update="Microsoft.ProjectReunion"
36+
Version="$(_MicrosoftProjectReunionVersion)"
37+
/>
38+
<PackageReference
39+
Update="Microsoft.ProjectReunion.Foundation"
40+
Version="$(_MicrosoftProjectReunionVersion)"
41+
/>
42+
<PackageReference
43+
Update="Microsoft.ProjectReunion.WinUI"
44+
Version="$(_MicrosoftProjectReunionVersion)"
45+
/>
3246
</ItemGroup>
3347
</Project>

‎src/Compatibility/Core/src/Compatibility-net6.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
</PropertyGroup>
2727
</Target>
2828
<ItemGroup Condition="$(TargetFramework.Contains('-windows')) == true ">
29-
<PackageReference Include="Microsoft.ProjectReunion" Version="0.5.0-prerelease" />
30-
<PackageReference Include="Microsoft.ProjectReunion.Foundation" Version="0.5.0-prerelease" />
31-
<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="0.5.0-prerelease" />
29+
<PackageReference Include="Microsoft.ProjectReunion" />
30+
<PackageReference Include="Microsoft.ProjectReunion.Foundation" />
31+
<PackageReference Include="Microsoft.ProjectReunion.WinUI" />
3232
</ItemGroup>
3333

3434
<!--<Import Project="..\..\..\..\.nuspec\Microsoft.Maui.Controls.MultiTargeting.targets" />-->

‎src/Controls/samples/Controls.Sample.WinUI (Package)/Maui.Controls.Sample.WinUI (Package).wapproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,19 +60,19 @@
6060
<!--PackageReference.GeneratePathProperty does not support NUGET_PACKAGES env var...-->
6161
<NuGetPackageRoot Condition="'$(NuGetPackageRoot)'==''">$(NUGET_PACKAGES)</NuGetPackageRoot>
6262
<NuGetPackageRoot Condition="'$(NuGetPackageRoot)'==''">$(UserProfile)\.nuget\packages</NuGetPackageRoot>
63-
<PkgMicrosoft_ProjectReunion Condition="'$(PkgMicrosoft_ProjectReunion)'==''">$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'Microsoft.ProjectReunion', '0.5.0-prerelease'))</PkgMicrosoft_ProjectReunion>
64-
<PkgMicrosoft_ProjectReunion Condition="!Exists($(PkgMicrosoft_ProjectReunion))">$(SolutionDir)packages\Microsoft.ProjectReunion.0.5.0-prerelease\</PkgMicrosoft_ProjectReunion>
65-
<PkgMicrosoft_ProjectReunion_WinUI Condition="'$(PkgMicrosoft_ProjectReunion_WinUI)'==''">$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'Microsoft.ProjectReunion.WinUI', '0.5.0-prerelease'))</PkgMicrosoft_ProjectReunion_WinUI>
66-
<PkgMicrosoft_ProjectReunion_WinUI Condition="!Exists($(PkgMicrosoft_ProjectReunion_WinUI))">$(SolutionDir)packages\Microsoft.ProjectReunion.WinUI.0.5.0-prerelease\</PkgMicrosoft_ProjectReunion_WinUI>
63+
<PkgMicrosoft_ProjectReunion Condition="'$(PkgMicrosoft_ProjectReunion)'==''">$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'Microsoft.ProjectReunion', '$(_MicrosoftProjectReunionVersion)'))</PkgMicrosoft_ProjectReunion>
64+
<PkgMicrosoft_ProjectReunion Condition="!Exists($(PkgMicrosoft_ProjectReunion))">$(SolutionDir)packages\Microsoft.ProjectReunion.$(_MicrosoftProjectReunionVersion)\</PkgMicrosoft_ProjectReunion>
65+
<PkgMicrosoft_ProjectReunion_WinUI Condition="'$(PkgMicrosoft_ProjectReunion_WinUI)'==''">$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'Microsoft.ProjectReunion.WinUI', '$(_MicrosoftProjectReunionVersion)'))</PkgMicrosoft_ProjectReunion_WinUI>
66+
<PkgMicrosoft_ProjectReunion_WinUI Condition="!Exists($(PkgMicrosoft_ProjectReunion_WinUI))">$(SolutionDir)packages\Microsoft.ProjectReunion.WinUI.$(_MicrosoftProjectReunionVersion)\</PkgMicrosoft_ProjectReunion_WinUI>
6767
<Microsoft_ProjectReunion_AppXReference_props>$([MSBuild]::NormalizeDirectory('$(PkgMicrosoft_ProjectReunion)', 'build'))Microsoft.ProjectReunion.AppXReference.props</Microsoft_ProjectReunion_AppXReference_props>
6868
<Microsoft_WinUI_AppX_targets>$([MSBuild]::NormalizeDirectory('$(PkgMicrosoft_ProjectReunion_WinUI)', 'build'))Microsoft.WinUI.AppX.targets</Microsoft_WinUI_AppX_targets>
6969
<EntryPointProjectUniqueName>..\Controls.Sample.WinUI\Maui.Controls.Sample.WinUI.csproj</EntryPointProjectUniqueName>
7070
</PropertyGroup>
7171
<ItemGroup>
72-
<PackageReference Include="Microsoft.ProjectReunion" Version="[0.5.0-prerelease]" GeneratePathProperty="true">
72+
<PackageReference Include="Microsoft.ProjectReunion" Version="[$(_MicrosoftProjectReunionVersion)]" GeneratePathProperty="true">
7373
<ExcludeAssets>all</ExcludeAssets>
7474
</PackageReference>
75-
<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="[0.5.0-prerelease]" GeneratePathProperty="true">
75+
<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="[$(_MicrosoftProjectReunionVersion)]" GeneratePathProperty="true">
7676
<ExcludeAssets>all</ExcludeAssets>
7777
</PackageReference>
7878
</ItemGroup>

‎src/Controls/samples/Controls.Sample.WinUI/Maui.Controls.Sample.WinUI.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
1010
</PropertyGroup>
1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.ProjectReunion" Version="0.5.0-prerelease" />
13-
<PackageReference Include="Microsoft.ProjectReunion.Foundation" Version="0.5.0-prerelease" />
14-
<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="0.5.0-prerelease" />
12+
<PackageReference Include="Microsoft.ProjectReunion" />
13+
<PackageReference Include="Microsoft.ProjectReunion.Foundation" />
14+
<PackageReference Include="Microsoft.ProjectReunion.WinUI" />
1515
<Manifest Include="$(ApplicationManifest)" />
1616
</ItemGroup>
1717
<ItemGroup>

‎src/Controls/samples/Controls.Sample/Maui.Controls.Sample-net6.csproj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@
1818
<PackageReference Include="Microsoft.Extensions.Logging" />
1919
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
2020
</ItemGroup>
21+
<ItemGroup Condition="$(TargetFramework.Contains('-windows')) == true ">
22+
<PackageReference Include="Microsoft.ProjectReunion" />
23+
<PackageReference Include="Microsoft.ProjectReunion.Foundation" />
24+
<PackageReference Include="Microsoft.ProjectReunion.WinUI" />
25+
</ItemGroup>
2126

2227
<ItemGroup>
2328
<ProjectReference Include="..\..\..\Essentials\src\Essentials-net6.csproj" />

0 commit comments

Comments
 (0)