Merge pull request #132 from reactivemarbles/MigrateToReactiveMarbles

Migrate to ReactiveMarbles
reactivemarbles · May 18, 2024 · d77839c · d77839c
2 parents 714b7eb + d8fb1e5
commit d77839c
Show file tree

Hide file tree

Showing 588 changed files with 11,947 additions and 10,429 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
diff --git a/.github/workflows/BuildDeploy.yml b/.github/workflows/BuildDeploy.yml
@@ -21,6 +21,9 @@ on:
     branches:
       - master
 
+env:
+  configuration: Release
+
 jobs:
   windows-latest:
     name: windows-latest
@@ -31,12 +34,6 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: NBGV
-        id: nbgv
-        uses: dotnet/nbgv@master
-        with:
-          setAllVars: true
-      - run: echo 'SemVer2=${{ steps.nbgv.outputs.SemVer2 }}'
 
       - name: 'Setup Java JDK 11'
         uses: actions/setup-java@v4.2.1
@@ -49,23 +46,43 @@ jobs:
         run: |
           dotnet workload install android ios tvos macos maui maccatalyst wasm-tools
 
+      - name: NBGV
+        id: nbgv
+        uses: dotnet/nbgv@master
+        with:
+          setAllVars: true
+
+      - run: echo 'SemVer2=${{ steps.nbgv.outputs.SemVer2 }}'
+
       - name: 'Cache: .nuke/temp, ~/.nuget/packages'
         uses: actions/cache@v4
         with:
           path: |
             .nuke/temp
             ~/.nuget/packages
           key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj', '**/Directory.Packages.props') }}
-      - name: 'Run: Compile, Deploy'
-        run: ./build.cmd Compile Deploy
+
+      - name: 'Run: Compile Pack'
+        run: ./build.cmd Pack
         env:
           NuGetApiKey: ${{ secrets.NUGET_API_KEY }}
+
       - name: 'Publish: output'
         uses: actions/upload-artifact@v4
         with:
           name: output
           path: output
 
+        # Decode the base 64 encoded pfx and save the Signing_Certificate
+      - name: Sign NuGet packages
+        shell: pwsh
+        run: |
+            $pfx_cert_byte = [System.Convert]::FromBase64String("${{ secrets.SIGNING_CERTIFICATE }}")
+            [IO.File]::WriteAllBytes("GitHubActionsWorkflow.pfx", $pfx_cert_byte)
+            $secure_password = ConvertTo-SecureString ${{ secrets.SIGN_CERTIFICATE_PASSWORD }} –asplaintext –force
+            Import-PfxCertificate -FilePath GitHubActionsWorkflow.pfx -Password $secure_password -CertStoreLocation Cert:\CurrentUser\My
+            nuget sign -Timestamper http://timestamp.digicert.com -CertificateFingerprint ${{ secrets.SIGN_CERTIFICATE_HASH }} **/*.nupkg
+        
       - name: Changelog
         uses: glennawatson/ChangeLog@v1
         id: changelog
@@ -79,3 +96,8 @@ jobs:
           release_name: ${{ steps.nbgv.outputs.SemVer2 }}
           body: |
             ${{ steps.changelog.outputs.commitLog }}
+            
+      - name: 'Run: Deploy'
+        run: ./build.cmd Deploy
+        env:
+          NuGetApiKey: ${{ secrets.NUGET_API_KEY }}
diff --git a/.github/workflows/BuildOnly.yml b/.github/workflows/BuildOnly.yml
@@ -41,6 +41,14 @@ jobs:
         run: |
           dotnet workload install android ios tvos macos maui maccatalyst wasm-tools
 
+      - name: NBGV
+        id: nbgv
+        uses: dotnet/nbgv@master
+        with:
+          setAllVars: true
+
+      - run: echo 'SemVer2=${{ steps.nbgv.outputs.SemVer2 }}'
+
       - name: 'Cache: .nuke/temp, ~/.nuget/packages'
         uses: actions/cache@v4
         with:

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -14,12 +14,12 @@
     <Nullable>enable</Nullable>
     <PackageIcon>CrissCross.png</PackageIcon>
     <PackageReadmeFile>README.md</PackageReadmeFile>
-    <PackageReleaseNotes>Compatability with Net 6/7/8 and netstandard2.0</PackageReleaseNotes>
+    <PackageReleaseNotes>Compatability with Net 6/8 and netstandard2.0</PackageReleaseNotes>
     <PackageTags>ReactiveUI;Navigation;wpf;avalonia;winforms;maui;xamforms;webview2;rx;reactive;extensions;observable;LINQ;net;netstandard</PackageTags>
     <EnableNETAnalyzers>True</EnableNETAnalyzers>
     <AnalysisLevel>latest</AnalysisLevel>
