Skip to content

Commit

Permalink
Stop testing with .NET 8 (#503)
Browse files Browse the repository at this point in the history
  • Loading branch information
jeffkl authored Nov 2, 2023
1 parent 0cc7e9a commit 91f47f3
Show file tree
Hide file tree
Showing 10 changed files with 10 additions and 52 deletions.
1 change: 1 addition & 0 deletions Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<PropertyGroup>
<MicroBuild_NuPkgSigningEnabled Condition="'$(SignType)' == 'Test'">false</MicroBuild_NuPkgSigningEnabled>
<NoWarn Condition="'$(IsTestProject)' == 'true'">$(NoWarn);SA1600</NoWarn>
<ShadeAssemblies Condition="'$(Configuration)' == 'Release'">false</ShadeAssemblies>
</PropertyGroup>

<PropertyGroup Condition="'$(SignType)' == 'Test'">
Expand Down
1 change: 1 addition & 0 deletions azure-pipelines-official.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ stages:
inputs:
projects: 'MSBuildSdks.sln'
msbuildArgs: '$(MSBuildArgs)'
msbuildArchitecture: 'x64'

- task: PublishBuildArtifacts@1
displayName: 'Publish Artifacts'
Expand Down
43 changes: 0 additions & 43 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ variables:
BuildPlatform: 'Any CPU'
DotNet6Version: '6.x'
DotNet7Version: '7.x'
DotNet8Version: '8.x'
MSBuildArgs: '"/p:Platform=$(BuildPlatform)" "/p:Configuration=$(BuildConfiguration)" "/BinaryLogger:$(Build.SourcesDirectory)\$(ArtifactsDirectoryName)\msbuild.binlog"'
SignType: 'Test'

Expand Down Expand Up @@ -46,12 +45,6 @@ jobs:
inputs:
version: '$(DotNet7Version)'

- task: UseDotNet@2
displayName: 'Install .NET $(DotNet8Version)'
inputs:
version: '$(DotNet8Version)'
includePreviewVersions: true

- task: DotNetCoreCLI@2
displayName: 'Build Solution'
inputs:
Expand Down Expand Up @@ -82,14 +75,6 @@ jobs:
testRunTitle: 'Windows .NET 7.0'
condition: succeededOrFailed()

- task: DotNetCoreCLI@2
displayName: 'Run Unit Tests (.NET 8.0)'
inputs:
command: 'test'
arguments: '--no-restore --no-build --framework net8.0 /noautorsp'
testRunTitle: 'Windows .NET 8.0'
condition: succeededOrFailed()

- task: PublishBuildArtifacts@1
displayName: 'Publish Artifacts'
inputs:
Expand All @@ -113,12 +98,6 @@ jobs:
inputs:
version: '$(DotNet7Version)'

- task: UseDotNet@2
displayName: 'Install .NET $(DotNet8Version)'
inputs:
version: '$(DotNet8Version)'
includePreviewVersions: true

- task: DotNetCoreCLI@2
displayName: 'dotnet build'
inputs:
Expand All @@ -141,14 +120,6 @@ jobs:
testRunTitle: 'Linux .NET 7.0'
condition: succeededOrFailed()

- task: DotNetCoreCLI@2
displayName: 'Run Unit Tests (.NET 8.0)'
inputs:
command: 'test'
arguments: '--no-restore --no-build --framework net8.0 /noautorsp'
testRunTitle: 'Linux .NET 8.0'
condition: succeededOrFailed()

- task: PublishBuildArtifacts@1
displayName: 'Publish Artifacts'
inputs:
Expand All @@ -172,12 +143,6 @@ jobs:
inputs:
version: '$(DotNet7Version)'

- task: UseDotNet@2
displayName: 'Install .NET $(DotNet8Version)'
inputs:
version: '$(DotNet8Version)'
includePreviewVersions: true

- task: DotNetCoreCLI@2
displayName: 'dotnet build'
inputs:
Expand All @@ -200,14 +165,6 @@ jobs:
testRunTitle: 'MacOS .NET 7.0'
condition: succeededOrFailed()

- task: DotNetCoreCLI@2
displayName: 'Run Unit Tests (.NET 8.0)'
inputs:
command: 'test'
arguments: '--no-restore --no-build --framework net8.0 /noautorsp'
testRunTitle: 'MacOS .NET 8.0'
condition: succeededOrFailed()

- task: PublishBuildArtifacts@1
displayName: 'Publish Artifacts'
inputs:
Expand Down
5 changes: 3 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"sdk": {
"version": "6.0.100",
"rollForward": "latestMajor"
"version": "7.0.100",
"rollForward": "latestMajor",
"allowPrerelease": true
},
"msbuild-sdks": {
"Microsoft.Build.NoTargets": "3.7.0"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>net472;net6.0;net7.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AssemblyShader" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>net472;net6.0;net7.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>net472;net6.0;net7.0</TargetFrameworks>
<Nullable>Enable</Nullable>
</PropertyGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>net472;net6.0;net7.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AssemblyShader" />
Expand Down
2 changes: 0 additions & 2 deletions src/NoTargets.UnitTests/NoTargetsTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,6 @@ public void DoNotReferenceOutputAssemblies()
targetFramework: "net7.0")
#elif NET6_0
targetFramework: "net6.0")
#elif NET8_0
targetFramework: "net8.0")
#endif
.Save();

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>net472;net6.0;net7.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AssemblyShader" />
Expand Down

0 comments on commit 91f47f3

Please sign in to comment.