Fix build problems with newer 6.0 SDKs/arcade (#2525)

* Update dependencies from https://github.com/dotnet/installer build 20210418.6 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.1.21103.13 -> To Version 6.0.100-preview.4.21218.6 * Update dependencies from https://github.com/dotnet/installer build 20210426.1 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.1.21103.13 -> To Version 6.0.100-preview.5.21226.1 * Update dependencies from https://github.com/dotnet/installer build 20210502.3 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.1.21103.13 -> To Version 6.0.100-preview.5.21252.3 * Update dependencies from https://github.com/dotnet/installer build 20210510.2 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.1.21103.13 -> To Version 6.0.100-preview.5.21260.2 * Update dependencies from https://github.com/dotnet/installer build 20210516.3 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.1.21103.13 -> To Version 6.0.100-preview.5.21266.3 * Update dependencies from https://github.com/dotnet/installer build 20210524.3 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.1.21103.13 -> To Version 6.0.100-preview.6.21274.3 * Update dependencies from https://github.com/dotnet/installer build 20210530.2 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.1.21103.13 -> To Version 6.0.100-preview.6.21280.2 * Update dependencies from https://github.com/dotnet/installer build 20210606.2 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.1.21103.13 -> To Version 6.0.100-preview.6.21306.2 * Update dependencies from https://github.com/dotnet/installer build 20210613.2 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.1.21103.13 -> To Version 6.0.100-preview.6.21313.2 * Update dependencies from https://github.com/dotnet/installer build 20210621.2 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.1.21103.13 -> To Version 6.0.100-preview.7.21321.2 * Update dependencies from https://github.com/dotnet/installer build 20210627.2 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.1.21103.13 -> To Version 6.0.100-preview.7.21327.2 * Update dependencies from https://github.com/dotnet/installer build 20210704.4 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.1.21103.13 -> To Version 6.0.100-preview.7.21354.4 * Update dependencies from https://github.com/dotnet/installer build 20210710.1 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.1.21103.13 -> To Version 6.0.100-preview.7.21360.1 * Update dependencies from https://github.com/dotnet/installer build 20210719.3 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.1.21103.13 -> To Version 6.0.100-rc.1.21369.3 * Update dependencies from https://github.com/dotnet/installer build 20210726.3 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.1.21103.13 -> To Version 6.0.100-rc.1.21376.3 * Update dependencies from https://github.com/dotnet/installer build 20210801.2 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.1.21103.13 -> To Version 6.0.100-rc.1.21401.2 * Update dependencies from https://github.com/dotnet/installer build 20210808.2 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.1.21103.13 -> To Version 6.0.100-rc.1.21408.2 * Update dependencies from https://github.com/dotnet/installer build 20210815.2 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.1.21103.13 -> To Version 6.0.100-rc.1.21415.2 * Update dependencies from https://github.com/dotnet/installer build 20210823.2 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.1.21103.13 -> To Version 6.0.100-rc.2.21423.2 * Update dependencies from https://github.com/dotnet/arcade build 20210514.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.RemoteExecutor From Version 6.0.0-beta.21160.7 -> To Version 6.0.0-beta.21264.2 * Update dependencies from https://github.com/dotnet/arcade build 20210521.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.RemoteExecutor From Version 6.0.0-beta.21160.7 -> To Version 6.0.0-beta.21271.3 * Update dependencies from https://github.com/dotnet/arcade build 20210528.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.RemoteExecutor From Version 6.0.0-beta.21160.7 -> To Version 6.0.0-beta.21278.1 * Update dependencies from https://github.com/dotnet/arcade build 20210604.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.RemoteExecutor From Version 6.0.0-beta.21160.7 -> To Version 6.0.0-beta.21304.1 * Update dependencies from https://github.com/dotnet/arcade build 20210611.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.RemoteExecutor From Version 6.0.0-beta.21160.7 -> To Version 6.0.0-beta.21311.3 * Update dependencies from https://github.com/dotnet/arcade build 20210619.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.RemoteExecutor From Version 6.0.0-beta.21160.7 -> To Version 6.0.0-beta.21319.2 * Update dependencies from https://github.com/dotnet/arcade build 20210624.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.RemoteExecutor From Version 6.0.0-beta.21160.7 -> To Version 6.0.0-beta.21324.3 * Update dependencies from https://github.com/dotnet/arcade build 20210701.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.RemoteExecutor From Version 6.0.0-beta.21160.7 -> To Version 6.0.0-beta.21351.2 * Update dependencies from https://github.com/dotnet/arcade build 20210707.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.RemoteExecutor From Version 6.0.0-beta.21160.7 -> To Version 6.0.0-beta.21357.3 * Update dependencies from https://github.com/dotnet/arcade build 20210716.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.RemoteExecutor From Version 6.0.0-beta.21160.7 -> To Version 6.0.0-beta.21366.1 * Update dependencies from https://github.com/dotnet/arcade build 20210723.11 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.RemoteExecutor From Version 6.0.0-beta.21160.7 -> To Version 6.0.0-beta.21373.11 * Update dependencies from https://github.com/dotnet/arcade build 20210729.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.RemoteExecutor From Version 6.0.0-beta.21160.7 -> To Version 6.0.0-beta.21379.2 * Update dependencies from https://github.com/dotnet/arcade build 20210806.6 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.RemoteExecutor From Version 6.0.0-beta.21160.7 -> To Version 6.0.0-beta.21406.6 * Update dependencies from https://github.com/dotnet/arcade build 20210812.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.RemoteExecutor From Version 6.0.0-beta.21160.7 -> To Version 6.0.0-beta.21412.1 * Update dependencies from https://github.com/dotnet/arcade build 20210820.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.RemoteExecutor From Version 6.0.0-beta.21160.7 -> To Version 6.0.0-beta.21420.4 * Fix build problems with newer 6.0 SDKs/arcade Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
dotnet · Aug 26, 2021 · af85249 · af85249
1 parent 2b6fc48
commit af85249
Show file tree

Hide file tree

Showing 53 changed files with 1,042 additions and 1,520 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -1,8 +1,8 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21160.7">
+    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21420.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>7f13798e5f567b72ffe63205bf49839245f0f8c1</Sha>
+      <Sha>fe787bd48ed72e51a98eb5e4e5e5af74edb531e5</Sha>
     </Dependency>
     <Dependency Name="Microsoft.SymbolStore" Version="1.0.240901">
       <Uri>https://github.com/dotnet/symstore</Uri>
@@ -16,9 +16,9 @@
       <Uri>https://github.com/microsoft/clrmd</Uri>
       <Sha>957981f36eeccb6e9d266407df6522ca5cfbd899</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-preview.1.21103.13">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-rc.2.21423.2">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>53e0c8c7f9c65a13c17f58135557665a5a0c15b1</Sha>
+      <Sha>eca586b5e70ee7f55557daed7fa00be974639bf5</Sha>
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="5.0.0-alpha.1.20473.1">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
@@ -27,9 +27,9 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21160.7">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21420.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>7f13798e5f567b72ffe63205bf49839245f0f8c1</Sha>
+      <Sha>fe787bd48ed72e51a98eb5e4e5e5af74edb531e5</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.0-rc.2.21421.2">

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -23,7 +23,7 @@
     <MicrosoftAspNetCoreAppRefInternalVersion>6.0.0-rc.2.21421.2</MicrosoftAspNetCoreAppRefInternalVersion>
     <MicrosoftAspNetCoreAppRefVersion>6.0.0-rc.2.21421.2</MicrosoftAspNetCoreAppRefVersion>
     <!-- dotnet/installer: Testing version of the SDK. Needed for the signed & entitled host. -->
-    <MicrosoftDotnetSdkInternalVersion>6.0.100-preview.1.21103.13</MicrosoftDotnetSdkInternalVersion>
+    <MicrosoftDotnetSdkInternalVersion>6.0.100-rc.2.21423.2</MicrosoftDotnetSdkInternalVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Opt-in/out repo features -->
@@ -51,7 +51,7 @@
     <SystemTextJsonVersion>4.7.1</SystemTextJsonVersion>
     <XUnitVersion>2.4.1</XUnitVersion>
     <XUnitAbstractionsVersion>2.0.3</XUnitAbstractionsVersion>
-    <MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21160.7</MicrosoftDotNetRemoteExecutorVersion>
+    <MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21420.4</MicrosoftDotNetRemoteExecutorVersion>
     <cdbsosversion>10.0.18362</cdbsosversion>
   </PropertyGroup>
 </Project>
diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1
@@ -158,4 +158,10 @@ if ($dotnet5Source -ne $null) {
     AddPackageSource -Sources $sources -SourceName "dotnet5-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
 }
 
+$dotnet6Source = $sources.SelectSingleNode("add[@key='dotnet6']")
+if ($dotnet6Source -ne $null) {
+    AddPackageSource -Sources $sources -SourceName "dotnet6-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
+    AddPackageSource -Sources $sources -SourceName "dotnet6-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
+}
+
 $doc.Save($filename)
diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh
@@ -129,6 +129,30 @@ if [ "$?" == "0" ]; then
     PackageSources+=('dotnet5-internal-transport')
 fi
 
+# Ensure dotnet6-internal and dotnet6-internal-transport are in the packageSources if the public dotnet6 feeds are present
+grep -i "<add key=\"dotnet6\"" $ConfigFile
+if [ "$?" == "0" ]; then
+    grep -i "<add key=\"dotnet6-internal\"" $ConfigFile
+    if [ "$?" != "0" ]; then
+        echo "Adding dotnet6-internal to the packageSources."
+        PackageSourcesNodeFooter="</packageSources>"
+        PackageSourceTemplate="${TB}<add key=\"dotnet6-internal\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal/nuget/v2\" />"
+
+        sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
+    fi
+    PackageSources+=('dotnet6-internal')
+
+    grep -i "<add key=\"dotnet6-internal-transport\">" $ConfigFile
+    if [ "$?" != "0" ]; then
+        echo "Adding dotnet6-internal-transport to the packageSources."
+        PackageSourcesNodeFooter="</packageSources>"
+        PackageSourceTemplate="${TB}<add key=\"dotnet6-internal-transport\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal-transport/nuget/v2\" />"
+
+        sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
+    fi
+    PackageSources+=('dotnet6-internal-transport')
+fi
+
 # I want things split line by line
 PrevIFS=$IFS
 IFS=$'\n'

diff --git a/eng/common/build.ps1 b/eng/common/build.ps1
@@ -25,6 +25,7 @@ Param(
   [switch] $prepareMachine,
   [string] $runtimeSourceFeed = '',
   [string] $runtimeSourceFeedKey = '',
+  [switch] $excludePrereleaseVS,
   [switch] $help,
   [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
 )
@@ -65,6 +66,7 @@ function Print-Usage() {
   Write-Host "  -prepareMachine         Prepare machine for CI run, clean up processes after build"
   Write-Host "  -warnAsError <value>    Sets warnaserror msbuild parameter ('true' or 'false')"
   Write-Host "  -msbuildEngine <value>  Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
+  Write-Host "  -excludePrereleaseVS    Set to exclude build engines in prerelease versions of Visual Studio"
   Write-Host ""
 
   Write-Host "Command line arguments not listed above are passed thru to msbuild."

diff --git a/eng/common/build.sh b/eng/common/build.sh
@@ -187,6 +187,7 @@ function InitializeCustomToolset {
 }
 
 function Build {
+  TryLogClientIpAddress
   InitializeToolset
   InitializeCustomToolset
 

diff --git a/eng/common/cross/arm/sources.list.trusty b/eng/common/cross/arm/sources.list.trusty
diff --git a/eng/common/cross/arm/trusty-lttng-2.4.patch b/eng/common/cross/arm/trusty-lttng-2.4.patch
diff --git a/eng/common/cross/arm/trusty.patch b/eng/common/cross/arm/trusty.patch
diff --git a/eng/common/cross/arm64/sources.list.trusty b/eng/common/cross/arm64/sources.list.trusty
diff --git a/eng/common/cross/arm64/tizen-fetch.sh b/eng/common/cross/arm64/tizen-fetch.sh
@@ -157,7 +157,7 @@ fetch_tizen_pkgs()
 Inform "Initialize arm base"
 fetch_tizen_pkgs_init standard base
 Inform "fetch common packages"
-fetch_tizen_pkgs aarch64 gcc glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel
+fetch_tizen_pkgs aarch64 gcc glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils
 Inform "fetch coreclr packages"
 fetch_tizen_pkgs aarch64 lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu
 Inform "fetch corefx packages"