Skip to content

[master] Update dependencies from dotnet/arcade dotnet/aspnetcore-tooling #19083

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.

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
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
eadbfbb
Update dependencies from https://github.com/dotnet/aspnetcore-tooling…
dotnet-maestro[bot] Feb 15, 2020
b3d8301
Update dependencies from https://github.com/dotnet/arcade build 20200…
dotnet-maestro[bot] Feb 17, 2020
2ff3361
Update dependencies from https://github.com/dotnet/aspnetcore-tooling…
dotnet-maestro[bot] Feb 17, 2020
e6df6b1
Update dependencies from https://github.com/dotnet/aspnetcore-tooling…
dotnet-maestro[bot] Feb 17, 2020
e9d3d29
Update dependencies from https://github.com/dotnet/aspnetcore-tooling…
dotnet-maestro[bot] Feb 18, 2020
9c0da21
Update dependencies from https://github.com/dotnet/aspnetcore-tooling…
dotnet-maestro[bot] Feb 19, 2020
de70e8c
Update dependencies from https://github.com/dotnet/aspnetcore-tooling…
dotnet-maestro[bot] Feb 19, 2020
0ba8323
Update dependencies from https://github.com/dotnet/aspnetcore-tooling…
dotnet-maestro[bot] Feb 19, 2020
fc2b326
Update dependencies from https://github.com/dotnet/aspnetcore-tooling…
dotnet-maestro[bot] Feb 19, 2020
eddfcb6
Merge branch 'master' into darc-master-eb3c3068-653a-40cd-9d17-bd710a…
dougbu Feb 19, 2020
a96369f
Update dependencies from https://github.com/dotnet/aspnetcore-tooling…
dotnet-maestro[bot] Feb 20, 2020
00a50ed
Update dependencies from https://github.com/dotnet/aspnetcore-tooling…
dotnet-maestro[bot] Feb 20, 2020
d951692
Update dependencies from https://github.com/dotnet/aspnetcore-tooling…
dotnet-maestro[bot] Feb 20, 2020
385fec7
Update dependencies from https://github.com/dotnet/aspnetcore-tooling…
dotnet-maestro[bot] Feb 21, 2020
be9cc93
Use same .NET Core SDK as A-T
dougbu Feb 21, 2020
77222de
Update dependencies from https://github.com/dotnet/aspnetcore-tooling…
dotnet-maestro[bot] Feb 21, 2020
54e3378
Update dependencies from https://github.com/dotnet/aspnetcore-tooling…
dotnet-maestro[bot] Feb 21, 2020
c073e34
Update dependencies from https://github.com/dotnet/aspnetcore-tooling…
dotnet-maestro[bot] Feb 21, 2020
05ea586
Merge branch 'master' into darc-master-eb3c3068-653a-40cd-9d17-bd710a…
jkotalik Feb 21, 2020
33a2757
Update test cert
jkotalik Feb 21, 2020
c47f6fd
global json
jkotalik Feb 21, 2020
6c6ceba
Update certs again
jkotalik Feb 21, 2020
5e8d78d
Merge remote-tracking branch 'origin/master' into darc-master-eb3c306…
jkotalik Feb 21, 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
376 changes: 224 additions & 152 deletions eng/Version.Details.xml

Large diffs are not rendered by default.

169 changes: 94 additions & 75 deletions eng/Versions.props

Large diffs are not rendered by default.

44 changes: 0 additions & 44 deletions eng/common/post-build/darc-gather-drop.ps1

This file was deleted.

23 changes: 0 additions & 23 deletions eng/common/templates/post-build/darc-gather-drop.yml

This file was deleted.

2 changes: 1 addition & 1 deletion eng/common/tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ function GetDotNetInstallScript {

# Use curl if available, otherwise use wget
if command -v curl > /dev/null; then
with_retries curl "$install_script_url" -isSLv --retry 10 --create-dirs -o "$install_script" || {
with_retries curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script" || {
local exit_code=$?
Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to acquire dotnet install script (exit code '$exit_code')."
ExitWithExitCode $exit_code
Expand Down
8 changes: 4 additions & 4 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"sdk": {
"version": "5.0.100-preview.1.20119.10"
"version": "5.0.100-preview.2.20120.3"
},
"tools": {
"dotnet": "5.0.100-preview.1.20119.10",
"dotnet": "5.0.100-preview.2.20120.3",
"runtimes": {
"dotnet/x64": [
"$(MicrosoftNETCoreAppInternalPackageVersion)"
Expand All @@ -25,7 +25,7 @@
},
"msbuild-sdks": {
"Yarn.MSBuild": "1.15.2",
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20113.3",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20113.3"
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20116.1",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20116.1"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ public void ConfigureEndpointDevelopmentCertificateGetsLoadedWhenPresent()
try
{
var serverOptions = CreateServerOptions();
var certificate = new X509Certificate2(TestResources.GetCertPath("aspnetdevcert.pfx"), "aspnetdevcert", X509KeyStorageFlags.Exportable);
var certificate = new X509Certificate2(TestResources.GetCertPath("aspnetdevcert.pfx"), "testPassword", X509KeyStorageFlags.Exportable);
var bytes = certificate.Export(X509ContentType.Pkcs12, "1234");
var path = GetCertificatePath();
Directory.CreateDirectory(Path.GetDirectoryName(path));
Expand Down Expand Up @@ -258,7 +258,7 @@ public void ConfigureEndpointDevelopmentCertificateGetsIgnoredIfPasswordIsNotCor
try
{
var serverOptions = CreateServerOptions();
var certificate = new X509Certificate2(TestResources.GetCertPath("aspnetdevcert.pfx"), "aspnetdevcert", X509KeyStorageFlags.Exportable);
var certificate = new X509Certificate2(TestResources.GetCertPath("aspnetdevcert.pfx"), "testPassword", X509KeyStorageFlags.Exportable);
var bytes = certificate.Export(X509ContentType.Pkcs12, "1234");
var path = GetCertificatePath();
Directory.CreateDirectory(Path.GetDirectoryName(path));
Expand Down
Binary file not shown.
Binary file modified src/Servers/Kestrel/shared/test/TestCertificates/testCert.pfx
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ public async Task DevCertWithInvalidPrivateKeyProducesCustomWarning()
new TestServiceContext(LoggerFactory),
listenOptions =>
{
listenOptions.UseHttps(TestResources.GetTestCertificate());
listenOptions.UseHttps(TestResources.GetTestCertificate("aspnetdevcert.pfx", "testPassword"));
}))
{
using (var connection = server.CreateConnection())
Expand Down