Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
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: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,10 @@ and test signing key build\Assets\TemporaryKey.pfx in your Win2D repository.

You only need to perform the below steps once:

1. Open a PowerShell command prompt.
1. Open a PowerShell command prompt as an administrator.
2. Using the PowerShell command prompt, change to the 'build' directory from the root of the repository.
3. Run `powershell -ep Bypass GenerateTestPfx.ps1`.
* GenerateTestPfx.ps1 registers the test package certificate to CurrentUser\My certificate store and saves the private key to `build\Assets\TemporaryKey.pfx` for use in building the Store unit tests package. This file is ignored by .gitignore from being included in commits.
3. Run `.\GenerateTestPfx.ps1`.
* GenerateTestPfx.ps1 registers the test package certificate to LocalMachine\TrustedPeople certificate store and saves the private key to `build\Assets\TemporaryKey.pfx` for use in building the Store unit tests package. This file is ignored by .gitignore from being included in commits.

#### Submit a pull request to the main repository

Expand Down
20 changes: 20 additions & 0 deletions Microsoft.Graphics.Win2D.sln
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winrt.test.nativecomponent.
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winrt.test.external.uap", "winrt\test.external\winrt.test.external.uap.vcxproj", "{F33C7CB9-5ECA-47B7-9393-81E6E8F0BD34}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleSample.winappsdk", "samples\SimpleSample\SimpleSample.winappsdk.csproj", "{16DE7EC1-EDB4-4C29-9598-487A0D211D99}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C868222C-3A9F-419D-9B8F-FAE49D14F91D}"
ProjectSection(SolutionItems) = preProject
global.json = global.json
Expand Down Expand Up @@ -188,6 +190,24 @@ Global
{B44A302A-EBBA-45F0-A94C-8E5F5F4635F7}.Release|x64.ActiveCfg = Release|x64
{B44A302A-EBBA-45F0-A94C-8E5F5F4635F7}.Release|x64.Build.0 = Release|x64
{B44A302A-EBBA-45F0-A94C-8E5F5F4635F7}.Release|x64.Deploy.0 = Release|x64
{16DE7EC1-EDB4-4C29-9598-487A0D211D99}.Debug|ARM64.ActiveCfg = Debug|ARM64
{16DE7EC1-EDB4-4C29-9598-487A0D211D99}.Debug|ARM64.Build.0 = Debug|ARM64
{16DE7EC1-EDB4-4C29-9598-487A0D211D99}.Debug|ARM64.Deploy.0 = Debug|ARM64
{16DE7EC1-EDB4-4C29-9598-487A0D211D99}.Debug|Win32.ActiveCfg = Debug|Win32
{16DE7EC1-EDB4-4C29-9598-487A0D211D99}.Debug|Win32.Build.0 = Debug|Win32
{16DE7EC1-EDB4-4C29-9598-487A0D211D99}.Debug|Win32.Deploy.0 = Debug|Win32
{16DE7EC1-EDB4-4C29-9598-487A0D211D99}.Debug|x64.ActiveCfg = Debug|x64
{16DE7EC1-EDB4-4C29-9598-487A0D211D99}.Debug|x64.Build.0 = Debug|x64
{16DE7EC1-EDB4-4C29-9598-487A0D211D99}.Debug|x64.Deploy.0 = Debug|x64
{16DE7EC1-EDB4-4C29-9598-487A0D211D99}.Release|ARM64.ActiveCfg = Release|ARM64
{16DE7EC1-EDB4-4C29-9598-487A0D211D99}.Release|ARM64.Build.0 = Release|ARM64
{16DE7EC1-EDB4-4C29-9598-487A0D211D99}.Release|ARM64.Deploy.0 = Release|ARM64
{16DE7EC1-EDB4-4C29-9598-487A0D211D99}.Release|Win32.ActiveCfg = Release|Win32
{16DE7EC1-EDB4-4C29-9598-487A0D211D99}.Release|Win32.Build.0 = Release|Win32
{16DE7EC1-EDB4-4C29-9598-487A0D211D99}.Release|Win32.Deploy.0 = Release|Win32
{16DE7EC1-EDB4-4C29-9598-487A0D211D99}.Release|x64.ActiveCfg = Release|x64
{16DE7EC1-EDB4-4C29-9598-487A0D211D99}.Release|x64.Build.0 = Release|x64
{16DE7EC1-EDB4-4C29-9598-487A0D211D99}.Release|x64.Deploy.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
70 changes: 50 additions & 20 deletions Win2D.proj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<BuildConfigurations>Debug;Release</BuildConfigurations>
<BuildTests>true</BuildTests>
<BuildTools>true</BuildTools>
<BuildDocs>false</BuildDocs>
<BuildDocs>true</BuildDocs>
<RunTests>true</RunTests>
</PropertyGroup>

