Merge pull request #38 from litetex/develop

Minor Updates / QoL 🌲
litetex · Jun 5, 2020 · d25a3b5 · d25a3b5
2 parents b74d25a + ca59116
commit d25a3b5
Show file tree

Hide file tree

Showing 17 changed files with 218 additions and 36 deletions.
diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
@@ -15,7 +15,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.201
+        dotnet-version: 3.1.300
 
     - name: Build
       run: dotnet build --configuration Release
@@ -24,10 +24,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+    # The maximum value for either of the parts is 65534 - https://stackoverflow.com/a/37941296/11649486
     - name: Generate version and save it to file
       shell: bash
       run: |
-        echo $(date -u +%Y.%m.%d.%k%M%S)-dev | tee version.txt
+        echo $(date -u +%Y.%m.%d.%k%M) | tee version.txt
         
     - name: Upload version - Upload Artifact
       uses: actions/upload-artifact@v1
@@ -66,11 +67,12 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.201
+        dotnet-version: 3.1.300
 
     - name: Pack
       working-directory: ${{ matrix.project }}
-      run: dotnet pack --configuration Release -p:PackageVersion=${{ steps.versionprovider.outputs.version }}
+      run: |
+        dotnet pack --configuration Release -p:PackageVersion=${{ steps.versionprovider.outputs.version }}-dev -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} -p:PathMap="$GITHUB_WORKSPACE=/" -p:ContinuousIntegrationBuild=true
             
     - name: Find nupkg file
       id: nupkgvar

diff --git a/.github/workflows/master-release-test.yml b/.github/workflows/master-release-test.yml
@@ -15,7 +15,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.201
+        dotnet-version: 3.1.300
 
     - name: Build
       run: dotnet build --configuration Release
@@ -24,10 +24,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+    # The maximum value for either of the parts is 65534 - https://stackoverflow.com/a/37941296/11649486
     - name: Generate version and save it to file
       shell: bash
       run: |
-        echo $(date -u +%Y.%m.%d.%k%M%S)-dev | tee version.txt
+        echo $(date -u +%Y.%m.%d.%k%M) | tee version.txt
         
     - name: Upload version - Upload Artifact
       uses: actions/upload-artifact@v1
@@ -66,11 +67,12 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.201
+        dotnet-version: 3.1.300
 
     - name: Pack
       working-directory: ${{ matrix.project }}
-      run: dotnet pack --configuration Release -p:PackageVersion=${{ steps.versionprovider.outputs.version }}
+      run: |
+        dotnet pack --configuration Release -p:PackageVersion=${{ steps.versionprovider.outputs.version }}-dev -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} -p:PathMap="$GITHUB_WORKSPACE=/" -p:ContinuousIntegrationBuild=true
             
     - name: Find nupkg file
       id: nupkgvar

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -15,7 +15,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.201
+        dotnet-version: 3.1.300
 
     - name: Build
       run: dotnet build --configuration Release
@@ -26,8 +26,9 @@ jobs:
     steps:
     - name: Generate version and save it to file
       shell: bash
+      # The maximum value for either of the parts is 65534 - https://stackoverflow.com/a/37941296/11649486
       run: |
-        echo $(date -u +%Y.%m.%d.%k%M%S) | tee version.txt
+        echo $(date -u +%Y.%m.%d.%k%M) | tee version.txt
         
     - name: Upload version - Upload Artifact
       uses: actions/upload-artifact@v1
@@ -112,11 +113,12 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.201
+        dotnet-version: 3.1.300
 
     - name: Pack
       working-directory: ${{ matrix.project }}
-      run: dotnet pack --configuration Release -p:PackageVersion=${{ steps.versionprovider.outputs.version }}
+      run: |
+        dotnet pack --configuration Release -p:PackageVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} -p:PathMap="$GITHUB_WORKSPACE=/" -p:ContinuousIntegrationBuild=true
             
     - name: Find nupkg file
       id: nupkgvar

diff --git a/CoreFramework.Base/CoreFramework.Base.csproj b/CoreFramework.Base/CoreFramework.Base.csproj
@@ -16,11 +16,20 @@
     <PackageIcon>icon.png</PackageIcon>
     <PackageIconUrl />
 
+    <!-- SourceLink -->
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
 
   </PropertyGroup>
 
+  <ItemGroup>
+    <!-- SourceLink -->
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
+  </ItemGroup>
+
   <ItemGroup>
     <None Include="icon.png" Pack="true" PackagePath="" />
   </ItemGroup>

