Update branding to 3.1.12 (#28126)

Jan Jahoda · Jan Jahoda · Anipik · web-flow · commit 5ddece238ded · 2021-01-15T11:45:08.000-08:00
* Update branding to 3.1.12

* Fixing myget failures

* Update dependencies.props

* Update version of BuildTools to one with new feeds

* Disable failing test

Co-authored-by: Jan Jahoda &lt;jajahoda@.microsoft.com&gt;
Co-authored-by: Anipik &lt;anirudhagnihotry098@gmail.com&gt;
Co-authored-by: Juan Hoyos &lt;juan.hoyos@microsoft.com&gt;
Co-authored-by: William Godbe &lt;wigodbe@microsoft.com&gt;
diff --git a/BuildToolsVersion.txt b/BuildToolsVersion.txt
@@ -1 +1 @@
-3.0.0-preview4-04022-01
+3.0.0-preview4-06015-01
diff --git a/NuGet.config b/NuGet.config
@@ -16,7 +16,7 @@
     <add key="dotnet3-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json" />
     <add key="dotnet3.1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json" />
     <add key="dotnet3.1-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json" />
-    <add key="myget.org dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
+    <add key="myget-core-blob" value="https://dotnetmygetlegacy.blob.core.windows.net/dotnet-core/index.json" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
   </packageSources>
diff --git a/build-test.cmd b/build-test.cmd
@@ -458,7 +458,7 @@ set __MsbuildErr=/flp2:ErrorsOnly;LogFile="%__BuildErr%"
 set __Logging=!__MsbuildLog! !__MsbuildWrn! !__MsbuildErr!
 
 REM Build wrappers using the local SDK's msbuild. As we move to arcade, the other builds should be moved away from run.exe as well.
-call "%__ProjectDir%\dotnet.cmd" msbuild %__ProjectDir%\tests\runtest.proj /p:RestoreAdditionalProjectSources=https://dotnet.myget.org/F/dotnet-core/  /p:BuildWrappers=true !__Logging! %__msbuildArgs% %TargetsWindowsMsbuildArg% %__UnprocessedBuildArgs%
+call "%__ProjectDir%\dotnet.cmd" msbuild %__ProjectDir%\tests\runtest.proj /p:RestoreAdditionalProjectSources=https://dotnetmygetlegacy.blob.core.windows.net/dotnet-core/index.json  /p:BuildWrappers=true !__Logging! %__msbuildArgs% %TargetsWindowsMsbuildArg% %__UnprocessedBuildArgs%
 if errorlevel 1 (
     echo %__MsgPrefix%Error: Xunit wrapper build failed. Refer to the build log files for details:
     echo     %__BuildLog%
diff --git a/build-test.sh b/build-test.sh
@@ -63,7 +63,7 @@ build_test_wrappers()
         __MsbuildErr="/fileloggerparameters2:\"ErrorsOnly;LogFile=${__BuildErr}\""
         __Logging="$__MsbuildLog $__MsbuildWrn $__MsbuildErr /consoleloggerparameters:$buildVerbosity"
 
-        nextCommand="\"${__DotNetCli}\" msbuild \"${__ProjectDir}/tests/runtest.proj\" /p:RestoreAdditionalProjectSources=https://dotnet.myget.org/F/dotnet-core/ /p:BuildWrappers=true /p:TargetsWindows=false $__Logging /p:__BuildOS=$__BuildOS /p:__BuildType=$__BuildType /p:__BuildArch=$__BuildArch"
+        nextCommand="\"${__DotNetCli}\" msbuild \"${__ProjectDir}/tests/runtest.proj\" /p:RestoreAdditionalProjectSources=https://dotnetmygetlegacy.blob.core.windows.net/dotnet-core/index.json /p:BuildWrappers=true /p:TargetsWindows=false $__Logging /p:__BuildOS=$__BuildOS /p:__BuildType=$__BuildType /p:__BuildArch=$__BuildArch"
         eval $nextCommand
 
         if [ $? -ne 0 ]; then
@@ -1049,4 +1049,3 @@ else
     echo "To run single test use the following command:"
     echo "    bash ${__TestBinDir}/__TEST_PATH__/__TEST_NAME__.sh -coreroot=${CORE_ROOT}"
 fi
-
diff --git a/dependencies.props b/dependencies.props
@@ -5,7 +5,7 @@
     <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
       https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
       https://dotnetfeed.blob.core.windows.net/dotnet-coreclr/index.json;
-      https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
+      https://dotnetmygetlegacy.blob.core.windows.net/dotnet-core/index.json;
       https://api.nuget.org/v3/index.json;
       $(RestoreSources)
     </RestoreSources>
diff --git a/dir.common.props b/dir.common.props
@@ -65,7 +65,7 @@
 
   <PropertyGroup>
     <!-- Central place to set the versions of all nuget packages produced in the repo -->
-    <PackageVersion Condition="'$(PackageVersion)' == ''">3.1.11</PackageVersion>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">3.1.12</PackageVersion>
     <PreReleaseLabel>servicing</PreReleaseLabel>
   </PropertyGroup>
 
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <!-- The .NET Core product branding version -->
-    <ProductVersion>3.1.11</ProductVersion>
+    <ProductVersion>3.1.12</ProductVersion>
     <!-- File version numbers -->
     <MajorVersion>4</MajorVersion>
     <MinorVersion>7</MinorVersion>
diff --git a/init-tools.cmd b/init-tools.cmd
@@ -10,10 +10,11 @@ if [%PACKAGES_DIR%]==[] set PACKAGES_DIR=%~dp0.packages
 if [%TOOLRUNTIME_DIR%]==[] set TOOLRUNTIME_DIR=%~dp0Tools
 set DOTNET_PATH=%~dp0.dotnet\
 if [%DOTNET_CMD%]==[] set DOTNET_CMD=%DOTNET_PATH%dotnet.exe
-if [%BUILDTOOLS_SOURCE%]==[] set BUILDTOOLS_SOURCE=https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json
+if [%BUILDTOOLS_SOURCE%]==[] set BUILDTOOLS_SOURCE=https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json
 set /P BUILDTOOLS_VERSION=< "%~dp0BuildToolsVersion.txt"
 set BUILD_TOOLS_PATH=%PACKAGES_DIR%\Microsoft.DotNet.BuildTools\%BUILDTOOLS_VERSION%\lib
 set INIT_TOOLS_RESTORE_PROJECT=%~dp0init-tools.msbuild
+set "INIT_TOOLS_RESTORE_ARGS=--source https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json"
 set BUILD_TOOLS_SEMAPHORE_DIR=%TOOLRUNTIME_DIR%\%BUILDTOOLS_VERSION%
 set BUILD_TOOLS_SEMAPHORE=%BUILD_TOOLS_SEMAPHORE_DIR%\init-tools.completed
 
diff --git a/init-tools.sh b/init-tools.sh
@@ -6,13 +6,14 @@ __PACKAGES_DIR="$__scriptpath/.packages"
 __TOOLRUNTIME_DIR="$__scriptpath/Tools"
 __DOTNET_PATH="$__scriptpath/.dotnet"
 __DOTNET_CMD="$__DOTNET_PATH/dotnet"
-if [ -z "${__BUILDTOOLS_SOURCE:-}" ]; then __BUILDTOOLS_SOURCE=https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json; fi
+if [ -z "${__BUILDTOOLS_SOURCE:-}" ]; then __BUILDTOOLS_SOURCE=https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json; fi
 export __BUILDTOOLS_USE_CSPROJ=true
 __BUILD_TOOLS_PACKAGE_VERSION=$(cat "$__scriptpath/BuildToolsVersion.txt" | sed 's/\r$//') # remove CR if mounted repo on Windows drive
 __DOTNET_TOOLS_VERSION=$(cat "$__scriptpath/DotnetCLIVersion.txt" | sed 's/\r$//') # remove CR if mounted repo on Windows drive
 __ILASM_VERSION=$(cat "$__scriptpath/ILAsmVersion.txt" | sed 's/\r$//') # remove CR if mounted repo on Windows drive
 __BUILD_TOOLS_PATH="$__PACKAGES_DIR/microsoft.dotnet.buildtools/$__BUILD_TOOLS_PACKAGE_VERSION/lib"
 __INIT_TOOLS_RESTORE_PROJECT="$__scriptpath/init-tools.msbuild"
+export __INIT_TOOLS_RESTORE_ARGS="--source https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json"
 __BUILD_TOOLS_SEMAPHORE="$__TOOLRUNTIME_DIR/$__BUILD_TOOLS_PACKAGE_VERSION/init-tools.complete"
 
 if [ -e "$__BUILD_TOOLS_SEMAPHORE" ]; then
diff --git a/tests/CoreFX/CoreFX.issues.rsp b/tests/CoreFX/CoreFX.issues.rsp
@@ -86,3 +86,6 @@
 
 # Test failure: https://github.com/dotnet/corefx/issues/39223
 -nomethod System.ComponentModel.TypeConverterTests.FontConverterTest.TestConvertFrom
+
+# Test failure: https://github.com/dotnet/runtime/issues/43166
+-nomethod System.IO.Tests.File_GetSetTimes.SetDateTimeMax
diff --git a/tests/bringup_runtest.sh b/tests/bringup_runtest.sh
@@ -1093,7 +1093,7 @@ function coreclr_code_coverage {
     pushd $toolsDir > /dev/null
 
     echo "Pulling down code coverage tools"
-    wget -q https://www.myget.org/F/dotnet-buildtools/api/v2/package/unix-code-coverage-tools/1.0.0 -O $packageName
+    wget -q https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/flat2/unix-code-coverage-tools/1.0.0/unix-code-coverage-tools.1.0.0.nupkg -O $packageName
     echo "Unzipping to $toolsDir"
     unzip -q -o $packageName
 
diff --git a/tests/debugger_tests/ConfigFilesGenerators/ConfigTemplate.txt b/tests/debugger_tests/ConfigFilesGenerators/ConfigTemplate.txt
@@ -20,8 +20,8 @@
  <CliPath>##Cli_Path##</CliPath> 
  <NuGetPackageCacheDir>$(NugetCacheRoot)</NuGetPackageCacheDir> 
  <NuGetPackageFeeds> 
-     myget.org dotnet-core=https://dotnet.myget.org/F/dotnet-core/api/v3/index.json; 
-     myget.org=https://www.nuget.org/api/v2/ 
+     myget.org dotnet-core=https://dotnetmygetlegacy.blob.core.windows.net/dotnet-core/index.json; 
+     nuget.org=https://www.nuget.org/api/v2/ 
  </NuGetPackageFeeds> 
  <SOSPath>$(RuntimeRoot)\sos.dll</SOSPath> 
  <MDbgDir>$(TestRoot)\mdbg</MDbgDir> 
diff --git a/tests/dir.props b/tests/dir.props
@@ -90,7 +90,7 @@
   <!-- Add test-specific package restore sources. -->
   <PropertyGroup>
     <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
-      https://dotnet.myget.org/F/dotnet-corefxlab/api/v3/index.json;
+      https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental/nuget/v3/index.json;
       $(RestoreSources)
     </RestoreSources>
     <RestoreSources Condition="'$(IntermediateAzureFeed)' != ''">
diff --git a/tests/runtest.py b/tests/runtest.py
@@ -1839,7 +1839,7 @@ def build_test_wrappers(host_os,
     command = [dotnetcli_location,
                "msbuild",
                os.path.join(coreclr_repo_location, "tests", "runtest.proj"),
-               "/p:RestoreAdditionalProjectSources=https://dotnet.myget.org/F/dotnet-core/",
+               "/p:RestoreAdditionalProjectSources=https://dotnetmygetlegacy.blob.core.windows.net/dotnet-core/index.json",
                "/p:BuildWrappers=true",
                "/p:TargetsWindows=%s" % ("true" if host_os == "Windows_NT" else "false")]
 
diff --git a/tests/scripts/perf-prep.sh b/tests/scripts/perf-prep.sh
@@ -89,8 +89,8 @@ if [ $throughput -eq 1 ]; then
         mkdir Microsoft.Benchview.ThroughputBenchmarks.x64.Windows_NT
         cd Microsoft.Benchview.ThroughputBenchmarks.x64.Windows_NT
 
-        curl -OL https://dotnet.myget.org/F/dotnet-core/api/v2/package/Microsoft.Benchview.ThroughputBenchmarks.x64.Windows_NT/1.0.0
-        mv 1.0.0 1.0.0.zip
+        curl -OL https://dotnetmygetlegacy.blob.core.windows.net/dotnet-core/flatcontainer/microsoft.benchview.throughputbenchmarks.x64.windows_nt/1.0.0/microsoft.benchview.throughputbenchmarks.x64.windows_nt.1.0.0.nupkg
+        mv microsoft.benchview.throughputbenchmarks.x64.windows_nt.1.0.0.nupkg 1.0.0.zip
         unzip -q 1.0.0.zip
     fi
 
diff --git a/tests/scripts/run-corefx-tests.sh b/tests/scripts/run-corefx-tests.sh
@@ -367,9 +367,9 @@ coreclr_code_coverage()
 
     which curl > /dev/null 2> /dev/null
     if [ $? -ne 0 ]; then
-        wget -q -O $packageName https://www.myget.org/F/dotnet-buildtools/api/v2/package/unix-code-coverage-tools/1.0.0
+        wget -q -O $packageName https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/flat2/unix-code-coverage-tools/1.0.0/unix-code-coverage-tools.1.0.0.nupkg
     else
-        curl -sSL -o $packageName https://www.myget.org/F/dotnet-buildtools/api/v2/package/unix-code-coverage-tools/1.0.0
+        curl -sSL -o $packageName https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/flat2/unix-code-coverage-tools/1.0.0/unix-code-coverage-tools.1.0.0.nupkg
     fi
 
     echo "Unzipping to $toolsDir"
diff --git a/tests/setup-stress-dependencies.cmd b/tests/setup-stress-dependencies.cmd
@@ -79,7 +79,7 @@ REM ============================================================================
 
 REM Download the package
 echo Downloading CoreDisTools package
-set DOTNETCMD="%__DotNetCmd%" restore "%__CsprojPath%" --source https://dotnet.myget.org/F/dotnet-core/ --packages "%__PackageDir%"
+set DOTNETCMD="%__DotNetCmd%" restore "%__CsprojPath%" --source https://dotnetmygetlegacy.blob.core.windows.net/dotnet-core/index.json --packages "%__PackageDir%"
 echo %DOTNETCMD%
 call %DOTNETCMD%
 if errorlevel 1 goto Fail
diff --git a/tests/setup-stress-dependencies.sh b/tests/setup-stress-dependencies.sh
@@ -177,7 +177,7 @@ fi
 
 # Download the package
 echo Downloading CoreDisTools package
-bash -c -x "$dotnet restore $csprojPath --source https://dotnet.myget.org/F/dotnet-core/ --packages $packageDir"
+bash -c -x "$dotnet restore $csprojPath --source https://dotnetmygetlegacy.blob.core.windows.net/dotnet-core/index.json --packages $packageDir"
 if [ $? -ne 0 ]
 then
     exit_with_error 1 "Failed to restore the package"
diff --git a/tests/src/performance/linkbench/assets/MusicStore/Get-Crossgen.ps1 b/tests/src/performance/linkbench/assets/MusicStore/Get-Crossgen.ps1
@@ -55,7 +55,7 @@ $netcoreappversion = $version
 Write-Host -ForegroundColor Green "Getting NuGet.exe"
 
 $nugeturl = "https://dist.nuget.org/win-x86-commandline/v3.4.4/NuGet.exe"
-$nugetfeed = "https://dotnet.myget.org/F/dotnet-core/api/v3/index.json"
+$nugetfeed = "https://dotnetmygetlegacy.blob.core.windows.net/dotnet-core/index.json"
 $nugetexepath = "$path\NuGet.exe"
 $wc = New-Object System.Net.WebClient
 $wc.DownloadFile($nugeturl, $nugetexepath)
diff --git a/tests/src/sizeondisk/sodbench/SoDBench.cs b/tests/src/sizeondisk/sodbench/SoDBench.cs
@@ -156,7 +156,7 @@ class Program
         <configuration>
         <packageSources>
             <add key='nuget.org' value='https://api.nuget.org/v3/index.json' protocolVersion='3' />
-            <add key='myget.org/dotnet-core' value='https://dotnet.myget.org/F/dotnet-core/api/v3/index.json' protocolVersion='3' />
+            <add key='myget.org/dotnet-core' value='https://dotnetmygetlegacy.blob.core.windows.net/dotnet-core/index.json' protocolVersion='3' />
             <add key='myget.org/aspnet-core' value='https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json' protocolVersion='3' />
         </packageSources>
         </configuration>";

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-3.0.0-preview4-04022-01`
	`1`	`+3.0.0-preview4-06015-01`