mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#19988)

Browse source
This commit is contained in:
Marc Paine 2024-07-12 13:18:06 -07:00 committed by GitHub
commit e37b9c5d3d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 32 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.vsts-ci.yml
View file

@ -61,8 +61,8 @@ extends:
template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines
parameters:
containers:
fedora39:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39
fedora40:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-40
sdl:
sourceAnalysisPool:
name: $(DncEngInternalBuildPool)

2
src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml
View file

@ -2,7 +2,7 @@
jobs:
- job: Source_Build_Create_Tarball
container: fedora39
container: fedora40
displayName: Source-Build Create Tarball
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:

12
src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml
View file

@ -12,7 +12,7 @@ parameters:
alpine317Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17
centOS7Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-source-build
centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
fedora39Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39
fedora40Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-40
ubuntu2004Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-arm64
poolInternalAmd64:
name: NetCore1ESPool-Svc-Internal
@ -63,9 +63,9 @@ jobs:
_ExcludeOmniSharpTests: false
_OverrideDistroDisablingSha1: true
_RunOnline: false
Fedora39-Offline:
fedora40-Offline:
_BootstrapPrep: false
_Container: ${{ parameters.fedora39Container }}
_Container: ${{ parameters.fedora40Container }}
_EnablePoison: true
_ExcludeOmniSharpTests: false
_OverrideDistroDisablingSha1: false
@ -108,9 +108,9 @@ jobs:
excludeSdkContentTests: true
installerBuildResourceId: ${{ parameters.installerBuildResourceId }}
matrix:
Fedora39-Offline:
_PreviousSourceBuildArtifact: Build_Tarball_x64 Fedora39-Offline_Artifacts
_Container: ${{ parameters.fedora39Container }}
fedora40-Offline:
_PreviousSourceBuildArtifact: Build_Tarball_x64 fedora40-Offline_Artifacts
_Container: ${{ parameters.fedora40Container }}
_EnablePoison: false
_ExcludeOmniSharpTests: false
_OverrideDistroDisablingSha1: false

12
src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml
View file

@ -12,7 +12,7 @@ parameters:
alpine317Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17
centOS7Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-source-build
centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
fedora39Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39
fedora40Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-40
ubuntu2004Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-arm64
poolInternalAmd64:
name: NetCore1ESPool-Svc-Internal
@ -69,9 +69,9 @@ jobs:
_ExcludeOmniSharpTests: false
_OverrideDistroDisablingSha1: true
_RunOnline: false
Fedora39-Offline:
fedora40-Offline:
_BootstrapPrep: false
_Container: ${{ parameters.fedora39Container }}
_Container: ${{ parameters.fedora40Container }}
_EnablePoison: true
_ExcludeOmniSharpTests: false
_OverrideDistroDisablingSha1: false
@ -114,9 +114,9 @@ jobs:
excludeSdkContentTests: true
installerBuildResourceId: ${{ parameters.installerBuildResourceId }}
matrix:
Fedora39-Offline:
_PreviousSourceBuildArtifact: Build_Tarball_x64 Fedora39-Offline_Artifacts
_Container: ${{ parameters.fedora39Container }}
fedora40-Offline:
_PreviousSourceBuildArtifact: Build_Tarball_x64 fedora40-Offline_Artifacts
_Container: ${{ parameters.fedora40Container }}
_EnablePoison: false
_ExcludeOmniSharpTests: false
_OverrideDistroDisablingSha1: false

17
src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff
View file

@ -14,7 +14,20 @@ index ------------
./packs/Microsoft.AspNetCore.App.Ref/
./packs/Microsoft.AspNetCore.App.Ref/x.y.z/
@@ ------------ @@
./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.JSInterop.xml
./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.dll
./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.xml
+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.dll
+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.xml
./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.dll
./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.xml
+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.dll
+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.xml
./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.dll
./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml
+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.CompilerServices.Unsafe.dll
+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.dll
+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.xml
./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.dll
./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml
-./packs/Microsoft.NETCore.App.Host.portable-rid/
@ -29,6 +42,10 @@ index ------------
-./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/libnethost.so
-./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/nethost.h
-./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/singlefilehost
+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll
+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.xml
+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.dll
+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml
+./packs/Microsoft.NETCore.App.Host.banana-rid/
+./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/
+./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/runtimes/