-    <PackageProjectUrl>https://github.com/ChrisPulman/CrissCross</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/ChrisPulman/CrissCross</RepositoryUrl>
+    <PackageProjectUrl>https://github.com/reactivemarbles/CrissCross</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/reactivemarbles/CrissCross</RepositoryUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <!--https://devblogs.microsoft.com/dotnet/producing-packages-with-source-link/-->
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
@@ -30,10 +30,11 @@
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
     <IncludePackageReferencesDuringMarkupCompilation>true</IncludePackageReferencesDuringMarkupCompilation>
     <AvaloniaVersion>11.0.10</AvaloniaVersion>
-    <ReactiveUIVersion>19.6.1</ReactiveUIVersion>
-    <CrissCrossCoreTargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</CrissCrossCoreTargetFrameworks>
-    <CrissCrossWinTargetFrameworks>net462;net472;net48;net6.0-windows10.0.17763.0;net7.0-windows10.0.17763.0;net8.0-windows10.0.17763.0</CrissCrossWinTargetFrameworks>
-    <CrissCrossWebviewTargetFrameworks>net462;net472;net48;net6.0-windows;net7.0-windows;net8.0-windows</CrissCrossWebviewTargetFrameworks>
+    <ReactiveUIVersion>20.1.1</ReactiveUIVersion>
+    <XamarinReactiveUIVersion>19.6.12</XamarinReactiveUIVersion>
+    <CrissCrossCoreTargetFrameworks>netstandard2.0;net6.0;net8.0</CrissCrossCoreTargetFrameworks>
+    <CrissCrossWinTargetFrameworks>net462;net472;net48;net6.0-windows10.0.17763.0;net8.0-windows10.0.17763.0</CrissCrossWinTargetFrameworks>
+    <CrissCrossWebviewTargetFrameworks>net462;net472;net48;net6.0-windows;net8.0-windows</CrissCrossWebviewTargetFrameworks>
   </PropertyGroup>
   <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
     <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>

