Skip to content

[master] Update dependencies from dotnet/runtime dotnet/efcore #25090

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
merged 27 commits into from
Aug 29, 2020
Merged

[master] Update dependencies from dotnet/runtime dotnet/efcore #25090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
e9b6daf
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Aug 20, 2020
6786e6a
skip tests
BrennanConroy Aug 20, 2020
3eec641
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Aug 21, 2020
778ece8
Update NuGet.config
mmitche Aug 21, 2020
03b0e2f
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Aug 21, 2020
d310152
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Aug 22, 2020
89f1660
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Aug 23, 2020
3568cb2
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Aug 24, 2020
f82a0c8
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Aug 24, 2020
8824d79
Add dotnet6 as source for helix
wtgodbe Aug 24, 2020
c8145d2
fixup
wtgodbe Aug 24, 2020
fe8806f
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Aug 24, 2020
288c2d0
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Aug 24, 2020
24c46c6
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Aug 25, 2020
a9311b3
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Aug 25, 2020
b978c63
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Aug 25, 2020
1479d1d
Fix Typescript tests
BrennanConroy Aug 26, 2020
89f8a18
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Aug 26, 2020
7fc40e5
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Aug 26, 2020
a2aab42
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Aug 27, 2020
059e37e
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Aug 28, 2020
916efff
Add dotnet6 source to TestRunner
Aug 28, 2020
37f3ae5
Make it a command line argument so only the scripts need to be edited
Aug 28, 2020
deea037
Merge branch 'master' into darc-master-dbbb9576-1bf8-4685-8771-d97f6e…
Aug 28, 2020
bd29c75
Typo
Aug 28, 2020
00af7e9
Merge branch 'master' into darc-master-dbbb9576-1bf8-4685-8771-d97f6e…
Aug 29, 2020
e8cff12
Update Version.Details.xml
Aug 29, 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
2 changes: 2 additions & 0 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
<add key="dotnet5-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json" />
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
<add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mmitche why do we still need the dotnet5* feeds❔ I'm guessing the new feeds aren't primed yet but would like to confirm.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you'll need them until all inputs are dotnet6. I was going to remove them, but thought it likely that things would fail.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When we remove dotnet5 here, we'll also need to remove it from eng\helix\content\runtests.cmd

<add key="roslyn" value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="roslyn-tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
Expand Down
296 changes: 148 additions & 148 deletions eng/Version.Details.xml
View file
Open in desktop

Large diffs are not rendered by default.

148 changes: 74 additions & 74 deletions eng/Versions.props
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions eng/helix/content/RunTests/RunTestsOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,11 @@ public static RunTestsOptions Parse(string[] args)
aliases: new string[] { "--helixTimeout" },
description: "The timeout duration of the Helix job")
{ Argument = new Argument<string>(), Required = true },

new Option(
aliases: new string[] { "--source" },
description: "The restore sources to use during testing")
{ Argument = new Argument<string>() { Arity = ArgumentArity.ZeroOrMore }, Required = true }
};

var parseResult = command.Parse(args);
Expand All @@ -79,6 +84,7 @@ public static RunTestsOptions Parse(string[] args)
options.AspNetRuntime = parseResult.ValueForOption<string>("--aspnetruntime");
options.AspNetRef = parseResult.ValueForOption<string>("--aspnetref");
options.Timeout = TimeSpan.Parse(parseResult.ValueForOption<string>("--helixTimeout"));
options.Source = parseResult.ValueForOption<IEnumerable<string>>("--source");
options.HELIX_WORKITEM_ROOT = Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT");
options.Path = Environment.GetEnvironmentVariable("PATH");
options.DotnetRoot = Environment.GetEnvironmentVariable("DOTNET_ROOT");
Expand All @@ -97,6 +103,7 @@ public static RunTestsOptions Parse(string[] args)
public string HELIX_WORKITEM_ROOT { get; set;}
public string DotnetRoot { get; set; }
public string Path { get; set; }
public IEnumerable<string> Source { get; set; }
public TimeSpan Timeout { get; set; }
}
}
21 changes: 12 additions & 9 deletions eng/helix/content/RunTests/TestRunner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,13 +126,16 @@ await ProcessUtil.RunAsync($"{Options.DotnetRoot}/dotnet",
throwOnError: false,
cancellationToken: new CancellationTokenSource(TimeSpan.FromMinutes(2)).Token);

