Changed the output paths, updated Github action workflows.

yallie · Jan 27, 2023 · f99cae8 · f99cae8
1 parent 854968f
commit f99cae8
Show file tree

Hide file tree

Showing 17 changed files with 159 additions and 95 deletions.
diff --git a/.github/workflows/publish-nuget.yml b/.github/workflows/publish-nuget.yml
@@ -34,4 +34,4 @@ jobs:
       run: dotnet pack src -c Release --no-build -p:PublicRelease=true
 
     - name: Publish
-      run: dotnet nuget push CdekSdk\bin\Release\CdekSdk*.nupkg -k "${{ secrets.NUGET_JSON_SERVICES_API_TOKEN }}" -s https://api.nuget.org/v3/index.json
+      run: dotnet nuget push bin\Release\JsonServices*.nupkg -k "${{ secrets.NUGET_JSON_SERVICES_API_TOKEN }}" -s https://api.nuget.org/v3/index.json
diff --git a/sample/sample-core-server/JsonServices.Sample.CoreServer.csproj b/sample/sample-core-server/JsonServices.Sample.CoreServer.csproj
@@ -5,6 +5,7 @@
     <Copyright>Copyright Alexey Yakovlev 2018-2023. All rights reserved.</Copyright>
     <Description>C# Message-Based JSON-RPC Client over WebSockets</Description>
     <TargetFrameworks>net6.0</TargetFrameworks>
+    <IsPackable>False</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...vices.Auth.SecureRemotePassword.Tests/JsonServices.Auth.SecureRemotePassword.Tests.csproj b/...vices.Auth.SecureRemotePassword.Tests/JsonServices.Auth.SecureRemotePassword.Tests.csproj
@@ -15,12 +15,6 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <DebugType>Full</DebugType>
-    <DebugSymbols>True</DebugSymbols>
-    <BaseOutputPath>..\..\bin\UnitTests</BaseOutputPath>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
@@ -41,6 +35,12 @@
   <PropertyGroup>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+    <BaseOutputPath>..\..\bin\UnitTests</BaseOutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DebugType>Full</DebugType>
+    <DebugSymbols>True</DebugSymbols>
   </PropertyGroup>
 
 </Project>
diff --git a/src/JsonServices.Auth.SecureRemotePassword/JsonServices.Auth.SecureRemotePassword.csproj b/src/JsonServices.Auth.SecureRemotePassword/JsonServices.Auth.SecureRemotePassword.csproj
@@ -9,6 +9,9 @@
     <PackageProjectUrl>https://github.com/yallie/JsonServices</PackageProjectUrl>
     <RepositoryUrl>https://github.com/yallie/JsonServices</RepositoryUrl>
     <PackageTags>websockets json rpc events</PackageTags>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <TargetFrameworks>net461;net6.0</TargetFrameworks>
   </PropertyGroup>
 
@@ -18,12 +21,6 @@
     <AssemblyName>JsonServices.Auth.SecureRemotePassword</AssemblyName>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <DebugType>Full</DebugType>
-    <DebugSymbols>True</DebugSymbols>
-    <BaseOutputPath>..\..\bin\</BaseOutputPath>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="srp" Version="1.0.7" />
   </ItemGroup>
@@ -42,6 +39,12 @@
   <PropertyGroup>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+    <BaseOutputPath>..\..\bin\</BaseOutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DebugType>Full</DebugType>
+    <DebugSymbols>True</DebugSymbols>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Release'">
@@ -50,4 +53,8 @@
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="..\..\README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/JsonServices.Core.Tests/JsonServices.Core.Tests.csproj b/src/JsonServices.Core.Tests/JsonServices.Core.Tests.csproj
@@ -15,12 +15,6 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <DebugType>Full</DebugType>
-    <DebugSymbols>True</DebugSymbols>
-    <BaseOutputPath>..\..\bin\UnitTests</BaseOutputPath>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
@@ -41,6 +35,12 @@
   <PropertyGroup>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+    <BaseOutputPath>..\..\bin\UnitTests</BaseOutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DebugType>Full</DebugType>
+    <DebugSymbols>True</DebugSymbols>
   </PropertyGroup>
 
 </Project>
diff --git a/src/JsonServices.Core/JsonServices.Core.csproj b/src/JsonServices.Core/JsonServices.Core.csproj
@@ -9,6 +9,9 @@
     <PackageProjectUrl>https://github.com/yallie/JsonServices</PackageProjectUrl>
     <RepositoryUrl>https://github.com/yallie/JsonServices</RepositoryUrl>
     <PackageTags>websockets json rpc events</PackageTags>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <TargetFrameworks>net461;net6.0</TargetFrameworks>
   </PropertyGroup>
 
@@ -18,12 +21,6 @@
     <AssemblyName>JsonServices</AssemblyName>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <DebugType>Full</DebugType>
-    <DebugSymbols>True</DebugSymbols>
-    <BaseOutputPath>..\..\bin</BaseOutputPath>
-  </PropertyGroup>
-
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
@@ -38,6 +35,12 @@
   <PropertyGroup>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+    <BaseOutputPath>..\..\bin</BaseOutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DebugType>Full</DebugType>
+    <DebugSymbols>True</DebugSymbols>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Release'">
@@ -46,4 +49,8 @@
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="..\..\README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/JsonServices.Serialization.Newtonsoft/JsonServices.Serialization.Newtonsoft.csproj b/src/JsonServices.Serialization.Newtonsoft/JsonServices.Serialization.Newtonsoft.csproj
@@ -9,6 +9,9 @@
     <PackageProjectUrl>https://github.com/yallie/JsonServices</PackageProjectUrl>
     <RepositoryUrl>https://github.com/yallie/JsonServices</RepositoryUrl>
     <PackageTags>websockets json rpc events</PackageTags>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <TargetFrameworks>net461;net6.0</TargetFrameworks>
   </PropertyGroup>
 
