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

Update to WinAppSDK 1.4.2 and remove temporary workaround for including version info without dupe warnings #1379

Merged
merged 1 commit into from
Oct 11, 2023
Merged

Update to WinAppSDK 1.4.2 and remove temporary workaround for including version info without dupe warnings #1379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 1 addition & 18 deletions WinUIGallery/WinUIGallery.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@
<Optimized Condition="'$(Configuration)' == 'Debug-Unpackaged' Or '$(Configuration)' == 'Debug'">false</Optimized>
<SingleProject>true</SingleProject>
<SingleProject Condition="'$(SolutionName)' == 'WinUIGallery.DesktopWap'">false</SingleProject>
<!-- Enable ExplicitlyIncludeVersionInfo workaround by setting WindowsAppSdkSelfContained earlier than the mock package would -->
<WindowsAppSdkSelfContained Condition="'$(IsInWinUIRepo)' == 'true' and '$(WindowsAppSdkSelfContained)'==''">true</WindowsAppSdkSelfContained>
<WindowsAppSdkIncludeVersionInfo>true</WindowsAppSdkIncludeVersionInfo>
</PropertyGroup>

<PropertyGroup Condition="'$(Packaged)' != 'true' and '$(SingleProject)'=='true'">
Expand Down Expand Up @@ -249,20 +248,4 @@
</ItemGroup>
<Import Project="ContentIncludes.props" />

<!-- Workaround to ensure WindowsAppSDK-VersionInfo.cs is included in project exactly once, before any compilation -->
<PropertyGroup>
<ExplicitlyIncludeVersionInfo Condition="'$(WindowsAppSdkSelfContained)'=='true' or '$(SingleProject)'!='true'">true</ExplicitlyIncludeVersionInfo>
</PropertyGroup>
<PropertyGroup Condition="'$(ExplicitlyIncludeVersionInfo)'!='true'">
<CoreCompileDependsOn Condition="'$(Packaged)'=='true'">$(CoreCompileDependsOn);GenerateDeploymentManagerCS</CoreCompileDependsOn>
<CoreCompileDependsOn Condition="'$(Packaged)'!='true'">$(CoreCompileDependsOn);GenerateBootstrapCS</CoreCompileDependsOn>
</PropertyGroup>
<ItemGroup>
<Compile Condition="'$(ExplicitlyIncludeVersionInfo)'=='true'" Include="$(MicrosoftWindowsAppSDKPackageDir)include\WindowsAppSDK-VersionInfo.cs" />
</ItemGroup>
<!-- When WindowsAppSdkIncludeVersionInfo supported, above workaround can be replaced with this: -->
<PropertyGroup>
<WindowsAppSdkIncludeVersionInfo>true</WindowsAppSdkIncludeVersionInfo>
</PropertyGroup>

</Project>
2 changes: 1 addition & 1 deletion WinUIGallery/standalone.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<!-- The NuGet versions of dependencies to build against. -->
<SamplesTargetFrameworkMoniker>net7.0-windows10.0.19041.0</SamplesTargetFrameworkMoniker>
<WindowsAppSdkPackageVersion>1.4.230913002</WindowsAppSdkPackageVersion>
<WindowsAppSdkPackageVersion>1.4.231008000</WindowsAppSdkPackageVersion>
<MicrosoftNETCoreUniversalWindowsPlatformVersion>6.2.11</MicrosoftNETCoreUniversalWindowsPlatformVersion>
<GraphicsWin2DVersion>1.0.4</GraphicsWin2DVersion>
<ColorCodeVersion>2.0.13</ColorCodeVersion>
Expand Down