build(sln): update GH actions, global.json and package Icon filename

seangwright · May 6, 2023 · 1c24575 · 1c24575
1 parent 58eeb15
commit 1c24575
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 63 deletions.
diff --git a/.github/actions/set-env/action.yml b/.github/actions/set-env/action.yml
diff --git a/.github/variables/build.env b/.github/variables/build.env
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,45 +2,40 @@ name: 'CI: Build and Test'
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
     paths:
-    - '**.cs'
-    - '**.csproj'
-    - '**.props'
-    - '**.targets'
-    - '**.sln'
+      - '**.cs'
+      - '**.csproj'
+      - '**.props'
+      - '**.targets'
+      - '**.sln'
   pull_request:
-    branches: [ main ]
+    branches: [main]
     paths:
-    - '**.cs'
-    - '**.csproj'
-    - '**.props'
-    - '**.targets'
-    - '**.sln'
+      - '**.cs'
+      - '**.csproj'
+      - '**.props'
+      - '**.targets'
+      - '**.sln'
 
 jobs:
   build:
-
     name: build
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Set Environment Variables
-      uses: ./.github/actions/set-env
+      - uses: actions/checkout@v3
 
-    - uses: actions/checkout@v2
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v3
+        with:
+          global-json-file: ${{ github.workspace }}/global.json
 
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: ${{ env.DOTNET_SDK_VERSION }}
+      - name: Install dependencies
+        run: dotnet restore --locked-mode
 
-    - name: Install dependencies
-      run: dotnet restore --locked-mode
-
-    - name: Build Solution
-      run: dotnet build --configuration Release --no-restore
+      - name: Build Solution
+        run: dotnet build --configuration Release --no-restore
 
-    - name: Test Solution
-      run: dotnet test --configuration Release --no-build --no-restore
+      - name: Test Solution
+        run: dotnet test --configuration Release --no-build --no-restore
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -15,20 +15,15 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-
-      - name: Set Environment Variables
-        uses: ./.github/actions/set-env
 
-      - uses: actions/checkout@v2
-
-      - name: Setup dotnet
-        uses: actions/setup-dotnet@v2
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: ${{ env.DOTNET_SDK_VERSION }}
+          global-json-file: ${{ github.workspace }}/global.json
 
       - name: Install dependencies
         run: dotnet restore --locked-mode
-      
+
       - name: Build Solution
         run: dotnet build -c Release --no-restore
 
@@ -56,7 +51,7 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           name: prerelease
-          
+
       - name: Publish NuGet Package
         run: dotnet nuget push *.nupkg -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_API_KEY }}
 
@@ -70,6 +65,6 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           name: release
-          
+
       - name: Publish NuGet Package
-        run: dotnet nuget push *.nupkg -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_API_KEY }}
+        run: dotnet nuget push *.nupkg -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_API_KEY }}
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -11,7 +11,7 @@
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<Title>$(Product)</Title>
 		<PackageProjectUrl>https://github.com/seangwright/xperience-community-preview-component-outlines</PackageProjectUrl>
-		<PackageIcon>kentico.png</PackageIcon>
+		<PackageIcon>Icon.png</PackageIcon>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
 		<PackageTags>xperience;kentico;aspnetcore;page-builder</PackageTags>
 		<PackageReleaseNotes>https://github.com/seangwright/xperience-community-preview-component-outlines/releases</PackageReleaseNotes>

diff --git a/global.json b/global.json
@@ -1,7 +1,7 @@
 {
   "sdk": {
-    "version": "6.0.301",
-    "rollForward": "latestMajor",
+    "version": "7.0.203",
+    "rollForward": "latestMinor",
     "allowPrerelease": false
   }
 }