diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 757e3fd0..6609ce2c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ on: merge_group: env: - DOTNET_VERSION: ${{ '9.0.x' }} + DOTNET_VERSION: '9.0.310' # Only used by jobs that cannot access global.json (no checkout/artifact-only jobs) ENABLE_DIAGNOSTICS: true MSBUILD_VERBOSITY: normal #COREHOST_TRACE: 1 @@ -36,17 +36,17 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: - - name: Install .NET SDK v${{ env.DOTNET_VERSION }} - uses: actions/setup-dotnet@v4 - with: - dotnet-version: ${{ env.DOTNET_VERSION }} - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - name: Checkout Repository uses: actions/checkout@v4 with: submodules: recursive + - name: Install .NET SDK + uses: actions/setup-dotnet@v4 + with: + global-json-file: global.json + # Restore Tools from Manifest list in the Repository - name: Restore dotnet tools run: dotnet tool restore @@ -85,21 +85,21 @@ jobs: maximum-size: 32GB disk-root: "C:" - - name: Install .NET SDK v${{ env.DOTNET_VERSION }} + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - name: Checkout Repository + uses: actions/checkout@v4 + with: + submodules: recursive + + - name: Install .NET SDK uses: actions/setup-dotnet@v4 with: - dotnet-version: ${{ env.DOTNET_VERSION }} + global-json-file: global.json - name: .NET Info (if diagnostics) if: ${{ env.ENABLE_DIAGNOSTICS == 'true' }} run: dotnet --info - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - name: Checkout Repository - uses: actions/checkout@v4 - with: - submodules: recursive - - name: Install procdump if: ${{ env.ENABLE_DIAGNOSTICS == 'true' }} shell: pwsh @@ -222,21 +222,21 @@ jobs: VERSION_PROPERTY: ${{ github.ref == 'refs/heads/main' && format('build.{0}', github.run_number) || format('pull-{0}.{1}', github.event.number, github.run_number) }} steps: - - name: Install .NET SDK v${{ env.DOTNET_VERSION }} + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - name: Checkout Repository + uses: actions/checkout@v4 + with: + submodules: recursive + + - name: Install .NET SDK uses: actions/setup-dotnet@v4 with: - dotnet-version: ${{ env.DOTNET_VERSION }} + global-json-file: global.json - name: .NET Info (if diagnostics) if: ${{ env.ENABLE_DIAGNOSTICS == 'true' }} run: dotnet --info - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - name: Checkout Repository - uses: actions/checkout@v4 - with: - submodules: recursive - # Semver regex: https://regex101.com/r/Ly7O1x/3/ - name: Format Date/Time of Release Package Version if: ${{ env.IS_RELEASE == 'true' }} @@ -333,7 +333,7 @@ jobs: winui: [2, 3] steps: - - name: Install .NET SDK v${{ env.DOTNET_VERSION }} + - name: Install .NET SDK uses: actions/setup-dotnet@v4 with: dotnet-version: ${{ env.DOTNET_VERSION }} @@ -398,7 +398,7 @@ jobs: winui: [2, 3] steps: - - name: Install .NET SDK v${{ env.DOTNET_VERSION }} + - name: Install .NET SDK uses: actions/setup-dotnet@v4 with: dotnet-version: ${{ env.DOTNET_VERSION }} @@ -421,21 +421,21 @@ jobs: runs-on: ubuntu-latest steps: - - name: Install .NET SDK v${{ env.DOTNET_VERSION }} + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - name: Checkout Repository + uses: actions/checkout@v4 + with: + submodules: recursive + + - name: Install .NET SDK uses: actions/setup-dotnet@v4 with: - dotnet-version: ${{ env.DOTNET_VERSION }} + global-json-file: global.json - name: .NET Info (if diagnostics) if: ${{ env.ENABLE_DIAGNOSTICS == 'true' }} run: dotnet --info - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - name: Checkout Repository - uses: actions/checkout@v4 - with: - submodules: recursive - # Restore Tools from Manifest list in the Repository - name: Restore dotnet tools run: dotnet tool restore diff --git a/global.json b/global.json index 3f28a3a3..338ca727 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "9.0.308", - "rollForward": "disable" + "version": "9.0.310", + "rollForward": "latestFeature" }, - "msbuild-sdks": + "msbuild-sdks": { "MSBuild.Sdk.Extras":"3.0.23" }