Skip to content

Commit 305280b

Browse files
[release/10.0] Source code updates from dotnet/dotnet (#63959)
* Update dependencies from https://github.com/dotnet/dotnet build 286007 Updated Dependencies: Microsoft.NET.Runtime.WebAssembly.Sdk, Microsoft.NETCore.BrowserDebugHost.Transport, Microsoft.NET.Runtime.MonoAOTCompiler.Task, dotnet-ef, Microsoft.Bcl.AsyncInterfaces, Microsoft.Bcl.TimeProvider, Microsoft.EntityFrameworkCore, Microsoft.EntityFrameworkCore.Design, Microsoft.EntityFrameworkCore.InMemory, Microsoft.EntityFrameworkCore.Relational, Microsoft.EntityFrameworkCore.Sqlite, Microsoft.EntityFrameworkCore.SqlServer, Microsoft.EntityFrameworkCore.Tools, Microsoft.Extensions.Caching.Abstractions, Microsoft.Extensions.Caching.Memory, Microsoft.Extensions.Configuration, Microsoft.Extensions.Configuration.Abstractions, Microsoft.Extensions.Configuration.Binder, Microsoft.Extensions.Configuration.CommandLine, Microsoft.Extensions.Configuration.EnvironmentVariables, Microsoft.Extensions.Configuration.FileExtensions, Microsoft.Extensions.Configuration.Ini, Microsoft.Extensions.Configuration.Json, Microsoft.Extensions.Configuration.UserSecrets, Microsoft.Extensions.Configuration.Xml, Microsoft.Extensions.DependencyInjection, Microsoft.Extensions.DependencyInjection.Abstractions, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.Diagnostics, Microsoft.Extensions.Diagnostics.Abstractions, Microsoft.Extensions.FileProviders.Abstractions, Microsoft.Extensions.FileProviders.Composite, Microsoft.Extensions.FileProviders.Physical, Microsoft.Extensions.FileSystemGlobbing, Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.Extensions.Hosting, Microsoft.Extensions.Hosting.Abstractions, Microsoft.Extensions.Http, Microsoft.Extensions.Logging, Microsoft.Extensions.Logging.Abstractions, Microsoft.Extensions.Logging.Configuration, Microsoft.Extensions.Logging.Console, Microsoft.Extensions.Logging.Debug, Microsoft.Extensions.Logging.EventLog, Microsoft.Extensions.Logging.EventSource, Microsoft.Extensions.Logging.TraceSource, Microsoft.Extensions.Options, Microsoft.Extensions.Options.ConfigurationExtensions, Microsoft.Extensions.Options.DataAnnotations, Microsoft.Extensions.Primitives, Microsoft.Internal.Runtime.AspNetCore.Transport, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, System.Collections.Immutable, System.Composition, System.Configuration.ConfigurationManager, System.Diagnostics.DiagnosticSource, System.Diagnostics.EventLog, System.Diagnostics.PerformanceCounter, System.DirectoryServices.Protocols, System.Formats.Asn1, System.Formats.Cbor, System.IO.Hashing, System.IO.Pipelines, System.Memory.Data, System.Net.Http.Json, System.Net.Http.WinHttpHandler, System.Net.ServerSentEvents, System.Numerics.Tensors, System.Reflection.Metadata, System.Resources.Extensions, System.Runtime.Caching, System.Security.Cryptography.Pkcs, System.Security.Cryptography.Xml, System.Security.Permissions, System.ServiceProcess.ServiceController, System.Text.Encodings.Web, System.Text.Json, System.Threading.AccessControl, System.Threading.Channels, System.Threading.RateLimiting (Version 10.0.0-rtm.25479.115 -> 10.0.0-rtm.25507.103) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Archives, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.RemoteExecutor, Microsoft.DotNet.SharedFramework.Sdk (Version 10.0.0-beta.25479.115 -> 10.0.0-beta.25507.103) Microsoft.Web.Xdt (Version 3.2.0-preview.25479.115 -> 3.2.0-preview.25507.103) NuGet.Frameworks, NuGet.Packaging, NuGet.Versioning (Version 7.0.0-rc.48015 -> 7.0.0-rc.803) * Change nginx installation to specific version 12.9.1 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: William Godbe <[email protected]>
1 parent 0e4a5ef commit 305280b

File tree

8 files changed

+287
-292
lines changed

8 files changed

+287
-292
lines changed

.azure/pipelines/ci-public.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ stages:
518518
isAzDOTestingJob: true
519519
buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs)
520520
beforeBuild:
521-
- bash: "./eng/scripts/install-nginx-mac.sh"
521+
- bash: "./eng/scripts/install-nginx.sh"
522522
displayName: Installing Nginx
523523
artifacts:
524524
- name: MacOS_Test_Logs_Attempt_$(System.JobAttempt)
@@ -539,7 +539,7 @@ stages:
539539
useHostedUbuntu: false
540540
buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs)
541541
beforeBuild:
542-
- bash: "./eng/scripts/install-nginx-linux.sh"
542+
- bash: "./eng/scripts/install-nginx.sh"
543543
displayName: Installing Nginx
544544
- bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p"
545545
displayName: Increase inotify limit

