From 3339690e2acf154cc062cfe63dc15f25fb2c7003 Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Sun, 24 May 2020 19:11:35 -0400
Subject: [PATCH] Improvements to ModuleCreator external template to use
 Package references and include framework in Nuspec file

---
 Oqtane.Client/UI/SiteRouter.razor             |  2 +-
 Oqtane.Package/Oqtane.Client.nuspec           | 23 +++++++++++++++++++
 Oqtane.Package/Oqtane.Framework.nuspec        | 12 +++++-----
 Oqtane.Package/Oqtane.Server.nuspec           | 23 +++++++++++++++++++
 Oqtane.Package/Oqtane.Shared.nuspec           | 23 +++++++++++++++++++
 Oqtane.Package/pack.cmd                       |  3 ---
 Oqtane.Package/release.cmd                    |  6 +++++
 .../Client/[Owner].[Module]s.Client.csproj    |  8 ++-----
 .../External/Package/[Owner].[Module]s.nuspec | 12 +++++-----
 .../Server/[Owner].[Module]s.Server.csproj    |  9 ++------
 .../Shared/[Owner].[Module]s.Shared.csproj    |  4 +---
 11 files changed, 93 insertions(+), 32 deletions(-)
 create mode 100644 Oqtane.Package/Oqtane.Client.nuspec
 create mode 100644 Oqtane.Package/Oqtane.Server.nuspec
 create mode 100644 Oqtane.Package/Oqtane.Shared.nuspec
 delete mode 100644 Oqtane.Package/pack.cmd
 create mode 100644 Oqtane.Package/release.cmd

diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor
index ee2516c9..f602b83c 100644
--- a/Oqtane.Client/UI/SiteRouter.razor
+++ b/Oqtane.Client/UI/SiteRouter.razor
@@ -173,7 +173,7 @@
 
             if (alias.Path != "")
             {
-                path = path.Replace(alias.Path + "/", "");
+                path = path.Substring(alias.Path.Length + 1);
             }
 
             // extract admin route elements from path
diff --git a/Oqtane.Package/Oqtane.Client.nuspec b/Oqtane.Package/Oqtane.Client.nuspec
new file mode 100644
index 00000000..72947da2
--- /dev/null
+++ b/Oqtane.Package/Oqtane.Client.nuspec
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata>
+    <id>Oqtane.Client</id>
+    <version>1.0.0</version>
+    <authors>Shaun Walker</authors>
+    <owners>.NET Foundation</owners>
+    <title>Oqtane Framework</title>
+    <description>A modular application framework for Blazor</description>
+    <copyright>.NET Foundation</copyright>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <license type="expression">MIT</license>
+    <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
+    <iconUrl>https://www.oqtane.org/Portals/0/icon.jpg</iconUrl>
+    <tags>oqtane framework</tags>
+    <releaseNotes>Initial Release</releaseNotes>
+    <summary>A modular application framework for Blazor</summary>
+  </metadata>
+  <files>
+    <file src="..\Oqtane.Client\bin\Release\netstandard2.1\Oqtane.Client.dll" target="lib\netstandard2.1" /> 
+    <file src="..\Oqtane.Client\bin\Release\netstandard2.1\Oqtane.Client.pdb" target="lib\netstandard2.1" /> 
+  </files>
+</package>
\ No newline at end of file
diff --git a/Oqtane.Package/Oqtane.Framework.nuspec b/Oqtane.Package/Oqtane.Framework.nuspec
index cf35e229..b5e83d5a 100644
--- a/Oqtane.Package/Oqtane.Framework.nuspec
+++ b/Oqtane.Package/Oqtane.Framework.nuspec
@@ -17,12 +17,12 @@
     <summary>A modular application framework for Blazor</summary>
   </metadata>
   <files>
