Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace ProjectReunion version variables with WindowsAppSdk ones #1172

Merged
merged 2 commits into from
Jan 23, 2023
Merged

Replace ProjectReunion version variables with WindowsAppSdk ones #1172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c48f7c6
Retire ProjectReunion version variables
bpulliam Jan 22, 2023
01e9260
including project files this time :)
bpulliam Jan 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions WinUIGallery/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<Project>
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<!-- We have two projects in the same directory here, so we'll add a differentiator folder to output directories. -->
<GenerateProjectSpecificOutputFolder>true</GenerateProjectSpecificOutputFolder>
Expand Down Expand Up @@ -26,5 +27,6 @@
</PropertyGroup>

<!-- If we aren't building in the WinUI repo, import the necessary missing props we'd normally pick up from its Directory.Build.props hierarchy -->
<Import Project="Standalone.props" Condition="'$(IsInWinUIRepo)' != 'true'"/>
<!-- The UseStandalone property allows this to be overridden, in order to buildReleaseSamples to build without changing the entire repo -->
<Import Project="Standalone.props" Condition="'$(IsInWinUIRepo)' != 'true' OR '$(UseStandalone)' == 'true'"/>
</Project>
3 changes: 2 additions & 1 deletion WinUIGallery/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<Project>
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../')))"/>
<PropertyGroup Condition="'$(WindowsPackageType)' == 'MSIX'">
<!-- These are set in Directory.Build.targets because we need to import the publish profile first -->
Expand Down
4 changes: 2 additions & 2 deletions WinUIGallery/WinUIGallery.DesktopWap.Package.wapproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@
<PublishProfile>Properties\PublishProfiles\win10-$(Platform).pubxml</PublishProfile>
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="'$(ProjectReunionPackageVersion)' != ''">
<PackageReference Include="Microsoft.WindowsAppSDK" Version="[$(ProjectReunionPackageVersion)]" GeneratePathProperty="true">
<ItemGroup Condition="'$(WindowsAppSdkPackageVersion)' != ''">
<PackageReference Include="Microsoft.WindowsAppSDK" Version="[$(WindowsAppSdkPackageVersion)]" GeneratePathProperty="true">
<IncludeAssets>build</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="[$(MicrosoftWindowsSDKBuildToolsNugetPackageVersion)]">
Expand Down
4 changes: 2 additions & 2 deletions WinUIGallery/WinUIGallery.DesktopWap.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,14 @@
<PackageReference Update="System.Private.Uri" Version="4.3.2" />
</ItemGroup>

<ItemGroup Condition="'$(ProjectReunionPackageVersion)' != ''">
<ItemGroup Condition="'$(WindowsAppSdkPackageVersion)' != ''">
<PackageReference Remove="Microsoft.WinUI" />
<PackageReference Remove="Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage" />
<PackageReference Include="Microsoft.WindowsAppSDK" />
</ItemGroup>

<ItemGroup Condition="'$(IsInWinUIRepo)' != 'true'">
<PackageReference Update="Microsoft.WindowsAppSDK" Version="$(ProjectReunionPackageVersion)" Condition="'$(ProjectReunionPackageVersion)' != ''" />
<PackageReference Update="Microsoft.WindowsAppSDK" Version="$(WindowsAppSdkPackageVersion)" Condition="'$(WindowsAppSdkPackageVersion)' != ''" />
</ItemGroup>

<ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions WinUIGallery/standalone.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<Project>
<PropertyGroup>
<!-- The NuGet versions of dependencies to build against. -->
<ProjectReunionPackageVersion>1.2.221209.1</ProjectReunionPackageVersion>
<ProjectReunionWinUIPackageVersion>1.2.221209.1</ProjectReunionWinUIPackageVersion>
<WindowsAppSdkPackageVersion>1.2.221109.1</WindowsAppSdkPackageVersion>
<SamplesTargetFrameworkMoniker>net6.0-windows10.0.18362.0</SamplesTargetFrameworkMoniker>
<MicrosoftNETCoreUniversalWindowsPlatformVersion>6.2.11</MicrosoftNETCoreUniversalWindowsPlatformVersion>
<GraphicsWin2DVersion>1.0.4</GraphicsWin2DVersion>
Expand Down