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

[release/5.0.4xx] Update dependencies from dotnet/sdk (#11101)

Browse source 
[release/5.0.4xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Net.Compilers.Toolset: from 3.11.0-3.21352.9 to 3.11.0-3.21359.6 (parent: Microsoft.NET.Sdk)

 - Update Docker imports to new MCR source. (#11096)
This commit is contained in:
dotnet-maestro[bot] 2021-07-14 11:20:55 +00:00 • committed by GitHub
parent b520810a5d
commit a9b72801a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
eng/Version.Details.xml
View file

@ -87,13 +87,13 @@
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>e832de2ee744332d876b2d979e7bf838f082639a</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="5.0.400-preview.21358.2">
<Dependency Name="Microsoft.NET.Sdk" Version="5.0.400-preview.21360.3">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>f1311c060caa49258a9be6984825110c321d8f57</Sha>
<Sha>0537716e2a62b457062019bf3235c5d51e85d560</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.400-preview.21358.2">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.400-preview.21360.3">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>f1311c060caa49258a9be6984825110c321d8f57</Sha>
<Sha>0537716e2a62b457062019bf3235c5d51e85d560</Sha>
</Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.6-servicing.21221.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@ -117,9 +117,9 @@
<Sha>e6a47c70b7878b346ff0858085eb8a6379f6f0bb</Sha>
<RepoName>linker</RepoName>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.11.0-3.21352.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.11.0-3.21359.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>e73cf0139ea53178948e869dc1b322a0d2a890dd</Sha>
<Sha>c7ab50623cb6843cbb6e75c38c026f0c8be04f01</Sha>
</Dependency>
<Dependency Name="Microsoft.Build" Version="16.11.0-preview-21351-03" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/msbuild</Uri>

4
eng/Versions.props
View file

@ -55,8 +55,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>5.0.400-preview.21358.2</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.400-preview.21358.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>5.0.400-preview.21360.3</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.400-preview.21360.3</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>

2
eng/docker/alpine.3.6/Dockerfile
View file

@ -4,7 +4,7 @@
#
# Dockerfile that creates a container suitable to build dotnet-cli
FROM microsoft/dotnet-buildtools-prereqs:alpine-3.6-3148f11-20171119021156
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.6-3148f11-20171119021156
RUN apk update && apk upgrade && apk add --no-cache curl ncurses

2
eng/docker/centos/Dockerfile
View file

@ -4,7 +4,7 @@
#
# Dockerfile that creates a container suitable to build dotnet-cli
FROM microsoft/dotnet-buildtools-prereqs:centos-7-b46d863-20180719033416
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-b46d863-20180719033416
RUN yum -q -y install sudo

4
eng/docker/fedora.29/Dockerfile
View file

@ -4,7 +4,7 @@
#
# Dockerfile that creates a container suitable to build dotnet-cli
FROM microsoft/dotnet-buildtools-prereqs:fedora-29-2f0798a-20181105183801
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-29-2f0798a-20181105183801
RUN dnf install -y nss
@ -27,4 +27,4 @@ USER ${USER_ID}
# Set working directory
ARG WORK_DIR
WORKDIR ${WORK_DIR}
WORKDIR ${WORK_DIR}

2
eng/docker/rhel/Dockerfile
View file

@ -4,7 +4,7 @@
#
# Dockerfile that creates a container suitable to build dotnet-cli
FROM microsoft/dotnet-buildtools-prereqs:rhel-7-rpmpkg-e1b4a89-20175311035359
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:rhel-7-rpmpkg-e1b4a89-20175311035359
# Setup User to match Host User, and give superuser permissions
ARG USER_ID=0

4
eng/docker/ubuntu.18.04/Dockerfile
View file

@ -4,7 +4,7 @@
#
# Dockerfile that creates a container suitable to build dotnet-cli
FROM microsoft/dotnet-buildtools-prereqs:ubuntu-18.04-f90bc20-20180320154721
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-f90bc20-20180320154721
RUN apt-get update && \
apt-get -qqy install \
@ -29,4 +29,4 @@ USER ${USER_ID}
# Set working directory
ARG WORK_DIR
WORKDIR ${WORK_DIR}
WORKDIR ${WORK_DIR}