Skip to content
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

[master] Update dependencies from dotnet/msbuild #12730

Merged
merged 15 commits into from
Aug 3, 2020
Merged

[master] Update dependencies from dotnet/msbuild #12730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
a293dcb
Update dependencies from https://github.com/dotnet/msbuild build 2020…
dotnet-maestro[bot] Jul 31, 2020
9a25d4e
Update dependencies from https://github.com/dotnet/msbuild build 2020…
dotnet-maestro[bot] Jul 31, 2020
2b3e9ec
Update dependencies from https://github.com/dotnet/msbuild build 2020…
dotnet-maestro[bot] Jul 31, 2020
616e35f
Update dependencies from https://github.com/dotnet/msbuild build 2020…
dotnet-maestro[bot] Jul 31, 2020
0fa33a0
Update dependencies from https://github.com/dotnet/msbuild build 2020…
dotnet-maestro[bot] Jul 31, 2020
59cb87b
Update dependencies from https://github.com/dotnet/msbuild build 2020…
dotnet-maestro[bot] Jul 31, 2020
e13b36d
Update dependencies from https://github.com/dotnet/msbuild build 2020…
dotnet-maestro[bot] Jul 31, 2020
8477dbe
Update dependencies from https://github.com/dotnet/msbuild build 2020…
dotnet-maestro[bot] Jul 31, 2020
0e1cef6
Update dependencies from https://github.com/dotnet/msbuild build 2020…
dotnet-maestro[bot] Jul 31, 2020
6cae8fc
Update dependencies from https://github.com/dotnet/msbuild build 2020…
dotnet-maestro[bot] Jul 31, 2020
258e22f
Update dependencies from https://github.com/dotnet/msbuild build 2020…
dotnet-maestro[bot] Jul 31, 2020
e803b9f
Update dependencies from https://github.com/dotnet/msbuild build 2020…
dotnet-maestro[bot] Jul 31, 2020
17878dc
Merge remote-tracking branch 'upstream/master' into darc-master-59e77…
sfoslund Jul 31, 2020
f65150b
Updating new test to require MSBuild version
sfoslund Jul 31, 2020
d817d97
Update dependencies from https://github.com/dotnet/msbuild build 2020…
dotnet-maestro[bot] Aug 1, 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
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.8.0-preview-20380-03">
<Dependency Name="Microsoft.Build" Version="16.8.0-preview-20401-01">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>0e7b70f663ab86af7ab41d5d7b409f72f7143899</Sha>
<Sha>15307131458845313df37549b1e25c5076519809</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Localization" Version="16.8.0-preview-20380-03">
<Dependency Name="Microsoft.Build.Localization" Version="16.8.0-preview-20401-01">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>0e7b70f663ab86af7ab41d5d7b409f72f7143899</Sha>
<Sha>15307131458845313df37549b1e25c5076519809</Sha>
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="11.0.0-beta.20373.2">
<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.8.0-preview-20380-03</MicrosoftBuildPackageVersion>
<MicrosoftBuildPackageVersion>16.8.0-preview-20401-01</MicrosoftBuildPackageVersion>
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
<MicrosoftBuildLocalizationPackageVersion>16.8.0-preview-20380-03</MicrosoftBuildLocalizationPackageVersion>
<MicrosoftBuildLocalizationPackageVersion>16.8.0-preview-20401-01</MicrosoftBuildLocalizationPackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
<MicrosoftBuildVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildVersion>
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildFrameworkPackageVersion)</MicrosoftBuildFrameworkVersion>
Expand Down
2 changes: 1 addition & 1 deletion src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToProduceReferenceAssembly.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public class GivenThatWeWantToProduceReferenceAssembly : SdkTest
public GivenThatWeWantToProduceReferenceAssembly(ITestOutputHelper log) : base(log)
{}

[Theory]
[RequiresMSBuildVersionTheory("16.8.0")]
[InlineData("netcoreapp3.1", false)]
[InlineData("net5.0", true)]
public void It_produces_ref_assembly_for_appropriate_frameworks(string targetFramework, bool expectedExists)
Expand Down