From 1d8a0002f09f322a5eba72bc73ebb71600e43e3e Mon Sep 17 00:00:00 2001
From: Shimmy <2716316+weitzhandler@users.noreply.github.com>
Date: Sun, 16 Jun 2019 12:37:24 +0300
Subject: [PATCH] housekeeping: Rename from System.Reactive.Wasm to
 Reactive.Wasm (#2)

---
 build.cake                                    |  2 +-
 src/Directory.build.props                     |  5 ++++
 .../System.Reactive.Wasm.sln                  |  4 +--
 .../WasmPlatformEnlightenmentProvider.cs      |  6 ----
 .../System.Reactive.Wasm.csproj               |  2 +-
 version.json                                  | 28 +++++++++----------
 6 files changed, 23 insertions(+), 24 deletions(-)
 rename System.Reactive.Wasm.sln => src/System.Reactive.Wasm.sln (87%)

diff --git a/build.cake b/build.cake
index 1a5cb40..6fc6de9 100644
--- a/build.cake
+++ b/build.cake
@@ -15,7 +15,7 @@ var packageTestWhitelist = new FilePath[]
 
 BuildParameters.SetParameters(context: Context, 
                             buildSystem: BuildSystem,
-                            title: "System.Reactive.Wasm",
+                            title: "Reactive.Wasm",
                             whitelistPackages: packageWhitelist,
                             whitelistTestPackages: packageTestWhitelist,
                             artifactsDirectory: "./artifacts",
diff --git a/src/Directory.build.props b/src/Directory.build.props
index 607c324..a74a588 100644
--- a/src/Directory.build.props
+++ b/src/Directory.build.props
@@ -8,6 +8,11 @@
     <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)analyzers.ruleset</CodeAnalysisRuleSet>
     <PackageDescription>Wasm implementation for System.Reactive.</PackageDescription>
     <PackageTags>mvvm;rx;reactive extensions;observable;frp;uwp;net;netstandard;uno;blazer</PackageTags>
+    <PackageReleaseNotes>https://github.com/reactiveui/Reactive.Wasm/releases</PackageReleaseNotes>
+    <RepositoryUrl>https://github.com/reactiveui/Reactive.Wasm</RepositoryUrl>
+    <PackageProjectUrl>https://github.com/reactiveui/Reactive.Wasm</PackageProjectUrl>
+    <PackageIconUrl>https://raw.githubusercontent.com/dotnet/reactive/0f837d11385cfaf575861ccc5a5fbcafb22d888f/Rx.NET/Resources/Artwork/Logo.png</PackageIconUrl>
+    <RepositoryType>git</RepositoryType>
     <IsTestProject>$(MSBuildProjectName.Contains('Tests'))</IsTestProject>
     <DebugType>Embedded</DebugType>
     <!-- Optional: Publish the repository URL in the built .nupkg (in the NuSpec <Repository> element) -->
diff --git a/System.Reactive.Wasm.sln b/src/System.Reactive.Wasm.sln
similarity index 87%
rename from System.Reactive.Wasm.sln
rename to src/System.Reactive.Wasm.sln
index 02d8223..deb6d9a 100644
--- a/System.Reactive.Wasm.sln
+++ b/src/System.Reactive.Wasm.sln
@@ -8,9 +8,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		..\version.json = ..\version.json
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reactive.Wasm", "src\System.Reactive.Wasm\System.Reactive.Wasm.csproj", "{E667F495-E8EF-4902-93C7-98363E292675}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reactive.Wasm", ".\System.Reactive.Wasm\System.Reactive.Wasm.csproj", "{E667F495-E8EF-4902-93C7-98363E292675}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reactive.Wasm.Tests", "src\System.Reactive.Wasm.Tests\System.Reactive.Wasm.Tests.csproj", "{AEF30B2B-21E7-40CD-927F-4BF8448ACF6F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reactive.Wasm.Tests", ".\System.Reactive.Wasm.Tests\System.Reactive.Wasm.Tests.csproj", "{AEF30B2B-21E7-40CD-927F-4BF8448ACF6F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/System.Reactive.Wasm/Internal/WasmPlatformEnlightenmentProvider.cs b/src/System.Reactive.Wasm/Internal/WasmPlatformEnlightenmentProvider.cs
index 08b4bfd..a9af4db 100644
--- a/src/System.Reactive.Wasm/Internal/WasmPlatformEnlightenmentProvider.cs
+++ b/src/System.Reactive.Wasm/Internal/WasmPlatformEnlightenmentProvider.cs
@@ -4,15 +4,9 @@
 // See the LICENSE file in the project root for full license information.
 
 // WARNING: The full namespace-qualified type name should stay the same for the discovery in System.Reactive.Core to work!
-using System;
 using System.ComponentModel;
-using System.Diagnostics;
 using System.Reactive.Concurrency;
-using System.Reactive.Linq;
-using System.Reflection;
-using System.Runtime.InteropServices;
 using System.Threading;
-
 using Splat;
 
 namespace System.Reactive.PlatformServices
diff --git a/src/System.Reactive.Wasm/System.Reactive.Wasm.csproj b/src/System.Reactive.Wasm/System.Reactive.Wasm.csproj
index c0be8e9..dcba29c 100644
--- a/src/System.Reactive.Wasm/System.Reactive.Wasm.csproj
+++ b/src/System.Reactive.Wasm/System.Reactive.Wasm.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageId>System.Reactive.Wasm</PackageId>
+    <PackageId>Reactive.Wasm</PackageId>
     <Description>Wasm implementation for System.Reactive</Description>
   </PropertyGroup>
 
diff --git a/version.json b/version.json
index 7bb1982..773aebd 100644
--- a/version.json
+++ b/version.json
@@ -1,17 +1,17 @@
 {
-  "version": "4.1.5",
-  "publicReleaseRefSpec": [
-    "^refs/heads/master$", // we release out of master
-    "^refs/heads/develop$", // we release out of develop
-    "^refs/heads/rel/\\d+\\.\\d+\\.\\d+" // we also release branches starting with rel/N.N.N
-  ],
-  "nugetPackageVersion":{
-    "semVer": 2
-  },
-  "cloudBuild": {
-    "setVersionVariables": true,
-    "buildNumber": {
-      "enabled": false
+    "version": "1.0.1-preview.{height}",
+    "publicReleaseRefSpec": [
+        "^refs/heads/master$", // we release out of master
+        "^refs/heads/preview/.*", // we release previews
+        "^refs/heads/rel/\\d+\\.\\d+\\.\\d+" // we also release branches starting with rel/N.N.N
+    ],
+    "nugetPackageVersion": {
+        "semVer": 2
+    },
+    "cloudBuild": {
+        "setVersionVariables": true,
+        "buildNumber": {
+            "enabled": false
+        }
     }
-  }
 }