Skip to content

Commit 0bbf498

Browse files
authored
Update Microsoft.Build.Locator.csproj to target .net 8 (#330)
1 parent 6235ee4 commit 0bbf498

File tree

5 files changed

+16
-26
lines changed

5 files changed

+16
-26
lines changed

samples/BuilderApp/BuilderApp.csproj

+3-10
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net472;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net472;net8.0</TargetFrameworks>
65
<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
76
<IsPackable>false</IsPackable>
87
</PropertyGroup>
9-
108
<ItemGroup>
119
<None Include="test.proj" />
1210
</ItemGroup>
13-
1411
<ItemGroup>
1512
<!--
1613
These are intentionally not the most up-to-date version of the MSBuild packages to show that they're
@@ -19,15 +16,11 @@
1916
<PackageReference Include="Microsoft.Build" Version="15.5.180" ExcludeAssets="Runtime" />
2017
<PackageReference Include="Microsoft.Build.Framework" Version="15.5.180" ExcludeAssets="Runtime" />
2118
</ItemGroup>
22-
2319
<ItemGroup>
2420
<ProjectReference Include="..\..\src\MSBuildLocator\Microsoft.Build.Locator.csproj" />
2521
</ItemGroup>
26-
2722
<!-- Explicitly import the file that gives auto binding redirects for package users.
2823
Not necessary if you use the package! -->
29-
<Import Project="..\..\src\MSBuildLocator\build\Microsoft.Build.Locator.props"/>
30-
31-
<Import Project="..\..\src\MSBuildLocator\build\Microsoft.Build.Locator.targets"/>
32-
24+
<Import Project="..\..\src\MSBuildLocator\build\Microsoft.Build.Locator.props" />
25+
<Import Project="..\..\src\MSBuildLocator\build\Microsoft.Build.Locator.targets" />
3326
</Project>

src/MSBuildLocator.Tests/Microsoft.Build.Locator.Tests.csproj

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
4-
<TargetFrameworks>net472;net6.0</TargetFrameworks>
3+
<TargetFrameworks>net472;net8.0</TargetFrameworks>
54
<IsPackable>false</IsPackable>
65
<SignAssembly>true</SignAssembly>
76
<AssemblyOriginatorKeyFile>..\MSBuildLocator\key.snk</AssemblyOriginatorKeyFile>
87
</PropertyGroup>
9-
108
<ItemGroup>
119
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
1210
<PackageReference Include="Shouldly" Version="4.3.0" />
1311
<PackageReference Include="xunit" Version="2.9.3" />
1412
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1" />
1513
</ItemGroup>
16-
1714
<ItemGroup>
1815
<ProjectReference Include="..\MSBuildLocator\Microsoft.Build.Locator.csproj" />
1916
</ItemGroup>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
3+
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
4+
<!-- No in-support .NET 6 SDKs so this isn't a breaking change in practices -->
5+
<Suppression>
6+
<DiagnosticId>PKV006</DiagnosticId>
7+
<Target>net6.0</Target>
8+
</Suppression>
9+
</Suppressions>
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,27 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<OutputType>Library</OutputType>
5-
<TargetFrameworks>net46;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net46;net8.0</TargetFrameworks>
65
<DebugType>full</DebugType>
7-
86
<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
97
<AssemblyName>Microsoft.Build.Locator</AssemblyName>
108
<RootNamespace>Microsoft.Build.Locator</RootNamespace>
119
<SignAssembly>true</SignAssembly>
1210
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
1311
<EnableDefaultNoneItems>false</EnableDefaultNoneItems>
14-
1512
<Title>MSBuild Locator</Title>
1613
<Description>Package that assists in locating and using a copy of MSBuild installed as part of Visual Studio 2017 or higher or .NET Core SDK 2.1 or higher.</Description>
17-
<PackageTags>msbuildlocator;locator;buildlocator</PackageTags>
18-
14+
<PackageTags>msbuildlocator;locator;buildlocator</PackageTags>
1915
<EnablePackageValidation>true</EnablePackageValidation>
2016
<PackageValidationBaselineVersion>1.6.1</PackageValidationBaselineVersion>
2117
</PropertyGroup>
22-
2318
<PropertyGroup Condition="'$(TargetFramework)'=='net46'">
2419
<DefineConstants>$(DefineConstants);FEATURE_VISUALSTUDIOSETUP</DefineConstants>
2520
</PropertyGroup>
26-
2721
<ItemGroup Condition="'$(TargetFramework)'=='net46'">
2822
<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.12.2149" PrivateAssets="all" />
2923
<PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.36" PrivateAssets="all" />
3024
</ItemGroup>
31-
3225
<ItemGroup>
3326
<PackageReference Include="MicroBuild.Core" Version="0.3.0" PrivateAssets="all" />
3427
<Content Include="build\Microsoft.Build.Locator.props">
@@ -40,11 +33,9 @@
4033
<PackagePath>build\</PackagePath>
4134
</Content>
4235
</ItemGroup>
43-
4436
<ItemGroup>
4537
<FilesToSign Include="$(OutDir)\Microsoft.Build.Locator.dll">
4638
<Authenticode>Microsoft400</Authenticode>
4739
</FilesToSign>
4840
</ItemGroup>
49-
5041
</Project>

version.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.8",
2+
"version": "1.9",
33
"assemblyVersion": "1.0.0.0",
44
"publicReleaseRefSpec": [
55
"^refs/heads/release/.*"

0 commit comments

Comments
 (0)