diff --git a/README.md b/README.md
@@ -3,9 +3,9 @@ A Navigation Framework for ReactiveUI based projects
 
 ![Alt](https://repobeats.axiom.co/api/embed/3ffd196858ee7468fa2e28225b0edf635b6c740b.svg "Repobeats analytics image")
 
-![CrissCross](https://github.com/ChrisPulman/CrissCross/blob/master/Images/CrissCross.png)
+![CrissCross](https://github.com/reactivemarbles/CrissCross/blob/master/Images/CrissCross.png)
 
-[![CrissCross CI-Build](https://github.com/ChrisPulman/CrissCross/actions/workflows/BuildOnly.yml/badge.svg)](https://github.com/ChrisPulman/CrissCross/actions/workflows/BuildOnly.yml) 
+[![CrissCross CI-Build](https://github.com/reactivemarbles/CrissCross/actions/workflows/BuildOnly.yml/badge.svg)](https://github.com/ChrisPulman/CrissCross/actions/workflows/BuildOnly.yml) 
 
 ## What is CrissCross?
 
@@ -77,7 +77,7 @@ Create a ViewModel that inherits from `RxObject`. This is the ViewModel that wil
 ### Step 3: Create a View
 
 Create a View that inherits from `NavigationWindow`. This is the View that will be used for the MainWindow.
-add xmlns:rxNav="https://github.com/ChrisPulman/CrissCross" to the Window inherits in XAML.
+add xmlns:rxNav="https://github.com/reactivemarbles/CrissCross" to the Window inherits in XAML.
 Change Window to rxNav:NavigationWindow in XAML.
 Add x:TypeArguments="local:MainWindowViewModel"
 
@@ -201,7 +201,7 @@ Create a ViewModel that inherits from `RxObject`. This is the ViewModel that wil
 
 
 Create a View that inherits from `NavigationWindow` OR `NavigationUserControl`. This is the View that will be used for the MainWindow.
-add xmlns:rxNav="https://github.com/ChrisPulman/CrissCross"
+add xmlns:rxNav="https://github.com/reactivemarbles/CrissCross"
 Change Window to rxNav:NavigationWindow in XAML.
 OR Change UserControl to rxNav:NavigationUserControl in XAML.
 

diff --git a/Version.json b/Version.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "1.0.25",
+    "version": "2.0",
     "publicReleaseRefSpec": [
         "^refs/heads/master$",
         "^refs/heads/main$"

diff --git a/build/Build.cs b/build/Build.cs
@@ -32,7 +32,7 @@ partial class Build : NukeBuild
     ////   - Microsoft VisualStudio     https://nuke.build/visualstudio
     ////   - Microsoft VSCode           https://nuke.build/vscode
 
-    public static int Main() => Execute<Build>(x => x.Compile);
+    public static int Main() => Execute<Build>(x => x.Pack);
 
     [GitRepository] readonly GitRepository Repository;
     [Solution(GenerateProjects = true)] readonly Solution Solution;
@@ -71,7 +71,7 @@ partial class Build : NukeBuild
                 .SetRestore(false)));
 
     Target Pack => _ => _
-    .After(Compile)
+    .DependsOn(Compile)
     .Produces(PackagesDirectory / "*.nupkg")
     .Executes(() =>
     {
@@ -88,7 +88,6 @@ partial class Build : NukeBuild
     });
 
     Target Deploy => _ => _
-    .DependsOn(Pack)
     .Requires(() => NuGetApiKey)
     .Executes(() =>
     {

diff --git a/src/CrissCross.Avalonia.Test.Android/MainActivity.cs b/src/CrissCross.Avalonia.Test.Android/MainActivity.cs
@@ -1,5 +1,6 @@
-// Copyright (c) Chris Pulman. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
+// ReactiveUI Association Incorporated licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
 
 using Android.App;
 using Android.Content.PM;

diff --git a/src/CrissCross.Avalonia.Test.Browser/Program.cs b/src/CrissCross.Avalonia.Test.Browser/Program.cs
@@ -1,5 +1,6 @@
-// Copyright (c) Chris Pulman. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
+// ReactiveUI Association Incorporated licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
 
 using System.Runtime.Versioning;
 using System.Threading.Tasks;

diff --git a/src/CrissCross.Avalonia.Test.Desktop/Program.cs b/src/CrissCross.Avalonia.Test.Desktop/Program.cs
@@ -1,5 +1,6 @@
-// Copyright (c) Chris Pulman. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
+// ReactiveUI Association Incorporated licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
 
 using System;
 

diff --git a/src/CrissCross.Avalonia.Test.iOS/AppDelegate.cs b/src/CrissCross.Avalonia.Test.iOS/AppDelegate.cs
@@ -1,5 +1,6 @@
-// Copyright (c) Chris Pulman. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
+// ReactiveUI Association Incorporated licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
 
 using Avalonia;
 using Avalonia.iOS;

diff --git a/src/CrissCross.Avalonia.Test.iOS/Main.cs b/src/CrissCross.Avalonia.Test.iOS/Main.cs
@@ -1,5 +1,6 @@
-// Copyright (c) Chris Pulman. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
+// ReactiveUI Association Incorporated licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
 
 using UIKit;
 

diff --git a/src/CrissCross.Avalonia.Test/App.axaml.cs b/src/CrissCross.Avalonia.Test/App.axaml.cs
@@ -1,5 +1,6 @@
-// Copyright (c) Chris Pulman. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
+// ReactiveUI Association Incorporated licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
 
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;

diff --git a/src/CrissCross.Avalonia.Test/ViewModels/FirstViewModel.cs b/src/CrissCross.Avalonia.Test/ViewModels/FirstViewModel.cs
@@ -1,5 +1,6 @@
-// Copyright (c) Chris Pulman. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
+// ReactiveUI Association Incorporated licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
 
 using System;
 using System.Diagnostics;

diff --git a/src/CrissCross.Avalonia.Test/ViewModels/MainViewModel.cs b/src/CrissCross.Avalonia.Test/ViewModels/MainViewModel.cs
@@ -1,5 +1,6 @@
-// Copyright (c) Chris Pulman. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
+// ReactiveUI Association Incorporated licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
 
 using System;
 using System.Diagnostics;

diff --git a/src/CrissCross.Avalonia.Test/ViewModels/MainWindowViewModel.cs b/src/CrissCross.Avalonia.Test/ViewModels/MainWindowViewModel.cs
@@ -1,5 +1,6 @@
-// Copyright (c) Chris Pulman. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
+// ReactiveUI Association Incorporated licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
 
 using CrissCross.Avalonia.Test.Views;
 using ReactiveUI;

diff --git a/src/CrissCross.Avalonia.Test/Views/FirstView.axaml.cs b/src/CrissCross.Avalonia.Test/Views/FirstView.axaml.cs
@@ -1,5 +1,6 @@
-// Copyright (c) Chris Pulman. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
+// ReactiveUI Association Incorporated licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
 
 using System.Reactive.Disposables;
 using Avalonia.Controls;

diff --git a/src/CrissCross.Avalonia.Test/Views/MainUserControl.axaml b/src/CrissCross.Avalonia.Test/Views/MainUserControl.axaml
@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:nav="https://github.com/ChrisPulman/CrissCross"
+    xmlns:nav="https://github.com/reactivemarbles/CrissCross"
     xmlns:views="clr-namespace:CrissCross.Avalonia.Test.Views"
     xmlns:vm="using:CrissCross.Avalonia.Test.ViewModels"
     Name="mainWindow"

diff --git a/src/CrissCross.Avalonia.Test/Views/MainUserControl.axaml.cs b/src/CrissCross.Avalonia.Test/Views/MainUserControl.axaml.cs
@@ -1,5 +1,6 @@
-// Copyright (c) Chris Pulman. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
+// ReactiveUI Association Incorporated licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
 
 using System.Reactive.Disposables;
 using Avalonia.Controls;

diff --git a/src/CrissCross.Avalonia.Test/Views/MainView.axaml.cs b/src/CrissCross.Avalonia.Test/Views/MainView.axaml.cs
@@ -1,5 +1,6 @@
-// Copyright (c) Chris Pulman. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
+// ReactiveUI Association Incorporated licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
 
 using System.Reactive.Disposables;
 using Avalonia.Controls;

diff --git a/src/CrissCross.Avalonia.Test/Views/MainWindow.axaml b/src/CrissCross.Avalonia.Test/Views/MainWindow.axaml
@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:nav="https://github.com/ChrisPulman/CrissCross"
+    xmlns:nav="https://github.com/reactivemarbles/CrissCross"
     xmlns:views="clr-namespace:CrissCross.Avalonia.Test.Views"
     xmlns:vm="using:CrissCross.Avalonia.Test.ViewModels"
     Name="mainWindow"

diff --git a/src/CrissCross.Avalonia.Test/Views/MainWindow.axaml.cs b/src/CrissCross.Avalonia.Test/Views/MainWindow.axaml.cs
@@ -1,5 +1,6 @@
-// Copyright (c) Chris Pulman. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
+// ReactiveUI Association Incorporated licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
 
 using System.Reactive.Disposables;
 using Avalonia.Controls;

diff --git a/src/CrissCross.Avalonia/NavigationUserControl.cs b/src/CrissCross.Avalonia/NavigationUserControl.cs
@@ -1,5 +1,6 @@
-// Copyright (c) Chris Pulman. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
+// ReactiveUI Association Incorporated licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
 
 using Avalonia;
 using Avalonia.Controls;

diff --git a/src/CrissCross.Avalonia/NavigationUserControl{TViewModel}.cs b/src/CrissCross.Avalonia/NavigationUserControl{TViewModel}.cs
@@ -1,5 +1,6 @@
-// Copyright (c) Chris Pulman. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
+// ReactiveUI Association Incorporated licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
 
 using Avalonia;
 using ReactiveUI;

diff --git a/src/CrissCross.Avalonia/NavigationWindow.cs b/src/CrissCross.Avalonia/NavigationWindow.cs
@@ -1,5 +1,6 @@
-// Copyright (c) Chris Pulman. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
+// ReactiveUI Association Incorporated licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
 
 using Avalonia;
 using Avalonia.Controls;
@@ -9,9 +10,9 @@
 using Avalonia.Metadata;
 using ReactiveUI;
 
-[assembly: XmlnsDefinition("https://github.com/ChrisPulman/CrissCross", "CrissCross")]
-[assembly: XmlnsDefinition("https://github.com/ChrisPulman/CrissCross", "CrissCross.Avalonia")]
-[assembly: XmlnsPrefix("https://github.com/ChrisPulman/CrissCross", "rxNav")]
+[assembly: XmlnsDefinition("https://github.com/reactivemarbles/CrissCross", "CrissCross")]
+[assembly: XmlnsDefinition("https://github.com/reactivemarbles/CrissCross", "CrissCross.Avalonia")]
+[assembly: XmlnsPrefix("https://github.com/reactivemarbles/CrissCross", "rxNav")]
 
 namespace CrissCross.Avalonia;
 

diff --git a/src/CrissCross.Avalonia/NavigationWindow{TViewModel}.cs b/src/CrissCross.Avalonia/NavigationWindow{TViewModel}.cs
@@ -1,5 +1,6 @@
-// Copyright (c) Chris Pulman. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
+// ReactiveUI Association Incorporated licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
 
 using Avalonia;
 using ReactiveUI;

diff --git a/src/CrissCross.Avalonia/ReactiveTransitioningContentControl.cs b/src/CrissCross.Avalonia/ReactiveTransitioningContentControl.cs
@@ -1,5 +1,6 @@
-// Copyright (c) Chris Pulman. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
+// ReactiveUI Association Incorporated licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
 
 using System.Reactive.Concurrency;
 using System.Reactive.Disposables;