Expand Down Expand Up @@ -51,6 +51,16 @@
<Platforms>Win32;x64</Platforms>
<AutomatedTests Condition="$(ShouldRunUAPTests)">desktop</AutomatedTests>
</UAPProject>
<UAPProject Include="winrt\test.nativecomponent\winrt.test.nativecomponent.uap.vcxproj" />
<UAPProject Include="winrt\test.managed\winrt.test.managed.winappsdk.csproj">
<Platforms>Win32;x64</Platforms>
<AutomatedTests Condition="$(ShouldRunUAPTests)">store</AutomatedTests>
<BuildInParallel>false</BuildInParallel>
<BinDir></BinDir>
</UAPProject>
<UAPProject Include="samples\SimpleSample\SimpleSample.winappsdk.csproj">
<BuildInParallel>false</BuildInParallel>
</UAPProject>
</ItemGroup>

<!-- Tools projects -->
Expand All @@ -64,28 +74,28 @@
<AnyCPUProject Include="tools\mock\test\mock.test.csproj" Condition="$(BuildTests)">
<AutomatedTests>desktop</AutomatedTests>
</AnyCPUProject>
<AnyCPUProject Include="tools\docs\DocDiff\DocDiff.csproj" />
<AnyCPUProject Include="tools\docs\DocPreprocess\DocPreprocess.csproj" />
<AnyCPUProject Include="tools\docs\ExtractAPISurface\ExtractAPISurface.csproj" />
<AnyCPUProject Include="tools\docs\MergeIntellisense\MergeIntellisense.csproj" />
<AnyCPUProject Include="tools\exportsample\exportsample.csproj" />
</ItemGroup>


<!-- Master target just chains to a bunch of workers -->
<Target Name="Build"
DependsOnTargets="BuildProjects; CheckCode; RunTests" />


<!-- TargetPlatformMinVersion 10.0.16299.0 and 10.0.10240 Platforms must be build separately. -->
<Target Name="BuildProjects" DependsOnTargets="BuildProjects18362" />

DependsOnTargets="BuildProjects; CheckCode; BuildDocs; RunTests" />

<Target Name="BuildProjectsPrelim" DependsOnTargets="PrepareVersionInfo; ChooseProjectsToBuild; ChooseConfigurationsToRestore" />


<!-- Use batching to build each project in turn -->
<Target Name="BuildProjects18362"
DependsOnTargets="BuildProjectsPrelim; RestoreNuGetPackages18362"
<Target Name="BuildProjects"
DependsOnTargets="BuildProjectsPrelim; RestoreNuGetPackages"
Inputs="@(ProjectsToBuild)"
Outputs="%(PlatformIndependentName)">

<Message Importance="High" Text="Building TargetPlatformMinVersion 18362 variants of project %(ProjectsToBuild.PlatformIndependentName):" />
<Message Importance="High" Text="Building all variants of project %(ProjectsToBuild.PlatformIndependentName):" />
<Message Importance="High" Text=" %(ProjectsToBuild.Filename) (%(ProjectsToBuild.Configuration)|%(ProjectsToBuild.Platform))" />

