Skip to content

Merge master to master-vs-deps #41648

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
9 commits merged into from
Feb 13, 2020
Merged

Merge master to master-vs-deps #41648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
41dadf1
Use correct project capability for test projects
drewnoakes Jan 31, 2020
30cc89e
Remove unneeded TestContainer project capability
drewnoakes Jan 31, 2020
2903485
Revert compiler update that slowed down the build
sharwell Feb 12, 2020
9e47b92
Skip flaky Emit test
JoeRobich Feb 12, 2020
f173f0c
Merge pull request #41630 from JoeRobich/skip-emit-test
JoeRobich Feb 13, 2020
3b88f61
Merge pull request #41334 from drewnoakes/fix-test-container-capability
drewnoakes Feb 13, 2020
0e10735
Merge pull request #41643 from dotnet/merges/release/dev16.5-to-master
Feb 13, 2020
91045ab
Update dependencies from https://github.com/dotnet/arcade build 20200…
dotnet-maestro[bot] Feb 13, 2020
1a75987
Merge pull request #41625 from sharwell/faster-build
sharwell Feb 13, 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
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20111.11">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20112.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>998b715ed1fbb966437345a1996af64e22c83368</Sha>
<Sha>951ea7430678b2682ff861fe1149b8a2f55887ca</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
1 change: 1 addition & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
<VisualStudioEditorPackagesVersion>16.4.248</VisualStudioEditorPackagesVersion>
<ILToolsPackageVersion>5.0.0-alpha1.19409.1</ILToolsPackageVersion>
<MicrosoftVisualStudioLanguageServerPackagesVersion>16.3.27-develop-gdd55e997</MicrosoftVisualStudioLanguageServerPackagesVersion>
<MicrosoftNetCompilersToolsetVersion>3.5.0-beta2-20074-05</MicrosoftNetCompilersToolsetVersion>
</PropertyGroup>
<!--
Dependency versions
Expand Down
5 changes: 0 additions & 5 deletions eng/targets/Imports.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,6 @@
<BypassFrameworkInstallChecks>true</BypassFrameworkInstallChecks>
</PropertyGroup>

<!-- Add the UnitTestContainer project capability -->
<ItemGroup Condition="'$(IsTestProject)' == 'true'">
<ProjectCapability Include="UnitTestContainer" />
</ItemGroup>

<!--
Do not copy dependencies to the output directory of a library project, unless it's a unit test project.
-->
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
"xcopy-msbuild": "16.4.0-alpha"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20111.11"
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20112.7"
}
}
2 changes: 1 addition & 1 deletion src/Compilers/CSharp/Test/Emit/Emit/DeterministicTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ public void CompareAllBytesEmitted_Release(DebugInformationFormat pdbFormat)
}

[WorkItem(926, "https://github.com/dotnet/roslyn/issues/926")]
[Theory]
[Theory(Skip = "https://github.com/dotnet/roslyn/issues/41626")]
[MemberData(nameof(PdbFormats))]
public void CompareAllBytesEmitted_Debug(DebugInformationFormat pdbFormat)
{
Expand Down