Skip to content

Commit 20cd457

Browse files
authored
Update to WinAppSDK 1.4.2 and remove temporary workaround for including version info without dupe warnings (microsoft#1379)
1 parent c2fd30d commit 20cd457

2 files changed

Lines changed: 2 additions & 19 deletions

File tree

WinUIGallery/WinUIGallery.csproj

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@
2828
<Optimized Condition="'$(Configuration)' == 'Debug-Unpackaged' Or '$(Configuration)' == 'Debug'">false</Optimized>
2929
<SingleProject>true</SingleProject>
3030
<SingleProject Condition="'$(SolutionName)' == 'WinUIGallery.DesktopWap'">false</SingleProject>
31-
<!-- Enable ExplicitlyIncludeVersionInfo workaround by setting WindowsAppSdkSelfContained earlier than the mock package would -->
32-
<WindowsAppSdkSelfContained Condition="'$(IsInWinUIRepo)' == 'true' and '$(WindowsAppSdkSelfContained)'==''">true</WindowsAppSdkSelfContained>
31+
<WindowsAppSdkIncludeVersionInfo>true</WindowsAppSdkIncludeVersionInfo>
3332
</PropertyGroup>
3433

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

252-
<!-- Workaround to ensure WindowsAppSDK-VersionInfo.cs is included in project exactly once, before any compilation -->
253-
<PropertyGroup>
254-
<ExplicitlyIncludeVersionInfo Condition="'$(WindowsAppSdkSelfContained)'=='true' or '$(SingleProject)'!='true'">true</ExplicitlyIncludeVersionInfo>
255-
</PropertyGroup>
256-
<PropertyGroup Condition="'$(ExplicitlyIncludeVersionInfo)'!='true'">
257-
<CoreCompileDependsOn Condition="'$(Packaged)'=='true'">$(CoreCompileDependsOn);GenerateDeploymentManagerCS</CoreCompileDependsOn>
258-
<CoreCompileDependsOn Condition="'$(Packaged)'!='true'">$(CoreCompileDependsOn);GenerateBootstrapCS</CoreCompileDependsOn>
259-
</PropertyGroup>
260-
<ItemGroup>
261-
<Compile Condition="'$(ExplicitlyIncludeVersionInfo)'=='true'" Include="$(MicrosoftWindowsAppSDKPackageDir)include\WindowsAppSDK-VersionInfo.cs" />
262-
</ItemGroup>
263-
<!-- When WindowsAppSdkIncludeVersionInfo supported, above workaround can be replaced with this: -->
264-
<PropertyGroup>
265-
<WindowsAppSdkIncludeVersionInfo>true</WindowsAppSdkIncludeVersionInfo>
266-
</PropertyGroup>
267-
268251
</Project>

WinUIGallery/standalone.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<!-- The NuGet versions of dependencies to build against. -->
44
<SamplesTargetFrameworkMoniker>net7.0-windows10.0.19041.0</SamplesTargetFrameworkMoniker>
5-
<WindowsAppSdkPackageVersion>1.4.230913002</WindowsAppSdkPackageVersion>
5+
<WindowsAppSdkPackageVersion>1.4.231008000</WindowsAppSdkPackageVersion>
66
<MicrosoftNETCoreUniversalWindowsPlatformVersion>6.2.11</MicrosoftNETCoreUniversalWindowsPlatformVersion>
77
<GraphicsWin2DVersion>1.0.4</GraphicsWin2DVersion>
88
<ColorCodeVersion>2.0.13</ColorCodeVersion>

0 commit comments

Comments
 (0)