<!-- All the variants (platform and configuration) of most projects can be built in parallel -->
Expand Down Expand Up @@ -185,15 +195,35 @@
<!-- Build the reference documentation -->
<UsingTask TaskName="SetEnv" AssemblyFile="$(VCTargetsPath)Microsoft.Build.CppTasks.Common.dll"/>

<Target Name="BuildDocs"
Condition="$(BuildDocs) and
$(BuildTools) and
$(BuildPlatforms.Contains('AnyCPU')) and
$(BuildPlatforms.Contains('Win32')) and
$(BuildConfigurations.Contains('Release'))">

<Message Importance="High" Text="Building documentation" />

<!-- unset SHFBROOT, so that BuildDocs only picks up the version of
sandcastle installed via nuget -->
<SetEnv Name="SHFBROOT" Prefix="false" />

<!-- Use <Exec> rather than <MSBuild> here, since we want BuildDocs.proj to
be isolated from the environment that's formed around running
Win2D.proj up to this point, and to suppress the Sandcastle
false positive warning BHT0001 -->
<Exec Command="&quot;$(MSBuildBinPath)\msbuild&quot; $(MSBuildThisFileDirectory)tools\docs\BuildDocs.proj"
IgnoreStandardErrorWarningFormat="true"
CustomErrorRegularExpression=": error "
CustomWarningRegularExpression=": warning (?!BHT0001)" />
</Target>

<!-- Run the automated tests -->

<PropertyGroup>
<_VsTestPathUnderCommonTools>..\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe</_VsTestPathUnderCommonTools>
<_VsTest Condition="Exists('$(VS120COMNTOOLS)$(_VsTestPathUnderCommonTools)')">$(VS120COMNTOOLS)$(_VsTestPathUnderCommonTools)</_VsTest>
<_VsTest Condition="Exists('$(VS140COMNTOOLS)$(_VsTestPathUnderCommonTools)')">$(VS140COMNTOOLS)$(_VsTestPathUnderCommonTools)</_VsTest>
<_VsTest Condition="Exists('$(VS150COMNTOOLS)$(_VsTestPathUnderCommonTools)')">$(VS150COMNTOOLS)$(_VsTestPathUnderCommonTools)</_VsTest>
<_VsTest Condition="Exists('$(VS160COMNTOOLS)$(_VsTestPathUnderCommonTools)')">$(VS160COMNTOOLS)$(_VsTestPathUnderCommonTools)</_VsTest>
<_VsTest Condition="Exists('$(VS170COMNTOOLS)$(_VsTestPathUnderCommonTools)')">$(VS170COMNTOOLS)$(_VsTestPathUnderCommonTools)</_VsTest>
<_VsTest Condition="Exists('$(VS180COMNTOOLS)$(_VsTestPathUnderCommonTools)')">$(VS180COMNTOOLS)$(_VsTestPathUnderCommonTools)</_VsTest>
<VsTest Condition="'$(_VsTest)' != ''">"$([System.IO.Path]::GetFullPath('$(_VsTest)'))"</VsTest>
</PropertyGroup>

Expand All @@ -210,27 +240,27 @@
<Error Text="vstest.console.exe not found, please specify using the VsTest property" Condition="'$(VsTest)' == ''" />
<Message Importance="High" Text="Running tests: %(TestProjects.Filename) (%(TestProjects.Configuration)|%(TestProjects.Platform))" />

