Skip to content

Commit b76b3b6

Browse files
Update MSBuild (#346)
1 parent 501101d commit b76b3b6

File tree

4 files changed

+7
-11
lines changed

4 files changed

+7
-11
lines changed

.github/workflows/CI.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,13 @@ jobs:
4343
with:
4444
fetch-depth: 0
4545

46-
- name: Install .NET ${{ env.DotNet8Version }} and ${{ env.DotNet9Version }}
46+
- name: Install .NET ${{ env.DotNet8Version }}, ${{ env.DotNet9Version }}, and ${{ env.DotNet10Version }}
4747
uses: actions/setup-dotnet@v5
4848
with:
4949
dotnet-version: |
5050
${{ env.DotNet8Version }}
5151
${{ env.DotNet9Version }}
52-
53-
- name: Install .NET ${{ env.DotNet10Version }}
54-
uses: actions/setup-dotnet@v5
55-
with:
56-
dotnet-version: ${{ env.DotNet10Version }}
57-
dotnet-quality: 'preview'
52+
${{ env.DotNet10Version }}
5853
5954
- name: Build Solution
6055
run: dotnet build "/Property:Platform=${{ env.BuildPlatform }};Configuration=${{ env.BuildConfiguration }}" "/BinaryLogger:${{ env.ArtifactsDirectoryName }}/build.binlog"

.github/workflows/Official.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ jobs:
3333
with:
3434
dotnet-version: |
3535
${{ env.DotNet10Version }}
36-
dotnet-quality: 'preview'
3736
3837
- name: Build Solution
3938
run: dotnet build "/Property:Platform=${{ env.BuildPlatform }};Configuration=${{ env.BuildConfiguration }}" "/BinaryLogger:${{ env.ArtifactsDirectoryName }}\build.binlog"

Directory.Packages.props

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
5-
<MicrosoftBuildPackageVersion>17.14.28</MicrosoftBuildPackageVersion>
6-
<MicrosoftBuildPackageVersion Condition="'$(TargetFramework)' == 'net8.0'">17.11.48</MicrosoftBuildPackageVersion>
5+
<MicrosoftBuildPackageVersion Condition="'$(TargetFramework)' == 'net472' ">18.0.2</MicrosoftBuildPackageVersion>
6+
<MicrosoftBuildPackageVersion Condition="'$(TargetFramework)' == 'net10.0' ">18.0.2</MicrosoftBuildPackageVersion>
7+
<MicrosoftBuildPackageVersion Condition="'$(TargetFramework)' == 'net9.0' ">17.14.28</MicrosoftBuildPackageVersion>
8+
<MicrosoftBuildPackageVersion Condition="'$(TargetFramework)' == 'net8.0' ">17.11.48</MicrosoftBuildPackageVersion>
79
</PropertyGroup>
810
<ItemGroup>
911
<PackageVersion Include="AssemblyShader" Version="1.1.3" />

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-alpha",
3+
"version": "10.0.100",
44
"rollForward": "latestMinor",
55
"allowPrerelease": true
66
}

0 commit comments

Comments
 (0)