Upgraded build to GitHub Actions, reset folder structure to match oth…

…er projects
phatboyg · Jan 2, 2023 · a6e96eb · a6e96eb
1 parent 0cc6451
commit a6e96eb
Show file tree

Hide file tree

Showing 24 changed files with 867 additions and 1,490 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,97 @@
+name: NewId
+env:
+  NEWID_VERSION: 4.0.1
+  DOTNET_CLI_TELEMETRY_OPTOUT: 1
+  DOTNET_SYSTEM_GLOBALIZATION_INVARIANT: true
+on:
+  push:
+    paths:
+      - 'src/**'
+      - 'tests/**'
+      - 'NewId.sln'
+      - 'Directory.Build.props'
+      - '**/build.yml'
+  pull_request:
+    paths:
+      - 'src/**'
+      - 'tests/**'
+      - 'NewId.sln'
+      - 'Directory.Build.props'
+      - '**/build.yml'
+  workflow_dispatch:
+
+jobs:
+  compile:
+    name: Compile and Unit Tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+
+      - name: Install .NET Core SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '3.1.x'
+
+      - name: Install .NET Core SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.x'
+
+      - name: Restore NuGet packages
+        run: dotnet restore
+        working-directory: ./
+
+      - name: Build
+        run: dotnet build -c Release --no-restore
+        working-directory: ./
+
+      - name: Test
+        run: dotnet test -c Release --no-build
+        working-directory: tests/NewId.Tests
+
+  calc-version:
+    name: Calculate Version
+    runs-on: ubuntu-latest
+    needs:
+      - compile
+    outputs:
+      version: ${{ steps.v.outputs.version }}
+    steps:
+      - id: v
+        run: |
+          if [ "${{ github.ref }}" = 'refs/heads/master' ]; then
+            echo "::set-output name=version::${NEWID_VERSION}"
+          else
+            echo "::set-output name=version::${NEWID_VERSION}-develop.${{ github.run_number }}"
+          fi
+
+  publish:
+    name: Build and Publish NuGets
+    runs-on: ubuntu-latest
+    if: (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop') && github.repository == 'MassTransit/NewId' && success()
+    needs:
+      - calc-version
+    steps:
+      - name: Version Output Check
+        run: |
+          echo "${{ needs.calc-version.outputs.version }}"
+
+      - name: Check out code
+        uses: actions/checkout@v2
+
+      - name: Install .NET Core SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.x'
+
+      - name: Build and Publish NewId
+        # was: brandedoutcast/[email protected]
+        uses: drusellers/publish-nuget@master
+        with:
+          project-file-path: src/NewId/NewId.csproj
+          version: ${{ needs.calc-version.outputs.version }}
+          tag-commit: false
+          nuget-key: ${{secrets.NUGET_API_KEY}}
+          include-symbols: true
+
diff --git a/src/NewId.sln → NewId.sln b/src/NewId.sln → NewId.sln
@@ -1,46 +1,37 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26403.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NewId", "NewId\NewId.csproj", "{660D8862-F851-4C9B-A8AB-62A7EEA65614}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NewId.Tests", "NewId.Tests\NewId.Tests.csproj", "{C92C3C4B-5DA0-49C5-A382-E31FD69CDBCD}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Cake", "Cake", "{40320C2F-D164-462C-8E57-F91DADC8D440}"
-ProjectSection(SolutionItems) = preProject
-	Directory.Build.props = Directory.Build.props
-	..\appveyor.yml = ..\appveyor.yml
-	..\build.cake = ..\build.cake
-	..\build.ps1 = ..\build.ps1
-	..\build.sh = ..\build.sh
-EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NewId.Benchmarks", "NewId.Benchmarks\NewId.Benchmarks.csproj", "{0753A4DB-8D17-4D51-BC09-1F50D1B5820D}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{660D8862-F851-4C9B-A8AB-62A7EEA65614}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{660D8862-F851-4C9B-A8AB-62A7EEA65614}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{660D8862-F851-4C9B-A8AB-62A7EEA65614}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{660D8862-F851-4C9B-A8AB-62A7EEA65614}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C92C3C4B-5DA0-49C5-A382-E31FD69CDBCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C92C3C4B-5DA0-49C5-A382-E31FD69CDBCD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C92C3C4B-5DA0-49C5-A382-E31FD69CDBCD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C92C3C4B-5DA0-49C5-A382-E31FD69CDBCD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0753A4DB-8D17-4D51-BC09-1F50D1B5820D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0753A4DB-8D17-4D51-BC09-1F50D1B5820D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0753A4DB-8D17-4D51-BC09-1F50D1B5820D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0753A4DB-8D17-4D51-BC09-1F50D1B5820D}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {9BD652A7-9C0C-4784-AC00-8CC69969DDC5}
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26403.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NewId", "src\NewId\NewId.csproj", "{660D8862-F851-4C9B-A8AB-62A7EEA65614}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NewId.Tests", "tests\NewId.Tests\NewId.Tests.csproj", "{C92C3C4B-5DA0-49C5-A382-E31FD69CDBCD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NewId.Benchmarks", "tests\NewId.Benchmarks\NewId.Benchmarks.csproj", "{0753A4DB-8D17-4D51-BC09-1F50D1B5820D}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{660D8862-F851-4C9B-A8AB-62A7EEA65614}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{660D8862-F851-4C9B-A8AB-62A7EEA65614}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{660D8862-F851-4C9B-A8AB-62A7EEA65614}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{660D8862-F851-4C9B-A8AB-62A7EEA65614}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C92C3C4B-5DA0-49C5-A382-E31FD69CDBCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C92C3C4B-5DA0-49C5-A382-E31FD69CDBCD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C92C3C4B-5DA0-49C5-A382-E31FD69CDBCD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C92C3C4B-5DA0-49C5-A382-E31FD69CDBCD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0753A4DB-8D17-4D51-BC09-1F50D1B5820D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0753A4DB-8D17-4D51-BC09-1F50D1B5820D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0753A4DB-8D17-4D51-BC09-1F50D1B5820D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0753A4DB-8D17-4D51-BC09-1F50D1B5820D}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {9BD652A7-9C0C-4784-AC00-8CC69969DDC5}
+	EndGlobalSection
+EndGlobal
diff --git a/appveyor.yml b/appveyor.yml
diff --git a/build.cake b/build.cake