diff --git a/CoreFramework.Base/packages.lock.json b/CoreFramework.Base/packages.lock.json
@@ -1,6 +1,27 @@
 {
   "version": 1,
   "dependencies": {
-    ".NETCoreApp,Version=v3.1": {}
+    ".NETCoreApp,Version=v3.1": {
+      "Microsoft.SourceLink.GitHub": {
+        "type": "Direct",
+        "requested": "[1.0.0, )",
+        "resolved": "1.0.0",
+        "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==",
+        "dependencies": {
+          "Microsoft.Build.Tasks.Git": "1.0.0",
+          "Microsoft.SourceLink.Common": "1.0.0"
+        }
+      },
+      "Microsoft.Build.Tasks.Git": {
+        "type": "Transitive",
+        "resolved": "1.0.0",
+        "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ=="
+      },
+      "Microsoft.SourceLink.Common": {
+        "type": "Transitive",
+        "resolved": "1.0.0",
+        "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg=="
+      }
+    }
   }
 }
diff --git a/CoreFramework.Config.Json/CoreFramework.Config.Json.csproj b/CoreFramework.Config.Json/CoreFramework.Config.Json.csproj
@@ -16,10 +16,19 @@
     <PackageIcon>icon.png</PackageIcon>
     <PackageIconUrl />
 
+    <!-- SourceLink -->
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
 
+  <ItemGroup>
+    <!-- SourceLink -->
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>

