diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 8bdeae70de..7cb984d425 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -384,6 +384,10 @@
https://github.com/dotnet/arcade
d37270268a65592cae630f1b979b70f74d4614dd
+
+ https://github.com/dotnet/arcade
+ 000
+
https://github.com/aspnet/Extensions
b38492576f2ad4025dda6ad49a83324804f9ff9c
diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj
index 7bfe5d8708..9e27f2ac56 100644
--- a/eng/helix/helix.proj
+++ b/eng/helix/helix.proj
@@ -1,13 +1,10 @@
-
-
-
-
+
-
+
diff --git a/eng/scripts/CodeCheck.ps1 b/eng/scripts/CodeCheck.ps1
index b4ef42df69..05902d24b6 100644
--- a/eng/scripts/CodeCheck.ps1
+++ b/eng/scripts/CodeCheck.ps1
@@ -45,6 +45,7 @@ try {
Write-Host "Checking that Versions.props and Version.Details.xml match"
[xml] $versionProps = Get-Content "$repoRoot/eng/Versions.props"
[xml] $versionDetails = Get-Content "$repoRoot/eng/Version.Details.xml"
+ $globalJson = Get-Content $repoRoot/global.json | ConvertFrom-Json
$versionVars = New-Object 'System.Collections.Generic.HashSet[string]'
foreach ($vars in $versionProps.SelectNodes("//PropertyGroup[`@Label=`"Automated`"]/*")) {
@@ -53,24 +54,38 @@ try {
foreach ($dep in $versionDetails.SelectNodes('//Dependency')) {
Write-Verbose "Found $dep"
- $varName = $dep.Name -replace '\.',''
- $varName = $varName -replace '\-',''
- $varName = "${varName}PackageVersion"
- $versionVar = $versionProps.SelectSingleNode("//PropertyGroup[`@Label=`"Automated`"]/$varName")
- if (-not $versionVar) {
- LogError "Missing version variable '$varName' in the 'Automated' property group in $repoRoot/eng/Versions.props"
- continue
- }
-
- $versionVars.Remove($varName) | Out-Null
$expectedVersion = $dep.Version
- $actualVersion = $versionVar.InnerText
- if ($expectedVersion -ne $actualVersion) {
- LogError `
- "Version variable '$varName' does not match the value in Version.Details.xml. Expected '$expectedVersion', actual '$actualVersion'" `
- -filepath "$repoRoot\eng\Versions.props"
+ if ($dep.Name -in $globalJson.'msbuild-sdks'.PSObject.Properties.Name) {
+
+ $actualVersion = $globalJson.'msbuild-sdks'.($dep.Name)
+
+ if ($expectedVersion -ne $actualVersion) {
+ LogError `
+ "MSBuild SDK version '$($dep.Name)' in global.json does not match the value in Version.Details.xml. Expected '$expectedVersion', actual '$actualVersion'" `
+ -filepath "$repoRoot\global.json"
+ }
+ }
+ else {
+ $varName = $dep.Name -replace '\.',''
+ $varName = $varName -replace '\-',''
+ $varName = "${varName}PackageVersion"
+
+ $versionVar = $versionProps.SelectSingleNode("//PropertyGroup[`@Label=`"Automated`"]/$varName")
+ $actualVersion = $versionVar.InnerText
+ $versionVars.Remove($varName) | Out-Null
+
+ if (-not $versionVar) {
+ LogError "Missing version variable '$varName' in the 'Automated' property group in $repoRoot/eng/Versions.props"
+ continue
+ }
+
+ if ($expectedVersion -ne $actualVersion) {
+ LogError `
+ "Version variable '$varName' does not match the value in Version.Details.xml. Expected '$expectedVersion', actual '$actualVersion'" `
+ -filepath "$repoRoot\eng\Versions.props"
+ }
}
}
diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props
index 8c335657a0..09fdfee74f 100644
--- a/eng/targets/Helix.Common.props
+++ b/eng/targets/Helix.Common.props
@@ -1,27 +1,28 @@
-
-
- true
-
-
+
+
+ true
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
diff --git a/eng/targets/Helix.props b/eng/targets/Helix.props
index 25f48377ff..c4723b3a34 100644
--- a/eng/targets/Helix.props
+++ b/eng/targets/Helix.props
@@ -25,7 +25,7 @@
-
+
diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets
index d60460b8b4..40887fadd7 100644
--- a/eng/targets/Helix.targets
+++ b/eng/targets/Helix.targets
@@ -30,7 +30,7 @@
- <_HelixProjectTargetQueue Include="%(HelixAvailibleTargetQueue.Identity)" Condition="'$(_SelectedPlatforms.Contains(%(Platform)))' == 'true' AND '%(EnableByDefault)' == 'true'" />
+ <_HelixProjectTargetQueue Include="%(HelixAvailableTargetQueue.Identity)" Condition="'$(_SelectedPlatforms.Contains(%(Platform)))' == 'true' AND '%(EnableByDefault)' == 'true'" />
<_HelixProjectTargetQueue Include="%(HelixProjectTargetQueue.Identity)" />
diff --git a/global.json b/global.json
index 339c8c9e4c..96d4643c28 100644
--- a/global.json
+++ b/global.json
@@ -3,6 +3,7 @@
"version": "3.0.100-preview4-011136"
},
"msbuild-sdks": {
- "Yarn.MSBuild": "1.13.0"
+ "Yarn.MSBuild": "1.13.0",
+ "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19105.2"
}
}