fix publish

ptixed · Jul 5, 2024 · fbf26b8 · fbf26b8
1 parent f2f43e4
commit fbf26b8
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 38 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -2,27 +2,19 @@ name: publish to nuget
 on:
   push:
     branches:
-      - master
+    - master
 jobs:
   publish:
-    name: build, pack & publish
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: publish on version change
-        id: publish_nuget
-        uses: alirezanet/[email protected]
-        with:
-          PROJECT_FILE_PATH: Ptixed.Sql.SqlServer/Ptixed.Sql.SqlServer.csproj
-          PACKAGE_NAME: Ptixed.Sql
-
-          VERSION_FILE_PATH: Ptixed.Sql.SqlServer/Ptixed.Sql.SqlServer.csproj
-          VERSION_REGEX: ^\s*<Version>(.*)<\/Version>\s*$
-
-          TAG_COMMIT: true
-          TAG_FORMAT: v*
-
-          NUGET_KEY: ${{secrets.NUGET_API_KEY}}
-          NUGET_SOURCE: https://api.nuget.org
-
-          INCLUDE_SYMBOLS: false
+    - uses: actions/checkout@v2
+    - uses: alirezanet/[email protected]
+      with:
+        PROJECT_FILE_PATH: Ptixed.Sql/Ptixed.Sql.csproj
+        TAG_FORMAT: Ptixed.Sql.v*
+        TAG_COMMIT: true
+    - uses: alirezanet/[email protected]
+      with:
+        PROJECT_FILE_PATH: Ptixed.Sql.SqlServer/Ptixed.Sql.SqlServer.csproj
+        TAG_FORMAT: Ptixed.Sql.SqlServer.v*
+        TAG_COMMIT: true
diff --git a/Ptixed.Sql.Postgres/Ptixed.Sql.Postgres.csproj b/Ptixed.Sql.Postgres/Ptixed.Sql.Postgres.csproj
@@ -1,18 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <TargetFrameworks>netstandard2.0</TargetFrameworks>
-        <SignAssembly>False</SignAssembly>
-        <Title>Ptixed.Sql.Postgres</Title>
-        <Version>0.1.0</Version>
-        <Description>Library for interacting with Microsoft SQL databases</Description>
-        <Authors>ptixed</Authors>
-        <RepositoryUrl>https://github.com/ptixed/Ptixed.Sql</RepositoryUrl>
-        <PackageTags>ptixed sql tsql database db</PackageTags>
-        <AssemblyVersion>0.1.0</AssemblyVersion>
-        <FileVersion>0.1.0</FileVersion>
-        <Company />
-        <PackageIconUrl>https://raw.githubusercontent.com/ptixed/Ptixed.Sql/master/logo-nuget.png</PackageIconUrl>
-    </PropertyGroup>
     <ItemGroup>
       <PackageReference Include="Npgsql" Version="8.0.3" />
     </ItemGroup>

diff --git a/Ptixed.Sql.SqlServer/Ptixed.Sql.SqlServer.csproj b/Ptixed.Sql.SqlServer/Ptixed.Sql.SqlServer.csproj
@@ -2,14 +2,14 @@
     <PropertyGroup>
         <TargetFrameworks>netstandard2.0</TargetFrameworks>
         <SignAssembly>False</SignAssembly>
-        <Title>Ptixed.Sql</Title>
-        <Version>0.9.0</Version>
+        <Title>Ptixed.Sql.SqlServer</Title>
+        <Version>1.0.0</Version>
         <Description>Library for interacting with Microsoft SQL databases</Description>
         <Authors>ptixed</Authors>
         <RepositoryUrl>https://github.com/ptixed/Ptixed.Sql</RepositoryUrl>
         <PackageTags>ptixed sql tsql database db</PackageTags>
-        <AssemblyVersion>0.9.0</AssemblyVersion>
-        <FileVersion>0.9.0</FileVersion>
+        <AssemblyVersion>1.0.0</AssemblyVersion>
+        <FileVersion>1.0.0</FileVersion>
         <Company />
         <PackageIconUrl>https://raw.githubusercontent.com/ptixed/Ptixed.Sql/master/logo-nuget.png</PackageIconUrl>
     </PropertyGroup>

diff --git a/Ptixed.Sql/Ptixed.Sql.csproj b/Ptixed.Sql/Ptixed.Sql.csproj
@@ -1,4 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <TargetFrameworks>netstandard2.0</TargetFrameworks>
+        <SignAssembly>False</SignAssembly>
+        <Title>Ptixed.Sql</Title>
+        <Version>1.0.1</Version>
+        <Description>Library for interacting with SQL databases; base classes</Description>
+        <Authors>ptixed</Authors>
+        <RepositoryUrl>https://github.com/ptixed/Ptixed.Sql</RepositoryUrl>
+        <PackageTags>ptixed sql database db</PackageTags>
+        <AssemblyVersion>1.0.1</AssemblyVersion>
+        <FileVersion>1.0.1</FileVersion>
+        <Company />
+        <PackageIconUrl>https://raw.githubusercontent.com/ptixed/Ptixed.Sql/master/logo-nuget.png</PackageIconUrl>
+    </PropertyGroup>
     <PropertyGroup>
         <TargetFrameworks>netstandard2.0</TargetFrameworks>
     </PropertyGroup>