From a9b72801a01cab8f46cef685b19cf80d7a02bebe Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 14 Jul 2021 11:20:55 +0000
Subject: [PATCH] [release/5.0.4xx] Update dependencies from dotnet/sdk
(#11101)
[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)
---
eng/Version.Details.xml | 12 ++++++------
eng/Versions.props | 4 ++--
eng/docker/alpine.3.6/Dockerfile | 2 +-
eng/docker/centos/Dockerfile | 2 +-
eng/docker/fedora.29/Dockerfile | 4 ++--
eng/docker/rhel/Dockerfile | 2 +-
eng/docker/ubuntu.18.04/Dockerfile | 4 ++--
7 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index b2a4cf850..04e7504b7 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -87,13 +87,13 @@
https://github.com/dotnet/templating
e832de2ee744332d876b2d979e7bf838f082639a
-
+
https://github.com/dotnet/sdk
- f1311c060caa49258a9be6984825110c321d8f57
+ 0537716e2a62b457062019bf3235c5d51e85d560
-
+
https://github.com/dotnet/sdk
- f1311c060caa49258a9be6984825110c321d8f57
+ 0537716e2a62b457062019bf3235c5d51e85d560
@@ -117,9 +117,9 @@
e6a47c70b7878b346ff0858085eb8a6379f6f0bb
linker
-
+
https://github.com/dotnet/roslyn
- e73cf0139ea53178948e869dc1b322a0d2a890dd
+ c7ab50623cb6843cbb6e75c38c026f0c8be04f01
https://github.com/dotnet/msbuild
diff --git a/eng/Versions.props b/eng/Versions.props
index 0b814b101..c0328f683 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -55,8 +55,8 @@
- 5.0.400-preview.21358.2
- 5.0.400-preview.21358.2
+ 5.0.400-preview.21360.3
+ 5.0.400-preview.21360.3
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
diff --git a/eng/docker/alpine.3.6/Dockerfile b/eng/docker/alpine.3.6/Dockerfile
index 9f9461690..315e11e2a 100644
--- a/eng/docker/alpine.3.6/Dockerfile
+++ b/eng/docker/alpine.3.6/Dockerfile
@@ -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
diff --git a/eng/docker/centos/Dockerfile b/eng/docker/centos/Dockerfile
index eec66c48c..49b3abede 100644
--- a/eng/docker/centos/Dockerfile
+++ b/eng/docker/centos/Dockerfile
@@ -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
diff --git a/eng/docker/fedora.29/Dockerfile b/eng/docker/fedora.29/Dockerfile
index a58f30b74..925bd8564 100644
--- a/eng/docker/fedora.29/Dockerfile
+++ b/eng/docker/fedora.29/Dockerfile
@@ -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}
\ No newline at end of file
+WORKDIR ${WORK_DIR}
diff --git a/eng/docker/rhel/Dockerfile b/eng/docker/rhel/Dockerfile
index cd5ec2d15..14fef0e6c 100644
--- a/eng/docker/rhel/Dockerfile
+++ b/eng/docker/rhel/Dockerfile
@@ -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
diff --git a/eng/docker/ubuntu.18.04/Dockerfile b/eng/docker/ubuntu.18.04/Dockerfile
index 39a9c0327..0ba3da86b 100644
--- a/eng/docker/ubuntu.18.04/Dockerfile
+++ b/eng/docker/ubuntu.18.04/Dockerfile
@@ -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}
\ No newline at end of file
+WORKDIR ${WORK_DIR}