chore: merge from develop #14 (#17)

LogoFX · Jun 27, 2021 · 58c4959 · 58c4959
1 parent 42eb9f7
commit 58c4959
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 21 deletions.
diff --git a/...ack/LogoFX.Client.Mvvm.Commanding.Core/contents/LogoFX.Client.Mvvm.Commanding.Core.nuspec b/...ack/LogoFX.Client.Mvvm.Commanding.Core/contents/LogoFX.Client.Mvvm.Commanding.Core.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>LogoFX.Client.Mvvm.Commanding.Core</id>
-    <version>2.2.0-rc3</version>
+    <version>2.2.0</version>
     <title>LogoFX.Client.Mvvm.Commanding.Core</title>
     <authors>Gennady Verdel,Vlad Spivak</authors>
     <owners>Gennady Verdel</owners>
@@ -12,10 +12,12 @@
     <iconUrl>https://github.com/LogoFX/logofx-assets/blob/master/icons/icon.png?raw=true</iconUrl>
     <description>LogoFX Client Mvvm Commanding containing implementation of ICommand with Fluent API.</description>
     <summary>LogoFX Client Mvvm Commanding containing implementation of ICommand with Fluent API.</summary>
-    <releaseNotes>Updated dependent packages</releaseNotes>
+    <releaseNotes>Using System.Reactive.Linq 5</releaseNotes>
     <dependencies>
-      <dependency id="LogoFX.Client.Core.Core" version="2.2.0-rc3" />
+      <dependency id="LogoFX.Client.Core.Core" version="2.2.0" />
       <dependency id="System.Reactive.Linq" version="5.0.0" />
     </dependencies>
+    <tags>framework logofx dotnet</tags>
+    <repository type="Open Source" url="https://github.com/LogoFX/logofx-client-mvvm-commanding" />
   </metadata>
 </package>
diff --git a/devops/pack/LogoFX.Client.Mvvm.Commanding/contents/LogoFX.Client.Mvvm.Commanding.nuspec b/devops/pack/LogoFX.Client.Mvvm.Commanding/contents/LogoFX.Client.Mvvm.Commanding.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>LogoFX.Client.Mvvm.Commanding</id>
-    <version>2.2.0-rc3</version>
+    <version>2.2.0</version>
     <title>LogoFX.Client.Mvvm.Commanding</title>
     <authors>Gennady Verdel,Vlad Spivak</authors>
     <owners>Gennady Verdel</owners>
@@ -12,19 +12,21 @@
     <iconUrl>https://github.com/LogoFX/logofx-assets/blob/master/icons/icon.png?raw=true</iconUrl>
     <description>LogoFX Client Mvvm Commanding containing implementation of ICommand with Fluent API.</description>
     <summary>LogoFX Client Mvvm Commanding containing implementation of ICommand with Fluent API.</summary>
-    <releaseNotes>Updated dependent packages</releaseNotes>
+    <releaseNotes>Added support for .NET Core</releaseNotes>
     <dependencies>
       <group>
         <dependency id="Solid.Practices.Middleware" version="2.3.1" />
         <dependency id="Solid.Bootstrapping" version="2.3.1" />
         <dependency id="Solid.Extensibility" version="2.3.1" />
-        <dependency id="LogoFX.Client.Core" version="2.2.0-rc3" />
-        <dependency id="LogoFX.Client.Mvvm.Core" version="2.2.0-rc3" />
-        <dependency id="LogoFX.Client.Mvvm.Commanding.Core" version="2.2.0-rc3" />
+        <dependency id="LogoFX.Client.Core" version="2.2.0" />
+        <dependency id="LogoFX.Client.Mvvm.Core" version="2.2.0" />
+        <dependency id="LogoFX.Client.Mvvm.Commanding.Core" version="2.2.0" />
       </group>
       <group targetFramework="UAP10.0">
         <dependency id="Microsoft.Xaml.Behaviors.Uwp.Managed" version="2.0.1" />
       </group>
     </dependencies>
+    <tags>framework logofx dotnet</tags>
+    <repository type="Open Source" url="https://github.com/LogoFX/logofx-client-mvvm-commanding" />
   </metadata>
 </package>
diff --git a/devops/publish/PublishUtil/Program.cs b/devops/publish/PublishUtil/Program.cs
@@ -31,7 +31,7 @@ private static void PublishPackage(string packageId)
             Directory.SetCurrentDirectory(Path.Combine(Directory.GetCurrentDirectory(), "publish"));
             var copyBat = Path.Combine(Directory.GetCurrentDirectory(), "copy-single.bat");
             //TODO: pass version as well
