Skip to content

Commit dc4a485

Browse files
kkwpsvkkwpsv
authored
Merge pull request #8 from dotnet/release/6.0
Release/6.0
2 parents 14a1e0e + f228884 commit dc4a485

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+812
-402
lines changed

‎Microsoft.Dotnet.Wpf.sln‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1259,7 +1259,6 @@ Global
12591259
{60E8E057-79E1-4860-A015-23C9587434F7}.Debug|Any CPU.Build.0 = Debug|Win32
12601260
{60E8E057-79E1-4860-A015-23C9587434F7}.Debug|Any CPU.Deploy.0 = Debug|Win32
12611261
{60E8E057-79E1-4860-A015-23C9587434F7}.Debug|ARM64.ActiveCfg = Debug|ARM64
1262-
{60E8E057-79E1-4860-A015-23C9587434F7}.Debug|ARM64.Build.0 = Debug|ARM64
12631262
{60E8E057-79E1-4860-A015-23C9587434F7}.Debug|x64.ActiveCfg = Debug|x64
12641263
{60E8E057-79E1-4860-A015-23C9587434F7}.Debug|x64.Build.0 = Debug|x64
12651264
{60E8E057-79E1-4860-A015-23C9587434F7}.Debug|x64.Deploy.0 = Debug|x64
@@ -1270,7 +1269,6 @@ Global
12701269
{60E8E057-79E1-4860-A015-23C9587434F7}.Release|Any CPU.Build.0 = Release|Win32
12711270
{60E8E057-79E1-4860-A015-23C9587434F7}.Release|Any CPU.Deploy.0 = Release|Win32
12721271
{60E8E057-79E1-4860-A015-23C9587434F7}.Release|ARM64.ActiveCfg = Release|ARM64
1273-
{60E8E057-79E1-4860-A015-23C9587434F7}.Release|ARM64.Build.0 = Release|ARM64
12741272
{60E8E057-79E1-4860-A015-23C9587434F7}.Release|x64.ActiveCfg = Release|x64
12751273
{60E8E057-79E1-4860-A015-23C9587434F7}.Release|x64.Build.0 = Release|x64
12761274
{60E8E057-79E1-4860-A015-23C9587434F7}.Release|x64.Deploy.0 = Release|x64

‎NuGet.config‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<clear />
66
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
77
<!-- Begin: Package sources from dotnet-runtime -->
8-
<add key="darc-int-dotnet-runtime-be98e88" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-be98e88c/nuget/v3/index.json" />
98
<!-- End: Package sources from dotnet-runtime -->
109
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1110
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -19,7 +18,6 @@
1918
<disabledPackageSources>
2019
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2120
<!-- Begin: Package sources from dotnet-runtime -->
22-
<add key="darc-int-dotnet-runtime-be98e88" value="true" />
2321
<!-- End: Package sources from dotnet-runtime -->
2422
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2523
</disabledPackageSources>

‎azure-pipelines.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ stages:
7373
# agent pool can't be read from a user-defined variable (Azure DevOps limitation)
7474
pool:
7575
name: NetCore1ESPool-Svc-Internal
76-
demands: ImageOverride -equals build.windows.10.amd64.vs2019.pre
76+
demands: ImageOverride -equals windows.vs2019.amd64
7777
# runAsPublic is used in expressions, which can't read from user-defined variables
7878
runAsPublic: false
7979

