diff --git a/eng/TestVersions.props b/eng/TestVersions.props index d8d5d1b9d..671c82cf4 100644 --- a/eng/TestVersions.props +++ b/eng/TestVersions.props @@ -1,10 +1,10 @@ - 4.8.0-rtm.5348 - 3.0.100-alpha1-20180711-1 + 5.0.0-preview1.5663 + 3.0.100-preview.18580.6 0.1.1 15.8.0 - 3.0.0-preview-27122-01 + 3.0.0-preview-27205-02 1.3.1 diff --git a/eng/Versions.props b/eng/Versions.props index 6677186e6..8ec26d651 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 3.0.0-preview-27122-01 + 3.0.0-preview-27205-02 $(MicrosoftNETCoreAppPackageVersion) diff --git a/old/build/test/TestPackageProjects.targets b/old/build/test/TestPackageProjects.targets index 6e3f496f5..82230a578 100644 --- a/old/build/test/TestPackageProjects.targets +++ b/old/build/test/TestPackageProjects.targets @@ -20,16 +20,6 @@ - - dotnet-dependency-tool-invoker - dotnet-dependency-tool-invoker.csproj - True - True - $(CliVersionPrefix) - $(VersionSuffix) - $(ReleaseSuffix) - True - dotnet-portable dotnet-portable.csproj diff --git a/src/redist/targets/packaging/osx/clisdk/resources/cs.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/cs.lproj/welcome.html index 8adc80f3e..ca05aa063 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/cs.lproj/welcome.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/cs.lproj/welcome.html @@ -7,7 +7,7 @@

.NET Core SDK

-

.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!

+

.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!

Learn more about .NET Core

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/de.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/de.lproj/welcome.html index 8adc80f3e..ca05aa063 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/de.lproj/welcome.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/de.lproj/welcome.html @@ -7,7 +7,7 @@

.NET Core SDK

-

.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!

+

.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!

Learn more about .NET Core

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/welcome.html index 8adc80f3e..ca05aa063 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/welcome.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/welcome.html @@ -7,7 +7,7 @@

.NET Core SDK

-

.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!

+

.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!

Learn more about .NET Core

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/es.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/es.lproj/welcome.html index 8adc80f3e..ca05aa063 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/es.lproj/welcome.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/es.lproj/welcome.html @@ -7,7 +7,7 @@

.NET Core SDK

-

.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!

+

.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!

Learn more about .NET Core

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/fr.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/fr.lproj/welcome.html index 8adc80f3e..ca05aa063 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/fr.lproj/welcome.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/fr.lproj/welcome.html @@ -7,7 +7,7 @@

.NET Core SDK

-

.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!

+

.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!

Learn more about .NET Core

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/it.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/it.lproj/welcome.html index 8adc80f3e..ca05aa063 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/it.lproj/welcome.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/it.lproj/welcome.html @@ -7,7 +7,7 @@

.NET Core SDK

-

.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!

+

.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!

Learn more about .NET Core

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/ja.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/ja.lproj/welcome.html index 8adc80f3e..ca05aa063 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/ja.lproj/welcome.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/ja.lproj/welcome.html @@ -7,7 +7,7 @@

.NET Core SDK

-

.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!

+

.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!

Learn more about .NET Core

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/ko.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/ko.lproj/welcome.html index 8adc80f3e..ca05aa063 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/ko.lproj/welcome.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/ko.lproj/welcome.html @@ -7,7 +7,7 @@

.NET Core SDK

-

.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!

+

.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!

Learn more about .NET Core

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/pl.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/pl.lproj/welcome.html index 8adc80f3e..ca05aa063 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/pl.lproj/welcome.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/pl.lproj/welcome.html @@ -7,7 +7,7 @@

.NET Core SDK

-

.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!

+

.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!

Learn more about .NET Core

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/pt-br.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/pt-br.lproj/welcome.html index 8adc80f3e..ca05aa063 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/pt-br.lproj/welcome.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/pt-br.lproj/welcome.html @@ -7,7 +7,7 @@

.NET Core SDK

-

.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!

+

.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!

Learn more about .NET Core

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/ru.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/ru.lproj/welcome.html index 8adc80f3e..ca05aa063 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/ru.lproj/welcome.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/ru.lproj/welcome.html @@ -7,7 +7,7 @@

.NET Core SDK

-

.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!

+

.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!

Learn more about .NET Core

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/tr.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/tr.lproj/welcome.html index 8adc80f3e..ca05aa063 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/tr.lproj/welcome.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/tr.lproj/welcome.html @@ -7,7 +7,7 @@

.NET Core SDK

-

.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!

+

.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!

Learn more about .NET Core

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/zh-hans.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/zh-hans.lproj/welcome.html index 8adc80f3e..ca05aa063 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/zh-hans.lproj/welcome.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/zh-hans.lproj/welcome.html @@ -7,7 +7,7 @@

.NET Core SDK

-

.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!

+

.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!

Learn more about .NET Core

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/zh-hant.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/zh-hant.lproj/welcome.html index 8adc80f3e..ca05aa063 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/zh-hant.lproj/welcome.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/zh-hant.lproj/welcome.html @@ -7,7 +7,7 @@

.NET Core SDK

-

.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!

+

.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!

Learn more about .NET Core

diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj index 866245523..a0d76c961 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj @@ -1,6 +1,6 @@  - netstandard2.0 + netcoreapp3.0