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

Merge upstream changes

Browse source
This commit is contained in:
Daniel Plaisted 2018-12-05 18:08:40 -08:00
commit f974e2bbac
18 changed files with 19 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
eng/TestVersions.props
View file

@ -1,10 +1,10 @@
<Project>
<PropertyGroup>
<NuGetFrameworksPackageVersion>4.8.0-rtm.5348</NuGetFrameworksPackageVersion>
<MicrosoftDotNetCliUtilsPackageVersion>3.0.100-alpha1-20180711-1</MicrosoftDotNetCliUtilsPackageVersion>
<NuGetFrameworksPackageVersion>5.0.0-preview1.5663</NuGetFrameworksPackageVersion>
<MicrosoftDotNetCliUtilsPackageVersion>3.0.100-preview.18580.6</MicrosoftDotNetCliUtilsPackageVersion>
<MicrosoftDotNetCliCommandLinePackageVersion>0.1.1</MicrosoftDotNetCliCommandLinePackageVersion>
<MicrosoftNETTestSdkPackageVersion>15.8.0</MicrosoftNETTestSdkPackageVersion>
<MicrosoftDotNetPlatformAbstractionsPackageVersion>3.0.0-preview-27122-01</MicrosoftDotNetPlatformAbstractionsPackageVersion>
<MicrosoftDotNetPlatformAbstractionsPackageVersion>3.0.0-preview-27205-02</MicrosoftDotNetPlatformAbstractionsPackageVersion>
<MicrosoftDotNetProjectJsonMigrationPackageVersion>1.3.1</MicrosoftDotNetProjectJsonMigrationPackageVersion>
</PropertyGroup>
</Project>

2
eng/Versions.props
View file

@ -20,7 +20,7 @@
</PropertyGroup>
<PropertyGroup>
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview-27122-01</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview-27205-02</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
</PropertyGroup>

10
old/build/test/TestPackageProjects.targets
View file

@ -20,16 +20,6 @@
<Target Name="SetupTestPackageProjectBaseData">
<ItemGroup>
<BaseTestPackageProject Include="TestAssets/TestPackages/dotnet-dependency-tool-invoker">
<Name>dotnet-dependency-tool-invoker</Name>
<ProjectName>dotnet-dependency-tool-invoker.csproj</ProjectName>
<IsTool>True</IsTool>
<IsApplicable>True</IsApplicable>
<VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
<VersionSuffix>$(VersionSuffix)</VersionSuffix>
<ReleaseSuffix>$(ReleaseSuffix)</ReleaseSuffix>
<Clean>True</Clean>
</BaseTestPackageProject>
<BaseTestPackageProject Include="TestAssets/TestPackages/dotnet-portable">
<Name>dotnet-portable</Name>
<ProjectName>dotnet-portable.csproj</ProjectName>

2
src/redist/targets/packaging/osx/clisdk/resources/cs.lproj/welcome.html
View file

@ -7,7 +7,7 @@
<br>
<div align="left" style="font-family: Helvetica;padding-left:10px">
<h2>.NET Core SDK</h2>
<p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
<p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
</div>
<div align="left" style="font-family: Helvetica">
<h2 style="padding-left:10px">Learn more about .NET Core</h2>

2
src/redist/targets/packaging/osx/clisdk/resources/de.lproj/welcome.html
View file

@ -7,7 +7,7 @@
<br>
<div align="left" style="font-family: Helvetica;padding-left:10px">
<h2>.NET Core SDK</h2>
<p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
<p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
</div>
<div align="left" style="font-family: Helvetica">
<h2 style="padding-left:10px">Learn more about .NET Core</h2>

2
src/redist/targets/packaging/osx/clisdk/resources/en.lproj/welcome.html
View file

@ -7,7 +7,7 @@
<br>
<div align="left" style="font-family: Helvetica;padding-left:10px">
<h2>.NET Core SDK</h2>
<p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
<p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
</div>
<div align="left" style="font-family: Helvetica">
<h2 style="padding-left:10px">Learn more about .NET Core</h2>

2
src/redist/targets/packaging/osx/clisdk/resources/es.lproj/welcome.html
View file

@ -7,7 +7,7 @@
<br>
<div align="left" style="font-family: Helvetica;padding-left:10px">
<h2>.NET Core SDK</h2>
<p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
<p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
</div>
<div align="left" style="font-family: Helvetica">
<h2 style="padding-left:10px">Learn more about .NET Core</h2>