‎eng/Version.Details.xml‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.4-servicing.22164.7">
4+
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.25-servicing.23519.16">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
6-
<Sha>0c636f9d7cf5e0d9f23cf070c36711e7ac4d66ee</Sha>
6+
<Sha>d4ee94199afb6c67ed448c252a07c0747c089e41</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.4-servicing.22164.7">
8+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.25-servicing.23519.16">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
10-
<Sha>0c636f9d7cf5e0d9f23cf070c36711e7ac4d66ee</Sha>
10+
<Sha>d4ee94199afb6c67ed448c252a07c0747c089e41</Sha>
1111
</Dependency>
1212
<Dependency Name="System.CodeDom" Version="6.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
1313
<Uri>https://github.com/dotnet/runtime</Uri>
1414
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
1515
</Dependency>
16-
<Dependency Name="System.Configuration.ConfigurationManager" Version="6.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
17-
<Uri>https://github.com/dotnet/runtime</Uri>
18-
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
16+
<Dependency Name="System.Configuration.ConfigurationManager" Version="6.0.1" CoherentParentDependency="Microsoft.Private.Winforms">
17+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
18+
<Sha>163a63591cf9e9b682063cf3995948c2b885a042</Sha>
1919
</Dependency>
2020
<Dependency Name="System.Diagnostics.EventLog" Version="6.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
2121
<Uri>https://github.com/dotnet/runtime</Uri>
2222
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
2323
</Dependency>
24-
<Dependency Name="System.DirectoryServices" Version="6.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
25-
<Uri>https://github.com/dotnet/runtime</Uri>
26-
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
24+
<Dependency Name="System.DirectoryServices" Version="6.0.1" CoherentParentDependency="Microsoft.Private.Winforms">
25+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
26+
<Sha>2a90daa2cc41ae8f11a2c1519cb8b235f609251a</Sha>
2727
</Dependency>
2828
<Dependency Name="System.Drawing.Common" Version="6.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
2929
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -33,9 +33,9 @@
3333
<Uri>https://github.com/dotnet/runtime</Uri>
3434
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
3535
</Dependency>
36-
<Dependency Name="System.Security.Cryptography.Xml" Version="6.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
37-
<Uri>https://github.com/dotnet/runtime</Uri>
38-
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
36+
<Dependency Name="System.Security.Cryptography.Xml" Version="6.0.1" CoherentParentDependency="Microsoft.Private.Winforms">
37+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
38+
<Sha>55fb7ef977e7d120dc12f0960edcff0739d7ee0e</Sha>
3939
</Dependency>
4040
<Dependency Name="System.Security.Permissions" Version="6.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
4141
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -45,63 +45,63 @@
4545
<Uri>https://github.com/dotnet/runtime</Uri>
4646
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
4747
</Dependency>
48-
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.3" CoherentParentDependency="Microsoft.Private.Winforms">
48+
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.11" CoherentParentDependency="Microsoft.Private.Winforms">
4949
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
50-
<Sha>be98e88c760526452df94ef452fff4602fb5bded</Sha>
50+
<Sha>a08d9ce2caf02455c0b825bcdc32974bdf769a80</Sha>
5151
</Dependency>
52-
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="6.0.0-rtm.22161.2">
52+
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="6.0.0-rtm.23572.3">
5353
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
54-
<Sha>c8d46e6b93f648dd15d27210af19b62f98205daa</Sha>
54+
<Sha>4e9fd815d72fa267bfa5fb21e1304501df1d2f50</Sha>
5555
</Dependency>
5656
<Dependency Name="System.IO.Packaging" Version="6.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
5757
<Uri>https://github.com/dotnet/runtime</Uri>
5858
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
5959
</Dependency>
60-
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.4-servicing.22164.4" CoherentParentDependency="Microsoft.Private.Winforms">
60+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.25-servicing.23519.12" CoherentParentDependency="Microsoft.Private.Winforms">
6161
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
62-
<Sha>be98e88c760526452df94ef452fff4602fb5bded</Sha>
62+
<Sha>492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4</Sha>
6363
</Dependency>
64-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.4-servicing.22164.4" CoherentParentDependency="Microsoft.Private.Winforms">
64+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.25-servicing.23519.12" CoherentParentDependency="Microsoft.Private.Winforms">
6565
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
66-
<Sha>be98e88c760526452df94ef452fff4602fb5bded</Sha>
66+
<Sha>492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4</Sha>
6767
</Dependency>
6868
<Dependency Name="System.Resources.Extensions" Version="6.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
6969
<Uri>https://github.com/dotnet/runtime</Uri>
7070
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
7171
</Dependency>
72-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.4" CoherentParentDependency="Microsoft.Private.Winforms">
72+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.25" CoherentParentDependency="Microsoft.Private.Winforms">
7373
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
74-
<Sha>be98e88c760526452df94ef452fff4602fb5bded</Sha>
74+
<Sha>492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4</Sha>
7575
</Dependency>
76-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.4" CoherentParentDependency="Microsoft.Private.Winforms">
76+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.25" CoherentParentDependency="Microsoft.Private.Winforms">
7777
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
78-
<Sha>be98e88c760526452df94ef452fff4602fb5bded</Sha>
78+
<Sha>492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4</Sha>
7979
</Dependency>
80-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.4-servicing.22164.4" CoherentParentDependency="Microsoft.Private.Winforms">
80+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.25-servicing.23519.12" CoherentParentDependency="Microsoft.Private.Winforms">
8181
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
82-
<Sha>be98e88c760526452df94ef452fff4602fb5bded</Sha>
82+
<Sha>492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4</Sha>
8383
</Dependency>
8484
</ProductDependencies>
8585
<ToolsetDependencies>
86-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22122.7">
86+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.23517.3">
8787
<Uri>https://github.com/dotnet/arcade</Uri>
88-
<Sha>7215d8265a7fbcd022eb72ff7a6e2048444c985f</Sha>
88+
<Sha>7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.22122.7">
90+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.23517.3">
9191
<Uri>https://github.com/dotnet/arcade</Uri>
92-
<Sha>7215d8265a7fbcd022eb72ff7a6e2048444c985f</Sha>
92+
<Sha>7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22122.7">
94+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.23517.3">
9595
<Uri>https://github.com/dotnet/arcade</Uri>
96-
<Sha>7215d8265a7fbcd022eb72ff7a6e2048444c985f</Sha>
96+
<Sha>7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.22122.7">
98+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.23517.3">
9999
<Uri>https://github.com/dotnet/arcade</Uri>
100-
<Sha>7215d8265a7fbcd022eb72ff7a6e2048444c985f</Sha>
100+
<Sha>7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.22122.7">
102+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.23517.3">
103103
<Uri>https://github.com/dotnet/arcade</Uri>
104-
<Sha>7215d8265a7fbcd022eb72ff7a6e2048444c985f</Sha>
104+
<Sha>7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c</Sha>
105105
</Dependency>
106106
</ToolsetDependencies>
107107
</Dependencies>

