merge

twilio-labs · Nov 27, 2024 · 6ef7c26 · 6ef7c26
2 parents 51fe300 + 9f07c48
commit 6ef7c26
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 27 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ on:
         default: 0.0.0-alpha
         required: false
         type: string
-        
+
   push:
     branches: [ "main" ]
     paths:
@@ -30,11 +30,11 @@ on:
         description: 'The version of the library to use when compiling and packaging.'
         required: true
 
-env: 
+env:
   CI: true
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
   DOTNET_NOLOGO: true
-      
+
 jobs:
   build:
     name: Build, test, and pack
@@ -62,52 +62,52 @@ jobs:
               }
           }
         shell: pwsh
-          
+
       # Build and pack Twilio.AspNet.Common
       - name: (Twilio.AspNet.Common) Restore
         run: dotnet restore
         working-directory: src/Twilio.AspNet.Common/
         shell: pwsh
-        
+
       - name: (Twilio.AspNet.Common) Build
         run: dotnet build --no-restore --configuration Release
         working-directory: src/Twilio.AspNet.Common/
         shell: pwsh
-        
+
       - name: (Twilio.AspNet.Common) Pack
         run: dotnet pack -c Release -o ..\..\
         working-directory: src/Twilio.AspNet.Common/
         shell: pwsh
 
       - name: (Twilio.AspNet.Common) Upload Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Twilio.AspNet.Common NuGet Package
           path: |
             Twilio.AspNet.Common.${{ inputs.libraryVersion || '0.0.0-alpha' }}.nupkg
             Twilio.AspNet.Common.${{ inputs.libraryVersion || '0.0.0-alpha' }}.snupkg
-        
+
       # Build, test, and pack Twilio.AspNet.Core
       - name: (Twilio.AspNet.Core) Restore
         run: dotnet restore
         working-directory: src/Twilio.AspNet.Core/
         shell: pwsh
-        
+
       - name: (Twilio.AspNet.Core) Build
         run: dotnet build --no-restore --configuration Release
         working-directory: src/Twilio.AspNet.Core/
         shell: pwsh
-      
+
       - name: (Twilio.AspNet.Core.UnitTests) Restore
         run: dotnet restore
         working-directory: src/Twilio.AspNet.Core.UnitTests/
         shell: pwsh
-        
+
       - name: (Twilio.AspNet.Core.UnitTests) Build
         run: dotnet build --no-restore
         working-directory: src/Twilio.AspNet.Core.UnitTests/
         shell: pwsh
-      
+
       - name: (Twilio.AspNet.Core.UnitTests) Test
         run: dotnet test --no-build --no-restore
         working-directory: src/Twilio.AspNet.Core.UnitTests/
@@ -125,28 +125,28 @@ jobs:
           path: |
             Twilio.AspNet.Core.${{ inputs.libraryVersion || '0.0.0-alpha' }}.nupkg
             Twilio.AspNet.Core.${{ inputs.libraryVersion || '0.0.0-alpha' }}.snupkg
-        
+
       # Build, test, and pack Twilio.AspNet.Mvc
       - name: (Twilio.AspNet.Mvc) Restore
         run: dotnet restore
         working-directory: src/Twilio.AspNet.Mvc/
         shell: pwsh
-        
+
       - name: (Twilio.AspNet.Mvc) Build
         run: dotnet build --no-restore --configuration Release
         working-directory: src/Twilio.AspNet.Mvc/
         shell: pwsh
-        
+
       - name: (Twilio.AspNet.Mvc.UnitTests) Restore
         run: dotnet restore
         working-directory: src/Twilio.AspNet.Mvc.UnitTests/
         shell: pwsh
-        
+
       - name: (Twilio.AspNet.Mvc.UnitTests) Build
         run: dotnet build --no-restore
         working-directory: src/Twilio.AspNet.Mvc.UnitTests/
         shell: pwsh
-        
+
       - name: (Twilio.AspNet.Mvc.UnitTests) Test
         run: dotnet test --no-build --no-restore
         working-directory: src/Twilio.AspNet.Mvc.UnitTests/
@@ -156,9 +156,9 @@ jobs:
         run: dotnet pack --no-build --no-restore -c Release -o ..\..\
         working-directory: src/Twilio.AspNet.Mvc/
         shell: pwsh
-        
+
       - name: (Twilio.AspNet.Mvc) Upload Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Twilio.AspNet.Mvc NuGet Package
           path: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -33,17 +33,17 @@ jobs:
     runs-on: ubuntu-latest
     needs: [build]
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         name: Download Twilio.AspNet.Common NuGet Package
         with:
           name: Twilio.AspNet.Common NuGet Package
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         name: Download Twilio.AspNet.Core NuGet Package
         with:
           name: Twilio.AspNet.Core NuGet Package
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         name: Download Twilio.AspNet.Mvc NuGet Package
         with:
           name: Twilio.AspNet.Mvc NuGet Package

diff --git a/src/Twilio.AspNet.sln b/src/Twilio.AspNet.sln
@@ -31,12 +31,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Twilio.AspNet.Mvc.UnitTests
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Twilio.AspNet.Core.UnitTests", "Twilio.AspNet.Core.UnitTests\Twilio.AspNet.Core.UnitTests.csproj", "{B3E732C9-27EF-4E96-B620-5B5DA57D9AD3}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{9B3D65CE-AF46-4122-885D-1CFE42D5EAFB}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{14C361F2-74BC-4D62-AC32-8B640D28A94F}"
+	ProjectSection(SolutionItems) = preProject
+		..\.github\workflows\release.yml = ..\.github\workflows\release.yml
+	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{4CAACCDD-6731-4617-9DE4-B6495B96DE08}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{5001EA6E-22E1-454C-8746-D76CD562D89B}"
 	ProjectSection(SolutionItems) = preProject
 		..\.github\workflows\ci.yml = ..\.github\workflows\ci.yml
-		..\.github\workflows\release.yml = ..\.github\workflows\release.yml
 	EndProjectSection
 EndProject
 Global
@@ -73,7 +75,7 @@ Global
 		SolutionGuid = {7D0F9171-129A-4B05-809E-F501DBC23197}
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{9B3D65CE-AF46-4122-885D-1CFE42D5EAFB} = {339A75DF-3315-4CF3-9FD9-DAF1B0DB50B2}
-		{4CAACCDD-6731-4617-9DE4-B6495B96DE08} = {9B3D65CE-AF46-4122-885D-1CFE42D5EAFB}
+		{14C361F2-74BC-4D62-AC32-8B640D28A94F} = {339A75DF-3315-4CF3-9FD9-DAF1B0DB50B2}
+		{5001EA6E-22E1-454C-8746-D76CD562D89B} = {14C361F2-74BC-4D62-AC32-8B640D28A94F}
 	EndGlobalSection
 EndGlobal