Skip to content

Commit a1997c4

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[master] Update dependencies from dotnet/runtime dotnet/efcore (#25090)
[master] Update dependencies from dotnet/runtime dotnet/efcore - Updates: - System.ComponentModel.Annotations: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - System.Diagnostics.DiagnosticSource: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - System.Diagnostics.EventLog: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.Extensions.Logging.Abstractions: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.Extensions.Logging.Configuration: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.Extensions.Logging.Console: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.Extensions.Logging.Debug: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.Extensions.Logging.EventLog: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.Extensions.Logging.EventSource: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.Extensions.Logging.TraceSource: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.Extensions.Options: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.Extensions.Options.ConfigurationExtensions: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.Extensions.Options.DataAnnotations: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.Extensions.Primitives: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.Extensions.Logging: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.Extensions.Internal.Transport: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.Extensions.Http: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.Extensions.Hosting.Abstractions: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.Extensions.Caching.Abstractions: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.Extensions.Caching.Memory: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.Extensions.Configuration: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.Extensions.Configuration.Abstractions: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.Extensions.Configuration.Binder: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.Extensions.Configuration.CommandLine: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.Extensions.Configuration.EnvironmentVariables: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.Extensions.Configuration.FileExtensions: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.Extensions.Configuration.Ini: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.Extensions.Configuration.UserSecrets: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.Extensions.Configuration.Xml: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.Extensions.DependencyInjection: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.Extensions.DependencyInjection.Abstractions: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.Extensions.DependencyModel: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.Extensions.FileProviders.Abstractions: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.Extensions.FileProviders.Composite: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.Extensions.FileProviders.Physical: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.Extensions.FileSystemGlobbing: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.Extensions.HostFactoryResolver.Sources: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.Extensions.Hosting: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.Extensions.Configuration.Json: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.Win32.Registry: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.Win32.SystemEvents: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - System.Drawing.Common: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - System.Text.Json: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - System.Threading.Channels: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - System.Windows.Extensions: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - System.Text.Encodings.Web: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - System.ServiceProcess.ServiceController: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - System.IO.Pipelines: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - System.Net.Http.Json: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - System.Net.Http.WinHttpHandler: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - System.Net.WebSockets.WebSocketProtocol: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - System.Reflection.Metadata: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - System.Resources.Extensions: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - System.Runtime.CompilerServices.Unsafe: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - System.Security.AccessControl: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - System.Security.Cryptography.Cng: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - System.Security.Cryptography.Pkcs: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - System.Security.Cryptography.Xml: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - System.Security.Permissions: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - System.Security.Principal.Windows: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20428.2 - Updates: - Microsoft.EntityFrameworkCore.Tools: from 6.0.0-alpha.1.20417.8 to 6.0.0-alpha.1.20428.6 - Microsoft.EntityFrameworkCore.SqlServer: from 6.0.0-alpha.1.20417.8 to 6.0.0-alpha.1.20428.6 - dotnet-ef: from 6.0.0-alpha.1.20417.8 to 6.0.0-alpha.1.20428.6 - Microsoft.EntityFrameworkCore: from 6.0.0-alpha.1.20417.8 to 6.0.0-alpha.1.20428.6 - Microsoft.EntityFrameworkCore.Design: from 6.0.0-alpha.1.20417.8 to 6.0.0-alpha.1.20428.6 - Microsoft.EntityFrameworkCore.Relational: from 6.0.0-alpha.1.20417.8 to 6.0.0-alpha.1.20428.6 - Microsoft.EntityFrameworkCore.Sqlite: from 6.0.0-alpha.1.20417.8 to 6.0.0-alpha.1.20428.6 - Microsoft.EntityFrameworkCore.InMemory: from 6.0.0-alpha.1.20417.8 to 6.0.0-alpha.1.20428.6 - skip tests - Update NuGet.config - Add dotnet6 as source for helix - fixup - Fix Typescript tests - Add dotnet6 source to TestRunner - Make it a command line argument so only the scripts need to be edited - Merge branch 'master' into darc-master-dbbb9576-1bf8-4685-8771-d97f6e100fb8 - Typo - Merge branch 'master' into darc-master-dbbb9576-1bf8-4685-8771-d97f6e100fb8 - Update Version.Details.xml
1 parent ce16ff0 commit a1997c4

File tree

8 files changed

+254
-242
lines changed

8 files changed

+254
-242
lines changed

‎NuGet.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
77
<add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
88
<add key="dotnet5-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json" />
9+
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
10+
<add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
911
<add key="roslyn" value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
1012
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
1113
<add key="roslyn-tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />

‎eng/Version.Details.xml‎

Lines changed: 148 additions & 148 deletions
Large diffs are not rendered by default.

‎eng/Versions.props‎

Lines changed: 74 additions & 74 deletions
Large diffs are not rendered by default.

‎eng/helix/content/RunTests/RunTestsOptions.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,11 @@ public static RunTestsOptions Parse(string[] args)
6565
aliases: new string[] { "--helixTimeout" },
6666
description: "The timeout duration of the Helix job")
6767
{ Argument = new Argument<string>(), Required = true },
68+
69+
new Option(
70+
aliases: new string[] { "--source" },
71+
description: "The restore sources to use during testing")
72+
{ Argument = new Argument<string>() { Arity = ArgumentArity.ZeroOrMore }, Required = true }
6873
};
6974

