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

Commit 1f7186c

Browse files
wtgodbewtgodbe
committed
Merged PR 7657: Merge public to internal
2 parents b1ac7a3 + ea0c5ad commit 1f7186c

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

‎eng/Version.Details.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="3.1.4-servicing.20177.1">
4+
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="3.1.2-servicing.20064.1">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>55ff2d0d7b63a97b2e53dc2e94df8d1cae9858ac</Sha>
6+
<Sha>247f60e9e34a03ed99e855eb1ea0c20931a968db</Sha>
77
</Dependency>
88
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.4">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
@@ -31,9 +31,9 @@
3131
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-corefx</Uri>
3232
<Sha>aa650a2cf7cad8f234926b5e374cb2f006065db2</Sha>
3333
</Dependency>
34-
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.1.4-servicing.20205.4">
35-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
36-
<Sha>a68e5e2c420ec6a733e5adcda0459ddcfadfe1a4</Sha>
34+
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.1.2-servicing.20068.1">
35+
<Uri>https://github.com/dotnet/aspnetcore</Uri>
36+
<Sha>c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc</Sha>
3737
</Dependency>
3838
<!-- Keep this dependency at the bottom of ProductDependencies, else it will be picked as the parent for CoherentParentDependencies -->
3939
<Dependency Name="Microsoft.NETCore.App.Ref" Version="3.1.0" Pinned="true">
@@ -48,9 +48,9 @@
4848
</Dependency>
4949
</ToolsetDependencies>
5050
<ProductDependencies>
51-
<Dependency Name="Microsoft.NET.Sdk" Version="3.1.300-preview.20202.4">
51+
<Dependency Name="Microsoft.NET.Sdk" Version="3.1.300-preview.20229.6">
5252
<Uri>https://github.com/dotnet/sdk</Uri>
53-
<Sha>fa5992a1d50a0257c732dfd009f98d6da00aa067</Sha>
53+
<Sha>42ea8278db4c13727a7ac5db923228716e986bfa</Sha>
5454
</Dependency>
5555
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.4-servicing.20203.4">
5656
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
@@ -60,9 +60,9 @@
6060
<Uri>https://github.com/dotnet/CliCommandLineParser</Uri>
6161
<Sha>0e89c2116ad28e404ba56c14d1c3f938caa25a01</Sha>
6262
</Dependency>
63-
<Dependency Name="NuGet.Build.Tasks" Version="5.6.0-preview.2.6532">
63+
<Dependency Name="NuGet.Build.Tasks" Version="5.6.0-rtm.6591">
6464
<Uri>https://github.com/NuGet/NuGet.Client</Uri>
65-
<Sha>1c2681b16a0bb9be9271abe043a1cbf892761ef8</Sha>
65+
<Sha>636570e68732c1f718ede9ca07802d7b1cc69aa0</Sha>
6666
</Dependency>
6767
</ProductDependencies>
6868
</Dependencies>

‎eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</PropertyGroup>
2929
<PropertyGroup>
3030
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
31-
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.1.4-servicing.20205.4</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
31+
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.1.2-servicing.20068.1</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
3232
</PropertyGroup>
3333
<PropertyGroup>
3434
<!-- Dependencies from https://github.com/microsoft/msbuild -->
@@ -39,12 +39,12 @@
3939
</PropertyGroup>
4040
<PropertyGroup>
4141
<!-- Dependencies from https://github.com/dotnet/sdk -->
42-
<MicrosoftNETSdkPackageVersion>3.1.300-preview.20202.4</MicrosoftNETSdkPackageVersion>
42+
<MicrosoftNETSdkPackageVersion>3.1.300-preview.20229.6</MicrosoftNETSdkPackageVersion>
4343
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
4444
</PropertyGroup>
4545
<PropertyGroup>
4646
<!-- Dependencies from https://github.com/dotnet/templating -->
47-
<MicrosoftTemplateEngineCliPackageVersion>3.1.4-servicing.20177.1</MicrosoftTemplateEngineCliPackageVersion>
47+
<MicrosoftTemplateEngineCliPackageVersion>3.1.2-servicing.20064.1</MicrosoftTemplateEngineCliPackageVersion>
4848
<MicrosoftTemplateEngineAbstractionsPackageVersion>$(MicrosoftTemplateEngineCliPackageVersion)</MicrosoftTemplateEngineAbstractionsPackageVersion>
4949
<MicrosoftTemplateEngineCliLocalizationPackageVersion>$(MicrosoftTemplateEngineCliPackageVersion)</MicrosoftTemplateEngineCliLocalizationPackageVersion>
5050
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineCliPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
@@ -57,7 +57,7 @@
5757
</PropertyGroup>
5858
<PropertyGroup>
5959
<!-- Dependencies from https://github.com/NuGet/NuGet.Client-->
60-
<NuGetBuildTasksPackageVersion>5.6.0-preview.2.6532</NuGetBuildTasksPackageVersion>
60+
<NuGetBuildTasksPackageVersion>5.6.0-rtm.6591</NuGetBuildTasksPackageVersion>
6161
<NuGetCommonPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetCommonPackageVersion>
6262
<NuGetConfigurationPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetConfigurationPackageVersion>
6363
<NuGetFrameworksPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetFrameworksPackageVersion>

‎scripts/docker/alpine.3.6/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55

66
# Dockerfile that creates a container suitable to build dotnet-cli
7-
FROM microsoft/dotnet-buildtools-prereqs:alpine-3.6-3148f11-20171119021156
7+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.6-3e800f1-20190501005341
88

99
# This Dockerfile doesn't use the USER_ID, but the parameter needs to be declared to prevent docker
1010
# from issuing a warning

‎src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ The .NET Core tools collect usage data in order to help us improve your experien
4343
Read more about .NET Core CLI Tools telemetry: https://aka.ms/dotnet-cli-telemetry</source>
4444
<target state="translated">Telemetría
4545
---------
46-
Las herramientas de .NET Core recopilan datos de uso para ayudarnos a ejorar su experiencia. Estos datos son anónimos. Microsoft los recopila y comparte con la comunidad. Puede optar por no participar en la telemetría si establece la variable de entorno DOTNET_CLI_TELEMETRY_OPTOUT en "1" o "true" mediante su shell favorito.
46+
Las herramientas de .NET Core recopilan datos de uso para ayudarnos a mejorar su experiencia. Estos datos son anónimos. Microsoft los recopila y comparte con la comunidad. Puede optar por no participar en la telemetría si establece la variable de entorno DOTNET_CLI_TELEMETRY_OPTOUT en "1" o "true" mediante su shell favorito.
4747

4848
Lea más sobre la telemetría de las herramientas de la CLI de .NET Core: https://aka.ms/dotnet-cli-telemetry</target>
4949
<note />

‎src/dotnet/xlf/CommonLocalizableStrings.fr.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ export PATH="$PATH:{0}"
582582
</trans-unit>
583583
<trans-unit id="TemplateCreatedSuccessfully">
584584
<source>The template {0} created successfully. run "dotnet restore" to get started!</source>
585-
<target state="translated">Le modèle {0} a été créé. Exécutez "dotnet restore" pour commencer !</target>
585+
<target state="translated">Le modèle {0} a été créé. Exécutez "dotnet restore" pour démarrer !</target>
586586
<note />
587587
</trans-unit>
588588
<trans-unit id="TemplateInstalledSuccesfully">

0 commit comments

Comments
 (0)