<Exec Command="$(PowerShellExe) -NonInteractive -executionpolicy Unrestricted -command &quot;&amp; { get-appxpackage -name E2C40EB9-8CCE-48B1-9A5C-4C8CA4999631 | remove-appxpackage } &quot;" ConsoleToMsBuild="true" ContinueOnError="ErrorAndContinue" IgnoreStandardErrorWarningFormat="true"/>
<Exec Command="$(PowerShellExe) -NonInteractive -executionpolicy Unrestricted -command &quot;&amp; { get-appxpackage -name 09ca071b-56a7-4712-b99e-9ead40b150e3 | remove-appxpackage } &quot;" ConsoleToMsBuild="true" ContinueOnError="ErrorAndContinue" IgnoreStandardErrorWarningFormat="true"/>
<Exec Command="$(VsTest) %(TestProjects.TestBinary)%(TestProjects.TestArgs)" ContinueOnError="ErrorAndContinue" IgnoreStandardErrorWarningFormat="true" />
</Target>


<Target Name="ChooseTestsToRun">
<ItemGroup>
<TestProjects Include="@(ProjectsToBuild)" Condition="%(ProjectsToBuild.AutomatedTests) != '' and %(ProjectsToBuild.Platform) != ARM and %(ProjectsToBuild.Platform) != ARM64">
<TestProjects Include="@(ProjectsToBuild)" Condition="%(ProjectsToBuild.AutomatedTests) != '' and %(ProjectsToBuild.Platform) != ARM64">
<!-- Remap Win32 to x86 -->
<TestPlatform Condition="%(ProjectsToBuild.Platform) == Win32">x86</TestPlatform>
<TestPlatform Condition="%(ProjectsToBuild.Platform) != Win32">%(ProjectsToBuild.Platform)</TestPlatform>

<!-- Work out where the test binaries are located -->
<TestPath>bin\%(ProjectsToBuild.BinDir)%(TestProjects.TestPlatform)\%(ProjectsToBuild.Configuration)</TestPath>

<TestAppX Condition="%(ProjectsToBuild.Configuration) == Release">%(ProjectsToBuild.Filename)_1.0.0.0_%(ProjectsToBuild.Platform)</TestAppX>
<TestAppX Condition="%(ProjectsToBuild.Configuration) != Release">%(ProjectsToBuild.Filename)_1.0.0.0_%(ProjectsToBuild.Platform)_%(ProjectsToBuild.Configuration)</TestAppX>
<TestAppX Condition="%(ProjectsToBuild.Configuration) == Release">%(ProjectsToBuild.Filename)_1.0.0.0_%(TestProjects.TestPlatform)</TestAppX>
<TestAppX Condition="%(ProjectsToBuild.Configuration) != Release">%(ProjectsToBuild.Filename)_1.0.0.0_%(TestProjects.TestPlatform)_%(ProjectsToBuild.Configuration)</TestAppX>

<!-- Binaries can be either a .dll for desktop tests, or .appx for store app tests -->
<TestBinary Condition="%(ProjectsToBuild.AutomatedTests) == desktop">%(TestProjects.TestPath)\%(ProjectsToBuild.Filename)\%(ProjectsToBuild.Filename).dll</TestBinary>
<TestBinary Condition="%(ProjectsToBuild.AutomatedTests) == store">%(TestProjects.TestPath)\%(ProjectsToBuild.Filename)\AppPackages\%(TestProjects.TestAppX)_Test\%(TestProjects.TestAppX).appx</TestBinary>
<TestBinary Condition="%(ProjectsToBuild.AutomatedTests) == store">%(TestProjects.TestPath)\%(ProjectsToBuild.Filename)\AppPackages\%(TestProjects.TestAppX)_Test\%(TestProjects.TestAppX).msix</TestBinary>

<!-- Do we need the /Platform or /InIsolation arguments for this test project? -->
<TestArgs Condition="%(ProjectsToBuild.Platform) == x64">%(TestProjects.TestArgs) /Platform:x64</TestArgs>
Expand All @@ -253,7 +283,7 @@
<Configuration>%(BuildConfiguration.Identity)</Configuration>
</ConfigToRestore>

