diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 5ea5a57ebe5..2737ba547f7 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -130,29 +130,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
-
+
https://github.com/dotnet/arcade
- 4d6406fa2e84c8516a338694be3a4097e6e1f104
+ 70831f0d126fe88b81d7dc8de11358e17a5ce364
-
+
https://github.com/dotnet/arcade
- 4d6406fa2e84c8516a338694be3a4097e6e1f104
+ 70831f0d126fe88b81d7dc8de11358e17a5ce364
-
+
https://github.com/dotnet/arcade
- 4d6406fa2e84c8516a338694be3a4097e6e1f104
+ 70831f0d126fe88b81d7dc8de11358e17a5ce364
-
+
https://github.com/dotnet/arcade
- 4d6406fa2e84c8516a338694be3a4097e6e1f104
+ 70831f0d126fe88b81d7dc8de11358e17a5ce364
-
+
https://github.com/dotnet/arcade
- 4d6406fa2e84c8516a338694be3a4097e6e1f104
+ 70831f0d126fe88b81d7dc8de11358e17a5ce364
-
+
https://github.com/dotnet/arcade
- 4d6406fa2e84c8516a338694be3a4097e6e1f104
+ 70831f0d126fe88b81d7dc8de11358e17a5ce364
diff --git a/eng/Versions.props b/eng/Versions.props
index 28c90228dbc..050af603a09 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -49,9 +49,9 @@
- 7.0.0-beta.22080.1
- 7.0.0-beta.22080.1
- 7.0.0-beta.22080.1
+ 7.0.0-beta.22103.1
+ 7.0.0-beta.22103.1
+ 7.0.0-beta.22103.1
16.5.0
diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml
index c5c2a991512..92e98af7ebd 100644
--- a/eng/common/templates/job/job.yml
+++ b/eng/common/templates/job/job.yml
@@ -140,6 +140,7 @@ jobs:
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}:
- task: ComponentGovernanceComponentDetection@0
+ continueOnError: true
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml
index d85d6d07d5c..12a8ff94d8e 100644
--- a/eng/common/templates/steps/source-build.yml
+++ b/eng/common/templates/steps/source-build.yml
@@ -43,8 +43,8 @@ steps:
# In that case, add variables to allow the download of internal runtimes if the specified versions are not found
# in the default public locations.
internalRuntimeDownloadArgs=
- if [ '$(dotnetclimsrc-read-sas-token-base64)' != '$''(dotnetclimsrc-read-sas-token-base64)' ]; then
- internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64) --runtimesourcefeed https://dotnetclimsrc.blob.core.windows.net/dotnet --runtimesourcefeedkey $(dotnetclimsrc-read-sas-token-base64)'
+ if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then
+ internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
fi
buildConfig=Release
diff --git a/global.json b/global.json
index bb55fa9e5dd..51d3d25e3b6 100644
--- a/global.json
+++ b/global.json
@@ -14,9 +14,9 @@
"version": "7.0.100-alpha.1.22053.1"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22080.1",
- "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22080.1",
- "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22080.1",
+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22103.1",
+ "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22103.1",
+ "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22103.1",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "7.0.0-preview.2.22102.17"
},
diff --git a/pkg/Microsoft.Dotnet.WinForms.ProjectTemplates/Microsoft.Dotnet.Winforms.ProjectTemplates.csproj b/pkg/Microsoft.Dotnet.WinForms.ProjectTemplates/Microsoft.Dotnet.Winforms.ProjectTemplates.csproj
index 7d4afff42f2..3e830c5fd9e 100644
--- a/pkg/Microsoft.Dotnet.WinForms.ProjectTemplates/Microsoft.Dotnet.Winforms.ProjectTemplates.csproj
+++ b/pkg/Microsoft.Dotnet.WinForms.ProjectTemplates/Microsoft.Dotnet.Winforms.ProjectTemplates.csproj
@@ -6,7 +6,7 @@
$(TargetFrameworkName)$(TargetFrameworkVersion)
false
false
- false
+ true
$(NoWarn);NU5131;NU5128