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
JasperFx · Oct 24, 2021 · f726e1a · f726e1a
1 parent 5a73995
commit f726e1a
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 38 deletions.
diff --git 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/[email protected]
-      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/[email protected]
-      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/[email protected]
-      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
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <Version>0.5.0</Version>
+    <Version>1.0.4</Version>
     <LangVersion>9.0</LangVersion>
+    <Nullable>enable</Nullable>
     <Authors>Jeremy D. Miller;Babu Annamalai;Oskar Dudycz;Joona-Pekka Kokko</Authors>
     <PackageIconUrl>http://jasperfx.github.io/marten/content/images/emblem.png</PackageIconUrl>
     <PackageProjectUrl>http://github.io/jasperfx/weasel</PackageProjectUrl>

diff --git a/src/Weasel.Core/Weasel.Core.csproj b/src/Weasel.Core/Weasel.Core.csproj
@@ -2,10 +2,7 @@
 
     <PropertyGroup>
         <TargetFrameworks>netstandard2.0;net5.0</TargetFrameworks>
-
         <Description>Core Weasel types for ADO.Net helpers, spin off of Marten</Description>
-        <Version>1.0.1</Version>
-        <Nullable>enable</Nullable>
         <GenerateAssemblyTitleAttribute>true</GenerateAssemblyTitleAttribute>
         <GenerateAssemblyDescriptionAttribute>true</GenerateAssemblyDescriptionAttribute>
         <GenerateAssemblyProductAttribute>true</GenerateAssemblyProductAttribute>

diff --git 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
@@ -4,8 +4,6 @@
         <TargetFrameworks>netstandard2.0;net5.0</TargetFrameworks>
 
         <Description>Npgsql Helpers and Postgresql Schema Migration Tool, spin off of Marten</Description>
-        <Version>1.0.3</Version>
-        <Nullable>enable</Nullable>
         <GenerateAssemblyTitleAttribute>true</GenerateAssemblyTitleAttribute>
         <GenerateAssemblyDescriptionAttribute>true</GenerateAssemblyDescriptionAttribute>
         <GenerateAssemblyProductAttribute>true</GenerateAssemblyProductAttribute>

diff --git a/src/Weasel.SqlServer/Weasel.SqlServer.csproj b/src/Weasel.SqlServer/Weasel.SqlServer.csproj
@@ -4,8 +4,6 @@
         <TargetFrameworks>netstandard2.0;net5.0</TargetFrameworks>
 
         <Description>SqlClient Helpers and SQL Server Schema Migration Tool, spin off of Marten</Description>
-        <Version>1.0.2</Version>
-        <Nullable>Enable</Nullable>
         <GenerateAssemblyTitleAttribute>true</GenerateAssemblyTitleAttribute>
         <GenerateAssemblyDescriptionAttribute>true</GenerateAssemblyDescriptionAttribute>
         <GenerateAssemblyProductAttribute>true</GenerateAssemblyProductAttribute>