<NuGetRestore Include="@(ConfigToRestore)" Condition="%(BuildPlatform.Identity) != AnyCPU">
<NuGetRestore Include="@(ConfigToRestore)">
<Platform>%(BuildPlatform.Identity)</Platform>
</NuGetRestore>

Expand Down
28 changes: 8 additions & 20 deletions build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,6 @@ IF "%VisualStudioVersion%" LSS "16.0" (
GOTO WRONG_COMMAND_PROMPT
)

WHERE /Q nuget >NUL
IF %ERRORLEVEL% NEQ 0 (
ECHO nuget not found.
ECHO.
ECHO Run "%~pd0download-nuget.cmd" to download the latest version, or update PATH as appropriate.
GOTO END
)

@REM Restore packages manually, since this does not get picked up by Win2D.proj
set Platform=AnyCPU
set Configuration=Release
nuget.exe restore .\Microsoft.Graphics.Win2D.sln
set Platform=AnyCPU
set Configuration=Debug
nuget.exe restore .\Microsoft.Graphics.Win2D.sln


WHERE /Q msbuild >NUL
IF %ERRORLEVEL% NEQ 0 (
ECHO Error: It appears that 'msbuild' is not available in this environment.
Expand All @@ -37,11 +20,16 @@ IF %ERRORLEVEL% NEQ 0 (
GOTO END
)

ECHO.
msbuild "%~dp0tools\docs\BuildDocs.proj" /nologo /v:m /p:IntellisenseOnly=true

SET /p VERSION=<build/nuget/VERSION
IF %ERRORLEVEL% NEQ 0 (
ECHO Build failed; aborting.
GOTO END
)

ECHO.

CALL "%~dp0build\nuget\build-nupkg.cmd" %VERSION%-local
CALL "%~dp0build\nuget\build-nupkg.cmd" local
GOTO END


Expand Down
4 changes: 0 additions & 4 deletions build/AzurePipelinesTemplates/Win2D-Stages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@ stages:
architecture: "x64"
archDirectory: "uapx64"
buildConfiguration: "Release"
# ARM:
# architecture: "ARM"
# archDirectory: "uaparm"
# buildConfiguration: "Release"
ARM64:
architecture: "ARM64"
archDirectory: "uaparm64"
Expand Down
2 changes: 1 addition & 1 deletion build/AzurePipelinesTemplates/Win2D-VersionNumber.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ steps:
$xmlfile = [xml](Get-Content $file)

Write-Host "Found Version.Details.xml file."
$xmlfile.Dependencies.ProductDependencies.Dependency | Where-Object Name -eq 'Microsoft.WindowsAppSDK' | ForEach-Object {
$xmlfile.Dependencies.ProductDependencies.Dependency | Where-Object Name -eq 'Microsoft.WindowsAppSDK.WinUI' | ForEach-Object {
$WIN_APP_SDK_VERSION = $_.Version
Write-Host "The WinAppSDK Version is $WIN_APP_SDK_VERSION"
Write-Host "##vso[task.setvariable variable=nightly_winappsdk_version;isOutput=true]$WIN_APP_SDK_VERSION"
Expand Down
9 changes: 8 additions & 1 deletion build/GenerateTestPfx.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,11 @@ $cert = New-SelfSignedCertificate -Type Custom `
-TextExtension @("2.5.29.37={text}1.3.6.1.5.5.7.3.3", "2.5.29.19={text}")

$certificateBytes = $cert.Export([System.Security.Cryptography.X509Certificates.X509ContentType]::Pkcs12)
[System.IO.File]::WriteAllBytes("$PSScriptRoot\Assets\TemporaryKey.pfx", $certificateBytes)
[System.IO.File]::WriteAllBytes("$PSScriptRoot\Assets\TemporaryKey.pfx", $certificateBytes)

$certThumbprint = $cert.Thumbprint
$tempCertPath = Join-Path $Env:Temp ((New-Guid).ToString() + '.cer')
Export-Certificate -Cert $cert -FilePath $tempCertPath | Out-Null
Remove-Item ('Cert:\CurrentUser\My\' + $certThumbprint)
Start-Process PowerShell -Wait -Verb RunAs "-NoProfile -ExecutionPolicy Bypass -Command `"certutil.exe '-addstore' 'TrustedPeople' '$tempCertPath'; (Get-ChildItem -Path Cert:\LocalMachine\TrustedPeople\$certThumbprint).FriendlyName = '$CertificateFriendlyName';`"";
Remove-Item $tempCertPath
2 changes: 1 addition & 1 deletion build/Win2D.common.props
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,6 @@

</PropertyGroup>

<Import Project="WindowsAppSdk.common.props" />
<Import Project="WindowsAppSdk.common.props" Condition="$(WindowsAppSdkWinUIVersion) == ''" />

</Project>
20 changes: 7 additions & 13 deletions build/Win2D.cpp.props
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@
<Import Project="Win2D.common.props" />

<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|ARM">
<Configuration>Debug</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|ARM64">
<Configuration>Debug</Configuration>
<Platform>ARM64</Platform>
Expand All @@ -30,10 +26,6 @@
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|ARM">
<Configuration>Release</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|ARM64">
<Configuration>Release</Configuration>
<Platform>ARM64</Platform>
Expand All @@ -48,12 +40,16 @@
</ProjectConfiguration>
</ItemGroup>

<PropertyGroup>
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
</PropertyGroup>

<PropertyGroup Label="Configuration">
<PlatformToolset Condition="'$(ApplicationType)' == 'Windows Store' And '$(ApplicationTypeRevision)' == '10.0'">v143</PlatformToolset>
</PropertyGroup>

<PropertyGroup>
<WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<PropertyGroup>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
Expand Down Expand Up @@ -113,10 +109,8 @@
<SDLCheck>true</SDLCheck>
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalOptions>/bigobj /Zm450 /wd4503 /wd4467 /D_CRT_STDIO_LEGACY_WIDE_SPECIFIERS=1 %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>/bigobj /wd4503 /wd4467 /D_CRT_STDIO_LEGACY_WIDE_SPECIFIERS=1 %(AdditionalOptions)</AdditionalOptions>
<!--
/Zm999 - this value needs to be bumped occasionally when as our PCH grows

/wd4503 - this disables the warning about decorated names being too
long. There isn't much we can do about this so the warning isn't very
helpful.
Expand Down Expand Up @@ -149,7 +143,7 @@
<ClCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLWINUI3_SUPPORTS_INKING>true</FunctionLevelLWINUI3_SUPPORTS_INKING>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<ControlFlowGuard>Guard</ControlFlowGuard>
</ClCompile>
Expand Down
2 changes: 1 addition & 1 deletion build/Win2D.cs.props
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<PropertyGroup>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
<TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
</PropertyGroup>
<PropertyGroup>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
Expand Down
1 change: 1 addition & 0 deletions build/WindowsAppSdk.common.props
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<WindowsAppSdkWinUIVersion Condition="'$(NIGHTLY_WINAPPSDK_VERSION)' != ''">$(NIGHTLY_WINAPPSDK_VERSION)</WindowsAppSdkWinUIVersion>
<WindowsAppSdkInteractiveExperiencesVersion Condition="'$(NIGHTLY_WINAPPSDK_VERSION)' == ''">1.8.260125001</WindowsAppSdkInteractiveExperiencesVersion>
<WindowsAppSdkFoundationVersion Condition="'$(NIGHTLY_WINAPPSDK_VERSION)' == ''">1.8.260203002</WindowsAppSdkFoundationVersion>
<WindowsAppSdkRuntimeVersion>1.8.260209005</WindowsAppSdkRuntimeVersion>
<WebView2Version>1.0.3800.47</WebView2Version>

<_PackagesPath>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\packages'))</_PackagesPath>
Expand Down
Loading