2
src/redist/targets/packaging/osx/clisdk/resources/fr.lproj/welcome.html
View file

@ -7,7 +7,7 @@
<br>
<div align="left" style="font-family: Helvetica;padding-left:10px">
<h2>.NET Core SDK</h2>
<p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
<p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
</div>
<div align="left" style="font-family: Helvetica">
<h2 style="padding-left:10px">Learn more about .NET Core</h2>

2
src/redist/targets/packaging/osx/clisdk/resources/it.lproj/welcome.html
View file

@ -7,7 +7,7 @@
<br>
<div align="left" style="font-family: Helvetica;padding-left:10px">
<h2>.NET Core SDK</h2>
<p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
<p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
</div>
<div align="left" style="font-family: Helvetica">
<h2 style="padding-left:10px">Learn more about .NET Core</h2>

2
src/redist/targets/packaging/osx/clisdk/resources/ja.lproj/welcome.html
View file

@ -7,7 +7,7 @@
<br>
<div align="left" style="font-family: Helvetica;padding-left:10px">
<h2>.NET Core SDK</h2>
<p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
<p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
</div>
<div align="left" style="font-family: Helvetica">
<h2 style="padding-left:10px">Learn more about .NET Core</h2>

2
src/redist/targets/packaging/osx/clisdk/resources/ko.lproj/welcome.html
View file

@ -7,7 +7,7 @@
<br>
<div align="left" style="font-family: Helvetica;padding-left:10px">
<h2>.NET Core SDK</h2>
<p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
<p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
</div>
<div align="left" style="font-family: Helvetica">
<h2 style="padding-left:10px">Learn more about .NET Core</h2>

2
src/redist/targets/packaging/osx/clisdk/resources/pl.lproj/welcome.html
View file

@ -7,7 +7,7 @@
<br>
<div align="left" style="font-family: Helvetica;padding-left:10px">
<h2>.NET Core SDK</h2>
<p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
<p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
</div>
<div align="left" style="font-family: Helvetica">
<h2 style="padding-left:10px">Learn more about .NET Core</h2>

2
src/redist/targets/packaging/osx/clisdk/resources/pt-br.lproj/welcome.html
View file

@ -7,7 +7,7 @@
<br>
<div align="left" style="font-family: Helvetica;padding-left:10px">
<h2>.NET Core SDK</h2>
<p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
<p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
</div>
<div align="left" style="font-family: Helvetica">
<h2 style="padding-left:10px">Learn more about .NET Core</h2>

2
src/redist/targets/packaging/osx/clisdk/resources/ru.lproj/welcome.html
View file

@ -7,7 +7,7 @@
<br>
<div align="left" style="font-family: Helvetica;padding-left:10px">
<h2>.NET Core SDK</h2>
<p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
<p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
</div>
<div align="left" style="font-family: Helvetica">
<h2 style="padding-left:10px">Learn more about .NET Core</h2>

2
src/redist/targets/packaging/osx/clisdk/resources/tr.lproj/welcome.html
View file

@ -7,7 +7,7 @@
<br>
<div align="left" style="font-family: Helvetica;padding-left:10px">
<h2>.NET Core SDK</h2>
<p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
<p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
</div>
<div align="left" style="font-family: Helvetica">
<h2 style="padding-left:10px">Learn more about .NET Core</h2>

2
src/redist/targets/packaging/osx/clisdk/resources/zh-hans.lproj/welcome.html
View file

@ -7,7 +7,7 @@
<br>
<div align="left" style="font-family: Helvetica;padding-left:10px">
<h2>.NET Core SDK</h2>
<p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
<p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
</div>
<div align="left" style="font-family: Helvetica">
<h2 style="padding-left:10px">Learn more about .NET Core</h2>

2
src/redist/targets/packaging/osx/clisdk/resources/zh-hant.lproj/welcome.html
View file

@ -7,7 +7,7 @@
<br>
<div align="left" style="font-family: Helvetica;padding-left:10px">
<h2>.NET Core SDK</h2>
<p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
<p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
</div>
<div align="left" style="font-family: Helvetica">
<h2 style="padding-left:10px">Learn more about .NET Core</h2>

2
test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj
View file

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
</PropertyGroup>
<ItemGroup>