diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 05cadfa7bfb..51ee8de2c02 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props - 11.0.0-beta.26062.101 - 3.0.0-alpha.1.26062.101 + 11.0.0-beta.26066.111 + 3.0.0-preview.1.26066.111 10.0.1 10.0.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dde983e9109..8c1056162cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 411dbc3cd87aad5a3edbc879081055c9e00b1db0 - + https://github.com/dotnet/dotnet - 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f + 411dbc3cd87aad5a3edbc879081055c9e00b1db0 diff --git a/eng/Versions.props b/eng/Versions.props index 654bde1d6be..b2c61801eaa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,8 +4,8 @@ 11.0.100 - alpha - + preview + 1 diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index c9ee8ffd8f1..8b5c635fe80 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -80,7 +80,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Publishing-Internal - image: windows.vs2022.amd64 + image: windows.vs2019.amd64 os: windows steps: - ${{ if eq(parameters.is1ESPipeline, '') }}: diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index 29addfcf8e6..06864cd1feb 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -293,11 +293,11 @@ stages: ${{ else }}: ${{ if eq(parameters.is1ESPipeline, true) }}: name: NetCore1ESPool-Publishing-Internal - image: windows.vs2022.amd64 + image: windows.vs2019.amd64 os: windows ${{ else }}: name: NetCore1ESPool-Publishing-Internal - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml parameters: diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml index 18693ea120d..e0b19c14a07 100644 --- a/eng/common/templates/variables/pool-providers.yml +++ b/eng/common/templates/variables/pool-providers.yml @@ -23,7 +23,7 @@ # # pool: # name: $(DncEngInternalBuildPool) -# demands: ImageOverride -equals windows.vs2022.amd64 +# demands: ImageOverride -equals windows.vs2019.amd64 variables: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - template: /eng/common/templates-official/variables/pool-providers.yml diff --git a/global.json b/global.json index bef4d63e951..158b9e8d636 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "11.0.100-alpha.1.25618.104", + "version": "11.0.100-alpha.1.26064.118", "allowPrerelease": true, "rollForward": "latestFeature", "paths": [ @@ -10,9 +10,9 @@ "errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it." }, "tools": { - "dotnet": "11.0.100-alpha.1.25618.104" + "dotnet": "11.0.100-alpha.1.26064.118" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26062.101" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26066.111" } } diff --git a/template_feed/Microsoft.TemplateEngine.Authoring.Templates/content/TemplatePackage/New.Template.Package.csproj b/template_feed/Microsoft.TemplateEngine.Authoring.Templates/content/TemplatePackage/New.Template.Package.csproj index a4165c4a68c..0e4ad032d76 100644 --- a/template_feed/Microsoft.TemplateEngine.Authoring.Templates/content/TemplatePackage/New.Template.Package.csproj +++ b/template_feed/Microsoft.TemplateEngine.Authoring.Templates/content/TemplatePackage/New.Template.Package.csproj @@ -13,7 +13,7 @@ Template - net10.0 + net11.0 true false content diff --git a/test/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Resources/BasicTemplatePackage/TemplatePackage.csproj b/test/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Resources/BasicTemplatePackage/TemplatePackage.csproj index bab0fdf4b6b..5921cf9ad72 100644 --- a/test/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Resources/BasicTemplatePackage/TemplatePackage.csproj +++ b/test/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Resources/BasicTemplatePackage/TemplatePackage.csproj @@ -1,6 +1,6 @@ - net10.0 + net11.0 Template TemplatePackage Microsoft diff --git a/test/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Resources/InvalidTemplatePackage/TemplatePackage.csproj b/test/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Resources/InvalidTemplatePackage/TemplatePackage.csproj index bab0fdf4b6b..5921cf9ad72 100644 --- a/test/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Resources/InvalidTemplatePackage/TemplatePackage.csproj +++ b/test/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Resources/InvalidTemplatePackage/TemplatePackage.csproj @@ -1,6 +1,6 @@ - net10.0 + net11.0 Template TemplatePackage Microsoft diff --git a/test/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Resources/InvalidTemplatePackage_MissingName/TemplatePackage.csproj b/test/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Resources/InvalidTemplatePackage_MissingName/TemplatePackage.csproj index bab0fdf4b6b..5921cf9ad72 100644 --- a/test/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Resources/InvalidTemplatePackage_MissingName/TemplatePackage.csproj +++ b/test/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Resources/InvalidTemplatePackage_MissingName/TemplatePackage.csproj @@ -1,6 +1,6 @@ - net10.0 + net11.0 Template TemplatePackage Microsoft diff --git a/test/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Resources/InvalidTemplatePackage_MissingOptionalData/TemplatePackage.csproj b/test/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Resources/InvalidTemplatePackage_MissingOptionalData/TemplatePackage.csproj index bab0fdf4b6b..5921cf9ad72 100644 --- a/test/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Resources/InvalidTemplatePackage_MissingOptionalData/TemplatePackage.csproj +++ b/test/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Resources/InvalidTemplatePackage_MissingOptionalData/TemplatePackage.csproj @@ -1,6 +1,6 @@ - net10.0 + net11.0 Template TemplatePackage Microsoft diff --git a/test/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Resources/TemplatePackageEnDe/TemplatePackage.csproj b/test/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Resources/TemplatePackageEnDe/TemplatePackage.csproj index cba911a1061..79f8783cd56 100644 --- a/test/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Resources/TemplatePackageEnDe/TemplatePackage.csproj +++ b/test/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Resources/TemplatePackageEnDe/TemplatePackage.csproj @@ -1,6 +1,6 @@ - net10.0 + net11.0 Template TemplatePackage Microsoft diff --git a/test/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Resources/TemplatePackagePartiallyLocalized/TemplatePackage.csproj b/test/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Resources/TemplatePackagePartiallyLocalized/TemplatePackage.csproj index 2307ed99db0..ff37505ca98 100644 --- a/test/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Resources/TemplatePackagePartiallyLocalized/TemplatePackage.csproj +++ b/test/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/Resources/TemplatePackagePartiallyLocalized/TemplatePackage.csproj @@ -1,6 +1,6 @@ - net10.0 + net11.0 Template TemplatePackage Microsoft diff --git a/test/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/Snapshots/templatepack.Basic.verified/templatepack/templatepack.csproj b/test/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/Snapshots/templatepack.Basic.verified/templatepack/templatepack.csproj index b7531434f04..3190e1a0b3e 100644 --- a/test/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/Snapshots/templatepack.Basic.verified/templatepack/templatepack.csproj +++ b/test/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/Snapshots/templatepack.Basic.verified/templatepack/templatepack.csproj @@ -13,7 +13,7 @@ Template - net10.0 + net11.0 true false content diff --git a/test/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/Snapshots/templatepack.CLI.verified/templatepack/templatepack.csproj b/test/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/Snapshots/templatepack.CLI.verified/templatepack/templatepack.csproj index b7531434f04..3190e1a0b3e 100644 --- a/test/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/Snapshots/templatepack.CLI.verified/templatepack/templatepack.csproj +++ b/test/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/Snapshots/templatepack.CLI.verified/templatepack/templatepack.csproj @@ -13,7 +13,7 @@ Template - net10.0 + net11.0 true false content diff --git a/test/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/Snapshots/templatepack.NoMSBuildTasks.verified/templatepack/templatepack.csproj b/test/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/Snapshots/templatepack.NoMSBuildTasks.verified/templatepack/templatepack.csproj index 73cbc8ff813..0ef7b5ae4ec 100644 --- a/test/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/Snapshots/templatepack.NoMSBuildTasks.verified/templatepack/templatepack.csproj +++ b/test/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/Snapshots/templatepack.NoMSBuildTasks.verified/templatepack/templatepack.csproj @@ -13,7 +13,7 @@ Template - net10.0 + net11.0 true false content diff --git a/test/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/Snapshots/templatepack.WithName.verified/templatepack/MyTemplatePackage.csproj b/test/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/Snapshots/templatepack.WithName.verified/templatepack/MyTemplatePackage.csproj index 9209c1e5afd..d7314ccc387 100644 --- a/test/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/Snapshots/templatepack.WithName.verified/templatepack/MyTemplatePackage.csproj +++ b/test/Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests/Snapshots/templatepack.WithName.verified/templatepack/MyTemplatePackage.csproj @@ -13,7 +13,7 @@ Template - net10.0 + net11.0 true false content