Skip to content

Commit

Permalink
housekeeping: Rename from System.Reactive.Wasm to Reactive.Wasm (#2)
Browse files Browse the repository at this point in the history
  • Loading branch information
weitzhandler authored and glennawatson committed Jun 16, 2019
1 parent 72771c3 commit 1d8a000
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 24 deletions.
2 changes: 1 addition & 1 deletion build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 5 additions & 0 deletions src/Directory.build.props
Original file line number Diff line number Diff line change
Expand Up @@ -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) -->
Expand Down
4 changes: 2 additions & 2 deletions System.Reactive.Wasm.sln → src/System.Reactive.Wasm.sln
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/System.Reactive.Wasm/System.Reactive.Wasm.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
28 changes: 14 additions & 14 deletions version.json
Original file line number Diff line number Diff line change
@@ -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
}
}
}
}

0 comments on commit 1d8a000

Please sign in to comment.