@@ -18,12 +21,6 @@
     <AssemblyName>JsonServices.Serialization.Newtonsoft</AssemblyName>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <DebugType>Full</DebugType>
-    <DebugSymbols>True</DebugSymbols>
-    <BaseOutputPath>..\..\bin</BaseOutputPath>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
   </ItemGroup>
@@ -42,6 +39,12 @@
   <PropertyGroup>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+    <BaseOutputPath>..\..\bin</BaseOutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DebugType>Full</DebugType>
+    <DebugSymbols>True</DebugSymbols>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Release'">
@@ -50,4 +53,8 @@
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="..\..\README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/JsonServices.Serialization.ServiceStack/JsonServices.Serialization.ServiceStack.csproj b/src/JsonServices.Serialization.ServiceStack/JsonServices.Serialization.ServiceStack.csproj
@@ -9,6 +9,9 @@
     <PackageProjectUrl>https://github.com/yallie/JsonServices</PackageProjectUrl>
     <RepositoryUrl>https://github.com/yallie/JsonServices</RepositoryUrl>
     <PackageTags>websockets json rpc events</PackageTags>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <TargetFrameworks>net461;net6.0</TargetFrameworks>
   </PropertyGroup>
 
@@ -18,12 +21,6 @@
     <AssemblyName>JsonServices.Serialization.ServiceStack</AssemblyName>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <DebugType>Full</DebugType>
-    <DebugSymbols>True</DebugSymbols>
-    <BaseOutputPath>..\..\bin</BaseOutputPath>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="ServiceStack.Text" Version="5.4.0" />
   </ItemGroup>
@@ -42,6 +39,12 @@
   <PropertyGroup>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+    <BaseOutputPath>..\..\bin</BaseOutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DebugType>Full</DebugType>
+    <DebugSymbols>True</DebugSymbols>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Release'">
@@ -50,4 +53,8 @@
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="..\..\README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/JsonServices.Serialization.ServiceStack4/JsonServices.Serialization.ServiceStack4.csproj b/src/JsonServices.Serialization.ServiceStack4/JsonServices.Serialization.ServiceStack4.csproj
@@ -9,6 +9,9 @@
     <PackageProjectUrl>https://github.com/yallie/JsonServices</PackageProjectUrl>
     <RepositoryUrl>https://github.com/yallie/JsonServices</RepositoryUrl>
     <PackageTags>websockets json rpc events</PackageTags>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <TargetFrameworks>net461</TargetFrameworks>
   </PropertyGroup>
 
@@ -18,12 +21,6 @@
     <AssemblyName>JsonServices.Serialization.ServiceStack4</AssemblyName>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <DebugType>Full</DebugType>
-    <DebugSymbols>True</DebugSymbols>
-    <BaseOutputPath>..\..\bin</BaseOutputPath>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="ServiceStack.Text" Version="4.0.33" />
   </ItemGroup>
@@ -51,6 +48,12 @@
   <PropertyGroup>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+    <BaseOutputPath>..\..\bin</BaseOutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DebugType>Full</DebugType>
+    <DebugSymbols>True</DebugSymbols>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Release'">
@@ -59,4 +62,8 @@
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="..\..\README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
 </Project>
diff --git a/...sonServices.Serialization.SystemTextJson/JsonServices.Serialization.SystemTextJson.csproj b/...sonServices.Serialization.SystemTextJson/JsonServices.Serialization.SystemTextJson.csproj
@@ -9,6 +9,9 @@
     <PackageProjectUrl>https://github.com/yallie/JsonServices</PackageProjectUrl>
     <RepositoryUrl>https://github.com/yallie/JsonServices</RepositoryUrl>
     <PackageTags>websockets json rpc events</PackageTags>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <TargetFrameworks>net461;net6.0</TargetFrameworks>
   </PropertyGroup>
 
@@ -18,16 +21,6 @@
     <AssemblyName>JsonServices.Serialization.SystemTextJson</AssemblyName>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
-    <DefineConstants>$(DefineConstants);NET_461</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <DebugType>Full</DebugType>
-    <DebugSymbols>True</DebugSymbols>
-    <BaseOutputPath>..\..\bin</BaseOutputPath>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="System.Text.Json" Version="4.7.2" />
   </ItemGroup>
@@ -43,9 +36,19 @@
     </PackageReference>
   </ItemGroup>
 
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
+    <DefineConstants>$(DefineConstants);NET_461</DefineConstants>
+  </PropertyGroup>
+
   <PropertyGroup>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+    <BaseOutputPath>..\..\bin</BaseOutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DebugType>Full</DebugType>
+    <DebugSymbols>True</DebugSymbols>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Release'">
@@ -54,4 +57,8 @@
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="..\..\README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/JsonServices.Serialization.Tests/JsonServices.Serialization.Tests.csproj b/src/JsonServices.Serialization.Tests/JsonServices.Serialization.Tests.csproj
@@ -19,12 +19,6 @@
     <NoWarn>$(NoWarn);SYSLIB0011</NoWarn>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <DebugType>Full</DebugType>
-    <DebugSymbols>True</DebugSymbols>
-    <BaseOutputPath>..\..\bin\UnitTests</BaseOutputPath>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
@@ -45,6 +39,12 @@
   <PropertyGroup>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+    <BaseOutputPath>..\..\bin\UnitTests</BaseOutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DebugType>Full</DebugType>
+    <DebugSymbols>True</DebugSymbols>
   </PropertyGroup>
 
 </Project>