fix maui build failure (#1448)

* bump rxui to maui7 * stop global pin of net6 * remove net analyzers, now in sdk * add wokload list * move back to net 6 * Update codeql-analysis.yml
dpvreony · Aug 11, 2023 · 2eab76b · 2eab76b
1 parent 7eee696
commit 2eab76b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 22 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -68,10 +68,10 @@ jobs:
     #  with:
     #    dotnet-version: 5.0.x
 
-    - name: Install .NET 7
+    - name: Install .NET 6
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 6.0.x
 
     - name: Install DotNet workloads
       shell: bash

diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
@@ -50,29 +50,16 @@ jobs:
         $process.Start()
         $process.WaitForExit()
 
-    - name: Install .NET 7
+    - name: Install .NET 6
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 6.0.x
 
     - name: Install DotNet workloads
       shell: bash
       run: |
         dotnet workload install android ios tvos macos maui
-
-    #- name: Download Sonar Scanner MsBuild
-    #  uses: robinraju/release-downloader@v1.6
-    #  with:
-    #    repository: "SonarSource/sonar-scanner-msbuild"
-    #    latest: true
-    #    fileName: "sonar-scanner-msbuild-*-net46.zip"
-    #    out-file-path: "downloads/sonar"
-
-    #- name: Extract Sonar Scanner MsBuild
-    #  run: |
-    #    Get-ChildItem *.zip | Expand-Archive -DestinationPath ../../tools/sonar
-    #    del *.zip
-    #  working-directory: downloads/sonar
+        dotnet workload list
 
     - name: Add MSBuild to PATH
       uses: microsoft/setup-msbuild@1ff57057b5cfdc39105cd07a01d78e9b0ea0c14c
@@ -124,7 +111,6 @@ jobs:
       if: env.SONAR_TOKEN != '' && env.SONAR_PROJECT_KEY != '' && env.SONAR_ORGANISATION_KEY != ''
       run: |
         dotnet sonarscanner begin /k:"${{ env.SONAR_PROJECT_KEY }}" /d:sonar.login="${{ env.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /o:"${{ env.SONAR_ORGANISATION_KEY }}" /d:sonar.cs.opencover.reportsPaths="../artifacts/unittestcoverage/**/*.xml"
-        # .\..\tools\sonar\SonarScanner.MSBuild.exe begin /k:"${{ env.SONAR_PROJECT_KEY }}" /d:sonar.login="${{ env.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /o:"${{ env.SONAR_ORGANISATION_KEY }}" /d:sonar.cs.opencover.reportsPaths="../artifacts/unittestcoverage/**/*.xml"
       working-directory: src
       env:
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
@@ -144,7 +130,6 @@ jobs:
       if: env.SONAR_TOKEN != '' && env.SONAR_PROJECT_KEY != '' && env.SONAR_ORGANISATION_KEY != ''
       run: |
         dotnet sonarscanner end /d:sonar.login="${{ env.SONAR_TOKEN }}"
-        # .\..\tools\sonar\SonarScanner.MSBuild.exe end /d:sonar.login="${{ env.SONAR_TOKEN }}"
       working-directory: src
       env:
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

diff --git a/src/Directory.build.props b/src/Directory.build.props
@@ -91,7 +91,6 @@
     <PackageReference Include="stylecop.analyzers" Version="1.2.0-beta.507" PrivateAssets="all" />
     <PackageReference Include="Roslynator.Analyzers" Version="4.4.0" PrivateAssets="All" />
     <PackageReference Include="InclusivenessAnalyzer" Version="1.3.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.3" PrivateAssets="all" />
   </ItemGroup>
 
   <!-- Net Analyzers config taken from : https://docs.microsoft.com/en-gb/visualstudio/code-quality/migrate-from-fxcop-analyzers-to-net-analyzers?view=vs-2019 -->

diff --git a/src/global.json b/src/global.json
@@ -1,6 +1,5 @@
 {
     "sdk": {
-        "version": "6.0",
         "rollForward": "latestMinor",
         "allowPrerelease": false
     },