Skip to content

Commit

Permalink
Updated to WAS 1.0.0-preview3.
Browse files Browse the repository at this point in the history
  • Loading branch information
azchohfi committed Oct 28, 2021
1 parent 85bfe0e commit c9df5b8
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<Version>0.10.0-alpha</Version>
</PackageReference>
<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed">
<Version>2.0.6</Version>
<Version>2.0.7</Version>
</PackageReference>
<PackageReference Include="System.ValueTuple">
<Version>4.5.0</Version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.6" />
<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.7" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="ColorCode.WinUI" Version="2.0.11" />
<PackageReference Include="ColorCode.WinUI" Version="2.0.12" />
</ItemGroup>

<Import Project="$(BuildToolsDirectory)Windows.Toolkit.WinUI.Controls.targets" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<ItemGroup>
<PackageReference Include="System.Text.Json" Version="5.0.2" />
<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.0.0.28-preview2" />
<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.0.0.29-preview3" />
</ItemGroup>

<Import Project="$(BuildToolsDirectory)Windows.Toolkit.WinUI.Controls.targets" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@

<ItemGroup>
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.0.0.28-preview2" />
<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.0.0.29-preview3" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Microsoft.WindowsAppRuntime.1.0-preview2.msix
Microsoft.WindowsAppRuntime.1.0-preview3.msix
Microsoft.VCLibs.x86.Debug.14.00.appx
Microsoft.VCLibs.x86.Debug.14.00.Desktop.appx
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Microsoft.WindowsAppRuntime.1.0-preview2.msix
Microsoft.WindowsAppRuntime.1.0-preview3.msix
Microsoft.VCLibs.x86.14.00.appx
Microsoft.VCLibs.x86.14.00.Desktop.appx
2 changes: 1 addition & 1 deletion UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<Version>4.3.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.Graphics.Win2D">
<Version>1.0.0.28-preview2</Version>
<Version>1.0.0.29-preview3</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion build/Windows.Toolkit.Common.props
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<TargetPlatformBaseVersion>10.0</TargetPlatformBaseVersion>
<TargetPlatformRevision>18362</TargetPlatformRevision>
<TargetPlatformMinRevision>17763</TargetPlatformMinRevision>
<WindowsAppSDKVersion>1.0.0-preview2</WindowsAppSDKVersion>
<WindowsAppSDKVersion>1.0.0-preview3</WindowsAppSDKVersion>
</PropertyGroup>

<PropertyGroup>
Expand Down
10 changes: 5 additions & 5 deletions build/Windows.Toolkit.WinUI.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="$(WindowsAppSDKVersion)" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="$(WindowsAppSDKVersion)" GeneratePathProperty="true" />
</ItemGroup>

<ItemGroup>
<Content Remove="@(None->WithMetadataValue('Pack','true'))" />
</ItemGroup>

<!-- Workaround for https://github.com/microsoft/WindowsAppSDK/issues/1217 -->
<Target Name="FixBinPlaceBootstrapDll" BeforeTargets="BinPlaceBootstrapDll">
<PropertyGroup>
<_WindowsAppSDKFoundationPlatform>x86</_WindowsAppSDKFoundationPlatform>
</PropertyGroup>
<Target Name="FixReferenceCopyLocalPaths" BeforeTargets="ResolvePackageAssets">
<ItemGroup>
<ReferenceCopyLocalPaths Remove="$(PkgMicrosoft_WindowsAppSDK)\build\..\runtimes\lib\native\AnyCPU\Microsoft.WindowsAppRuntime.Bootstrap.dll"/>
</ItemGroup>
</Target>
</Project>

0 comments on commit c9df5b8

Please sign in to comment.