diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8181da29c..adcba19a0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -40,14 +40,16 @@ stages: codeSign: true jobs: - job: Windows_NT + timeoutInMinutes: 120 pool: # For public or PR jobs, use the hosted pool. For internal jobs use the internal pool. # Will eventually change this to two BYOC pools. ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: name: NetCore-Public + demands: ImageOverride -equals 1es-windows-2019-open ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.windows.10.amd64.vs2017 + demands: ImageOverride -equals 1es-windows-2019 variables: - _Script: eng\common\cibuild.cmd @@ -107,6 +109,7 @@ stages: - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - job: OSX + timeoutInMinutes: 120 pool: vmImage: macOS-11 strategy: @@ -127,6 +130,7 @@ stages: condition: succeeded() - job: Linux + timeoutInMinutes: 120 pool: ${{ if or(ne(variables['System.TeamProject'], 'internal'), in(variables['Build.Reason'], 'Manual', 'PullRequest', 'Schedule')) }}: vmImage: ubuntu-18.04 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3446617a7..b6e23626f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,69 +7,69 @@ - + https://github.com/dotnet/efcore - a1bc1f47ccc8235866fe9daabd5fe892094c846f + fc5640c6c657c2886c9d1831d6b096f91b7d9f7e - + https://github.com/dotnet/efcore - a1bc1f47ccc8235866fe9daabd5fe892094c846f + fc5640c6c657c2886c9d1831d6b096f91b7d9f7e - + https://github.com/dotnet/efcore - a1bc1f47ccc8235866fe9daabd5fe892094c846f + fc5640c6c657c2886c9d1831d6b096f91b7d9f7e - + https://github.com/dotnet/runtime - + dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 - + https://github.com/dotnet/runtime - + dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 https://github.com/dotnet/aspnetcore 1bee0afeedab9d6d9d1cf23e65daa7ea5fcc6d47 - + https://github.com/dotnet/runtime - + dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 - + https://github.com/dotnet/runtime - + dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 - + https://github.com/dotnet/runtime - + dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 - + https://github.com/dotnet/runtime - + dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 - + https://github.com/dotnet/runtime - + dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 https://github.com/dotnet/aspnetcore 1bee0afeedab9d6d9d1cf23e65daa7ea5fcc6d47 - + https://github.com/dotnet/runtime - + dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 - + https://github.com/dotnet/runtime - + dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 - + https://github.com/dotnet/runtime - + dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 - + https://github.com/dotnet/runtime - + dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 72a96d779..b2e3dc30f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,37 +12,37 @@ $(MicrosoftBuildPackageVersion) - 8.0.0-alpha.1.22560.1 + 8.0.0-alpha.1.22564.5 - 8.0.0-alpha.1.22560.1 + 8.0.0-alpha.1.22564.5 8.0.0-alpha.1.22560.1 - - - - + + 8.0.0-alpha.1.22559.2 + + 8.0.0-alpha.1.22559.2 8.0.0-alpha.1.22558.5 - - - - - - - - - - + + 8.0.0-alpha.1.22559.2 + + 8.0.0-alpha.1.22559.2 + + 8.0.0-alpha.1.22559.2 + + 8.0.0-alpha.1.22559.2 + + 8.0.0-alpha.1.22559.2 8.0.0-alpha.1.22558.5 - - - - - - - - + + 8.0.0-alpha.1.22559.2 + + 8.0.0-alpha.1.22559.2 + + 8.0.0-alpha.1.22559.2 + + 8.0.0-alpha.1.22559.2 8.0.0-alpha.1.22558.5 @@ -78,10 +78,6 @@ 4.0.0 6.0.0-preview.3.21166.3 - - 8.0.0-alpha.1.22557.5 - - 8.0.0-alpha.1.22557.5 13.0.1 6.3.1 @@ -107,24 +103,6 @@ 6.0.0 1.0.0-rc3-003121 - - 8.0.0-alpha.1.22557.5 - - 8.0.0-alpha.1.22557.5 - - 8.0.0-alpha.1.22557.5 - - 8.0.0-alpha.1.22557.5 - - 8.0.0-alpha.1.22557.5 - - 8.0.0-alpha.1.22557.5 - - 8.0.0-alpha.1.22557.5 - - 8.0.0-alpha.1.22557.5 - - 8.0.0-alpha.1.22557.5 5.0.0-preview.6.20312.15