diff --git a/.vsts-ci.yml b/.vsts-ci.yml index a8a0ca6e4..fc6579578 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -41,7 +41,8 @@ stages: agentOs: Windows_NT pool: ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - vmImage: vs2017-win2016 + name: NetCorePublic-Pool + queue: buildpool.windows.10.amd64.vs2017.open ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: name: NetCoreInternal-Pool queue: buildpool.windows.10.amd64.vs2017 @@ -255,7 +256,8 @@ stages: - Darwin publishUsingPipelines: true pool: - vmImage: vs2017-win2016 + name: NetCorePublic-Pool + queue: buildpool.windows.10.amd64.vs2017.open - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - template: eng\common\templates\post-build\post-build.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b8406fb9f..07279d372 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,37 +1,37 @@ - + https://github.com/dotnet/windowsdesktop - 0f0a20ef103bd864b48bbb44ea55bccbecc450c7 + bb32c617a0b0a1f8ea73935f9e1c474b3de2e3b6 - + https://github.com/dotnet/windowsdesktop - 0f0a20ef103bd864b48bbb44ea55bccbecc450c7 + bb32c617a0b0a1f8ea73935f9e1c474b3de2e3b6 - + https://github.com/dotnet/windowsdesktop - 0f0a20ef103bd864b48bbb44ea55bccbecc450c7 + bb32c617a0b0a1f8ea73935f9e1c474b3de2e3b6 - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + fd45f7302018ff35405c9e14ca1cf6270efacfe3 - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + fd45f7302018ff35405c9e14ca1cf6270efacfe3 - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + fd45f7302018ff35405c9e14ca1cf6270efacfe3 - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + fd45f7302018ff35405c9e14ca1cf6270efacfe3 - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + fd45f7302018ff35405c9e14ca1cf6270efacfe3 @@ -39,33 +39,33 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + fd45f7302018ff35405c9e14ca1cf6270efacfe3 - + https://github.com/dotnet/aspnetcore - fae3dd12aeba7c9995f69bfaa1c9b74d82307ef1 + 71327921ed3afde65358a10517d6a108aaa068ee - + https://github.com/dotnet/aspnetcore - fae3dd12aeba7c9995f69bfaa1c9b74d82307ef1 + 71327921ed3afde65358a10517d6a108aaa068ee - + https://github.com/dotnet/aspnetcore - fae3dd12aeba7c9995f69bfaa1c9b74d82307ef1 + 71327921ed3afde65358a10517d6a108aaa068ee - + https://github.com/dotnet/aspnetcore - fae3dd12aeba7c9995f69bfaa1c9b74d82307ef1 + 71327921ed3afde65358a10517d6a108aaa068ee - + https://github.com/dotnet/aspnetcore - fae3dd12aeba7c9995f69bfaa1c9b74d82307ef1 + 71327921ed3afde65358a10517d6a108aaa068ee - + https://github.com/dotnet/aspnetcore - fae3dd12aeba7c9995f69bfaa1c9b74d82307ef1 + 71327921ed3afde65358a10517d6a108aaa068ee https://github.com/dotnet/test-templates @@ -75,26 +75,26 @@ https://github.com/dotnet/test-templates 6865397797d0e0c36d8db45a4ea5f916ce616b9c - + https://github.com/dotnet/templating - 6bb0326ac089950ead3b19fc83e34444c084e8f5 + a02ce3bcd7aea517e903886d0cc9761be225e18a - + https://github.com/dotnet/sdk - 9be071d41da311b89b65399b5ae930fd7ebe8155 + 86e2c2b0839af47d7d958040cceb8d0ab31718d7 - + https://github.com/dotnet/sdk - 9be071d41da311b89b65399b5ae930fd7ebe8155 + 86e2c2b0839af47d7d958040cceb8d0ab31718d7 - + https://github.com/dotnet/winforms - f40d9752f45385616d55c6e82b672506951353fa + 7804e088b9dfc54adfb781bba118467cdb5ed0df - + https://github.com/dotnet/wpf - abb96f98a8f4f94a08744404ce3a2cf0c784ed6d + 7a26b532499cfef8ac96400ce3c27286a1f922e2 diff --git a/eng/Versions.props b/eng/Versions.props index e4906b6d8..76eaa1612 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,15 +17,15 @@ - 5.0.0-preview.8.20361.2 + 5.0.0-preview.8.20365.1 - 5.0.0-preview.8.20361.2 + 5.0.0-preview.8.20365.1 - 5.0.0-preview.8.20322.2 + 5.0.0-rc.1.20365.5 @@ -37,41 +37,41 @@ - 5.0.0-preview.8.20360.11 - 5.0.0-preview.8.20360.11 - 5.0.0-preview.8.20360.11 - 5.0.0-preview.8.20360.11 - 5.0.0-preview.8.20360.11 - 5.0.0-preview.8.20360.11 + 5.0.0-rc.1.20366.25 + 5.0.0-rc.1.20366.25 + 5.0.0-rc.1.20366.25 + 5.0.0-rc.1.20366.25 + 5.0.0-rc.1.20366.25 + 5.0.0-rc.1.20366.25 0.2.0 - 5.0.100-preview.8.20362.2 - 5.0.100-preview.8.20362.2 + 5.0.100-rc.1.20367.4 + 5.0.100-rc.1.20367.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-preview.8.20361.2 + 5.0.0-rc.1.20366.14 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 + 5.0.0-rc.1.20366.14 + 5.0.0-rc.1.20366.14 + 5.0.0-rc.1.20366.14 + 5.0.0-rc.1.20366.14 + 5.0.0-rc.1.20366.14 2.1.0 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 + 5.0.0-preview.8.20365.2 + 5.0.0-preview.8.20365.2 + 5.0.0-preview.8.20365.2 diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index c08225a9a..83d316b26 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -56,7 +56,8 @@ jobs: - ${{ each job in parameters.jobs }}: - ${{ job.job }} pool: - vmImage: vs2017-win2016 + name: NetCorePublic-Pool + queue: buildpool.windows.10.amd64.vs2017.open runAsPublic: ${{ parameters.runAsPublic }} publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} @@ -69,4 +70,5 @@ jobs: dependsOn: - Asset_Registry_Publish pool: - vmImage: vs2017-win2016 + name: NetCorePublic-Pool + queue: buildpool.windows.10.amd64.vs2017.open