Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit cfd7acc

Browse files
radicalradical
authored
Merge branch 'release/7.0' into darc-release/7.0-1aa376fb-796a-4a7c-aa6a-49e17ece0c50
2 parents 1641005 + 0776945 commit cfd7acc

File tree

89 files changed

+1499
-406
lines changed

Some content is hidden

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

89 files changed

+1499
-406
lines changed

‎NuGet.config‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@
99
<clear />
1010
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1111
<!-- Begin: Package sources from dotnet-emsdk -->
12-
<add key="darc-pub-dotnet-emsdk-d71ea7c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-d71ea7cb/nuget/v3/index.json" />
13-
<add key="darc-pub-dotnet-emsdk-d71ea7c-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-d71ea7cb-3/nuget/v3/index.json" />
14-
<add key="darc-pub-dotnet-emsdk-d71ea7c-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-d71ea7cb-2/nuget/v3/index.json" />
15-
<add key="darc-pub-dotnet-emsdk-d71ea7c-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-d71ea7cb-1/nuget/v3/index.json" />
12+
<add key="darc-pub-dotnet-emsdk-00fbd97" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-00fbd974/nuget/v3/index.json" />
1613
<!-- End: Package sources from dotnet-emsdk -->
1714
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1815
<!--

‎eng/Version.Details.xml‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -50,85 +50,85 @@
5050
</Dependency>
5151
<Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.2">
5252
<Uri>https://github.com/dotnet/emsdk</Uri>
53-
<Sha>d71ea7cbed84152a921c7b7b4b4439c306bf9130</Sha>
53+
<Sha>00fbd974da8e15ee323c57e44a8e3d59560105a6</Sha>
5454
</Dependency>
5555
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.2">
5656
<Uri>https://github.com/dotnet/emsdk</Uri>
57-
<Sha>d71ea7cbed84152a921c7b7b4b4439c306bf9130</Sha>
57+
<Sha>00fbd974da8e15ee323c57e44a8e3d59560105a6</Sha>
5858
</Dependency>
5959
</ProductDependencies>
6060
<ToolsetDependencies>
61-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22561.2">
61+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22572.6">
6262
<Uri>https://github.com/dotnet/arcade</Uri>
63-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
63+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22561.2">
65+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22572.6">
6666
<Uri>https://github.com/dotnet/arcade</Uri>
67-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
67+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
6868
</Dependency>
69-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22561.2">
69+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22572.6">
7070
<Uri>https://github.com/dotnet/arcade</Uri>
71-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
71+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
7272
</Dependency>
73-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22561.2">
73+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22572.6">
7474
<Uri>https://github.com/dotnet/arcade</Uri>
75-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
75+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
7676
</Dependency>
77-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22561.2">
77+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22572.6">
7878
<Uri>https://github.com/dotnet/arcade</Uri>
79-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
79+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
8080
</Dependency>
81-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22561.2">
81+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22572.6">
8282
<Uri>https://github.com/dotnet/arcade</Uri>
83-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
83+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
8484
</Dependency>
85-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22561.2">
85+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22572.6">
8686
<Uri>https://github.com/dotnet/arcade</Uri>
87-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
87+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
8888
</Dependency>
89-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22561.2">
89+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22572.6">
9090
<Uri>https://github.com/dotnet/arcade</Uri>
91-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
91+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
9292
</Dependency>
93-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22561.2">
93+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22572.6">
9494
<Uri>https://github.com/dotnet/arcade</Uri>
95-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
95+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
9696
</Dependency>
97-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22561.2">
97+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22572.6">
9898
<Uri>https://github.com/dotnet/arcade</Uri>
99-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
99+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
100100
</Dependency>
101-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22561.2">
101+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22572.6">
102102
<Uri>https://github.com/dotnet/arcade</Uri>
103-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
103+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
104104
</Dependency>
105-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22561.2">
105+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22572.6">
106106
<Uri>https://github.com/dotnet/arcade</Uri>
107-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
107+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
108108
</Dependency>
109-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22561.2">
109+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22572.6">
110110
<Uri>https://github.com/dotnet/arcade</Uri>
111-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
111+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
112112
</Dependency>
113-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22561.2">
113+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22572.6">
114114
<Uri>https://github.com/dotnet/arcade</Uri>
115-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
115+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
116116
</Dependency>
117-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22561.2">
117+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22572.6">
118118
<Uri>https://github.com/dotnet/arcade</Uri>
119-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
119+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
120120
</Dependency>
121-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22561.2">
121+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22572.6">
122122
<Uri>https://github.com/dotnet/arcade</Uri>
123-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
123+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
124124
</Dependency>
125-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22561.2">
125+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22572.6">
126126
<Uri>https://github.com/dotnet/arcade</Uri>
127-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
127+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
128128
</Dependency>
129-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22561.2">
129+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22572.6">
130130
<Uri>https://github.com/dotnet/arcade</Uri>
131-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
131+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
132132
</Dependency>
133133
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.22553.1">
134134
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -254,9 +254,9 @@
254254
<Uri>https://github.com/dotnet/xharness</Uri>
255255
<Sha>5ebf69650b9f7b4ecab485be840b3022420f7812</Sha>
256256
</Dependency>
257-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22561.2">
257+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22572.6">
258258
<Uri>https://github.com/dotnet/arcade</Uri>
259-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
259+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
260260
</Dependency>
261261
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22415.6">
262262
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project>
22
<PropertyGroup>
33
<!-- The .NET product branding version -->
4-
<ProductVersion>7.0.2</ProductVersion>
4+
<ProductVersion>7.0.3</ProductVersion>
55
<!-- File version numbers -->
66
<MajorVersion>7</MajorVersion>
77
<MinorVersion>0</MinorVersion>
8-
<PatchVersion>2</PatchVersion>
8+
<PatchVersion>3</PatchVersion>
99
<SdkBandVersion>7.0.100</SdkBandVersion>
10-
<PackageVersionNet6>6.0.12</PackageVersionNet6>
10+
<PackageVersionNet6>6.0.13</PackageVersionNet6>
1111
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
1212
<PreReleaseVersionIteration>
1313
</PreReleaseVersionIteration>
@@ -62,22 +62,22 @@
6262
<!-- SDK dependencies -->
6363
<MicrosoftDotNetApiCompatTaskVersion>7.0.100-rc.1.22402.1</MicrosoftDotNetApiCompatTaskVersion>
6464
<!-- Arcade dependencies -->
65-
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22561.2</MicrosoftDotNetApiCompatVersion>
66-
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22561.2</MicrosoftDotNetBuildTasksFeedVersion>
67-
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22561.2</MicrosoftDotNetCodeAnalysisVersion>
68-
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.22561.2</MicrosoftDotNetGenAPIVersion>
69-
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22561.2</MicrosoftDotNetGenFacadesVersion>
70-
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22561.2</MicrosoftDotNetXUnitExtensionsVersion>
71-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22561.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
72-
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22561.2</MicrosoftDotNetBuildTasksArchivesVersion>
73-
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22561.2</MicrosoftDotNetBuildTasksInstallersVersion>
74-
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22561.2</MicrosoftDotNetBuildTasksPackagingVersion>
75-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22561.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
76-
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22561.2</MicrosoftDotNetBuildTasksTemplatingVersion>
77-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22561.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
78-
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22561.2</MicrosoftDotNetRemoteExecutorVersion>
79-
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22561.2</MicrosoftDotNetVersionToolsTasksVersion>
80-
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22561.2</MicrosoftDotNetPackageTestingVersion>
65+
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22572.6</MicrosoftDotNetApiCompatVersion>
66+
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22572.6</MicrosoftDotNetBuildTasksFeedVersion>
67+
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22572.6</MicrosoftDotNetCodeAnalysisVersion>
68+
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.22572.6</MicrosoftDotNetGenAPIVersion>
69+
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22572.6</MicrosoftDotNetGenFacadesVersion>
70+
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22572.6</MicrosoftDotNetXUnitExtensionsVersion>
71+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22572.6</MicrosoftDotNetXUnitConsoleRunnerVersion>
72+
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22572.6</MicrosoftDotNetBuildTasksArchivesVersion>
73+
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22572.6</MicrosoftDotNetBuildTasksInstallersVersion>
74+
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22572.6</MicrosoftDotNetBuildTasksPackagingVersion>
75+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22572.6</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
76+
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22572.6</MicrosoftDotNetBuildTasksTemplatingVersion>
77+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22572.6</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
78+
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22572.6</MicrosoftDotNetRemoteExecutorVersion>
79+
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22572.6</MicrosoftDotNetVersionToolsTasksVersion>
80+
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22572.6</MicrosoftDotNetPackageTestingVersion>
8181
<!-- NuGet dependencies -->
8282
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
8383
<!-- Installer dependencies -->