.azure/pipelines/ci-unofficial.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ extends:
556556
beforeBuild:
557557
- script: git submodule update --init
558558
displayName: Update submodules
559-
- bash: "./eng/scripts/install-nginx-mac.sh"
559+
- bash: "./eng/scripts/install-nginx.sh"
560560
displayName: Installing Nginx
561561
artifacts:
562562
- name: MacOS_Test_Logs_Attempt_$(System.JobAttempt)
@@ -579,7 +579,7 @@ extends:
579579
beforeBuild:
580580
- script: git submodule update --init
581581
displayName: Update submodules
582-
- bash: "./eng/scripts/install-nginx-linux.sh"
582+
- bash: "./eng/scripts/install-nginx.sh"
583583
displayName: Installing Nginx
584584
- bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p"
585585
displayName: Increase inotify limit

.azure/pipelines/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ extends:
548548
isAzDOTestingJob: true
549549
buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs)
550550
beforeBuild:
551-
- bash: "./eng/scripts/install-nginx-mac.sh"
551+
- bash: "./eng/scripts/install-nginx.sh"
552552
displayName: Installing Nginx
553553
artifacts:
554554
- name: MacOS_Test_Logs_Attempt_$(System.JobAttempt)
@@ -569,7 +569,7 @@ extends:
569569
useHostedUbuntu: false
570570
buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs)
571571
beforeBuild:
572-
- bash: "./eng/scripts/install-nginx-linux.sh"
572+
- bash: "./eng/scripts/install-nginx.sh"
573573
displayName: Installing Nginx
574574
- bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p"
575575
displayName: Increase inotify limit

eng/Version.Details.props

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

eng/Version.Details.xml

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

eng/scripts/install-nginx-mac.sh

Lines changed: 0 additions & 5 deletions
This file was deleted.

eng/scripts/install-nginx-linux.sh renamed to eng/scripts/install-nginx.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ scriptroot="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
66
reporoot="$(dirname "$(dirname "$scriptroot")")"
77
nginxinstall="$reporoot/.tools/nginx"
88

9-
curl -sSL http://nginx.org/download/nginx-1.26.3.tar.gz --retry 5 | tar zxfv - -C /tmp && cd /tmp/nginx-1.26.3/
9+
curl -sSL http://nginx.org/download/nginx-1.29.1.tar.gz --retry 5 | tar zxfv - -C /tmp && cd /tmp/nginx-1.29.1/
1010
./configure --prefix=$nginxinstall --with-http_ssl_module --without-http_rewrite_module
1111
make
1212
make install

global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
"jdk": "latest"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25479.115",
31-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25479.115",
32-
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25479.115",
30+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25507.103",
31+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25507.103",
32+
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25507.103",
3333
"Microsoft.Build.NoTargets": "3.7.0",
3434
"Microsoft.Build.Traversal": "3.4.0",
3535
"Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2737382"

0 commit comments

Comments
 (0)