‎eng/Versions.props‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<MajorVersion>6</MajorVersion>
55
<MinorVersion>0</MinorVersion>
6-
<PatchVersion>4</PatchVersion>
6+
<PatchVersion>26</PatchVersion>
77
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
88
<!--
99
Set assembly version to align with major and minor version, as for the patches and revisions should be manually
@@ -26,39 +26,39 @@
2626
</PropertyGroup>
2727
<!-- NuGet Package Versions -->
2828
<PropertyGroup>
29-
<MicrosoftPrivateWinformsVersion>6.0.4-servicing.22164.7</MicrosoftPrivateWinformsVersion>
29+
<MicrosoftPrivateWinformsVersion>6.0.25-servicing.23519.16</MicrosoftPrivateWinformsVersion>
3030
</PropertyGroup>
3131
<!-- Packages that come from https://github.com/dotnet/coreclr -->
3232
<PropertyGroup>
3333
<MicrosoftNETCoreRuntimeCoreCLRVersion>5.0.0-alpha1.19562.1</MicrosoftNETCoreRuntimeCoreCLRVersion>
34-
<MicrosoftNETCoreILDAsmVersion>6.0.4-servicing.22164.4</MicrosoftNETCoreILDAsmVersion>
35-
<MicrosoftNETCoreILAsmVersion>6.0.4-servicing.22164.4</MicrosoftNETCoreILAsmVersion>
34+
<MicrosoftNETCoreILDAsmVersion>6.0.25-servicing.23519.12</MicrosoftNETCoreILDAsmVersion>
35+
<MicrosoftNETCoreILAsmVersion>6.0.25-servicing.23519.12</MicrosoftNETCoreILAsmVersion>
3636
</PropertyGroup>
3737
<!-- Packages that come from https://github.com/dotnet/core-setup -->
3838
<PropertyGroup>
39-
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.4-servicing.22164.4</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
40-
<MicrosoftNETCoreAppRefVersion>6.0.4</MicrosoftNETCoreAppRefVersion>
41-
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.4</MicrosoftNETCoreAppRuntimewinx64Version>
42-
<MicrosoftNETCorePlatformsVersion>6.0.3</MicrosoftNETCorePlatformsVersion>
39+
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.25-servicing.23519.12</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
40+
<MicrosoftNETCoreAppRefVersion>6.0.25</MicrosoftNETCoreAppRefVersion>
41+
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.25</MicrosoftNETCoreAppRuntimewinx64Version>
42+
<MicrosoftNETCorePlatformsVersion>6.0.11</MicrosoftNETCorePlatformsVersion>
4343
<SystemDrawingCommonVersion>6.0.0</SystemDrawingCommonVersion>
44-
<SystemDirectoryServicesVersion>6.0.0</SystemDirectoryServicesVersion>
44+
<SystemDirectoryServicesVersion>6.0.1</SystemDirectoryServicesVersion>
4545
<SystemReflectionMetadataLoadContextVersion>6.0.0</SystemReflectionMetadataLoadContextVersion>
4646
</PropertyGroup>
4747
<!-- Packages that come from https://github.com/dotnet/corefx via core-setup coherency parent dependency -->
4848
<PropertyGroup>
4949
<SystemCodeDomPackageVersion>6.0.0</SystemCodeDomPackageVersion>
50-
<SystemConfigurationConfigurationManagerPackageVersion>6.0.0</SystemConfigurationConfigurationManagerPackageVersion>
50+
<SystemConfigurationConfigurationManagerPackageVersion>6.0.1</SystemConfigurationConfigurationManagerPackageVersion>
5151
<SystemDiagnosticsEventLogPackageVersion>6.0.0</SystemDiagnosticsEventLogPackageVersion>
5252
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
53-
<SystemSecurityCryptographyXmlPackageVersion>6.0.0</SystemSecurityCryptographyXmlPackageVersion>
53+
<SystemSecurityCryptographyXmlPackageVersion>6.0.1</SystemSecurityCryptographyXmlPackageVersion>
5454
<SystemSecurityPermissionsPackageVersion>6.0.0</SystemSecurityPermissionsPackageVersion>
5555
<SystemWindowsExtensionsPackageVersion>6.0.0</SystemWindowsExtensionsPackageVersion>
5656
</PropertyGroup>
5757
<!-- Packages that come from https://github.com/dotnet/arcade -->
5858
<PropertyGroup>
59-
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.22122.7</MicrosoftDotNetApiCompatVersion>
60-
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.22122.7</MicrosoftDotNetCodeAnalysisPackageVersion>
61-
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.22122.7</MicrosoftDotNetGenAPIVersion>
59+
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.23517.3</MicrosoftDotNetApiCompatVersion>
60+
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.23517.3</MicrosoftDotNetCodeAnalysisPackageVersion>
61+
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.23517.3</MicrosoftDotNetGenAPIVersion>
6262
</PropertyGroup>
6363
<!-- Maintain System.CodeDom PackageVersion at 4.4.0. See https://github.com/Microsoft/msbuild/issues/3627 -->
6464
<!-- Pin specific versions of S.Memory so that it would supply AssemblyVersion=4.0.1.0. See https://github.com/dotnet/runtime/issues/31672 -->
@@ -97,6 +97,6 @@
9797
<SystemReflectionMetadataLoadContextPackage>System.Reflection.MetadataLoadContext</SystemReflectionMetadataLoadContextPackage>
9898
</PropertyGroup>
9999
<PropertyGroup>
100-
<MicrosoftDotNetWpfDncEngVersion>6.0.0-rtm.22161.2</MicrosoftDotNetWpfDncEngVersion>
100+
<MicrosoftDotNetWpfDncEngVersion>6.0.0-rtm.23572.3</MicrosoftDotNetWpfDncEngVersion>
101101
</PropertyGroup>
102102
</Project>

