diff --git a/Directory.Build.props b/Directory.Build.props
index 5b7c2447a9c..fd10c974673 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,6 +1,7 @@
wpf
+ true
diff --git a/eng/WpfArcadeSdk/tools/ApiCompat.targets b/eng/WpfArcadeSdk/tools/ApiCompat.targets
index c7143d1ab21..af60363d07f 100644
--- a/eng/WpfArcadeSdk/tools/ApiCompat.targets
+++ b/eng/WpfArcadeSdk/tools/ApiCompat.targets
@@ -61,7 +61,7 @@
+ Condition="'$(WpfRuntimeIdentifier)'=='win-x64' or '$(WpfRuntimeIdentifier)'=='win-arm64'"/>
diff --git a/eng/copy-wpf.ps1 b/eng/copy-wpf.ps1
index 11d01eb6fca..cf1c40d7d50 100644
--- a/eng/copy-wpf.ps1
+++ b/eng/copy-wpf.ps1
@@ -37,10 +37,10 @@ Write-Host "Target architecture - configuration: " $arch $Config
function CopyBinariesToLocation($location)
{
$locallyBuiltBinaryLocationBase = Join-Path $RepoRoot "artifacts\packaging"
-
+
Write-Host "Copy native binaries..."
- CopyNativeBinariesToLocation $location $locallyBuiltBinaryLocationBase
-
+ CopyNativeBinariesToLocation $location $locallyBuiltBinaryLocationBase
+
Write-Host "Copy managed binaries..."
CopyManagedBinariesToLocation $location $locallyBuiltBinaryLocationBase
}
@@ -58,7 +58,7 @@ function CopyNativeBinariesToLocation($location, $localBinLocation)
}
function CopyManagedBinariesToLocation($location, $localBinLocation)
{
- # Layout of where the managed binaries looks something like this:
+ # Layout of where the managed binaries looks something like this:
# x86 - artifacts\packaging\Debug\Microsoft.DotNet.Wpf.GitHub\lib\net5.0
# x64 - artifacts\packaging\Debug\x64\Microsoft.DotNet.Wpf.GitHub\lib\net5.0
@@ -121,11 +121,11 @@ elseif($testhost)
}
else
{
- $location = Resolve-Path (Join-Path $destination "shared\Microsoft.WindowsDesktop.App\$version")
+ $location = Resolve-Path (Join-Path $destination "shared\Microsoft.WindowsDesktop.App\$version")
}
Write-Host "Copying binaries to dotnet installation at $location"
-
+
if(![System.IO.Directory]::Exists($location))
{
Write-Host "Location unavailable: " $location -ForegroundColor Red
@@ -146,7 +146,7 @@ elseif($testhost)
Write-Host "** Setting $dotnetVariableToSet to $destination **"
Set-Item -Path $dotnetVariableToSet -Value $destination
- Write-Host "** Setting env:DOTNET_MULTILEVEL_LOOKUP to 0 **"
+ Write-Host "** Setting env:DOTNET_MULTILEVEL_LOOKUP to 0 **"
$env:DOTNET_MULTILEVEL_LOOKUP=0
}
}
@@ -159,9 +159,8 @@ else
Write-Host "App publishing directory unavailable: " $location -ForegroundColor Red
return
}
-
+
Write-Host "App publishing directory: " $location
Write-Host "Copying binaries to app publishing directory..."
- CopyBinariesToLocation $location
+ CopyBinariesToLocation $location
}
-
diff --git a/eng/helixpublish.proj b/eng/helixpublish.proj
index 9fc63bbb47a..0b5ec2397ab 100644
--- a/eng/helixpublish.proj
+++ b/eng/helixpublish.proj
@@ -7,7 +7,7 @@
$(NoWarn);NU5111
-
true
-
+
$(MSBuildProjectName.Replace('.ArchNeutral',''))$(TransportPackageNameSuffix)
$(PackageName)
@@ -32,13 +32,13 @@
-
-
+
diff --git a/packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.ArchNeutral.csproj b/packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.ArchNeutral.csproj
index 5af1f2df7f5..09fe6a9509c 100644
--- a/packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.ArchNeutral.csproj
+++ b/packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.ArchNeutral.csproj
@@ -2,9 +2,9 @@
9a7e395b-e859-40e2-809d-efb72cf3a2ee
net5.0
- AnyCPU;x64
+ AnyCPU;x64;arm64
-
+
$(MSBuildProjectName.Replace('.ArchNeutral',''))$(TransportPackageNameSuffix)
$(PackageName)
diff --git a/packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.csproj b/packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.csproj
index 05bec6eafd6..b141ceb049c 100644
--- a/packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.csproj
+++ b/packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.csproj
@@ -2,7 +2,7 @@
c847934a-828c-4ebb-a004-b0e97c8313f4
net5.0
- AnyCPU;x64
+ AnyCPU;x64;arm64
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/Microsoft.DotNet.Wpf.ProjectTemplates.ArchNeutral.csproj b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/Microsoft.DotNet.Wpf.ProjectTemplates.ArchNeutral.csproj
index 743b67c04c6..66db36f5ea5 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/Microsoft.DotNet.Wpf.ProjectTemplates.ArchNeutral.csproj
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/Microsoft.DotNet.Wpf.ProjectTemplates.ArchNeutral.csproj
@@ -2,18 +2,18 @@
{BFF6C118-3369-43B5-ACA6-D65ED00EEBE0}
net5.0
- AnyCPU;x64
+ AnyCPU;x64;arm64
-
true
-
+
$(MSBuildProjectName.Replace('.ArchNeutral',''))$(TransportPackageNameSuffix)
$(PackageName)
@@ -21,7 +21,7 @@
-
+
diff --git a/packaging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj b/packaging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj
index 12a2c2898c1..ea204d019b2 100644
--- a/packaging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj
+++ b/packaging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj
@@ -2,18 +2,18 @@
{440d06b8-e3de-4c0d-ad25-cd4f43d836e1}
net5.0
- AnyCPU;x64
+ AnyCPU;x64;arm64
-
true
-
+
$(MSBuildProjectName.Replace('.ArchNeutral',''))$(TransportPackageNameSuffix)
$(PackageName)