Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 5ddece2

Browse files
Jan JahodaJan JahodaAnipikhoyosjswtgodbe
authored
Update branding to 3.1.12 (#28126)
* 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 <jajahoda@.microsoft.com> Co-authored-by: Anipik <anirudhagnihotry098@gmail.com> Co-authored-by: Juan Hoyos <juan.hoyos@microsoft.com> Co-authored-by: William Godbe <wigodbe@microsoft.com>
1 parent 9fb9458 commit 5ddece2

20 files changed

+27
-23
lines changed

‎BuildToolsVersion.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.0-preview4-04022-01
1+
3.0.0-preview4-06015-01

‎NuGet.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<add key="dotnet3-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json" />
1717
<add key="dotnet3.1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json" />
1818
<add key="dotnet3.1-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json" />
19-
<add key="myget.org dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
19+
<add key="myget-core-blob" value="https://dotnetmygetlegacy.blob.core.windows.net/dotnet-core/index.json" />
2020
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
2121
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
2222
</packageSources>

‎build-test.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ set __MsbuildErr=/flp2:ErrorsOnly;LogFile="%__BuildErr%"
458458
set __Logging=!__MsbuildLog! !__MsbuildWrn! !__MsbuildErr!
459459

460460
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.
461-
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%
461+
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%
462462
if errorlevel 1 (
463463
echo %__MsgPrefix%Error: Xunit wrapper build failed. Refer to the build log files for details:
464464
echo %__BuildLog%

‎build-test.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ build_test_wrappers()
6363
__MsbuildErr="/fileloggerparameters2:\"ErrorsOnly;LogFile=${__BuildErr}\""
6464
__Logging="$__MsbuildLog $__MsbuildWrn $__MsbuildErr /consoleloggerparameters:$buildVerbosity"
6565

66-
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"
66+
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"
6767
eval $nextCommand
6868

6969
if [ $? -ne 0 ]; then
@@ -1049,4 +1049,3 @@ else
10491049
echo "To run single test use the following command:"
10501050
echo " bash ${__TestBinDir}/__TEST_PATH__/__TEST_NAME__.sh -coreroot=${CORE_ROOT}"
10511051
fi
1052-

‎dependencies.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
66
https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
77
https://dotnetfeed.blob.core.windows.net/dotnet-coreclr/index.json;
8-
https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
8+
https://dotnetmygetlegacy.blob.core.windows.net/dotnet-core/index.json;
99
https://api.nuget.org/v3/index.json;
1010
$(RestoreSources)
1111
</RestoreSources>

‎dir.common.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565

6666
<PropertyGroup>
6767
<!-- Central place to set the versions of all nuget packages produced in the repo -->
68-
<PackageVersion Condition="'$(PackageVersion)' == ''">3.1.11</PackageVersion>
68+
<PackageVersion Condition="'$(PackageVersion)' == ''">3.1.12</PackageVersion>
6969
<PreReleaseLabel>servicing</PreReleaseLabel>
7070
</PropertyGroup>
7171

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project>
33
<PropertyGroup>
44
<!-- The .NET Core product branding version -->
5-
<ProductVersion>3.1.11</ProductVersion>
5+
<ProductVersion>3.1.12</ProductVersion>
66
<!-- File version numbers -->
77
<MajorVersion>4</MajorVersion>
88
<MinorVersion>7</MinorVersion>

‎init-tools.cmd

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ if [%PACKAGES_DIR%]==[] set PACKAGES_DIR=%~dp0.packages
1010
if [%TOOLRUNTIME_DIR%]==[] set TOOLRUNTIME_DIR=%~dp0Tools
1111
set DOTNET_PATH=%~dp0.dotnet\
1212
if [%DOTNET_CMD%]==[] set DOTNET_CMD=%DOTNET_PATH%dotnet.exe
13-
if [%BUILDTOOLS_SOURCE%]==[] set BUILDTOOLS_SOURCE=https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json
13+
if [%BUILDTOOLS_SOURCE%]==[] set BUILDTOOLS_SOURCE=https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json
1414
set /P BUILDTOOLS_VERSION=< "%~dp0BuildToolsVersion.txt"
1515
set BUILD_TOOLS_PATH=%PACKAGES_DIR%\Microsoft.DotNet.BuildTools\%BUILDTOOLS_VERSION%\lib
1616
set INIT_TOOLS_RESTORE_PROJECT=%~dp0init-tools.msbuild
17+
set "INIT_TOOLS_RESTORE_ARGS=--source https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json"
1718
set BUILD_TOOLS_SEMAPHORE_DIR=%TOOLRUNTIME_DIR%\%BUILDTOOLS_VERSION%
1819
set BUILD_TOOLS_SEMAPHORE=%BUILD_TOOLS_SEMAPHORE_DIR%\init-tools.completed
1920

‎init-tools.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@ __PACKAGES_DIR="$__scriptpath/.packages"
66
__TOOLRUNTIME_DIR="$__scriptpath/Tools"
77
__DOTNET_PATH="$__scriptpath/.dotnet"
88
__DOTNET_CMD="$__DOTNET_PATH/dotnet"
9-
if [ -z "${__BUILDTOOLS_SOURCE:-}" ]; then __BUILDTOOLS_SOURCE=https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json; fi
9+
if [ -z "${__BUILDTOOLS_SOURCE:-}" ]; then __BUILDTOOLS_SOURCE=https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json; fi
1010
export __BUILDTOOLS_USE_CSPROJ=true
1111
__BUILD_TOOLS_PACKAGE_VERSION=$(cat "$__scriptpath/BuildToolsVersion.txt" | sed 's/\r$//') # remove CR if mounted repo on Windows drive
1212
__DOTNET_TOOLS_VERSION=$(cat "$__scriptpath/DotnetCLIVersion.txt" | sed 's/\r$//') # remove CR if mounted repo on Windows drive
1313
__ILASM_VERSION=$(cat "$__scriptpath/ILAsmVersion.txt" | sed 's/\r$//') # remove CR if mounted repo on Windows drive
1414
__BUILD_TOOLS_PATH="$__PACKAGES_DIR/microsoft.dotnet.buildtools/$__BUILD_TOOLS_PACKAGE_VERSION/lib"
1515
__INIT_TOOLS_RESTORE_PROJECT="$__scriptpath/init-tools.msbuild"
16+
export __INIT_TOOLS_RESTORE_ARGS="--source https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json"
1617
__BUILD_TOOLS_SEMAPHORE="$__TOOLRUNTIME_DIR/$__BUILD_TOOLS_PACKAGE_VERSION/init-tools.complete"
1718

1819
if [ -e "$__BUILD_TOOLS_SEMAPHORE" ]; then

‎tests/CoreFX/CoreFX.issues.rsp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,3 +86,6 @@
8686

8787
# Test failure: https://github.com/dotnet/corefx/issues/39223
8888
-nomethod System.ComponentModel.TypeConverterTests.FontConverterTest.TestConvertFrom
89+
90+
# Test failure: https://github.com/dotnet/runtime/issues/43166
91+
-nomethod System.IO.Tests.File_GetSetTimes.SetDateTimeMax

‎tests/bringup_runtest.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1093,7 +1093,7 @@ function coreclr_code_coverage {
10931093
pushd $toolsDir > /dev/null
10941094

10951095
echo "Pulling down code coverage tools"
1096-
wget -q https://www.myget.org/F/dotnet-buildtools/api/v2/package/unix-code-coverage-tools/1.0.0 -O $packageName
1096+
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
10971097
echo "Unzipping to $toolsDir"
10981098
unzip -q -o $packageName
10991099

‎tests/debugger_tests/ConfigFilesGenerators/ConfigTemplate.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
<CliPath>##Cli_Path##</CliPath>
2121
<NuGetPackageCacheDir>$(NugetCacheRoot)</NuGetPackageCacheDir>
2222
<NuGetPackageFeeds>
23-
myget.org dotnet-core=https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
24-
myget.org=https://www.nuget.org/api/v2/
23+
myget.org dotnet-core=https://dotnetmygetlegacy.blob.core.windows.net/dotnet-core/index.json;
24+
nuget.org=https://www.nuget.org/api/v2/
2525
</NuGetPackageFeeds>
2626
<SOSPath>$(RuntimeRoot)\sos.dll</SOSPath>
2727
<MDbgDir>$(TestRoot)\mdbg</MDbgDir>

‎tests/dir.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
<!-- Add test-specific package restore sources. -->
9191
<PropertyGroup>
9292
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
93-
https://dotnet.myget.org/F/dotnet-corefxlab/api/v3/index.json;
93+
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental/nuget/v3/index.json;
9494
$(RestoreSources)
9595
</RestoreSources>
9696
<RestoreSources Condition="'$(IntermediateAzureFeed)' != ''">

‎tests/runtest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1839,7 +1839,7 @@ def build_test_wrappers(host_os,
18391839
command = [dotnetcli_location,
18401840
"msbuild",
18411841
os.path.join(coreclr_repo_location, "tests", "runtest.proj"),
1842-
"/p:RestoreAdditionalProjectSources=https://dotnet.myget.org/F/dotnet-core/",
1842+
"/p:RestoreAdditionalProjectSources=https://dotnetmygetlegacy.blob.core.windows.net/dotnet-core/index.json",
18431843
"/p:BuildWrappers=true",
18441844
"/p:TargetsWindows=%s" % ("true" if host_os == "Windows_NT" else "false")]
18451845

‎tests/scripts/perf-prep.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ if [ $throughput -eq 1 ]; then
8989
mkdir Microsoft.Benchview.ThroughputBenchmarks.x64.Windows_NT
9090
cd Microsoft.Benchview.ThroughputBenchmarks.x64.Windows_NT
9191

92-
curl -OL https://dotnet.myget.org/F/dotnet-core/api/v2/package/Microsoft.Benchview.ThroughputBenchmarks.x64.Windows_NT/1.0.0
93-
mv 1.0.0 1.0.0.zip
92+
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
93+
mv microsoft.benchview.throughputbenchmarks.x64.windows_nt.1.0.0.nupkg 1.0.0.zip
9494
unzip -q 1.0.0.zip
9595
fi
9696

‎tests/scripts/run-corefx-tests.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,9 +367,9 @@ coreclr_code_coverage()
367367

368368
which curl > /dev/null 2> /dev/null
369369
if [ $? -ne 0 ]; then
370-
wget -q -O $packageName https://www.myget.org/F/dotnet-buildtools/api/v2/package/unix-code-coverage-tools/1.0.0
370+
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
371371
else
372-
curl -sSL -o $packageName https://www.myget.org/F/dotnet-buildtools/api/v2/package/unix-code-coverage-tools/1.0.0
372+
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
373373
fi
374374

375375
echo "Unzipping to $toolsDir"

‎tests/setup-stress-dependencies.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ REM ============================================================================
7979

8080
REM Download the package
8181
echo Downloading CoreDisTools package
82-
set DOTNETCMD="%__DotNetCmd%" restore "%__CsprojPath%" --source https://dotnet.myget.org/F/dotnet-core/ --packages "%__PackageDir%"
82+
set DOTNETCMD="%__DotNetCmd%" restore "%__CsprojPath%" --source https://dotnetmygetlegacy.blob.core.windows.net/dotnet-core/index.json --packages "%__PackageDir%"
8383
echo %DOTNETCMD%
8484
call %DOTNETCMD%
8585
if errorlevel 1 goto Fail

‎tests/setup-stress-dependencies.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ fi
177177

178178
# Download the package
179179
echo Downloading CoreDisTools package
180-
bash -c -x "$dotnet restore $csprojPath --source https://dotnet.myget.org/F/dotnet-core/ --packages $packageDir"
180+
bash -c -x "$dotnet restore $csprojPath --source https://dotnetmygetlegacy.blob.core.windows.net/dotnet-core/index.json --packages $packageDir"
181181
if [ $? -ne 0 ]
182182
then
183183
exit_with_error 1 "Failed to restore the package"

‎tests/src/performance/linkbench/assets/MusicStore/Get-Crossgen.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ $netcoreappversion = $version
5555
Write-Host -ForegroundColor Green "Getting NuGet.exe"
5656

5757
$nugeturl = "https://dist.nuget.org/win-x86-commandline/v3.4.4/NuGet.exe"
58-
$nugetfeed = "https://dotnet.myget.org/F/dotnet-core/api/v3/index.json"
58+
$nugetfeed = "https://dotnetmygetlegacy.blob.core.windows.net/dotnet-core/index.json"
5959
$nugetexepath = "$path\NuGet.exe"
6060
$wc = New-Object System.Net.WebClient
6161
$wc.DownloadFile($nugeturl, $nugetexepath)

‎tests/src/sizeondisk/sodbench/SoDBench.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ class Program
156156
<configuration>
157157
<packageSources>
158158
<add key='nuget.org' value='https://api.nuget.org/v3/index.json' protocolVersion='3' />
159-
<add key='myget.org/dotnet-core' value='https://dotnet.myget.org/F/dotnet-core/api/v3/index.json' protocolVersion='3' />
159+
<add key='myget.org/dotnet-core' value='https://dotnetmygetlegacy.blob.core.windows.net/dotnet-core/index.json' protocolVersion='3' />
160160
<add key='myget.org/aspnet-core' value='https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json' protocolVersion='3' />
161161
</packageSources>
162162
</configuration>";

0 commit comments

Comments
 (0)