diff --git a/TestAssets/TestPackages/dotnet-dependency-context-test/project.json b/TestAssets/TestPackages/dotnet-dependency-context-test/project.json index 7c9d17446..76cdf5dc8 100644 --- a/TestAssets/TestPackages/dotnet-dependency-context-test/project.json +++ b/TestAssets/TestPackages/dotnet-dependency-context-test/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-preview1-*", + "version": "1.0.0-preview2-*", "compilationOptions": { "emitEntryPoint": true }, diff --git a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json index 7bba77ea9..7d9a42fc3 100644 --- a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json +++ b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-preview1-*", + "version": "1.0.0-preview2-*", "compilationOptions": { "emitEntryPoint": true }, diff --git a/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json b/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json index 2d9e5da19..4f09908ea 100644 --- a/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json +++ b/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-preview1-*", + "version": "1.0.0-preview2-*", "compilationOptions": { "emitEntryPoint": true }, diff --git a/TestAssets/TestPackages/dotnet-desktop-binding-redirects/project.json b/TestAssets/TestPackages/dotnet-desktop-binding-redirects/project.json index f04b04c6e..5eff0aae2 100644 --- a/TestAssets/TestPackages/dotnet-desktop-binding-redirects/project.json +++ b/TestAssets/TestPackages/dotnet-desktop-binding-redirects/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-preview1-*", + "version": "1.0.0-preview2-*", "compilationOptions": { "emitEntryPoint": true }, diff --git a/branchinfo.txt b/branchinfo.txt index bdb5ffaf6..714dc774c 100644 --- a/branchinfo.txt +++ b/branchinfo.txt @@ -4,5 +4,5 @@ MAJOR_VERSION=1 MINOR_VERSION=0 PATCH_VERSION=0 -RELEASE_SUFFIX=preview1 -CHANNEL=beta +RELEASE_SUFFIX=preview2 +CHANNEL=preview diff --git a/packaging/windows/clisdk/registrykeys.wxs b/packaging/windows/clisdk/registrykeys.wxs index 4f8853636..92f54dba8 100644 --- a/packaging/windows/clisdk/registrykeys.wxs +++ b/packaging/windows/clisdk/registrykeys.wxs @@ -10,7 +10,7 @@ - + diff --git a/scripts/dotnet-cli-build/Utils/Monikers.cs b/scripts/dotnet-cli-build/Utils/Monikers.cs index 5a3f599f5..f4e67e151 100644 --- a/scripts/dotnet-cli-build/Utils/Monikers.cs +++ b/scripts/dotnet-cli-build/Utils/Monikers.cs @@ -33,6 +33,7 @@ namespace Microsoft.DotNet.Cli.Build case "rc1": case "rc2": case "preview1": + case "preview2": case "rtm": packageName = "dotnet"; break; @@ -58,6 +59,7 @@ namespace Microsoft.DotNet.Cli.Build case "rc1": case "rc2": case "preview1": + case "preview2": case "rtm": packagePrefix = "dotnet"; break; diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index b8df84924..663495657 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-preview1-*", + "version": "1.0.0-preview2-*", "compilationOptions": { "keyFile": "../../tools/Key.snk", "warningsAsErrors": true diff --git a/src/Microsoft.DotNet.Compiler.Common/project.json b/src/Microsoft.DotNet.Compiler.Common/project.json index 77c099d07..3dc4e4f89 100644 --- a/src/Microsoft.DotNet.Compiler.Common/project.json +++ b/src/Microsoft.DotNet.Compiler.Common/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-preview1-*", + "version": "1.0.0-preview2-*", "compilationOptions": { "keyFile": "../../tools/Key.snk" }, diff --git a/src/Microsoft.DotNet.Files/project.json b/src/Microsoft.DotNet.Files/project.json index 9840684b1..48e381de8 100644 --- a/src/Microsoft.DotNet.Files/project.json +++ b/src/Microsoft.DotNet.Files/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-preview1-*", + "version": "1.0.0-preview2-*", "compilationOptions": { "keyFile": "../../tools/Key.snk" }, diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/project.json b/src/Microsoft.DotNet.ProjectModel.Loader/project.json index 81a6a62bb..fa6898e84 100644 --- a/src/Microsoft.DotNet.ProjectModel.Loader/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Loader/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-preview1-*", + "version": "1.0.0-preview2-*", "compilationOptions": { "keyFile": "../../tools/Key.snk" }, diff --git a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json index 77c6aefd2..395c61e7e 100644 --- a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-preview1-*", + "version": "1.0.0-preview2-*", "compilationOptions": { "keyFile": "../../tools/Key.snk" }, diff --git a/src/Microsoft.DotNet.TestFramework/project.json b/src/Microsoft.DotNet.TestFramework/project.json index 8a94264f0..9477b3907 100644 --- a/src/Microsoft.DotNet.TestFramework/project.json +++ b/src/Microsoft.DotNet.TestFramework/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-preview1-*", + "version": "1.0.0-preview2-*", "description": "Microsoft.DotNet.TestFramework Class Library", "tags": [ "" diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index 4687250f4..0f104b292 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -1,6 +1,6 @@ { "description": "Abstractions for test runners to communicate to a tool, such as Visual Studio.", - "version": "1.0.0-preview1-*", + "version": "1.0.0-preview2-*", "repository": { "type": "git", "url": "git://github.com/dotnet/cli" diff --git a/src/dotnet-compile-fsc/project.json b/src/dotnet-compile-fsc/project.json index 06fc3f1ab..f9a9d1b10 100644 --- a/src/dotnet-compile-fsc/project.json +++ b/src/dotnet-compile-fsc/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-preview1-*", + "version": "1.0.0-preview2-*", "compilationOptions": { "emitEntryPoint": true }, diff --git a/src/dotnet/project.json b/src/dotnet/project.json index c6fb06b0d..856bc5ddc 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-preview1-*", + "version": "1.0.0-preview2-*", "compilationOptions": { "emitEntryPoint": true },