-    <file src="..\Oqtane.Client\bin\Release\netstandard2.1\Oqtane.Client.dll" target="lib" /> 
-    <file src="..\Oqtane.Client\bin\Release\netstandard2.1\Oqtane.Client.pdb" target="lib" /> 
-    <file src="..\Oqtane.Server\bin\Release\netcoreapp3.1\Oqtane.Server.dll" target="lib" /> 
-    <file src="..\Oqtane.Server\bin\Release\netcoreapp3.1\Oqtane.Server.pdb" target="lib" /> 
-    <file src="..\Oqtane.Shared\bin\Release\netstandard2.1\Oqtane.Shared.dll" target="lib" /> 
-    <file src="..\Oqtane.Shared\bin\Release\netstandard2.1\Oqtane.Shared.pdb" target="lib" /> 
+    <file src="..\Oqtane.Client\bin\Release\netstandard2.1\Oqtane.Client.dll" target="lib\netcoreapp3.1" /> 
+    <file src="..\Oqtane.Client\bin\Release\netstandard2.1\Oqtane.Client.pdb" target="lib\netcoreapp3.1" /> 
+    <file src="..\Oqtane.Server\bin\Release\netcoreapp3.1\Oqtane.Server.dll" target="lib\netcoreapp3.1" /> 
+    <file src="..\Oqtane.Server\bin\Release\netcoreapp3.1\Oqtane.Server.pdb" target="lib\netcoreapp3.1" /> 
+    <file src="..\Oqtane.Shared\bin\Release\netstandard2.1\Oqtane.Shared.dll" target="lib\netcoreapp3.1" /> 
+    <file src="..\Oqtane.Shared\bin\Release\netstandard2.1\Oqtane.Shared.pdb" target="lib\netcoreapp3.1" /> 
     <file src="..\Oqtane.Server\wwwroot\**\*.*" target="wwwroot" /> 
   </files>
 </package>
\ No newline at end of file
diff --git a/Oqtane.Package/Oqtane.Server.nuspec b/Oqtane.Package/Oqtane.Server.nuspec
new file mode 100644
index 00000000..c6f9dd6e
--- /dev/null
+++ b/Oqtane.Package/Oqtane.Server.nuspec
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata>
+    <id>Oqtane.Server</id>
+    <version>1.0.0</version>
+    <authors>Shaun Walker</authors>
+    <owners>.NET Foundation</owners>
+    <title>Oqtane Framework</title>
+    <description>A modular application framework for Blazor</description>
+    <copyright>.NET Foundation</copyright>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <license type="expression">MIT</license>
+    <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
+    <iconUrl>https://www.oqtane.org/Portals/0/icon.jpg</iconUrl>
+    <tags>oqtane framework</tags>
+    <releaseNotes>Initial Release</releaseNotes>
+    <summary>A modular application framework for Blazor</summary>
+  </metadata>
+  <files>
+    <file src="..\Oqtane.Server\bin\Release\netcoreapp3.1\Oqtane.Server.dll" target="lib\netcoreapp3.1" /> 
+    <file src="..\Oqtane.Server\bin\Release\netcoreapp3.1\Oqtane.Server.pdb" target="lib\netcoreapp3.1" /> 
+  </files>
+</package>
\ No newline at end of file
diff --git a/Oqtane.Package/Oqtane.Shared.nuspec b/Oqtane.Package/Oqtane.Shared.nuspec
new file mode 100644
index 00000000..8ac8924f
--- /dev/null
+++ b/Oqtane.Package/Oqtane.Shared.nuspec
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata>
+    <id>Oqtane.Shared</id>
+    <version>1.0.0</version>
+    <authors>Shaun Walker</authors>
+    <owners>.NET Foundation</owners>
+    <title>Oqtane Framework</title>
+    <description>A modular application framework for Blazor</description>
+    <copyright>.NET Foundation</copyright>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <license type="expression">MIT</license>
+    <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
+    <iconUrl>https://www.oqtane.org/Portals/0/icon.jpg</iconUrl>
+    <tags>oqtane framework</tags>
+    <releaseNotes>Initial Release</releaseNotes>
+    <summary>A modular application framework for Blazor</summary>
+  </metadata>
+  <files>
+    <file src="..\Oqtane.Shared\bin\Release\netstandard2.1\Oqtane.Shared.dll" target="lib\netstandard2.1" /> 
+    <file src="..\Oqtane.Shared\bin\Release\netstandard2.1\Oqtane.Shared.pdb" target="lib\netstandard2.1" /> 
+  </files>
+</package>
\ No newline at end of file
diff --git a/Oqtane.Package/pack.cmd b/Oqtane.Package/pack.cmd
deleted file mode 100644
index aea8d441..00000000
--- a/Oqtane.Package/pack.cmd
+++ /dev/null
@@ -1,3 +0,0 @@
-DEL "*.nupkg"
-nuget.exe pack Oqtane.Framework.nuspec
- 
\ No newline at end of file
diff --git a/Oqtane.Package/release.cmd b/Oqtane.Package/release.cmd
new file mode 100644
index 00000000..fef9bc80
--- /dev/null
+++ b/Oqtane.Package/release.cmd
@@ -0,0 +1,6 @@
+DEL "*.nupkg"
+nuget.exe pack Oqtane.Framework.nuspec
+nuget.exe pack Oqtane.Client.nuspec
+nuget.exe pack Oqtane.Server.nuspec
+nuget.exe pack Oqtane.Shared.nuspec
+ 
\ No newline at end of file
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/[Owner].[Module]s.Client.csproj b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/[Owner].[Module]s.Client.csproj
index d0fc65b9..2cd5a042 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/[Owner].[Module]s.Client.csproj
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/[Owner].[Module]s.Client.csproj
@@ -25,12 +25,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="Oqtane.Client">
-      <HintPath>..\..\[RootFolder]\Oqtane.Client\bin\Debug\netstandard2.1\Oqtane.Client.dll</HintPath>
-    </Reference>
-    <Reference Include="Oqtane.Shared">
-      <HintPath>..\..\[RootFolder]\Oqtane.Client\bin\Debug\netstandard2.1\Oqtane.Shared.dll</HintPath>
-    </Reference>
+    <PackageReference Include="Oqtane.Client" Version="1.0.0" />
+    <PackageReference Include="Oqtane.Shared" Version="1.0.0" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module]s.nuspec b/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module]s.nuspec
index 72d74777..6fa789e8 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module]s.nuspec
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module]s.nuspec
@@ -20,12 +20,12 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="..\Client\bin\Release\netstandard2.1\[Owner].[Module]s.Client.Oqtane.dll" target="lib" /> 
-    <file src="..\Client\bin\Release\netstandard2.1\[Owner].[Module]s.Client.Oqtane.pdb" target="lib" /> 
-    <file src="..\Server\bin\Release\netcoreapp3.1\[Owner].[Module]s.Server.Oqtane.dll" target="lib" /> 
-    <file src="..\Server\bin\Release\netcoreapp3.1\[Owner].[Module]s.Server.Oqtane.pdb" target="lib" /> 
-    <file src="..\Shared\bin\Release\netstandard2.1\[Owner].[Module]s.Shared.Oqtane.dll" target="lib" /> 
-    <file src="..\Shared\bin\Release\netstandard2.1\[Owner].[Module]s.Shared.Oqtane.pdb" target="lib" /> 
+    <file src="..\Client\bin\Release\netstandard2.1\[Owner].[Module]s.Client.Oqtane.dll" target="lib\netstandard2.1" /> 
+    <file src="..\Client\bin\Release\netstandard2.1\[Owner].[Module]s.Client.Oqtane.pdb" target="lib\netstandard2.1" /> 
+    <file src="..\Server\bin\Release\netcoreapp3.1\[Owner].[Module]s.Server.Oqtane.dll" target="lib\netcoreapp3.1" /> 
+    <file src="..\Server\bin\Release\netcoreapp3.1\[Owner].[Module]s.Server.Oqtane.pdb" target="lib\netcoreapp3.1" /> 
+    <file src="..\Shared\bin\Release\netstandard2.1\[Owner].[Module]s.Shared.Oqtane.dll" target="lib\netstandard2.1" /> 
+    <file src="..\Shared\bin\Release\netstandard2.1\[Owner].[Module]s.Shared.Oqtane.pdb" target="lib\netstandard2.1" /> 
     <file src="..\Server\wwwroot\**\*.*" target="wwwroot" /> 
   </files>
 </package>
