Release/6.0.1

.github/workflows/publish-packages.yml

@@ -1,19 +1,20 @@
 name: CD
 
+
 on:
-  push:
-    branches:
-    - release/**
-  pull_request:
-    branches:
-    - release/**
-
+  workflow_run:
+    workflows: ["CI"]
+    branches: [ master ]
+    types:
+      - completed
+
 jobs:
   build:
 
     env:
       BUILD_CONFIG: 'Release'
       SOLUTION: './Solution/Modules.sln'
+      MESSAGE: ${{ github.event.head_commit.message }}
 
     runs-on: windows-latest
 
@@ -25,34 +26,32 @@ jobs:
 
     - name: Get Build Version
       run: |
-        Import-Module .\Tools\GetBuildVersion.psm1
-        Write-Host $env:GITHUB_REF
-        $version = GetBuildVersion -VersionString $env:GITHUB_REF
-        echo "BUILD_VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf-8 -Append
+        Get-ChildItem
+        Import-Module .\Solution\Tools\GetBuildVersion.psm1
+        Write-Host $env:MESSAGE
+        $version = GetBuildVersion -VersionString $env:MESSAGE
+        echo "BUILD_VERSION=$version" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
       shell: pwsh
 
     - name: Install .NET Core
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 5.0.x
+        dotnet-version: 6.0.x
 
     - name: Setup MSBuild.exe
       uses: microsoft/setup-msbuild@v1.0.2
 
-    - name: Setup NuGet
-      uses: NuGet/setup-nuget@v1.0.5
-
     - name: Restore dependencies
       run: nuget restore $env:SOLUTION
 
     - name: Build
-      run: dotnet build $env:SOLUTION --configuration $env:BUILD_CONFIG -p:Version=$env:$BUILD_VERSION --no-restore
+      run: dotnet build $env:SOLUTION --configuration $env:BUILD_CONFIG /p:AssemblyVersion=$BUILD_VERSION --no-restore
 
     - name: Run tests
       run: dotnet test $env:SOLUTION /p:Configuration=$env:BUILD_CONFIG --no-restore --no-build --verbosity normal
 
     - name: Publish
       if: startsWith(github.ref, 'refs/heads/release')
       run: |
-        nuget push **\*.nupkg -Source 'https://api.nuget.org/v3/index.json' -ApiKey ${{secrets.NUGET_API_KEY}}
-        nuget push **\*.nupkg -Source 'https://nuget.pkg.github.com/joshika39/index.json' --api-key ${{secrets.GIT_API_KEY}}
+        dotnet nuget push **\*.nupkg --source 'https://api.nuget.org/v3/index.json' --api-key ${{secrets.NUGET_API_KEY}}
+        dotnet nuget push **\*.nupkg --source 'https://nuget.pkg.github.com/joshika39/index.json' --api-key ${{secrets.GIT_API_KEY}}

Solution/Implementation/Implementation.csproj

@@ -4,12 +4,9 @@
         <TargetFramework>net5.0</TargetFramework>
         <PackageId>joshika39-$(AssemblyName)</PackageId>
         <Title>Implementation</Title>
-        <Version>0.0.6</Version>
         <Authors>Joshua Hegedus</Authors>
         <Company>JHost</Company>
         <Description>This is the backend for my base library.</Description>
-        <AssemblyVersion>0.0.6</AssemblyVersion>
-        <FileVersion>0.0.6</FileVersion>
         <NeutralLanguage>en</NeutralLanguage>
     </PropertyGroup>
 

Solution/Infrastructure/Infrastructure.csproj

@@ -4,12 +4,9 @@
         <TargetFramework>net5.0</TargetFramework>
         <PackageId>joshika39-$(AssemblyName)</PackageId>
         <Title>Infrastructure</Title>
-        <Version>0.0.6</Version>
         <Authors>Joshua Hegedus</Authors>
         <Company>JHost</Company>
         <Description>This contains the interfaces for my base library.</Description>
-        <AssemblyVersion>0.0.6</AssemblyVersion>
-        <FileVersion>0.0.6</FileVersion>
         <NeutralLanguage>en</NeutralLanguage>
     </PropertyGroup>