‎eng/WpfArcadeSdk/tools/Wpf.Cpp.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@
247247
<!--<AdditionalOptions>/Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>-->
248248
<!--<ConformanceMode>false</ConformanceMode>-->
249249

250-
<AdditionalOptions Condition="'$(ManagedCxx)'=='true'">%(AdditionalOptions) /clr:netcore</AdditionalOptions>
250+
<AdditionalOptions Condition="'$(ManagedCxx)'=='true'">%(AdditionalOptions) /clr:netcore /wd4956</AdditionalOptions>
251251
<ShowIncludes Condition="'$(ShowIncludes)'=='true'">true</ShowIncludes>
252252
</ClCompile>
253253
<Link>

‎eng/WpfArcadeSdk/tools/Wpf.Cpp.targets‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -353,6 +353,16 @@ using namespace System::Runtime::Versioning;
353353
<AdditionalNugetIds Remove="%40(AdditionalNugetIds)" />
354354
<AdditionalNugetIds Include="%24([System.String]::Copy('%25(_AdditionalPackages.Identity)').Split('+')[0])" />
355355
</ItemGroup>
356+
357+
<!--
358+
Removing the Microsoft.NETCore.Platforms directly and then
359+
adding it again to remove the duplicate reference.
360+
-->
361+
<ItemGroup>
362+
<PackageReference Remove="Microsoft.NETCore.Platforms" />
363+
<PackageReference Include="Microsoft.NETCore.Platforms"
364+
Version="$(MicrosoftNETCorePlatformsVersion)" />
365+
</ItemGroup>
356366
</Target>
357367
358368
<Target

