Merge branch 'release/7.0.4xx' into internal-merge-7.0.4xx-2024-01-09-1132
This commit is contained in:
Matt Thalman
GitHub
commit
d10cd11a6a
6 changed files with 63 additions and 19 deletions
|
|
@ -180,9 +180,9 @@
|
|||
<Sha>c3ad00ae84489071080a606f6a8e43c9a91a5cc2</Sha>
|
||||
<SourceBuildTarball RepoName="deployment-tools" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="7.0.0-alpha.1.23601.2">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-source-build-externals</Uri>
|
||||
<Sha>d6ad546c83ce94b3efb4662513bed71a3e6192ef</Sha>
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="7.0.0-alpha.1.24059.2">
|
||||
<Uri>https://github.com/dotnet/source-build-externals</Uri>
|
||||
<Sha>4bed7bdd937666fac4c4f351b9b02adddf8d035b</Sha>
|
||||
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.symreader" Version="1.4.0-beta2-21475-02">
|
||||
|
|
@ -192,22 +192,22 @@
|
|||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23620.3">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24059.5">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>ef97d6e7478f4ae77cf6e827ee40e8c41120093c</Sha>
|
||||
<Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
|
||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.23620.3">
|
||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.24059.5">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>ef97d6e7478f4ae77cf6e827ee40e8c41120093c</Sha>
|
||||
<Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23620.3">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.24059.5">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>ef97d6e7478f4ae77cf6e827ee40e8c41120093c</Sha>
|
||||
<Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.23578.1">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.24059.2">
|
||||
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
|
||||
<Sha>6d5841c05f04d60eccf3358588b8c8968215d9e2</Sha>
|
||||
<Sha>727ef4887d561dae6069d6b9c035773013dad041</Sha>
|
||||
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-22429-01" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.23620.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.24059.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"tools": {
|
||||
"dotnet": "7.0.113",
|
||||
"dotnet": "7.0.115",
|
||||
"runtimes": {
|
||||
"dotnet": [
|
||||
"$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)"
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
"cmake": "3.16.4"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23620.3",
|
||||
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23620.3"
|
||||
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24059.5",
|
||||
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24059.5"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -152,19 +152,24 @@ jobs:
|
|||
set -x
|
||||
df -h
|
||||
|
||||
networkArgs=
|
||||
customRunArgs=
|
||||
customBuildArgs=
|
||||
if [[ '$(_RunOnline)' == 'true' ]]; then
|
||||
customBuildArgs='--online'
|
||||
else
|
||||
networkArgs='--network none'
|
||||
customRunArgs='--network none'
|
||||
fi
|
||||
|
||||
# See https://github.com/dotnet/source-build/issues/3712
|
||||
if [[ '$(_OverrideDistroDisablingSha1)' == 'true' ]]; then
|
||||
customRunArgs="$customRunArgs -e OPENSSL_ENABLE_SHA1_SIGNATURES=1"
|
||||
fi
|
||||
|
||||
if [[ '$(_EnablePoison)' == 'true' ]]; then
|
||||
customBuildArgs="$customBuildArgs --poison"
|
||||
fi
|
||||
|
||||
docker run --rm -v $(tarballDir):/tarball -w /tarball ${networkArgs} $(_Container) ./build.sh --clean-while-building ${customBuildArgs} $(additionalBuildArgs)
|
||||
docker run --rm -v $(tarballDir):/tarball -w /tarball ${customRunArgs} $(_Container) ./build.sh --clean-while-building ${customBuildArgs} $(additionalBuildArgs)
|
||||
displayName: Build Tarball
|
||||
|
||||
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ parameters:
|
|||
# -----------------------------------------------------------------------------------------------
|
||||
alpine317Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17
|
||||
centOSStream8Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8
|
||||
centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9-20220107135047-4cd394c
|
||||
centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
|
||||
debian11Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-arm64v8
|
||||
fedora38Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38
|
||||
ubuntu2004Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04
|
||||
|
|
@ -41,6 +41,7 @@ jobs:
|
|||
_Container: ${{ parameters.centOSStream8Container }}
|
||||
_EnablePoison: false
|
||||
_ExcludeOmniSharpTests: true
|
||||
_OverrideDistroDisablingSha1: false
|
||||
_RunOnline: true
|
||||
_WithPreviousSDK: false
|
||||
CentOSStream8-Offline:
|
||||
|
|
@ -56,6 +57,7 @@ jobs:
|
|||
_Container: ${{ parameters.alpine317Container }}
|
||||
_EnablePoison: false
|
||||
_ExcludeOmniSharpTests: true
|
||||
_OverrideDistroDisablingSha1: false
|
||||
_RunOnline: false
|
||||
_WithPreviousSDK: false
|
||||
CentOSStream8-WithPreviousSDK:
|
||||
|
|
@ -70,6 +72,7 @@ jobs:
|
|||
_Container: ${{ parameters.centOSStream9Container }}
|
||||
_EnablePoison: false
|
||||
_ExcludeOmniSharpTests: false
|
||||
_OverrideDistroDisablingSha1: true
|
||||
_RunOnline: false
|
||||
_WithPreviousSDK: false
|
||||
Fedora38-Offline:
|
||||
|
|
@ -77,6 +80,7 @@ jobs:
|
|||
_Container: ${{ parameters.fedora38Container }}
|
||||
_EnablePoison: true
|
||||
_ExcludeOmniSharpTests: false
|
||||
_OverrideDistroDisablingSha1: false
|
||||
_RunOnline: false
|
||||
_WithPreviousSDK: false
|
||||
Ubuntu2004-Offline:
|
||||
|
|
@ -84,6 +88,7 @@ jobs:
|
|||
_Container: ${{ parameters.ubuntu2004Container }}
|
||||
_EnablePoison: false
|
||||
_ExcludeOmniSharpTests: false
|
||||
_OverrideDistroDisablingSha1: false
|
||||
_RunOnline: false
|
||||
_WithPreviousSDK: false
|
||||
name: Build_Tarball_x64
|
||||
|
|
@ -108,6 +113,7 @@ jobs:
|
|||
_Container: ${{ parameters.debian11Arm64Container }}
|
||||
_EnablePoison: false
|
||||
_ExcludeOmniSharpTests: false
|
||||
_OverrideDistroDisablingSha1: false
|
||||
_RunOnline: false
|
||||
_WithPreviousSDK: false
|
||||
name: Build_Tarball_arm64
|
||||
|
|
@ -129,6 +135,7 @@ jobs:
|
|||
_Container: ${{ parameters.fedora38Container }}
|
||||
_EnablePoison: false
|
||||
_ExcludeOmniSharpTests: false
|
||||
_OverrideDistroDisablingSha1: false
|
||||
_RunOnline: false
|
||||
_WithPreviousSDK: false
|
||||
name: Build_Tarball_x64_Using_Previous
|
||||
|
|
|
|||
|
|
@ -0,0 +1,32 @@
|
|||
trigger: none
|
||||
|
||||
variables:
|
||||
- name: cfsNPMWarnLevel
|
||||
value: none
|
||||
|
||||
- name: cfsNugetWarnLevel
|
||||
value: none
|
||||
|
||||
- name: myGetWarnLevel
|
||||
value: none
|
||||
|
||||
- name: NuGetSecurityAnalysisWarningLevel
|
||||
value: none
|
||||
|
||||
jobs:
|
||||
- template: ../../src/installer/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml
|
||||
parameters:
|
||||
architecture: x64
|
||||
excludeSdkContentTests: true
|
||||
matrix:
|
||||
Ubuntu2004-Offline:
|
||||
_BootstrapPrep: true
|
||||
_Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04
|
||||
_EnablePoison: false
|
||||
_ExcludeOmniSharpTests: false
|
||||
_RunOnline: false
|
||||
_WithPreviousSDK: false
|
||||
name: Build_Tarball_x64
|
||||
pool:
|
||||
name: NetCore1ESPool-Svc-Internal
|
||||
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
|
||||
Loading…
Reference in a new issue