\ No newline at end of file
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].[Module]s.Server.csproj b/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].[Module]s.Server.csproj
index 6668cf0f..4d0ae486 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].[Module]s.Server.csproj
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].[Module]s.Server.csproj
@@ -31,12 +31,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="Oqtane.Server">
-      <HintPath>..\..\[RootFolder]\Oqtane.Server\bin\Debug\netcoreapp3.1\Oqtane.Server.dll</HintPath>
-    </Reference>
-    <Reference Include="Oqtane.Shared">
-      <HintPath>..\..\[RootFolder]\Oqtane.Server\bin\Debug\netcoreapp3.1\Oqtane.Shared.dll</HintPath>
-    </Reference>
+    <PackageReference Include="Oqtane.Server" Version="1.0.0" />
+    <PackageReference Include="Oqtane.Shared" Version="1.0.0" />
   </ItemGroup>
-
 </Project>
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Shared/[Owner].[Module]s.Shared.csproj b/Oqtane.Server/wwwroot/Modules/Templates/External/Shared/[Owner].[Module]s.Shared.csproj
index fb4d620d..72da9ca8 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/External/Shared/[Owner].[Module]s.Shared.csproj
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Shared/[Owner].[Module]s.Shared.csproj
@@ -17,9 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="Oqtane.Shared">
-      <HintPath>..\..\[RootFolder]\Oqtane.Shared\bin\Debug\netstandard2.1\Oqtane.Shared.dll</HintPath>
-    </Reference>
+    <PackageReference Include="Oqtane.Shared" Version="1.0.0" />
   </ItemGroup>
 
 </Project>