7075
var parseResult = command.Parse(args);
@@ -79,6 +84,7 @@ public static RunTestsOptions Parse(string[] args)
7984
options.AspNetRuntime = parseResult.ValueForOption<string>("--aspnetruntime");
8085
options.AspNetRef = parseResult.ValueForOption<string>("--aspnetref");
8186
options.Timeout = TimeSpan.Parse(parseResult.ValueForOption<string>("--helixTimeout"));
87+
options.Source = parseResult.ValueForOption<IEnumerable<string>>("--source");
8288
options.HELIX_WORKITEM_ROOT = Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT");
8389
options.Path = Environment.GetEnvironmentVariable("PATH");
8490
options.DotnetRoot = Environment.GetEnvironmentVariable("DOTNET_ROOT");
@@ -97,6 +103,7 @@ public static RunTestsOptions Parse(string[] args)
97103
public string HELIX_WORKITEM_ROOT { get; set;}
98104
public string DotnetRoot { get; set; }
99105
public string Path { get; set; }
106+
public IEnumerable<string> Source { get; set; }
100107
public TimeSpan Timeout { get; set; }
101108
}
102109
}

‎eng/helix/content/RunTests/TestRunner.cs‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -126,13 +126,16 @@ await ProcessUtil.RunAsync($"{Options.DotnetRoot}/dotnet",
126126
throwOnError: false,
127127
cancellationToken: new CancellationTokenSource(TimeSpan.FromMinutes(2)).Token);
128128

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

137140
// Write nuget sources to console, useful for debugging purposes
138141
await ProcessUtil.RunAsync($"{Options.DotnetRoot}/dotnet",
@@ -247,7 +250,7 @@ public async Task<int> RunTestsAsync()
247250
{
248251
// Timeout test run 5 minutes before the Helix job would timeout
249252
var cts = new CancellationTokenSource(Options.Timeout.Subtract(TimeSpan.FromMinutes(5)));
250-
var commonTestArgs = $"test {Options.Target} --logger:xunit --logger:\"console;verbosity=normal\" --blame \"CollectHangDump;TestTimeout=5m\"";
253+
var commonTestArgs = $"test {Options.Target} --logger:xunit --logger:\"console;verbosity=normal\" --blame \"CollectHangDump;TestTimeout=5m\"";
251254
if (Options.Quarantined)
252255
{
253256
Console.WriteLine("Running quarantined tests.");
@@ -346,7 +349,7 @@ public void UploadResults()
346349
else
347350
{
348351
Console.WriteLine("No dmps found in TestResults");
349-
}
352+
}
350353
}
351354
}
352355
}

‎eng/helix/content/runtests.cmd‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ echo "Invoking InstallDotNet.ps1 %$arch% %$sdkVersion% %$runtimeVersion% %DOTNET
2828
powershell.exe -NoProfile -ExecutionPolicy unrestricted -file InstallDotNet.ps1 %$arch% %$sdkVersion% %$runtimeVersion% %DOTNET_ROOT%
2929

3030
set exit_code=0
31-
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..."
32-
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
31+
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..."
32+
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
3333

34-
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%..."
35-
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%
34+
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%..."
35+
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%
3636
if errorlevel neq 0 (
3737
set exit_code=%errorlevel%
3838
)

‎eng/helix/content/runtests.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@ fi
8686
sync
8787

8888
exit_code=0
89-
echo "Restore: $DOTNET_ROOT/dotnet restore RunTests/RunTests.csproj --source https://api.nuget.org/v3/index.json --ignore-failed-sources..."
90-
$DOTNET_ROOT/dotnet restore RunTests/RunTests.csproj --source https://api.nuget.org/v3/index.json --ignore-failed-sources
91-
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}..."
92-
$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}
89+
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..."
90+
$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
91+
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}..."
92+
$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}
9393
exit_code=$?
9494
echo "Finished tests...exit_code=$exit_code"
9595

‎src/Tools/dotnet-user-secrets/test/SecretManagerTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public void SupportsRelativePaths()
7979
Assert.Contains(Resources.FormatMessage_Project_File_Path(Path.Combine(cwd, "..", "TestProject.csproj")), _console.GetOutput());
8080
}
8181

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

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

269-
[Theory]
269+
[ConditionalTheory(Skip = "https://github.com/dotnet/aspnetcore/issues/25109")]
270270
[InlineData(true)]
271271
[InlineData(false)]
272272
public void Clear_Secrets(bool fromCurrentDirectory)

0 commit comments

Comments
 (0)