Skip to content

[release/5.0.1xx-preview8] Update dependencies from microsoft/msbuild #12526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dotnet-maestro merged 3 commits into from
Jul 17, 2020
Merged

[release/5.0.1xx-preview8] Update dependencies from microsoft/msbuild #12526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e97237a
Update dependencies from https://github.com/microsoft/msbuild build 2…
dotnet-maestro[bot] Jul 16, 2020
5b8d9ed
Update dependencies from https://github.com/microsoft/msbuild build 2…
dotnet-maestro[bot] Jul 17, 2020
42533fc
Fix issues packing projects
dsplaisted Jul 17, 2020
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
7 changes: 7 additions & 0 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@
<CopyToOutputDirectory Condition="'%(Filename)' == 'xunit.runner.utility.netcoreapp10'">false</CopyToOutputDirectory>
<CopyToOutputDirectory Condition="'%(Filename)' == 'xunit.runner.reporters.netcoreapp10'">false</CopyToOutputDirectory>
</None>

<!-- These files are included by the Microsoft.TestPlatform.TestHost package, but we don't want them in the .NET Tool NuGet package
(by default they would go in the content and contentFiles folders, generating NU5100 warnings. -->
<Content Update="@(Content)">
<Pack Condition="$([System.IO.Path]::GetFileName('%(Identity)')) == 'testhost.exe'">false</Pack>
<Pack Condition="$([System.IO.Path]::GetFileName('%(Identity)')) == 'testhost.dll'">false</Pack>
</Content>

</ItemGroup>

Expand Down
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@
<Uri>https://github.com/dotnet/CliCommandLineParser</Uri>
<Sha>0e89c2116ad28e404ba56c14d1c3f938caa25a01</Sha>
</Dependency>
<Dependency Name="Microsoft.Build" Version="16.7.0-preview-20360-03">
<Dependency Name="Microsoft.Build" Version="16.8.0-preview-20367-06">
<Uri>https://github.com/microsoft/msbuild</Uri>
<Sha>188921e2ffecf6c74dd4583cf01b62465fcbee3c</Sha>
<Sha>ccca596f350c87b9483577b956ed3dae7e7e1960</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Localization" Version="16.7.0-preview-20360-03">
<Dependency Name="Microsoft.Build.Localization" Version="16.8.0-preview-20367-06">
<Uri>https://github.com/microsoft/msbuild</Uri>
<Sha>188921e2ffecf6c74dd4583cf01b62465fcbee3c</Sha>
<Sha>ccca596f350c87b9483577b956ed3dae7e7e1960</Sha>
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="10.10.0-beta.20361.3">
<Uri>https://github.com/dotnet/fsharp</Uri>
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,10 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
<MicrosoftBuildPackageVersion>16.7.0-preview-20360-03</MicrosoftBuildPackageVersion>
<MicrosoftBuildPackageVersion>16.8.0-preview-20367-06</MicrosoftBuildPackageVersion>
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
<MicrosoftBuildLocalizationPackageVersion>16.7.0-preview-20360-03</MicrosoftBuildLocalizationPackageVersion>
<MicrosoftBuildLocalizationPackageVersion>16.8.0-preview-20367-06</MicrosoftBuildLocalizationPackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
<MicrosoftBuildVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildVersion>
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildFrameworkPackageVersion)</MicrosoftBuildFrameworkVersion>
Expand Down
3 changes: 3 additions & 0 deletions src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@
<OutputPath>$(BaseOutputPath)</OutputPath>
<IsPackable>true</IsPackable>
<PackageLayoutOutputPath>$(ArtifactsBinDir)$(Configuration)\Sdks\$(PackageId)\</PackageLayoutOutputPath>

<!-- Allow .editorconfig file for analyzers to be packed -->
<NoDefaultExcludes>true</NoDefaultExcludes>
</PropertyGroup>

<ItemDefinitionGroup>
Expand Down