preview1 --> preview2

Moves CLI version suffix from preview1 to preview2 Sets channel for preview2 to 1.0.0-preview2, abandoning the Beta channel to the 1.0.0-preview1 release. Once @sokket's publishing cleanup work is complete we can re-converge the channels if desired.
2016-05-09 02:34:04 -07:00 · 2016-05-09 02:34:04 -07:00 · 1033e61d57
commit 1033e61d57
parent 0336f6bb34
16 changed files with 18 additions and 16 deletions
--- 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
  },
--- 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
  },
--- 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
  },
--- 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
  },
--- 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
--- a/packaging/windows/clisdk/registrykeys.wxs
+++ b/packaging/windows/clisdk/registrykeys.wxs
@ -10,7 +10,7 @@
      </Component>
      <Component Id="SetupRegistry_x86_RC2_Compat_Key" Directory="TARGETDIR" Win64="no">
        <RegistryKey Root="HKLM" Key="SOFTWARE\dotnet\Setup\InstalledVersions\$(var.Platform)\sdk">
-          <RegistryValue Action="write" Name="1.0.0-preview1" Type="integer" Value="1" KeyPath="yes"/>
+          <RegistryValue Action="write" Name="1.0.0-preview2" Type="integer" Value="1" KeyPath="yes"/>
        </RegistryKey>
      </Component>
    </ComponentGroup>
--- 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;
--- 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
--- 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"
  },
--- 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"
  },
--- 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"
  },
--- 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"
  },
--- 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": [
    ""
--- 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"
--- 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
  },
--- 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
  },