-            process = Process.Start(copyBat, new [] {packageId, "2.2.0-rc3", "../../../../packages/Tests-All" });
+            process = Process.Start(copyBat, new [] {packageId, "2.2.0", "../../../../packages/Tests-All" });
             process.WaitForExit();
             GoUp(1);
         }

diff --git a/devops/publish/publish-all.bat b/devops/publish/publish-all.bat
@@ -1,4 +1,4 @@
-SET package_version=2.2.0-rc3
+SET package_version=2.2.0
 cd ../../src
 nuget restore
 cd ../devops

diff --git a/...oFX.Client.Mvvm.Commanding.Platform/net/LogoFX.Client.Mvvm.Commanding.Platform.NET.csproj b/...oFX.Client.Mvvm.Commanding.Platform/net/LogoFX.Client.Mvvm.Commanding.Platform.NET.csproj
@@ -24,8 +24,8 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Expression.Blend.Sdk" Version="1.0.2" />
-    <PackageReference Include="LogoFX.Client.Core" Version="2.2.0-rc3" />
-    <PackageReference Include="LogoFX.Client.Mvvm.Core" Version="2.2.0-rc3" />
+    <PackageReference Include="LogoFX.Client.Core" Version="2.2.0" />
+    <PackageReference Include="LogoFX.Client.Mvvm.Core" Version="2.2.0" />
     <PackageReference Include="Solid.Bootstrapping" Version="2.3.1" />
   </ItemGroup>
   <ItemGroup>

diff --git a/...nt.Mvvm.Commanding.Platform/netcore/LogoFX.Client.Mvvm.Commanding.Platform.NETCore.csproj b/...nt.Mvvm.Commanding.Platform/netcore/LogoFX.Client.Mvvm.Commanding.Platform.NETCore.csproj
@@ -24,8 +24,8 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Expression.Blend.Sdk" Version="1.0.2" />
-    <PackageReference Include="LogoFX.Client.Core" Version="2.2.0-rc3" />
-    <PackageReference Include="LogoFX.Client.Mvvm.Core" Version="2.2.0-rc3" />
+    <PackageReference Include="LogoFX.Client.Core" Version="2.2.0" />
+    <PackageReference Include="LogoFX.Client.Mvvm.Core" Version="2.2.0" />
     <PackageReference Include="Solid.Bootstrapping" Version="2.3.1" />
   </ItemGroup>
   <ItemGroup>

diff --git a/...mmanding.Platform/netframework/LogoFX.Client.Mvvm.Commanding.Platform.NETFramework.csproj b/...mmanding.Platform/netframework/LogoFX.Client.Mvvm.Commanding.Platform.NETFramework.csproj
@@ -69,13 +69,13 @@
       <Version>1.0.2</Version>
     </PackageReference>
     <PackageReference Include="LogoFX.Client.Core">
-      <Version>2.2.0-rc3</Version>
+      <Version>2.2.0</Version>
     </PackageReference>
     <PackageReference Include="LogoFX.Client.Mvvm.Core">
-      <Version>2.2.0-rc3</Version>
+      <Version>2.2.0</Version>
     </PackageReference>
     <PackageReference Include="LogoFX.Core">
-      <Version>2.2.0-rc3</Version>
+      <Version>2.2.0</Version>
     </PackageReference>
     <PackageReference Include="Solid.Bootstrapping">
       <Version>2.3.1</Version>

diff --git a/...oFX.Client.Mvvm.Commanding.Platform/uwp/LogoFX.Client.Mvvm.Commanding.Platform.UWP.csproj b/...oFX.Client.Mvvm.Commanding.Platform/uwp/LogoFX.Client.Mvvm.Commanding.Platform.UWP.csproj
@@ -130,13 +130,13 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="LogoFX.Client.Core">
-      <Version>2.2.0-rc3</Version>
+      <Version>2.2.0</Version>
     </PackageReference>
     <PackageReference Include="LogoFX.Client.Core.Core">
-      <Version>2.2.0-rc3</Version>
+      <Version>2.2.0</Version>
     </PackageReference>
     <PackageReference Include="LogoFX.Client.Mvvm.Core">
-      <Version>2.2.0-rc3</Version>
+      <Version>2.2.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.12</Version>

diff --git a/src/LogoFX.Client.Mvvm.Commanding/LogoFX.Client.Mvvm.Commanding.csproj b/src/LogoFX.Client.Mvvm.Commanding/LogoFX.Client.Mvvm.Commanding.csproj
@@ -12,7 +12,7 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="LogoFX.Client.Core.Core" Version="2.2.0-rc3" />
+    <PackageReference Include="LogoFX.Client.Core.Core" Version="2.2.0" />
     <PackageReference Include="System.Reactive.Linq" Version="5.0.0" />
   </ItemGroup>
 </Project>