diff --git a/CoreFramework.Config.Json/packages.lock.json b/CoreFramework.Config.Json/packages.lock.json
@@ -2,19 +2,39 @@
   "version": 1,
   "dependencies": {
     ".NETCoreApp,Version=v3.1": {
+      "Microsoft.SourceLink.GitHub": {
+        "type": "Direct",
+        "requested": "[1.0.0, )",
+        "resolved": "1.0.0",
+        "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==",
+        "dependencies": {
+          "Microsoft.Build.Tasks.Git": "1.0.0",
+          "Microsoft.SourceLink.Common": "1.0.0"
+        }
+      },
       "Newtonsoft.Json": {
         "type": "Direct",
         "requested": "[12.0.3, )",
         "resolved": "12.0.3",
         "contentHash": "6mgjfnRB4jKMlzHSl+VD+oUc1IebOZabkbyWj2RiTgWwYPPuaK1H97G1sHqGwPlS5npiF5Q0OrxN1wni2n5QWg=="
       },
+      "Microsoft.Build.Tasks.Git": {
+        "type": "Transitive",
+        "resolved": "1.0.0",
+        "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ=="
+      },
+      "Microsoft.SourceLink.Common": {
+        "type": "Transitive",
+        "resolved": "1.0.0",
+        "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg=="
+      },
       "Litetex.CoreFramework.Base": {
         "type": "Project"
       },
       "Litetex.CoreFramework.Config": {
         "type": "Project",
         "dependencies": {
-          "Litetex.CoreFramework.Base": "1.0.7446.27283"
+          "Litetex.CoreFramework.Base": "1.0.0"
         }
       }
     }

diff --git a/CoreFramework.Config.Yaml/CoreFramework.Config.Yaml.csproj b/CoreFramework.Config.Yaml/CoreFramework.Config.Yaml.csproj
@@ -16,12 +16,21 @@
     <PackageIcon>icon.png</PackageIcon>
     <PackageIconUrl />
 
+    <!-- SourceLink -->
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
 
+  <!-- SourceLink -->
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
+  </ItemGroup>
+
   <ItemGroup>
-    <PackageReference Include="YamlDotNet" Version="8.1.1" />
+    <PackageReference Include="YamlDotNet" Version="8.1.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/CoreFramework.Config.Yaml/packages.lock.json b/CoreFramework.Config.Yaml/packages.lock.json
@@ -2,19 +2,39 @@
   "version": 1,
   "dependencies": {
     ".NETCoreApp,Version=v3.1": {
+      "Microsoft.SourceLink.GitHub": {
+        "type": "Direct",
+        "requested": "[1.0.0, )",
+        "resolved": "1.0.0",
+        "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==",
+        "dependencies": {
+          "Microsoft.Build.Tasks.Git": "1.0.0",
+          "Microsoft.SourceLink.Common": "1.0.0"
+        }
+      },
       "YamlDotNet": {
         "type": "Direct",
-        "requested": "[8.1.1, )",
-        "resolved": "8.1.1",
-        "contentHash": "JXPO7bjUUeDIXgzlLAdNFCzrxBxBzYBbXy3MEp2uWIY7KK8LoNogaPhSg2mLuzCN5flp1ydeVqm+4j3tkP0pow=="
+        "requested": "[8.1.2, )",
+        "resolved": "8.1.2",
+        "contentHash": "GlPKbb4l+91dyYVKV7UnJlr2CWooNNM1ayZWC90QAmlFPgbwSkfhgId7dGjTAHqkB84BZqjMSy5PlAYf1iejVA=="
+      },
+      "Microsoft.Build.Tasks.Git": {
+        "type": "Transitive",
+        "resolved": "1.0.0",
+        "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ=="
+      },
+      "Microsoft.SourceLink.Common": {
+        "type": "Transitive",
+        "resolved": "1.0.0",
+        "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg=="
       },
       "Litetex.CoreFramework.Base": {
         "type": "Project"
       },
       "Litetex.CoreFramework.Config": {
         "type": "Project",
         "dependencies": {
-          "Litetex.CoreFramework.Base": "1.0.7446.27283"
+          "Litetex.CoreFramework.Base": "1.0.0"
         }
       }
     }

diff --git a/CoreFramework.Config/CoreFramework.Config.csproj b/CoreFramework.Config/CoreFramework.Config.csproj
@@ -16,10 +16,19 @@
     <PackageIcon>icon.png</PackageIcon>
     <PackageIconUrl />
 
+    <!-- SourceLink -->
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
 
+  <ItemGroup>
+    <!-- SourceLink -->
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\CoreFramework.Base\CoreFramework.Base.csproj" />
   </ItemGroup>

diff --git a/CoreFramework.Config/packages.lock.json b/CoreFramework.Config/packages.lock.json
@@ -2,6 +2,26 @@
   "version": 1,
   "dependencies": {
     ".NETCoreApp,Version=v3.1": {
+      "Microsoft.SourceLink.GitHub": {
+        "type": "Direct",
+        "requested": "[1.0.0, )",
+        "resolved": "1.0.0",
+        "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==",
+        "dependencies": {
+          "Microsoft.Build.Tasks.Git": "1.0.0",
+          "Microsoft.SourceLink.Common": "1.0.0"
+        }
+      },
+      "Microsoft.Build.Tasks.Git": {
+        "type": "Transitive",
+        "resolved": "1.0.0",
+        "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ=="
+      },
+      "Microsoft.SourceLink.Common": {
+        "type": "Transitive",
+        "resolved": "1.0.0",
+        "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg=="
+      },
       "Litetex.CoreFramework.Base": {
         "type": "Project"
       }

diff --git a/CoreFramework.CrashLogging/CoreFramework.CrashLogging.csproj b/CoreFramework.CrashLogging/CoreFramework.CrashLogging.csproj
@@ -16,10 +16,19 @@
     <PackageIcon>icon.png</PackageIcon>
     <PackageIconUrl />
 
+    <!-- SourceLink -->
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
 
+  <ItemGroup>
+    <!-- SourceLink -->
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\CoreFramework.Logging\CoreFramework.Logging.csproj" />
   </ItemGroup>

diff --git a/CoreFramework.CrashLogging/packages.lock.json b/CoreFramework.CrashLogging/packages.lock.json
@@ -2,6 +2,21 @@
   "version": 1,
   "dependencies": {
     ".NETCoreApp,Version=v3.1": {
+      "Microsoft.SourceLink.GitHub": {
+        "type": "Direct",
+        "requested": "[1.0.0, )",
+        "resolved": "1.0.0",
+        "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==",
+        "dependencies": {
+          "Microsoft.Build.Tasks.Git": "1.0.0",
+          "Microsoft.SourceLink.Common": "1.0.0"
+        }
+      },
+      "Microsoft.Build.Tasks.Git": {
+        "type": "Transitive",
+        "resolved": "1.0.0",
+        "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ=="
+      },
       "Microsoft.NETCore.Platforms": {
         "type": "Transitive",
         "resolved": "1.1.0",
@@ -12,6 +27,11 @@
         "resolved": "1.1.0",
         "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg=="
       },
+      "Microsoft.SourceLink.Common": {
+        "type": "Transitive",
+        "resolved": "1.0.0",
+        "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg=="
+      },
       "runtime.native.System": {
         "type": "Transitive",
         "resolved": "4.3.0",
@@ -260,7 +280,7 @@
       "Litetex.CoreFramework.Logging": {
         "type": "Project",
         "dependencies": {
-          "Litetex.CoreFramework.Base": "1.0.7446.27283",
+          "Litetex.CoreFramework.Base": "1.0.0",
           "Serilog": "2.9.0",
           "Serilog.Enrichers.Thread": "3.1.0",
           "Serilog.Sinks.Console": "3.1.1",