mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Revert bad merge

Browse source
This commit is contained in:
William Li 2021-09-09 14:29:21 -07:00
parent 9f0efebffa
commit 05f1624d9a
3 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NuGet.config
View file

@ -15,6 +15,8 @@
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" /> <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
<add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" /> <add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
<add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" /> <add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
<!-- Temporary feed for Xamarin workload manifest -->
<add key="xamarin" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/xamarin-impl/nuget/v3/index.json" />
</packageSources> </packageSources>
<disabledPackageSources /> <disabledPackageSources />
</configuration> </configuration>

3
eng/common/tools.ps1
View file

@ -154,9 +154,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
return $global:_DotNetInstallDir return $global:_DotNetInstallDir
} }
# In case of network error, try to log the current IP for reference
Try-LogClientIpAddress
# Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism # Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism
$env:DOTNET_MULTILEVEL_LOOKUP=0 $env:DOTNET_MULTILEVEL_LOOKUP=0

2
src/redist/targets/GenerateBundledVersions.targets
View file

@ -25,7 +25,7 @@
</Target> </Target>
<PropertyGroup> <PropertyGroup>
<VersionFeature21>30</VersionFeature21> <VersionFeature21>29</VersionFeature21>
<VersionFeature31>18</VersionFeature31> <VersionFeature31>18</VersionFeature31>
<VersionFeature50>9</VersionFeature50> <VersionFeature50>9</VersionFeature50>
</PropertyGroup> </PropertyGroup>