From 05a2886163a6b8c15d0acc717d172f76837efc6a Mon Sep 17 00:00:00 2001 From: litetex Date: Thu, 21 May 2020 20:57:03 +0200 Subject: [PATCH 01/19] Update Log.cs --- CoreFramework.Logging/Usage/Log.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CoreFramework.Logging/Usage/Log.cs b/CoreFramework.Logging/Usage/Log.cs index d52b21f..bca8842 100644 --- a/CoreFramework.Logging/Usage/Log.cs +++ b/CoreFramework.Logging/Usage/Log.cs @@ -6,7 +6,7 @@ namespace YOUR_NAMESPACE { /// - /// Adapter for CoreFrameworkbase + /// Adapter for CoreFramework /// internal class Log { From aebed904a8950532ff1e79486ab8fdb652fa2566 Mon Sep 17 00:00:00 2001 From: litetex <40789489+litetex@users.noreply.github.com> Date: Thu, 21 May 2020 21:16:59 +0200 Subject: [PATCH 02/19] Update README.md --- README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 76ec663..3212405 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,9 @@ -[![Build](https://dev.azure.com/litetex/CoreFrameworkBase/_apis/build/status/Master?label=build%20)](https://dev.azure.com/litetex/CoreFrameworkBase/_build/latest?definitionId=6) -[![Build nupkg](https://img.shields.io/github/workflow/status/litetex/CoreFrameworkBase/Master%20CI?label=build%20nupkg)](https://github.com/litetex/CoreFrameworkBase/actions?query=workflow%3A%22Master+CI%22) +[![Build](https://dev.azure.com/litetex/CoreFramework/_apis/build/status/Master?label=build%20)](https://dev.azure.com/litetex/CoreFramework/_build/latest?definitionId=6) +[![Build nupkg](https://img.shields.io/github/workflow/status/litetex/CoreFramework/Master%20CI?label=build%20nupkg)](https://github.com/litetex/CoreFramework/actions?query=workflow%3A%22Master+CI%22) +[![Latest Version](https://img.shields.io/github/v/release/litetex/CoreFramework)](https://github.com/litetex/CoreFramework/releases) -[![Build develop](https://dev.azure.com/litetex/CoreFrameworkBase/_apis/build/status/Develop?label=build%20develop)](https://dev.azure.com/litetex/CoreFrameworkBase/_build/latest?definitionId=4) -[![Build develop nupkg](https://img.shields.io/github/workflow/status/litetex/CoreFrameworkBase/Develop%20CI?label=build%20develop%20nupkg)](https://github.com/litetex/CoreFrameworkBase/actions?query=workflow%3A%22Develop+CI%22) +[![Build develop](https://dev.azure.com/litetex/CoreFramework/_apis/build/status/Develop?label=build%20develop)](https://dev.azure.com/litetex/CoreFramework/_build/latest?definitionId=4) +[![Build develop nupkg](https://img.shields.io/github/workflow/status/litetex/CoreFramework/Develop%20CI?label=build%20develop%20nupkg)](https://github.com/litetex/CoreFramework/actions?query=workflow%3A%22Develop+CI%22) # CoreFramework From e7c558837ffcf52acf02c151e0bb6ee422aab259 Mon Sep 17 00:00:00 2001 From: litetex <40789489+litetex@users.noreply.github.com> Date: Thu, 21 May 2020 21:34:08 +0200 Subject: [PATCH 03/19] Update README.md --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 3212405..dc04e3f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![Build](https://dev.azure.com/litetex/CoreFramework/_apis/build/status/Master?label=build%20)](https://dev.azure.com/litetex/CoreFramework/_build/latest?definitionId=6) [![Build nupkg](https://img.shields.io/github/workflow/status/litetex/CoreFramework/Master%20CI?label=build%20nupkg)](https://github.com/litetex/CoreFramework/actions?query=workflow%3A%22Master+CI%22) -[![Latest Version](https://img.shields.io/github/v/release/litetex/CoreFramework)](https://github.com/litetex/CoreFramework/releases) +[![Latest Version](https://img.shields.io/github/v/release/litetex/CoreFramework?style=flat-square)](https://github.com/litetex/CoreFramework/releases) [![Build develop](https://dev.azure.com/litetex/CoreFramework/_apis/build/status/Develop?label=build%20develop)](https://dev.azure.com/litetex/CoreFramework/_build/latest?definitionId=4) [![Build develop nupkg](https://img.shields.io/github/workflow/status/litetex/CoreFramework/Develop%20CI?label=build%20develop%20nupkg)](https://github.com/litetex/CoreFramework/actions?query=workflow%3A%22Develop+CI%22) @@ -13,9 +13,9 @@ Things that are frequently used in code | Module | Nuget | Nuget (dev) | | ------ | -------------- | ----------- | -| Base | [![Nuget](https://img.shields.io/nuget/v/Litetex.CoreFramework.Base)](https://www.nuget.org/packages/Litetex.CoreFramework.Base)| [![Nuget (dev)](https://img.shields.io/nuget/vpre/Litetex.CoreFramework.Base?label=nuget%20%28dev%29)](https://www.nuget.org/packages/Litetex.CoreFramework.Base) | -| Config | [![Nuget](https://img.shields.io/nuget/v/Litetex.CoreFramework.Config)](https://www.nuget.org/packages/Litetex.CoreFramework.Config)| [![Nuget (dev)](https://img.shields.io/nuget/vpre/Litetex.CoreFramework.Config?label=nuget%20%28dev%29)](https://www.nuget.org/packages/Litetex.CoreFramework.Config) | -| Config.Json | [![Nuget](https://img.shields.io/nuget/v/Litetex.CoreFramework.Config.Json)](https://www.nuget.org/packages/Litetex.CoreFramework.Config.Json)| [![Nuget (dev)](https://img.shields.io/nuget/vpre/Litetex.CoreFramework.Config.Json?label=nuget%20%28dev%29)](https://www.nuget.org/packages/Litetex.CoreFramework.Config.Json) | -| Config.Yaml | [![Nuget](https://img.shields.io/nuget/v/Litetex.CoreFramework.Config.Yaml)](https://www.nuget.org/packages/Litetex.CoreFramework.Config.Yaml)| [![Nuget (dev)](https://img.shields.io/nuget/vpre/Litetex.CoreFramework.Config.Yaml?label=nuget%20%28dev%29)](https://www.nuget.org/packages/Litetex.CoreFramework.Config.Yaml) | -| Logging | [![Nuget](https://img.shields.io/nuget/v/Litetex.CoreFramework.Logging)](https://www.nuget.org/packages/Litetex.CoreFramework.Logging)| [![Nuget (dev)](https://img.shields.io/nuget/vpre/Litetex.CoreFramework.Logging?label=nuget%20%28dev%29)](https://www.nuget.org/packages/Litetex.CoreFramework.Logging) | -| CrashLogging | [![Nuget](https://img.shields.io/nuget/v/Litetex.CoreFramework.CrashLogging)](https://www.nuget.org/packages/Litetex.CoreFramework.CrashLogging)| [![Nuget (dev)](https://img.shields.io/nuget/vpre/Litetex.CoreFramework.CrashLogging?label=nuget%20%28dev%29)](https://www.nuget.org/packages/Litetex.CoreFramework.CrashLogging) | +| Base | [![Nuget](https://img.shields.io/nuget/v/Litetex.CoreFramework.Base?style=flat-square)](https://www.nuget.org/packages/Litetex.CoreFramework.Base)| [![Nuget (dev)](https://img.shields.io/nuget/vpre/Litetex.CoreFramework.Base?label=nuget%20%28dev%29&style=flat-square)](https://www.nuget.org/packages/Litetex.CoreFramework.Base) | +| Config | [![Nuget](https://img.shields.io/nuget/v/Litetex.CoreFramework.Config?style=flat-square)](https://www.nuget.org/packages/Litetex.CoreFramework.Config)| [![Nuget (dev)](https://img.shields.io/nuget/vpre/Litetex.CoreFramework.Config?label=nuget%20%28dev%29&style=flat-square)](https://www.nuget.org/packages/Litetex.CoreFramework.Config) | +| Config.Json | [![Nuget](https://img.shields.io/nuget/v/Litetex.CoreFramework.Config.Json?style=flat-square)](https://www.nuget.org/packages/Litetex.CoreFramework.Config.Json)| [![Nuget (dev)](https://img.shields.io/nuget/vpre/Litetex.CoreFramework.Config.Json?label=nuget%20%28dev%29&style=flat-square)](https://www.nuget.org/packages/Litetex.CoreFramework.Config.Json) | +| Config.Yaml | [![Nuget](https://img.shields.io/nuget/v/Litetex.CoreFramework.Config.Yaml?style=flat-square)](https://www.nuget.org/packages/Litetex.CoreFramework.Config.Yaml)| [![Nuget (dev)](https://img.shields.io/nuget/vpre/Litetex.CoreFramework.Config.Yaml?label=nuget%20%28dev%29&style=flat-square)](https://www.nuget.org/packages/Litetex.CoreFramework.Config.Yaml) | +| Logging | [![Nuget](https://img.shields.io/nuget/v/Litetex.CoreFramework.Logging?style=flat-square)](https://www.nuget.org/packages/Litetex.CoreFramework.Logging)| [![Nuget (dev)](https://img.shields.io/nuget/vpre/Litetex.CoreFramework.Logging?label=nuget%20%28dev%29&style=flat-square)](https://www.nuget.org/packages/Litetex.CoreFramework.Logging) | +| CrashLogging | [![Nuget](https://img.shields.io/nuget/v/Litetex.CoreFramework.CrashLogging?style=flat-square)](https://www.nuget.org/packages/Litetex.CoreFramework.CrashLogging)| [![Nuget (dev)](https://img.shields.io/nuget/vpre/Litetex.CoreFramework.CrashLogging?label=nuget%20%28dev%29&style=flat-square)](https://www.nuget.org/packages/Litetex.CoreFramework.CrashLogging) | From 55af3980875995c5a223aab2cf4f267e5825f1d9 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 29 May 2020 05:02:10 +0000 Subject: [PATCH 04/19] Bump YamlDotNet from 8.1.1 to 8.1.2 Bumps [YamlDotNet](https://github.com/aaubry/YamlDotNet) from 8.1.1 to 8.1.2. - [Release notes](https://github.com/aaubry/YamlDotNet/releases) - [Changelog](https://github.com/aaubry/YamlDotNet/blob/master/RELEASE_NOTES.md) - [Commits](https://github.com/aaubry/YamlDotNet/compare/v8.1.1...v8.1.2) Signed-off-by: dependabot-preview[bot] --- CoreFramework.Config.Yaml/CoreFramework.Config.Yaml.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CoreFramework.Config.Yaml/CoreFramework.Config.Yaml.csproj b/CoreFramework.Config.Yaml/CoreFramework.Config.Yaml.csproj index 480de80..5f2128d 100644 --- a/CoreFramework.Config.Yaml/CoreFramework.Config.Yaml.csproj +++ b/CoreFramework.Config.Yaml/CoreFramework.Config.Yaml.csproj @@ -21,7 +21,7 @@ - + From f42cc1cde7657d77d3d868ed689065f4a9977e5c Mon Sep 17 00:00:00 2001 From: litetex <40789489+litetex@users.noreply.github.com> Date: Fri, 29 May 2020 22:53:29 +0200 Subject: [PATCH 05/19] Update Log.cs --- CoreFramework.Logging/Usage/Log.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CoreFramework.Logging/Usage/Log.cs b/CoreFramework.Logging/Usage/Log.cs index bca8842..fbad4c9 100644 --- a/CoreFramework.Logging/Usage/Log.cs +++ b/CoreFramework.Logging/Usage/Log.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Runtime.CompilerServices; using System.Text; From 914763d6076d3afed8b6e2751591aa0d0eab2beb Mon Sep 17 00:00:00 2001 From: litetex Date: Sun, 31 May 2020 16:51:03 +0200 Subject: [PATCH 06/19] Fixed fatal not pointing to fatal --- CoreFramework.Logging/Usage/Log.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CoreFramework.Logging/Usage/Log.cs b/CoreFramework.Logging/Usage/Log.cs index fbad4c9..2013c9d 100644 --- a/CoreFramework.Logging/Usage/Log.cs +++ b/CoreFramework.Logging/Usage/Log.cs @@ -160,7 +160,7 @@ public static void Fatal( [CallerFilePath] string sourceFilePath = "", [CallerLineNumber] int sourceLineNumber = 0) { - CoreFramework.Log.Error(message, memberName, sourceFilePath, sourceLineNumber); + CoreFramework.Log.Fatal(message, memberName, sourceFilePath, sourceLineNumber); } public static void Fatal( @@ -170,7 +170,7 @@ public static void Fatal( [CallerFilePath] string sourceFilePath = "", [CallerLineNumber] int sourceLineNumber = 0) { - CoreFramework.Log.Error(message, ex, memberName, sourceFilePath, sourceLineNumber); + CoreFramework.Log.Fatal(message, ex, memberName, sourceFilePath, sourceLineNumber); } public static void Fatal( @@ -179,7 +179,7 @@ public static void Fatal( [CallerFilePath] string sourceFilePath = "", [CallerLineNumber] int sourceLineNumber = 0) { - CoreFramework.Log.Error(ex, memberName, sourceFilePath, sourceLineNumber); + CoreFramework.Log.Fatal(ex, memberName, sourceFilePath, sourceLineNumber); } } } From 592000ddcec41699a43ea55b3203ae87b16d5f32 Mon Sep 17 00:00:00 2001 From: litetex <40789489+litetex@users.noreply.github.com> Date: Tue, 2 Jun 2020 19:48:48 +0200 Subject: [PATCH 07/19] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dc04e3f..98b56f7 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Things that are frequently used in code -| Module | Nuget | Nuget (dev) | +| Module | Nuget | Nuget (preview/dev) | | ------ | -------------- | ----------- | | Base | [![Nuget](https://img.shields.io/nuget/v/Litetex.CoreFramework.Base?style=flat-square)](https://www.nuget.org/packages/Litetex.CoreFramework.Base)| [![Nuget (dev)](https://img.shields.io/nuget/vpre/Litetex.CoreFramework.Base?label=nuget%20%28dev%29&style=flat-square)](https://www.nuget.org/packages/Litetex.CoreFramework.Base) | | Config | [![Nuget](https://img.shields.io/nuget/v/Litetex.CoreFramework.Config?style=flat-square)](https://www.nuget.org/packages/Litetex.CoreFramework.Config)| [![Nuget (dev)](https://img.shields.io/nuget/vpre/Litetex.CoreFramework.Config?label=nuget%20%28dev%29&style=flat-square)](https://www.nuget.org/packages/Litetex.CoreFramework.Config) | From 5633112091630e52afd8e1c3899ef0ae9d8f66e8 Mon Sep 17 00:00:00 2001 From: litetex Date: Fri, 5 Jun 2020 20:48:11 +0200 Subject: [PATCH 08/19] QoL (Quality of Life) improvements * enabled deterministic build * enabled SourceLink * fixed wrong version (fixes #33 ) * improved build plan :cactus: --- .github/workflows/develop.yml | 7 ++++- .github/workflows/master-release-test.yml | 7 ++++- .github/workflows/master.yml | 7 ++++- CoreFramework.Base/CoreFramework.Base.csproj | 10 +++++++ CoreFramework.Base/packages.lock.json | 23 ++++++++++++++- .../CoreFramework.Config.Json.csproj | 10 +++++++ CoreFramework.Config.Json/packages.lock.json | 22 ++++++++++++++- .../CoreFramework.Config.Yaml.csproj | 10 +++++++ CoreFramework.Config.Yaml/packages.lock.json | 28 ++++++++++++++++--- .../CoreFramework.Config.csproj | 10 +++++++ CoreFramework.Config/packages.lock.json | 20 +++++++++++++ .../CoreFramework.CrashLogging.csproj | 10 +++++++ CoreFramework.CrashLogging/packages.lock.json | 22 ++++++++++++++- .../CoreFramework.Logging.csproj | 10 +++++++ CoreFramework.Logging/packages.lock.json | 20 +++++++++++++ 15 files changed, 206 insertions(+), 10 deletions(-) diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index 4ba818c..ac19768 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -70,7 +70,12 @@ jobs: - 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:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} | + -p:AssemblyFileVersion=${{ steps.versionprovider.outputs.version }} | + -p:PathMap="$GITHUB_WORKSPACE=/" - name: Find nupkg file id: nupkgvar diff --git a/.github/workflows/master-release-test.yml b/.github/workflows/master-release-test.yml index 620b485..d3682af 100644 --- a/.github/workflows/master-release-test.yml +++ b/.github/workflows/master-release-test.yml @@ -70,7 +70,12 @@ jobs: - 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:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} | + -p:AssemblyFileVersion=${{ steps.versionprovider.outputs.version }} | + -p:PathMap="$GITHUB_WORKSPACE=/" - name: Find nupkg file id: nupkgvar diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index de394cf..2fb692f 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -116,7 +116,12 @@ jobs: - 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:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} | + -p:AssemblyFileVersion=${{ steps.versionprovider.outputs.version }} | + -p:PathMap="$GITHUB_WORKSPACE=/" - name: Find nupkg file id: nupkgvar diff --git a/CoreFramework.Base/CoreFramework.Base.csproj b/CoreFramework.Base/CoreFramework.Base.csproj index 0589da7..e12cf29 100644 --- a/CoreFramework.Base/CoreFramework.Base.csproj +++ b/CoreFramework.Base/CoreFramework.Base.csproj @@ -1,6 +1,8 @@  + true + netcoreapp3.1 true @@ -16,11 +18,19 @@ icon.png + + true + true snupkg + + + + + diff --git a/CoreFramework.Base/packages.lock.json b/CoreFramework.Base/packages.lock.json index e02aec8..7306909 100644 --- 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==" + } + } } } \ No newline at end of file diff --git a/CoreFramework.Config.Json/CoreFramework.Config.Json.csproj b/CoreFramework.Config.Json/CoreFramework.Config.Json.csproj index 41d46f2..de70d07 100644 --- a/CoreFramework.Config.Json/CoreFramework.Config.Json.csproj +++ b/CoreFramework.Config.Json/CoreFramework.Config.Json.csproj @@ -1,6 +1,8 @@  + true + netcoreapp3.1 true @@ -16,10 +18,18 @@ icon.png + + true + true snupkg + + + + + diff --git a/CoreFramework.Config.Json/packages.lock.json b/CoreFramework.Config.Json/packages.lock.json index ee2f72e..0d91edb 100644 --- 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 index 5f2128d..0f3d0b7 100644 --- a/CoreFramework.Config.Yaml/CoreFramework.Config.Yaml.csproj +++ b/CoreFramework.Config.Yaml/CoreFramework.Config.Yaml.csproj @@ -1,6 +1,8 @@  + true + netcoreapp3.1 true @@ -16,10 +18,18 @@ icon.png + + true + true snupkg + + + + + diff --git a/CoreFramework.Config.Yaml/packages.lock.json b/CoreFramework.Config.Yaml/packages.lock.json index c54ea5d..9d4627f 100644 --- a/CoreFramework.Config.Yaml/packages.lock.json +++ b/CoreFramework.Config.Yaml/packages.lock.json @@ -2,11 +2,31 @@ "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" @@ -14,7 +34,7 @@ "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 index e91e519..e7494f5 100644 --- a/CoreFramework.Config/CoreFramework.Config.csproj +++ b/CoreFramework.Config/CoreFramework.Config.csproj @@ -1,6 +1,8 @@  + true + netcoreapp3.1 true @@ -16,10 +18,18 @@ icon.png + + true + true snupkg + + + + + diff --git a/CoreFramework.Config/packages.lock.json b/CoreFramework.Config/packages.lock.json index 0292a9d..abf7f4b 100644 --- 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 index 797ab2d..1c58e56 100644 --- a/CoreFramework.CrashLogging/CoreFramework.CrashLogging.csproj +++ b/CoreFramework.CrashLogging/CoreFramework.CrashLogging.csproj @@ -1,6 +1,8 @@  + true + netcoreapp3.1 true @@ -16,10 +18,18 @@ icon.png + + true + true snupkg + + + + + diff --git a/CoreFramework.CrashLogging/packages.lock.json b/CoreFramework.CrashLogging/packages.lock.json index d5952c3..c6e0940 100644 --- 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", diff --git a/CoreFramework.Logging/CoreFramework.Logging.csproj b/CoreFramework.Logging/CoreFramework.Logging.csproj index 1e612a0..4732990 100644 --- a/CoreFramework.Logging/CoreFramework.Logging.csproj +++ b/CoreFramework.Logging/CoreFramework.Logging.csproj @@ -1,6 +1,8 @@  + true + netcoreapp3.1 true @@ -16,10 +18,18 @@ icon.png + + true + true snupkg + + + + + diff --git a/CoreFramework.Logging/packages.lock.json b/CoreFramework.Logging/packages.lock.json index 50db806..8d15e65 100644 --- a/CoreFramework.Logging/packages.lock.json +++ b/CoreFramework.Logging/packages.lock.json @@ -2,6 +2,16 @@ "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" + } + }, "Serilog": { "type": "Direct", "requested": "[2.9.0, )", @@ -41,6 +51,11 @@ "System.Threading.Timer": "4.0.1" } }, + "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", @@ -51,6 +66,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", From 91a1834452e631061e92a4f136580a9a37b980ee Mon Sep 17 00:00:00 2001 From: litetex Date: Fri, 5 Jun 2020 20:55:19 +0200 Subject: [PATCH 09/19] Trying to fix build problems --- .github/workflows/develop.yml | 11 ++++++----- .github/workflows/master-release-test.yml | 11 ++++++----- .github/workflows/master.yml | 11 ++++++----- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index ac19768..2842c09 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -70,11 +70,12 @@ jobs: - name: Pack working-directory: ${{ matrix.project }} - run: dotnet pack --configuration Release | - -p:PackageVersion=${{ steps.versionprovider.outputs.version }} | - -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} | - -p:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} | - -p:AssemblyFileVersion=${{ steps.versionprovider.outputs.version }} | + run: | + dotnet pack --configuration Release + -p:PackageVersion=${{ steps.versionprovider.outputs.version }} + -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} + -p:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} + -p:AssemblyFileVersion=${{ steps.versionprovider.outputs.version }} -p:PathMap="$GITHUB_WORKSPACE=/" - name: Find nupkg file diff --git a/.github/workflows/master-release-test.yml b/.github/workflows/master-release-test.yml index d3682af..0fe219a 100644 --- a/.github/workflows/master-release-test.yml +++ b/.github/workflows/master-release-test.yml @@ -70,11 +70,12 @@ jobs: - name: Pack working-directory: ${{ matrix.project }} - run: dotnet pack --configuration Release | - -p:PackageVersion=${{ steps.versionprovider.outputs.version }} | - -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} | - -p:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} | - -p:AssemblyFileVersion=${{ steps.versionprovider.outputs.version }} | + run: | + dotnet pack --configuration Release + -p:PackageVersion=${{ steps.versionprovider.outputs.version }} + -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} + -p:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} + -p:AssemblyFileVersion=${{ steps.versionprovider.outputs.version }} -p:PathMap="$GITHUB_WORKSPACE=/" - name: Find nupkg file diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 2fb692f..8deb4b3 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -116,11 +116,12 @@ jobs: - name: Pack working-directory: ${{ matrix.project }} - run: dotnet pack --configuration Release | - -p:PackageVersion=${{ steps.versionprovider.outputs.version }} | - -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} | - -p:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} | - -p:AssemblyFileVersion=${{ steps.versionprovider.outputs.version }} | + run: | + dotnet pack --configuration Release + -p:PackageVersion=${{ steps.versionprovider.outputs.version }} + -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} + -p:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} + -p:AssemblyFileVersion=${{ steps.versionprovider.outputs.version }} -p:PathMap="$GITHUB_WORKSPACE=/" - name: Find nupkg file From d7cae48fa37bf47332c023ac5a526355bb543f01 Mon Sep 17 00:00:00 2001 From: litetex Date: Fri, 5 Jun 2020 21:04:25 +0200 Subject: [PATCH 10/19] Fixing it once again... GitHub Actions does not support splitting a command into multiple lines https://stackoverflow.com/a/59954556 --- .github/workflows/develop.yml | 7 +------ .github/workflows/master-release-test.yml | 7 +------ .github/workflows/master.yml | 7 +------ 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index 2842c09..be565e4 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -71,12 +71,7 @@ jobs: - name: Pack working-directory: ${{ matrix.project }} run: | - dotnet pack --configuration Release - -p:PackageVersion=${{ steps.versionprovider.outputs.version }} - -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} - -p:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} - -p:AssemblyFileVersion=${{ steps.versionprovider.outputs.version }} - -p:PathMap="$GITHUB_WORKSPACE=/" + dotnet pack --configuration Release -p:PackageVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyFileVersion=${{ steps.versionprovider.outputs.version }} -p:PathMap="$GITHUB_WORKSPACE=/" - name: Find nupkg file id: nupkgvar diff --git a/.github/workflows/master-release-test.yml b/.github/workflows/master-release-test.yml index 0fe219a..da3e3c6 100644 --- a/.github/workflows/master-release-test.yml +++ b/.github/workflows/master-release-test.yml @@ -71,12 +71,7 @@ jobs: - name: Pack working-directory: ${{ matrix.project }} run: | - dotnet pack --configuration Release - -p:PackageVersion=${{ steps.versionprovider.outputs.version }} - -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} - -p:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} - -p:AssemblyFileVersion=${{ steps.versionprovider.outputs.version }} - -p:PathMap="$GITHUB_WORKSPACE=/" + dotnet pack --configuration Release -p:PackageVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyFileVersion=${{ steps.versionprovider.outputs.version }} -p:PathMap="$GITHUB_WORKSPACE=/" - name: Find nupkg file id: nupkgvar diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 8deb4b3..f3e28f5 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -117,12 +117,7 @@ jobs: - name: Pack working-directory: ${{ matrix.project }} run: | - dotnet pack --configuration Release - -p:PackageVersion=${{ steps.versionprovider.outputs.version }} - -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} - -p:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} - -p:AssemblyFileVersion=${{ steps.versionprovider.outputs.version }} - -p:PathMap="$GITHUB_WORKSPACE=/" + dotnet pack --configuration Release -p:PackageVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyFileVersion=${{ steps.versionprovider.outputs.version }} -p:PathMap="$GITHUB_WORKSPACE=/" - name: Find nupkg file id: nupkgvar From ea224847ad12c7713b6b8c7c7f6d6b05653ca528 Mon Sep 17 00:00:00 2001 From: litetex Date: Fri, 5 Jun 2020 21:08:11 +0200 Subject: [PATCH 11/19] And "fixing" it again --- .github/workflows/develop.yml | 2 +- .github/workflows/master-release-test.yml | 2 +- .github/workflows/master.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index be565e4..bd92979 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -71,7 +71,7 @@ jobs: - name: Pack working-directory: ${{ matrix.project }} run: | - dotnet pack --configuration Release -p:PackageVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyFileVersion=${{ steps.versionprovider.outputs.version }} -p:PathMap="$GITHUB_WORKSPACE=/" + dotnet pack --configuration Release -p:PackageVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} -p:PathMap="$GITHUB_WORKSPACE=/" - name: Find nupkg file id: nupkgvar diff --git a/.github/workflows/master-release-test.yml b/.github/workflows/master-release-test.yml index da3e3c6..287e979 100644 --- a/.github/workflows/master-release-test.yml +++ b/.github/workflows/master-release-test.yml @@ -71,7 +71,7 @@ jobs: - name: Pack working-directory: ${{ matrix.project }} run: | - dotnet pack --configuration Release -p:PackageVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyFileVersion=${{ steps.versionprovider.outputs.version }} -p:PathMap="$GITHUB_WORKSPACE=/" + dotnet pack --configuration Release -p:PackageVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} -p:PathMap="$GITHUB_WORKSPACE=/" - name: Find nupkg file id: nupkgvar diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index f3e28f5..9a6f729 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -117,7 +117,7 @@ jobs: - name: Pack working-directory: ${{ matrix.project }} run: | - dotnet pack --configuration Release -p:PackageVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyFileVersion=${{ steps.versionprovider.outputs.version }} -p:PathMap="$GITHUB_WORKSPACE=/" + dotnet pack --configuration Release -p:PackageVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} -p:PathMap="$GITHUB_WORKSPACE=/" - name: Find nupkg file id: nupkgvar From 182538e1d710216b4da833c5c18bad987c9aade6 Mon Sep 17 00:00:00 2001 From: litetex Date: Fri, 5 Jun 2020 21:10:43 +0200 Subject: [PATCH 12/19] Revert "And "fixing" it again" This reverts commit ea224847ad12c7713b6b8c7c7f6d6b05653ca528. --- .github/workflows/develop.yml | 2 +- .github/workflows/master-release-test.yml | 2 +- .github/workflows/master.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index bd92979..be565e4 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -71,7 +71,7 @@ jobs: - name: Pack working-directory: ${{ matrix.project }} run: | - dotnet pack --configuration Release -p:PackageVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} -p:PathMap="$GITHUB_WORKSPACE=/" + dotnet pack --configuration Release -p:PackageVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyFileVersion=${{ steps.versionprovider.outputs.version }} -p:PathMap="$GITHUB_WORKSPACE=/" - name: Find nupkg file id: nupkgvar diff --git a/.github/workflows/master-release-test.yml b/.github/workflows/master-release-test.yml index 287e979..da3e3c6 100644 --- a/.github/workflows/master-release-test.yml +++ b/.github/workflows/master-release-test.yml @@ -71,7 +71,7 @@ jobs: - name: Pack working-directory: ${{ matrix.project }} run: | - dotnet pack --configuration Release -p:PackageVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} -p:PathMap="$GITHUB_WORKSPACE=/" + dotnet pack --configuration Release -p:PackageVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyFileVersion=${{ steps.versionprovider.outputs.version }} -p:PathMap="$GITHUB_WORKSPACE=/" - name: Find nupkg file id: nupkgvar diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 9a6f729..f3e28f5 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -117,7 +117,7 @@ jobs: - name: Pack working-directory: ${{ matrix.project }} run: | - dotnet pack --configuration Release -p:PackageVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} -p:PathMap="$GITHUB_WORKSPACE=/" + dotnet pack --configuration Release -p:PackageVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyFileVersion=${{ steps.versionprovider.outputs.version }} -p:PathMap="$GITHUB_WORKSPACE=/" - name: Find nupkg file id: nupkgvar From 8478f545baea5cd204442b7037521c8cfe3aa0b4 Mon Sep 17 00:00:00 2001 From: litetex Date: Fri, 5 Jun 2020 21:12:52 +0200 Subject: [PATCH 13/19] Just another fix in the wall --- .github/workflows/develop.yml | 2 +- .github/workflows/master-release-test.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index be565e4..f3a1f84 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -71,7 +71,7 @@ jobs: - name: Pack working-directory: ${{ matrix.project }} run: | - dotnet pack --configuration Release -p:PackageVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyFileVersion=${{ steps.versionprovider.outputs.version }} -p:PathMap="$GITHUB_WORKSPACE=/" + dotnet pack --configuration Release -p:PackageVersion=${{ steps.versionprovider.outputs.version }}-dev -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyFileVersion=${{ steps.versionprovider.outputs.version }} -p:PathMap="$GITHUB_WORKSPACE=/" - name: Find nupkg file id: nupkgvar diff --git a/.github/workflows/master-release-test.yml b/.github/workflows/master-release-test.yml index da3e3c6..36f9cc6 100644 --- a/.github/workflows/master-release-test.yml +++ b/.github/workflows/master-release-test.yml @@ -27,7 +27,7 @@ jobs: - 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%S) | tee version.txt - name: Upload version - Upload Artifact uses: actions/upload-artifact@v1 @@ -71,7 +71,7 @@ jobs: - name: Pack working-directory: ${{ matrix.project }} run: | - dotnet pack --configuration Release -p:PackageVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyFileVersion=${{ steps.versionprovider.outputs.version }} -p:PathMap="$GITHUB_WORKSPACE=/" + dotnet pack --configuration Release -p:PackageVersion=${{ steps.versionprovider.outputs.version }}-dev -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyFileVersion=${{ steps.versionprovider.outputs.version }} -p:PathMap="$GITHUB_WORKSPACE=/" - name: Find nupkg file id: nupkgvar From 31e473d102aebae2421b86f40e70ffd54cb1d63a Mon Sep 17 00:00:00 2001 From: litetex Date: Fri, 5 Jun 2020 21:13:59 +0200 Subject: [PATCH 14/19] Updated .NET Core Version :cactus: --- .github/workflows/develop.yml | 4 ++-- .github/workflows/master-release-test.yml | 4 ++-- .github/workflows/master.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index f3a1f84..de94a6c 100644 --- 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 @@ -66,7 +66,7 @@ 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 }} diff --git a/.github/workflows/master-release-test.yml b/.github/workflows/master-release-test.yml index 36f9cc6..e207506 100644 --- 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 @@ -66,7 +66,7 @@ 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 }} diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index f3e28f5..10c5732 100644 --- 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 @@ -112,7 +112,7 @@ 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 }} From 4a71e10a1bebbbaf0152ef4ad66129ee315121b5 Mon Sep 17 00:00:00 2001 From: litetex Date: Fri, 5 Jun 2020 21:16:21 +0200 Subject: [PATCH 15/19] Update develop.yml * Fixed typo --- .github/workflows/develop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index de94a6c..32cc1a9 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -27,7 +27,7 @@ jobs: - 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%S) | tee version.txt - name: Upload version - Upload Artifact uses: actions/upload-artifact@v1 From bda870d2be514a67395b6155cf418f006117ded0 Mon Sep 17 00:00:00 2001 From: litetex Date: Fri, 5 Jun 2020 21:25:50 +0200 Subject: [PATCH 16/19] As expected as always * https://stackoverflow.com/a/37941296/11649486 --- .github/workflows/develop.yml | 3 ++- .github/workflows/master-release-test.yml | 3 ++- .github/workflows/master.yml | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index 32cc1a9..f922315 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -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) | tee version.txt + echo $(date -u +%Y.%m.%d.%k%M) | tee version.txt - name: Upload version - Upload Artifact uses: actions/upload-artifact@v1 diff --git a/.github/workflows/master-release-test.yml b/.github/workflows/master-release-test.yml index e207506..83e0210 100644 --- a/.github/workflows/master-release-test.yml +++ b/.github/workflows/master-release-test.yml @@ -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) | tee version.txt + echo $(date -u +%Y.%m.%d.%k%M) | tee version.txt - name: Upload version - Upload Artifact uses: actions/upload-artifact@v1 diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 10c5732..986a210 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -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 From 66a83e7cac03671c8c05262faf6d72e1da9d88e5 Mon Sep 17 00:00:00 2001 From: litetex Date: Fri, 5 Jun 2020 21:58:30 +0200 Subject: [PATCH 17/19] Making it "deterministic" --- .github/workflows/develop.yml | 2 +- .github/workflows/master-release-test.yml | 2 +- .github/workflows/master.yml | 2 +- CoreFramework.Base/CoreFramework.Base.csproj | 2 -- CoreFramework.Config.Json/CoreFramework.Config.Json.csproj | 2 -- CoreFramework.Config.Yaml/CoreFramework.Config.Yaml.csproj | 2 -- CoreFramework.Config/CoreFramework.Config.csproj | 2 -- CoreFramework.CrashLogging/CoreFramework.CrashLogging.csproj | 2 -- CoreFramework.Logging/CoreFramework.Logging.csproj | 2 -- 9 files changed, 3 insertions(+), 15 deletions(-) diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index f922315..9e0dcc5 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -72,7 +72,7 @@ jobs: - name: Pack working-directory: ${{ matrix.project }} run: | - dotnet pack --configuration Release -p:PackageVersion=${{ steps.versionprovider.outputs.version }}-dev -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyFileVersion=${{ steps.versionprovider.outputs.version }} -p:PathMap="$GITHUB_WORKSPACE=/" + dotnet pack --configuration Release -p:PackageVersion=${{ steps.versionprovider.outputs.version }}-dev -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyFileVersion=${{ 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 index 83e0210..e7d68c2 100644 --- a/.github/workflows/master-release-test.yml +++ b/.github/workflows/master-release-test.yml @@ -72,7 +72,7 @@ jobs: - name: Pack working-directory: ${{ matrix.project }} run: | - dotnet pack --configuration Release -p:PackageVersion=${{ steps.versionprovider.outputs.version }}-dev -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyFileVersion=${{ steps.versionprovider.outputs.version }} -p:PathMap="$GITHUB_WORKSPACE=/" + dotnet pack --configuration Release -p:PackageVersion=${{ steps.versionprovider.outputs.version }}-dev -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyFileVersion=${{ 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 index 986a210..17a0671 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -118,7 +118,7 @@ jobs: - name: Pack working-directory: ${{ matrix.project }} run: | - dotnet pack --configuration Release -p:PackageVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyFileVersion=${{ steps.versionprovider.outputs.version }} -p:PathMap="$GITHUB_WORKSPACE=/" + dotnet pack --configuration Release -p:PackageVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyFileVersion=${{ 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 index e12cf29..602b691 100644 --- a/CoreFramework.Base/CoreFramework.Base.csproj +++ b/CoreFramework.Base/CoreFramework.Base.csproj @@ -1,8 +1,6 @@  - true - netcoreapp3.1 true diff --git a/CoreFramework.Config.Json/CoreFramework.Config.Json.csproj b/CoreFramework.Config.Json/CoreFramework.Config.Json.csproj index de70d07..ad550f6 100644 --- a/CoreFramework.Config.Json/CoreFramework.Config.Json.csproj +++ b/CoreFramework.Config.Json/CoreFramework.Config.Json.csproj @@ -1,8 +1,6 @@  - true - netcoreapp3.1 true diff --git a/CoreFramework.Config.Yaml/CoreFramework.Config.Yaml.csproj b/CoreFramework.Config.Yaml/CoreFramework.Config.Yaml.csproj index 0f3d0b7..f9e9e62 100644 --- a/CoreFramework.Config.Yaml/CoreFramework.Config.Yaml.csproj +++ b/CoreFramework.Config.Yaml/CoreFramework.Config.Yaml.csproj @@ -1,8 +1,6 @@  - true - netcoreapp3.1 true diff --git a/CoreFramework.Config/CoreFramework.Config.csproj b/CoreFramework.Config/CoreFramework.Config.csproj index e7494f5..2a8f1ff 100644 --- a/CoreFramework.Config/CoreFramework.Config.csproj +++ b/CoreFramework.Config/CoreFramework.Config.csproj @@ -1,8 +1,6 @@  - true - netcoreapp3.1 true diff --git a/CoreFramework.CrashLogging/CoreFramework.CrashLogging.csproj b/CoreFramework.CrashLogging/CoreFramework.CrashLogging.csproj index 1c58e56..e24e2ae 100644 --- a/CoreFramework.CrashLogging/CoreFramework.CrashLogging.csproj +++ b/CoreFramework.CrashLogging/CoreFramework.CrashLogging.csproj @@ -1,8 +1,6 @@  - true - netcoreapp3.1 true diff --git a/CoreFramework.Logging/CoreFramework.Logging.csproj b/CoreFramework.Logging/CoreFramework.Logging.csproj index 4732990..98477e9 100644 --- a/CoreFramework.Logging/CoreFramework.Logging.csproj +++ b/CoreFramework.Logging/CoreFramework.Logging.csproj @@ -1,8 +1,6 @@  - true - netcoreapp3.1 true From d0eb82664556e52eac469beee5877b2ed475437a Mon Sep 17 00:00:00 2001 From: litetex Date: Fri, 5 Jun 2020 22:29:18 +0200 Subject: [PATCH 18/19] Try fix not working sourcelink --- CoreFramework.Base/CoreFramework.Base.csproj | 1 + CoreFramework.Config.Json/CoreFramework.Config.Json.csproj | 1 + CoreFramework.Config.Yaml/CoreFramework.Config.Yaml.csproj | 1 + CoreFramework.Config/CoreFramework.Config.csproj | 1 + CoreFramework.CrashLogging/CoreFramework.CrashLogging.csproj | 1 + CoreFramework.Logging/CoreFramework.Logging.csproj | 1 + 6 files changed, 6 insertions(+) diff --git a/CoreFramework.Base/CoreFramework.Base.csproj b/CoreFramework.Base/CoreFramework.Base.csproj index 602b691..8c79430 100644 --- a/CoreFramework.Base/CoreFramework.Base.csproj +++ b/CoreFramework.Base/CoreFramework.Base.csproj @@ -18,6 +18,7 @@ true + true true snupkg diff --git a/CoreFramework.Config.Json/CoreFramework.Config.Json.csproj b/CoreFramework.Config.Json/CoreFramework.Config.Json.csproj index ad550f6..ec15e87 100644 --- a/CoreFramework.Config.Json/CoreFramework.Config.Json.csproj +++ b/CoreFramework.Config.Json/CoreFramework.Config.Json.csproj @@ -18,6 +18,7 @@ true + true true snupkg diff --git a/CoreFramework.Config.Yaml/CoreFramework.Config.Yaml.csproj b/CoreFramework.Config.Yaml/CoreFramework.Config.Yaml.csproj index f9e9e62..20eeaac 100644 --- a/CoreFramework.Config.Yaml/CoreFramework.Config.Yaml.csproj +++ b/CoreFramework.Config.Yaml/CoreFramework.Config.Yaml.csproj @@ -18,6 +18,7 @@ true + true true snupkg diff --git a/CoreFramework.Config/CoreFramework.Config.csproj b/CoreFramework.Config/CoreFramework.Config.csproj index 2a8f1ff..911ba2e 100644 --- a/CoreFramework.Config/CoreFramework.Config.csproj +++ b/CoreFramework.Config/CoreFramework.Config.csproj @@ -18,6 +18,7 @@ true + true true snupkg diff --git a/CoreFramework.CrashLogging/CoreFramework.CrashLogging.csproj b/CoreFramework.CrashLogging/CoreFramework.CrashLogging.csproj index e24e2ae..96f2465 100644 --- a/CoreFramework.CrashLogging/CoreFramework.CrashLogging.csproj +++ b/CoreFramework.CrashLogging/CoreFramework.CrashLogging.csproj @@ -18,6 +18,7 @@ true + true true snupkg diff --git a/CoreFramework.Logging/CoreFramework.Logging.csproj b/CoreFramework.Logging/CoreFramework.Logging.csproj index 98477e9..b3e599a 100644 --- a/CoreFramework.Logging/CoreFramework.Logging.csproj +++ b/CoreFramework.Logging/CoreFramework.Logging.csproj @@ -18,6 +18,7 @@ true + true true snupkg From eeab399b09a3ac0e538c1bb7b20b01d41f87d4f9 Mon Sep 17 00:00:00 2001 From: litetex Date: Fri, 5 Jun 2020 22:34:02 +0200 Subject: [PATCH 19/19] Another fix? --- .github/workflows/develop.yml | 2 +- .github/workflows/master-release-test.yml | 2 +- .github/workflows/master.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index 9e0dcc5..3fd3192 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -72,7 +72,7 @@ jobs: - name: Pack working-directory: ${{ matrix.project }} run: | - dotnet pack --configuration Release -p:PackageVersion=${{ steps.versionprovider.outputs.version }}-dev -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyFileVersion=${{ steps.versionprovider.outputs.version }} -p:PathMap="$GITHUB_WORKSPACE=/" -p:ContinuousIntegrationBuild=true + 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 index e7d68c2..a05ace2 100644 --- a/.github/workflows/master-release-test.yml +++ b/.github/workflows/master-release-test.yml @@ -72,7 +72,7 @@ jobs: - name: Pack working-directory: ${{ matrix.project }} run: | - dotnet pack --configuration Release -p:PackageVersion=${{ steps.versionprovider.outputs.version }}-dev -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyFileVersion=${{ steps.versionprovider.outputs.version }} -p:PathMap="$GITHUB_WORKSPACE=/" -p:ContinuousIntegrationBuild=true + 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 index 17a0671..b71da47 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -118,7 +118,7 @@ jobs: - name: Pack working-directory: ${{ matrix.project }} run: | - dotnet pack --configuration Release -p:PackageVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyInformationalVersion=${{ steps.versionprovider.outputs.version }} -p:AssemblyFileVersion=${{ steps.versionprovider.outputs.version }} -p:PathMap="$GITHUB_WORKSPACE=/" -p:ContinuousIntegrationBuild=true + 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