diff --git a/NuGet.config b/NuGet.config index 2d78a6216..2d68b1a12 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,21 +8,28 @@ + + + + - + + + + @@ -44,14 +51,19 @@ + + - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1f77f2886..712ab3407 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -194,18 +194,18 @@ - + https://github.com/dotnet/arcade - ea5ae5b4a608862561d02a158dfaac443fbaaff1 + 91f852db39356b3f8fd9efa00a3dee82a9a7c2b3 - + https://github.com/dotnet/arcade - ea5ae5b4a608862561d02a158dfaac443fbaaff1 + 91f852db39356b3f8fd9efa00a3dee82a9a7c2b3 - + https://github.com/dotnet/arcade - ea5ae5b4a608862561d02a158dfaac443fbaaff1 + 91f852db39356b3f8fd9efa00a3dee82a9a7c2b3 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 754e9293c..186bcce53 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24176.7 + 7.0.0-beta.24209.2 diff --git a/eng/common/templates-official/steps/component-governance.yml b/eng/common/templates-official/steps/component-governance.yml index babc2757d..12527b80e 100644 --- a/eng/common/templates-official/steps/component-governance.yml +++ b/eng/common/templates-official/steps/component-governance.yml @@ -3,7 +3,7 @@ parameters: steps: - ${{ if eq(parameters.disableComponentGovernance, 'true') }}: - - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" displayName: Set skipComponentGovernanceDetection variable - ${{ if ne(parameters.disableComponentGovernance, 'true') }}: - task: ComponentGovernanceComponentDetection@0 diff --git a/eng/common/templates-official/variables/pool-providers.yml b/eng/common/templates-official/variables/pool-providers.yml index beab7d1bf..1f308b24e 100644 --- a/eng/common/templates-official/variables/pool-providers.yml +++ b/eng/common/templates-official/variables/pool-providers.yml @@ -23,7 +23,7 @@ # # pool: # name: $(DncEngInternalBuildPool) -# image: 1es-windows-2022-pt +# image: 1es-windows-2022 variables: # Coalesce the target and source branches so we know when a PR targets a release branch diff --git a/eng/common/templates/steps/component-governance.yml b/eng/common/templates/steps/component-governance.yml index babc2757d..12527b80e 100644 --- a/eng/common/templates/steps/component-governance.yml +++ b/eng/common/templates/steps/component-governance.yml @@ -3,7 +3,7 @@ parameters: steps: - ${{ if eq(parameters.disableComponentGovernance, 'true') }}: - - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" displayName: Set skipComponentGovernanceDetection variable - ${{ if ne(parameters.disableComponentGovernance, 'true') }}: - task: ComponentGovernanceComponentDetection@0 diff --git a/global.json b/global.json index 86cac79b9..53a34d119 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.117", + "dotnet": "7.0.118", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24176.7", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24176.7" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24209.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24209.2" } }