‎eng/common/build.ps1‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Param(
2626
[string] $runtimeSourceFeed = '',
2727
[string] $runtimeSourceFeedKey = '',
2828
[switch] $excludePrereleaseVS,
29+
[switch] $nativeToolsOnMachine,
2930
[switch] $help,
3031
[Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
3132
)
@@ -67,6 +68,7 @@ function Print-Usage() {
6768
Write-Host " -warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
6869
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
6970
Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio"
71+
Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)"
7072
Write-Host ""
7173

7274
Write-Host "Command line arguments not listed above are passed thru to msbuild."
@@ -146,6 +148,9 @@ try {
146148
$nodeReuse = $false
147149
}
148150

151+
if ($nativeToolsOnMachine) {
152+
$env:NativeToolsOnMachine = $true
153+
}
149154
if ($restore) {
150155
InitializeNativeTools
151156
}

‎eng/common/cross/toolchain.cmake‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
set(CROSS_ROOTFS $ENV{ROOTFS_DIR})
22

3+
# reset platform variables (e.g. cmake 3.25 sets LINUX=1)
4+
unset(LINUX)
5+
unset(FREEBSD)
6+
unset(ILLUMOS)
7+
unset(ANDROID)
8+
unset(TIZEN)
9+
310
set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH})
411
if(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version)
512
set(CMAKE_SYSTEM_NAME FreeBSD)

‎eng/common/dotnet-install.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ done
5252
# Use uname to determine what the CPU is, see https://en.wikipedia.org/wiki/Uname#Examples
5353
cpuname=$(uname -m)
5454
case $cpuname in
55-
aarch64)
55+
arm64|aarch64)
5656
buildarch=arm64
5757
;;
5858
amd64|x86_64)
@@ -61,7 +61,7 @@ case $cpuname in
6161
armv*l)
6262
buildarch=arm
6363
;;
64-
i686)
64+
i[3-6]86)
6565
buildarch=x86
6666
;;
6767
*)

0 commit comments

Comments
 (0)