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

Move up to WinUI 3 Preview 3, remove workarounds in sample, centralize SDK version #625

Merged
merged 2 commits into from
Dec 8, 2020
Merged

Move up to WinUI 3 Preview 3, remove workarounds in sample, centralize SDK version #625

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8898741
move build up to WinUI 3 Preview 3, remove workarounds in sample, cen…
Scottj1s Dec 8, 2020
6ba07ec
PR feedback
Scottj1s Dec 8, 2020
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
1 change: 0 additions & 1 deletion src/Authoring/AuthoringConsumptionTest/AuthoringConsumptionTest.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
<ProjectGuid>{0212a7c5-8d3f-443c-9ebc-1f28091fdf88}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>AuthoringConsumptionTest</RootNamespace>
<WindowsTargetPlatformVersion>10.0.19592.0</WindowsTargetPlatformVersion>
Scottj1s marked this conversation as resolved.
Show resolved Hide resolved
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
Expand Down
1 change: 0 additions & 1 deletion src/Authoring/WinRT.Host/WinRT.Host.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
<Keyword>Win32Proj</Keyword>
<ProjectGuid>{7e33bcb7-19c5-4061-981d-ba695322708a}</ProjectGuid>
<RootNamespace>WinRTHost</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
Expand Down
2 changes: 1 addition & 1 deletion src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<CppWinRTVerbosity>high</CppWinRTVerbosity>
<CsWinRTVerbosity>high</CsWinRTVerbosity>
<!--Note: unlisted at https://www.nuget.org/packages/Microsoft.WinUI/-->
<MicrosoftWinUIVersion>3.0.0-preview2.200713.0</MicrosoftWinUIVersion>
<MicrosoftWinUIVersion>3.0.0-preview3.201113.0</MicrosoftWinUIVersion>
<DebugType>full</DebugType>
<DebugSymbols>true</DebugSymbols>
<LangVersion>preview</LangVersion>
Expand Down
78 changes: 0 additions & 78 deletions src/Samples/WinUIDesktopSample/Net5_WinUI_Fixup.Targets
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion src/Samples/WinUIDesktopSample/WinUIDesktopSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
-->
<XamlCodeGenerationControlFlags>DoNotGenerateOtherProviders</XamlCodeGenerationControlFlags>
<Platforms>x86;x64</Platforms>
<MsAppxPackageTargets>$(MSBuildThisFileDirectory)Net5_WinUI_Fixup.Targets</MsAppxPackageTargets>
<TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>
<TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
Scottj1s marked this conversation as resolved.
Show resolved Hide resolved
</PropertyGroup>

<ItemGroup>
Expand Down
Loading