diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 3efa0ce63..5ead44906 100644
--- 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
index afdb32c6b..d412d5f88 100644
--- 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
index 037f069a2..23bbd026e 100644
--- a/src/Directory.build.props
+++ b/src/Directory.build.props
@@ -91,7 +91,6 @@
-
diff --git a/src/global.json b/src/global.json
index b1a39f01d..e201736fa 100644
--- a/src/global.json
+++ b/src/global.json
@@ -1,6 +1,5 @@
{
"sdk": {
- "version": "6.0",
"rollForward": "latestMinor",
"allowPrerelease": false
},