‎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/sdk-task.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ try {
6464
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
6565
}
6666
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
67-
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.3.1" -MemberType NoteProperty
67+
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.4.1" -MemberType NoteProperty
6868
}
6969
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
7070
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true

‎eng/common/templates/steps/source-build.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,6 @@ steps:
6363
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
6464
fi
6565
66-
runtimeOsArgs=
67-
if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then
68-
runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}'
69-
fi
70-
7166
publishArgs=
7267
if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then
7368
publishArgs='--publish'
@@ -80,7 +75,6 @@ steps:
8075
$internalRuntimeDownloadArgs \
8176
$internalRestoreArgs \
8277
$targetRidArgs \
83-
$runtimeOsArgs \
8478
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
8579
/p:ArcadeBuildFromSource=true
8680
displayName: Build

‎eng/common/tools.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,8 +365,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
365365

366366
# If the version of msbuild is going to be xcopied,
367367
# use this version. Version matches a package here:
368-
# https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.3.1view=overview
369-
$defaultXCopyMSBuildVersion = '17.3.1'
368+
# https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.4.1&view=overview
369+
$defaultXCopyMSBuildVersion = '17.4.1'
370370

371371
if (!$vsRequirements) {
372372
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {

‎eng/pipelines/coreclr/nativeaot-post-build-steps.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,9 @@ steps:
2929
- ${{ if ne(parameters.osGroup, 'windows') }}:
3030
- script: $(Build.SourcesDirectory)/src/tests/run.sh --runnativeaottests $(buildConfigUpper) ${{ parameters.archType }}
3131
displayName: Run tests in single file mode
32+
33+
# Publishing tooling doesn't support different configs between runtime and libs, so only run tests in Release config
34+
# PublishAot on OSX doesn't work yet. Need an SDK with https://github.com/dotnet/installer/pull/14443.
35+
- ${{ if and(eq(parameters.buildConfig, 'release'), ne(parameters.osGroup, 'OSX')) }}:
36+
- script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci -arch ${{ parameters.archType }} $(_osParameter) -s libs.tests -c $(_BuildConfig) /p:TestAssemblies=false /p:RunNativeAotTestApps=true $(_officialBuildParameter) $(_crossBuildPropertyArg) /bl:$(Build.SourcesDirectory)/artifacts/log/$(buildConfigUpper)/NativeAotTests.binlog ${{ parameters.extraTestArgs }}
37+
displayName: Run NativeAot Library Tests

‎eng/pipelines/libraries/helix-queues-setup.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ jobs:
175175

176176
# .NETFramework
177177
- ${{ if eq(parameters.jobParameters.framework, 'net48') }}:
178-
- Windows.10.Amd64.Client21H1.Open
178+
- windows.10.amd64.client.open
179179

180180
# windows arm
181181
- ${{ if eq(parameters.platform, 'windows_arm') }}:

‎eng/testing/linker/SupportFiles/Directory.Build.props‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<PropertyGroup>
33
<SkipConfigureTrimming>true</SkipConfigureTrimming>
44
<PublishTrimmed>true</PublishTrimmed>
5-
<SkipImportRepoLinkerTargets>true</SkipImportRepoLinkerTargets>
65
<TrimMode>full</TrimMode>
76
<TrimmerRemoveSymbols>false</TrimmerRemoveSymbols>
87
<SelfContained>true</SelfContained>

0 commit comments

Comments
 (0)