diff --git a/azure-pipelines-compiler.yml b/azure-pipelines-compiler.yml index 232e2673940..dd956cedf21 100644 --- a/azure-pipelines-compiler.yml +++ b/azure-pipelines-compiler.yml @@ -191,7 +191,8 @@ stages: - job: Linux pool: ${{ if or(ne(variables['System.TeamProject'], 'internal'), in(variables['Build.Reason'], 'Manual', 'PullRequest', 'Schedule')) }}: - vmImage: ubuntu-latest + name: NetCore-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if and(eq(variables['System.TeamProject'], 'internal'), notin(variables['Build.Reason'], 'Manual', 'PullRequest', 'Schedule')) }}: name: NetCore1ESPool-Internal demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 677554374da..2975a64e079 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -358,11 +358,12 @@ stages: - job: Linux container: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7 + image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8 options: --init # This ensures all the stray defunct processes are reaped. pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - vmImage: ubuntu-latest + name: NetCore-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 diff --git a/build.cmd b/build.cmd index c646ad3f0f4..96ce85f9b08 100644 --- a/build.cmd +++ b/build.cmd @@ -1,7 +1,7 @@ @echo off setlocal -set _args=-restore -build /p:TreatWarningsAsErrors=true %* +set _args=-restore -build /p:_SelfContainedWasSpecified=true %* if "%~1"=="-?" set _args=-help powershell -ExecutionPolicy ByPass -NoProfile -Command "& '%~dp0eng\common\build.ps1'" %_args% diff --git a/eng/AfterSigning.targets b/eng/AfterSigning.targets index 4d29e5a2405..d84fdea0b00 100644 --- a/eng/AfterSigning.targets +++ b/eng/AfterSigning.targets @@ -39,7 +39,6 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a21ea9b6a6c..3cdd5dd14b2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -94,19 +94,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 3a25a7f1cc446b60678ed25c9d829420d6321eba - + https://github.com/dotnet/arcade - 792c346a52b2388152c2fad6f626b88ed8736d6f + 06d73ccc1f421af06c2794741a9913f474f66b3d - + https://github.com/dotnet/sourcelink - 54eb3b811c57f5e94617d31a102fc9cb664ccdd5 + 4d2c8bf58e8cb7900ec2d9077c155572e2d3cd88 - + https://github.com/dotnet/xliff-tasks - 9e7fbcab4e5275f63c0cd37553ba426de9194309 + 4234ffac87e305da80597cb46dc0d4a87fc4f7c2 - RuntimeIdentifier=%(RuntimeIdentifierForPublish.Identity);PublishDir=$(RidsPublishDir)%(RuntimeIdentifierForPublish.Identity)\;TargetFramework=$(PublishTargetFramework) + RuntimeIdentifier=%(RuntimeIdentifierForPublish.Identity);PublishDir=$(RidsPublishDir)%(RuntimeIdentifierForPublish.Identity)\;TargetFramework=$(PublishTargetFramework);SelfContained=true - PublishDir=$(RidsPublishDir)\PlatformAgnostic\;UseAppHost=false;TargetFramework=$(PublishTargetFramework) + PublishDir=$(RidsPublishDir)\PlatformAgnostic\;UseAppHost=false;TargetFramework=$(PublishTargetFramework);