await ProcessUtil.RunAsync($"{Options.DotnetRoot}/dotnet",
"nuget add source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json --configfile NuGet.config",
environmentVariables: EnvironmentVariables,
outputDataReceived: Console.WriteLine,
errorDataReceived: Console.Error.WriteLine,
throwOnError: false,
cancellationToken: new CancellationTokenSource(TimeSpan.FromMinutes(2)).Token);
foreach (var restoreSource in Options.Source)
{
await ProcessUtil.RunAsync($"{Options.DotnetRoot}/dotnet",
$"nuget add source {restoreSource} --configfile NuGet.config",
environmentVariables: EnvironmentVariables,
outputDataReceived: Console.WriteLine,
errorDataReceived: Console.Error.WriteLine,
throwOnError: false,
cancellationToken: new CancellationTokenSource(TimeSpan.FromMinutes(2)).Token);
}

// Write nuget sources to console, useful for debugging purposes
await ProcessUtil.RunAsync($"{Options.DotnetRoot}/dotnet",
Expand Down Expand Up @@ -247,7 +250,7 @@ public async Task<int> RunTestsAsync()
{
// Timeout test run 5 minutes before the Helix job would timeout
var cts = new CancellationTokenSource(Options.Timeout.Subtract(TimeSpan.FromMinutes(5)));
var commonTestArgs = $"test {Options.Target} --logger:xunit --logger:\"console;verbosity=normal\" --blame \"CollectHangDump;TestTimeout=5m\"";
var commonTestArgs = $"test {Options.Target} --logger:xunit --logger:\"console;verbosity=normal\" --blame \"CollectHangDump;TestTimeout=5m\"";
if (Options.Quarantined)
{
Console.WriteLine("Running quarantined tests.");
Expand Down Expand Up @@ -346,7 +349,7 @@ public void UploadResults()
else
{
Console.WriteLine("No dmps found in TestResults");
}
}
}
}
}
8 changes: 4 additions & 4 deletions eng/helix/content/runtests.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ echo "Invoking InstallDotNet.ps1 %$arch% %$sdkVersion% %$runtimeVersion% %DOTNET
powershell.exe -NoProfile -ExecutionPolicy unrestricted -file InstallDotNet.ps1 %$arch% %$sdkVersion% %$runtimeVersion% %DOTNET_ROOT%

set exit_code=0
echo "Restore: dotnet restore RunTests\RunTests.csproj --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json --source https://api.nuget.org/v3/index.json --ignore-failed-sources..."
dotnet restore RunTests\RunTests.csproj --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json --source https://api.nuget.org/v3/index.json --ignore-failed-sources
echo "Restore: dotnet restore RunTests\RunTests.csproj --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json --source https://api.nuget.org/v3/index.json --ignore-failed-sources..."
dotnet restore RunTests\RunTests.csproj --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json --source https://api.nuget.org/v3/index.json --ignore-failed-sources

echo "Running tests: dotnet run --project RunTests\RunTests.csproj -- --target %$target% --sdk %$sdkVersion% --runtime %$runtimeVersion% --queue %$queue% --arch %$arch% --quarantined %$quarantined% --ef %$ef% --aspnetruntime %$aspnetruntime% --aspnetref %$aspnetref% --helixTimeout %$helixTimeout%..."
dotnet run --project RunTests\RunTests.csproj -- --target %$target% --sdk %$sdkVersion% --runtime %$runtimeVersion% --queue %$queue% --arch %$arch% --quarantined %$quarantined% --ef %$ef% --aspnetruntime %$aspnetruntime% --aspnetref %$aspnetref% --helixTimeout %$helixTimeout%
echo "Running tests: dotnet run --project RunTests\RunTests.csproj -- --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json --target %$target% --sdk %$sdkVersion% --runtime %$runtimeVersion% --queue %$queue% --arch %$arch% --quarantined %$quarantined% --ef %$ef% --aspnetruntime %$aspnetruntime% --aspnetref %$aspnetref% --helixTimeout %$helixTimeout%..."
dotnet run --project RunTests\RunTests.csproj -- --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json --target %$target% --sdk %$sdkVersion% --runtime %$runtimeVersion% --queue %$queue% --arch %$arch% --quarantined %$quarantined% --ef %$ef% --aspnetruntime %$aspnetruntime% --aspnetref %$aspnetref% --helixTimeout %$helixTimeout%
if errorlevel neq 0 (
set exit_code=%errorlevel%
)
Expand Down
8 changes: 4 additions & 4 deletions eng/helix/content/runtests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@ fi
sync

