Skip to content

Commit 014f916

Browse files
authored
Merge pull request #73978 from dotnet/merges/release/dev17.6-to-release/dev17.8
Merge release/dev17.6 to release/dev17.8
2 parents 63a620c + 074c7c1 commit 014f916

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

eng/InternalTools.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
https://devdiv.pkgs.visualstudio.com/_packaging/Engineering/nuget/v3/index.json;
77
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json;
88
</RestoreSources>
9-
<RestoreSources>
9+
<RestoreSources>
1010
$(RestoreSources);
1111
https://pkgs.dev.azure.com/devdiv/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json
1212
</RestoreSources>

src/Compilers/CSharp/Test/EndToEnd/EndToEndTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ bool runTestAndCatch(int depth)
113113
// This test is a canary attempting to make sure that we don't regress the # of fluent calls that
114114
// the compiler can handle.
115115
[WorkItem(16669, "https://github.com/dotnet/roslyn/issues/16669")]
116-
[ConditionalFact(typeof(WindowsOrLinuxOnly)), WorkItem(34880, "https://github.com/dotnet/roslyn/issues/34880")]
116+
[ConditionalFact(typeof(WindowsOrLinuxOnly), AlwaysSkip = "https://github.com/dotnet/roslyn/issues/67912"), WorkItem(34880, "https://github.com/dotnet/roslyn/issues/34880")]
117117
public void OverflowOnFluentCall()
118118
{
119119
int numberFluentCalls = (IntPtr.Size, ExecutionConditionUtil.Configuration) switch

0 commit comments

Comments
 (0)