Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions samples/BuilderApp/BuilderApp.csproj
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net472;net6.0</TargetFrameworks>
<TargetFrameworks>net472;net8.0</TargetFrameworks>
<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<None Include="test.proj" />
</ItemGroup>

<ItemGroup>
<!--
These are intentionally not the most up-to-date version of the MSBuild packages to show that they're
Expand All @@ -19,15 +16,11 @@
<PackageReference Include="Microsoft.Build" Version="15.5.180" ExcludeAssets="Runtime" />
<PackageReference Include="Microsoft.Build.Framework" Version="15.5.180" ExcludeAssets="Runtime" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\MSBuildLocator\Microsoft.Build.Locator.csproj" />
</ItemGroup>

<!-- Explicitly import the file that gives auto binding redirects for package users.
Not necessary if you use the package! -->
<Import Project="..\..\src\MSBuildLocator\build\Microsoft.Build.Locator.props"/>

<Import Project="..\..\src\MSBuildLocator\build\Microsoft.Build.Locator.targets"/>

<Import Project="..\..\src\MSBuildLocator\build\Microsoft.Build.Locator.props" />
<Import Project="..\..\src\MSBuildLocator\build\Microsoft.Build.Locator.targets" />
</Project>
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net472;net6.0</TargetFrameworks>
<TargetFrameworks>net472;net8.0</TargetFrameworks>
<IsPackable>false</IsPackable>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\MSBuildLocator\key.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="Shouldly" Version="4.3.0" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\MSBuildLocator\Microsoft.Build.Locator.csproj" />
</ItemGroup>
Expand Down
9 changes: 9 additions & 0 deletions src/MSBuildLocator/CompatibilitySuppressions.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<!-- No in-support .NET 6 SDKs so this isn't a breaking change in practices -->
<Suppression>
<DiagnosticId>PKV006</DiagnosticId>
<Target>net6.0</Target>
</Suppression>
</Suppressions>
13 changes: 2 additions & 11 deletions src/MSBuildLocator/Microsoft.Build.Locator.csproj
Original file line number Diff line number Diff line change
@@ -1,34 +1,27 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>net46;net6.0</TargetFrameworks>
<TargetFrameworks>net46;net8.0</TargetFrameworks>
<DebugType>full</DebugType>

<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
<AssemblyName>Microsoft.Build.Locator</AssemblyName>
<RootNamespace>Microsoft.Build.Locator</RootNamespace>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<EnableDefaultNoneItems>false</EnableDefaultNoneItems>

<Title>MSBuild Locator</Title>
<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>
<PackageTags>msbuildlocator;locator;buildlocator</PackageTags>

<PackageTags>msbuildlocator;locator;buildlocator</PackageTags>
<EnablePackageValidation>true</EnablePackageValidation>
<PackageValidationBaselineVersion>1.6.1</PackageValidationBaselineVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)'=='net46'">
<DefineConstants>$(DefineConstants);FEATURE_VISUALSTUDIOSETUP</DefineConstants>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net46'">
<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.12.2149" PrivateAssets="all" />
<PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.36" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.3.0" PrivateAssets="all" />
<Content Include="build\Microsoft.Build.Locator.props">
Expand All @@ -40,11 +33,9 @@
<PackagePath>build\</PackagePath>
</Content>
</ItemGroup>

<ItemGroup>
<FilesToSign Include="$(OutDir)\Microsoft.Build.Locator.dll">
<Authenticode>Microsoft400</Authenticode>
</FilesToSign>
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion version.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.8",
"version": "1.9",
"assemblyVersion": "1.0.0.0",
"publicReleaseRefSpec": [
"^refs/heads/release/.*"
Expand Down
Loading