exit_code=0
echo "Restore: $DOTNET_ROOT/dotnet restore RunTests/RunTests.csproj --source https://api.nuget.org/v3/index.json --ignore-failed-sources..."
$DOTNET_ROOT/dotnet restore RunTests/RunTests.csproj --source https://api.nuget.org/v3/index.json --ignore-failed-sources
echo "Running tests: $DOTNET_ROOT/dotnet run --project RunTests/RunTests.csproj -- --target $1 --sdk $2 --runtime $3 --queue $4 --arch $5 --quarantined $6 --ef $7 --aspnetruntime $8 --aspnetref $9 --helixTimeout ${10}..."
$DOTNET_ROOT/dotnet run --project RunTests/RunTests.csproj -- --target $1 --sdk $2 --runtime $3 --queue $4 --arch $5 --quarantined $6 --ef $7 --aspnetruntime $8 --aspnetref $9 --helixTimeout ${10}
echo "Restore: $DOTNET_ROOT/dotnet restore RunTests/RunTests.csproj --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json --source https://api.nuget.org/v3/index.json --ignore-failed-sources..."
$DOTNET_ROOT/dotnet restore RunTests/RunTests.csproj --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json --source https://api.nuget.org/v3/index.json --ignore-failed-sources
echo "Running tests: $DOTNET_ROOT/dotnet run --project RunTests/RunTests.csproj -- --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json --target $1 --sdk $2 --runtime $3 --queue $4 --arch $5 --quarantined $6 --ef $7 --aspnetruntime $8 --aspnetref $9 --helixTimeout ${10}..."
$DOTNET_ROOT/dotnet run --project RunTests/RunTests.csproj -- --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json --target $1 --sdk $2 --runtime $3 --queue $4 --arch $5 --quarantined $6 --ef $7 --aspnetruntime $8 --aspnetref $9 --helixTimeout ${10}
exit_code=$?
echo "Finished tests...exit_code=$exit_code"

Expand Down
6 changes: 3 additions & 3 deletions src/Tools/dotnet-user-secrets/test/SecretManagerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public void SupportsRelativePaths()
Assert.Contains(Resources.FormatMessage_Project_File_Path(Path.Combine(cwd, "..", "TestProject.csproj")), _console.GetOutput());
}

[Theory]
[ConditionalTheory(Skip = "https://github.com/dotnet/aspnetcore/issues/25109")]
[InlineData(true)]
[InlineData(false)]
public void SetSecrets(bool fromCurrentDirectory)
Expand Down Expand Up @@ -192,7 +192,7 @@ public void Remove_Non_Existing_Secret()
Assert.Contains("Cannot find 'secret1' in the secret store.", _console.GetOutput());
}

[Fact]
[ConditionalFact(Skip = "https://github.com/dotnet/aspnetcore/issues/25109")]
public void Remove_Is_Case_Insensitive()
{
var projectPath = _fixture.GetTempSecretProject();
Expand Down Expand Up @@ -266,7 +266,7 @@ public void List_Empty_Secrets_File()
Assert.Contains(Resources.Error_No_Secrets_Found, _console.GetOutput());
}

[Theory]
[ConditionalTheory(Skip = "https://github.com/dotnet/aspnetcore/issues/25109")]
[InlineData(true)]
[InlineData(false)]
public void Clear_Secrets(bool fromCurrentDirectory)
Expand Down