From f726e1ac7b550ddfa421a6a5eee84f85b1d9548f Mon Sep 17 00:00:00 2001 From: Oskar Dudycz Date: Sun, 24 Oct 2021 18:38:10 +0200 Subject: [PATCH] Moved Weasel version to Directory.Build.props to set the same version cadence for all Weasel packages. Brought back previous tagging settings in GitHub action Bumped version to 1.0.4 --- .github/workflows/publish_nuget.yml | 38 +++++++++---------- Directory.Build.props | 3 +- src/Weasel.Core/Weasel.Core.csproj | 3 -- src/Weasel.Postgresql/Tables/TableDelta.cs | 12 ++---- .../Weasel.Postgresql.csproj | 2 - src/Weasel.SqlServer/Weasel.SqlServer.csproj | 2 - 6 files changed, 22 insertions(+), 38 deletions(-) diff --git a/.github/workflows/publish_nuget.yml b/.github/workflows/publish_nuget.yml index 87b826a3..faa65195 100644 --- a/.github/workflows/publish_nuget.yml +++ b/.github/workflows/publish_nuget.yml @@ -13,28 +13,24 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: 5.0.x + - name: Install dependencies run: dotnet restore + - name: Build run: dotnet build --configuration Release --no-restore - - name: Publish Weasel.Core - uses: brandedoutcast/publish-nuget@v2.5.5 - with: - PROJECT_FILE_PATH: src/Weasel.Core/Weasel.Core.csproj - NUGET_KEY: ${{secrets.NUGET_API_KEY}} - TAG_FORMAT: Weasel.v* - INCLUDE_SYMBOLS: true - - name: Publish Weasel.Postgresql - uses: brandedoutcast/publish-nuget@v2.5.5 - with: - PROJECT_FILE_PATH: src/Weasel.Postgresql/Weasel.Postgresql.csproj - NUGET_KEY: ${{secrets.NUGET_API_KEY}} - TAG_FORMAT: Weasel.Postgresql.v* - INCLUDE_SYMBOLS: true - - name: Publish Weasel.SqlServer - uses: brandedoutcast/publish-nuget@v2.5.5 - with: - PROJECT_FILE_PATH: src/Weasel.SqlServer/Weasel.SqlServer.csproj - NUGET_KEY: ${{secrets.NUGET_API_KEY}} - TAG_FORMAT: Weasel.SqlServer.v* - INCLUDE_SYMBOLS: true + + - name: Pack Weasel.Core + run: dotnet pack ./src/Weasel.Core/Weasel.Core.csproj -o ./artifacts --configuration Release --no-build + + - name: Pack Weasel.Postgresql + run: dotnet pack ./src/Weasel.Postgresql/Weasel.Postgresql.csproj -o ./artifacts --configuration Release --no-build + + - name: Pack Weasel.SqlServer + run: dotnet pack ./src/Weasel.SqlServer/Weasel.SqlServer.csproj -o ./artifacts --configuration Release --no-build + + - name: Publish to NuGet + run: | + find . -name '*.nupkg' -exec dotnet nuget push "{}" -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_API_KEY }} --skip-duplicate \; + # find . -name '*.snupkg' -exec dotnet nuget push "{}" -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_API_KEY }} \; + shell: bash \ No newline at end of file diff --git a/Directory.Build.props b/Directory.Build.props index e9e2af75..dabcfa76 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,8 +1,9 @@ - 0.5.0 + 1.0.4 9.0 + enable Jeremy D. Miller;Babu Annamalai;Oskar Dudycz;Joona-Pekka Kokko http://jasperfx.github.io/marten/content/images/emblem.png http://github.io/jasperfx/weasel diff --git a/src/Weasel.Core/Weasel.Core.csproj b/src/Weasel.Core/Weasel.Core.csproj index fdbd0d1e..1202ca6f 100644 --- a/src/Weasel.Core/Weasel.Core.csproj +++ b/src/Weasel.Core/Weasel.Core.csproj @@ -2,10 +2,7 @@ netstandard2.0;net5.0 - Core Weasel types for ADO.Net helpers, spin off of Marten - 1.0.1 - enable true true true diff --git a/src/Weasel.Postgresql/Tables/TableDelta.cs b/src/Weasel.Postgresql/Tables/TableDelta.cs index 22b507f7..48008207 100644 --- a/src/Weasel.Postgresql/Tables/TableDelta.cs +++ b/src/Weasel.Postgresql/Tables/TableDelta.cs @@ -80,7 +80,6 @@ public override void WriteUpdate(DdlRules rules, TextWriter writer) writer.WriteLine(column.AddColumnSql(Expected)); } - // Different columns foreach (var change1 in Columns.Different) { @@ -100,20 +99,18 @@ public override void WriteUpdate(DdlRules rules, TextWriter writer) { writer.WriteLine(change.Expected.ToDDL(Expected)); } - - + // Extra columns foreach (var column in Columns.Extras) { writer.WriteLine(column.DropColumnSql(Expected)); } - switch (PrimaryKeyDifference) { case SchemaPatchDifference.Invalid: case SchemaPatchDifference.Update: - if (Expected.PrimaryKeyColumns.SequenceEqual(Actual?.PrimaryKeyColumns)) + if (Expected.PrimaryKeyColumns.SequenceEqual(Actual!.PrimaryKeyColumns)) { //for when PK constraint name changes only writer.WriteLine($"alter table {Expected.Identifier} rename constraint {Actual!.PrimaryKeyName} to {Expected.PrimaryKeyName};"); @@ -196,8 +193,6 @@ public override void WriteRollback(DdlRules rules, TextWriter writer) foreignKey.WriteAddStatement(Expected, writer); } - - switch (PrimaryKeyDifference) { case SchemaPatchDifference.Invalid: @@ -264,7 +259,7 @@ private SchemaPatchDifference determinePatchDifference() return SchemaPatchDifference.Invalid; } - var differences = new SchemaPatchDifference[] + var differences = new[] { Columns.Difference(), ForeignKeys.Difference(), @@ -291,6 +286,5 @@ public override string ToString() { return $"TableDelta for {Expected.Identifier}"; } - } } diff --git a/src/Weasel.Postgresql/Weasel.Postgresql.csproj b/src/Weasel.Postgresql/Weasel.Postgresql.csproj index 3a0b4fd9..5669f055 100644 --- a/src/Weasel.Postgresql/Weasel.Postgresql.csproj +++ b/src/Weasel.Postgresql/Weasel.Postgresql.csproj @@ -4,8 +4,6 @@ netstandard2.0;net5.0 Npgsql Helpers and Postgresql Schema Migration Tool, spin off of Marten - 1.0.3 - enable true true true diff --git a/src/Weasel.SqlServer/Weasel.SqlServer.csproj b/src/Weasel.SqlServer/Weasel.SqlServer.csproj index cf040399..d31cc2d3 100644 --- a/src/Weasel.SqlServer/Weasel.SqlServer.csproj +++ b/src/Weasel.SqlServer/Weasel.SqlServer.csproj @@ -4,8 +4,6 @@ netstandard2.0;net5.0 SqlClient Helpers and SQL Server Schema Migration Tool, spin off of Marten - 1.0.2 - Enable true true true