diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 3ce63da031753fd54ee13989ec5d88b5ac33bfbf..2d1f210823cfb873b200ba0160a69bb27d48b9df 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -626,7 +626,7 @@ stages: parameters: condition: ne(variables['SkipTests'], 'true') jobName: MacOS_Test - jobDisplayName: "Test: macOS 10.15" + jobDisplayName: "Test: macOS" agentOs: macOS isTestingJob: true buildArgs: --all --test "/p:RunTemplateTests=false" $(_InternalRuntimeDownloadArgs) diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index 7e7429da1a12ccad45ad699db3dabf0e772d755b..aeb4c72c9669ecc2d2b15f374293d4c7deaa8a2c 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -89,7 +89,7 @@ jobs: # See https://github.com/dotnet/arcade/blob/master/Documentation/ChoosingAMachinePool.md pool: ${{ if eq(parameters.agentOs, 'macOS') }}: - vmImage: macOS-10.15 + vmImage: macOS-11 ${{ if eq(parameters.agentOs, 'Linux') }}: vmImage: ubuntu-18.04 ${{ if eq(parameters.agentOs, 'Windows') }}: diff --git a/eng/Versions.props b/eng/Versions.props index d9054c7e2a0a60601f6e544ea0f7d7718ee96140..1413bc1b529bc604cc82c25a443a22eff4b49620 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,9 +8,9 @@ <PropertyGroup Label="Version settings"> <AspNetCoreMajorVersion>3</AspNetCoreMajorVersion> <AspNetCoreMinorVersion>1</AspNetCoreMinorVersion> - <AspNetCorePatchVersion>28</AspNetCorePatchVersion> + <AspNetCorePatchVersion>29</AspNetCorePatchVersion> <!-- This property should be 'false' between branding & code-merging, 'true' the rest of the time --> - <ValidateBaseline>true</ValidateBaseline> + <ValidateBaseline>false</ValidateBaseline> <PreReleasePreviewNumber>0</PreReleasePreviewNumber> <ComponentsWebAssemblyMajorVersion>3</ComponentsWebAssemblyMajorVersion> <ComponentsWebAssemblyMinorVersion>2</ComponentsWebAssemblyMinorVersion>