From 67761b3c1df88c462f1451fea3a3d500d5bc1344 Mon Sep 17 00:00:00 2001 From: Stephen Halter Date: Tue, 23 Apr 2024 18:19:26 -0700 Subject: [PATCH 01/38] Do not disable JWT validation unless requested Prior to this fix, when JwtBearerOptions are read from the default config section, issuer and audience validation would be disabled if no valid issuers or valid audiences were explicitly configured from config. This was a problem if the authority was supplied from config because this would disable validating the issuer matched what was provided by the authority. In the case of Entra, this means tokens for another tenant could be used since the JWKS are the same across tenants. Disabling audience validation when no valid audiences are provided by config is less severe because valid audiences cannot be inferred from an authority, but it could still be supplied outside config, and it should still validated unless validation is explicitly opted out of. The configuration reading logic now reads "ValidateIssuer" and "ValidateAudience" booleans from config allowing developers to explicitly opt out of validation by setting these false. Otherwise, the default remains true. --- .../src/JwtBearerConfigureOptions.cs | 6 +- .../test/JwtBearerTests_Handler.cs | 117 +++++++++++------- 2 files changed, 76 insertions(+), 47 deletions(-) diff --git a/src/Security/Authentication/JwtBearer/src/JwtBearerConfigureOptions.cs b/src/Security/Authentication/JwtBearer/src/JwtBearerConfigureOptions.cs index 812eb9287aa3..97568fde9751 100644 --- a/src/Security/Authentication/JwtBearer/src/JwtBearerConfigureOptions.cs +++ b/src/Security/Authentication/JwtBearer/src/JwtBearerConfigureOptions.cs @@ -40,12 +40,14 @@ public void Configure(string? name, JwtBearerOptions options) return; } + var validateIssuer = StringHelpers.ParseValueOrDefault(configSection[nameof(TokenValidationParameters.ValidateIssuer)], bool.Parse, options.TokenValidationParameters.ValidateIssuer); var issuer = configSection[nameof(TokenValidationParameters.ValidIssuer)]; var issuers = configSection.GetSection(nameof(TokenValidationParameters.ValidIssuers)).GetChildren().Select(iss => iss.Value).ToList(); if (issuer is not null) { issuers.Add(issuer); } + var validateAudience = StringHelpers.ParseValueOrDefault(configSection[nameof(TokenValidationParameters.ValidateAudience)], bool.Parse, options.TokenValidationParameters.ValidateAudience); var audience = configSection[nameof(TokenValidationParameters.ValidAudience)]; var audiences = configSection.GetSection(nameof(TokenValidationParameters.ValidAudiences)).GetChildren().Select(aud => aud.Value).ToList(); if (audience is not null) @@ -71,9 +73,9 @@ public void Configure(string? name, JwtBearerOptions options) options.SaveToken = StringHelpers.ParseValueOrDefault(configSection[nameof(options.SaveToken)], bool.Parse, options.SaveToken); options.TokenValidationParameters = new() { - ValidateIssuer = issuers.Count > 0, + ValidateIssuer = validateIssuer, ValidIssuers = issuers, - ValidateAudience = audiences.Count > 0, + ValidateAudience = validateAudience, ValidAudiences = audiences, ValidateIssuerSigningKey = true, IssuerSigningKeys = GetIssuerSigningKeys(configSection, issuers), diff --git a/src/Security/Authentication/test/JwtBearerTests_Handler.cs b/src/Security/Authentication/test/JwtBearerTests_Handler.cs index 6d8260c2a39f..bce43d0c48da 100644 --- a/src/Security/Authentication/test/JwtBearerTests_Handler.cs +++ b/src/Security/Authentication/test/JwtBearerTests_Handler.cs @@ -31,17 +31,9 @@ public class JwtBearerTests_Handler : SharedAuthenticationTests false; } protected override bool SupportsSignOut { get => false; } - protected override void RegisterAuth(AuthenticationBuilder services, Action configure) - { - services.AddJwtBearer(o => - { - ConfigureDefaults(o); - configure.Invoke(o); - }); - } - - private void ConfigureDefaults(JwtBearerOptions o) + protected override void RegisterAuth(AuthenticationBuilder services, Action configure = null) { + services.AddJwtBearer(configure); } [Fact] @@ -964,25 +956,19 @@ public async Task ExpirationAndIssuedWhenMinOrMaxValue() [Fact] public void CanReadJwtBearerOptionsFromConfig() { - var services = new ServiceCollection().AddLogging(); - var config = new ConfigurationBuilder().AddInMemoryCollection(new[] - { - new KeyValuePair("Authentication:Schemes:Bearer:ValidIssuer", "dotnet-user-jwts"), - new KeyValuePair("Authentication:Schemes:Bearer:ValidAudiences:0", "http://localhost:5000"), - new KeyValuePair("Authentication:Schemes:Bearer:ValidAudiences:1", "https://localhost:5001"), - new KeyValuePair("Authentication:Schemes:Bearer:BackchannelTimeout", "00:01:00"), - new KeyValuePair("Authentication:Schemes:Bearer:RequireHttpsMetadata", "false"), - new KeyValuePair("Authentication:Schemes:Bearer:SaveToken", "True"), - }).Build(); + var services = new ServiceCollection(); + var config = new ConfigurationBuilder().AddInMemoryCollection([ + new("Authentication:Schemes:Bearer:ValidIssuer", "dotnet-user-jwts"), + new("Authentication:Schemes:Bearer:ValidAudiences:0", "http://localhost:5000"), + new("Authentication:Schemes:Bearer:ValidAudiences:1", "https://localhost:5001"), + new("Authentication:Schemes:Bearer:BackchannelTimeout", "00:01:00"), + new("Authentication:Schemes:Bearer:RequireHttpsMetadata", "false"), + new("Authentication:Schemes:Bearer:SaveToken", "True"), + ]).Build(); services.AddSingleton(config); // Act - var builder = services.AddAuthentication(o => - { - o.AddScheme("Bearer", "Bearer"); - }); - builder.AddJwtBearer("Bearer"); - RegisterAuth(builder, _ => { }); + RegisterAuth(services.AddAuthentication()); var sp = services.BuildServiceProvider(); // Assert @@ -992,35 +978,34 @@ public void CanReadJwtBearerOptionsFromConfig() Assert.Equal(jwtBearerOptions.BackchannelTimeout, TimeSpan.FromSeconds(60)); Assert.False(jwtBearerOptions.RequireHttpsMetadata); Assert.True(jwtBearerOptions.SaveToken); - Assert.True(jwtBearerOptions.MapInboundClaims); // Assert default values are respected + // ValidateIssuerSignInKey should always be set to its non-default value of true if options are read from config. + Assert.True(jwtBearerOptions.TokenValidationParameters.ValidateIssuerSigningKey); + // Assert default values for other options are respected. + Assert.True(jwtBearerOptions.MapInboundClaims); + Assert.True(jwtBearerOptions.TokenValidationParameters.ValidateIssuer); + Assert.True(jwtBearerOptions.TokenValidationParameters.ValidateAudience); } [Fact] public void CanReadMultipleIssuersFromConfig() { - var services = new ServiceCollection().AddLogging(); + var services = new ServiceCollection(); var firstKey = "qPG6tDtfxFYZifHW3sEueQ=="; var secondKey = "6JPzXj6aOPdojlZdeLshaA=="; - var config = new ConfigurationBuilder().AddInMemoryCollection(new[] - { - new KeyValuePair("Authentication:Schemes:Bearer:ValidIssuers:0", "dotnet-user-jwts"), - new KeyValuePair("Authentication:Schemes:Bearer:ValidIssuers:1", "dotnet-user-jwts-2"), - new KeyValuePair("Authentication:Schemes:Bearer:SigningKeys:0:Issuer", "dotnet-user-jwts"), - new KeyValuePair("Authentication:Schemes:Bearer:SigningKeys:0:Value", firstKey), - new KeyValuePair("Authentication:Schemes:Bearer:SigningKeys:0:Length", "32"), - new KeyValuePair("Authentication:Schemes:Bearer:SigningKeys:1:Issuer", "dotnet-user-jwts-2"), - new KeyValuePair("Authentication:Schemes:Bearer:SigningKeys:1:Value", secondKey), - new KeyValuePair("Authentication:Schemes:Bearer:SigningKeys:1:Length", "32"), - }).Build(); + var config = new ConfigurationBuilder().AddInMemoryCollection([ + new("Authentication:Schemes:Bearer:ValidIssuers:0", "dotnet-user-jwts"), + new("Authentication:Schemes:Bearer:ValidIssuers:1", "dotnet-user-jwts-2"), + new("Authentication:Schemes:Bearer:SigningKeys:0:Issuer", "dotnet-user-jwts"), + new("Authentication:Schemes:Bearer:SigningKeys:0:Value", firstKey), + new("Authentication:Schemes:Bearer:SigningKeys:0:Length", "32"), + new("Authentication:Schemes:Bearer:SigningKeys:1:Issuer", "dotnet-user-jwts-2"), + new("Authentication:Schemes:Bearer:SigningKeys:1:Value", secondKey), + new("Authentication:Schemes:Bearer:SigningKeys:1:Length", "32"), + ]).Build(); services.AddSingleton(config); // Act - var builder = services.AddAuthentication(o => - { - o.AddScheme("Bearer", "Bearer"); - }); - builder.AddJwtBearer("Bearer"); - RegisterAuth(builder, _ => { }); + RegisterAuth(services.AddAuthentication()); var sp = services.BuildServiceProvider(); // Assert @@ -1030,6 +1015,48 @@ public void CanReadMultipleIssuersFromConfig() Assert.Equal(secondKey, Convert.ToBase64String(jwtBearerOptions.TokenValidationParameters.IssuerSigningKeys.OfType().LastOrDefault()?.Key)); } + [Fact] + public void IssuerAndAudienceValidationEnabledByDefaultWhenOptionsAreReadFromConfig() + { + var services = new ServiceCollection(); + var config = new ConfigurationBuilder().AddInMemoryCollection([ + new("Authentication:Schemes:Bearer:Authority", "https://localhost:5001"), + ]).Build(); + services.AddSingleton(config); + + // Act + RegisterAuth(services.AddAuthentication()); + var sp = services.BuildServiceProvider(); + + // Assert + var jwtBearerOptions = sp.GetRequiredService>().Get(JwtBearerDefaults.AuthenticationScheme); + Assert.Equal("https://localhost:5001", jwtBearerOptions.Authority); + Assert.True(jwtBearerOptions.TokenValidationParameters.ValidateIssuer); + Assert.True(jwtBearerOptions.TokenValidationParameters.ValidateAudience); + } + + [Fact] + public void IssuerAndAudienceValidationCanBeDisabledFromConfig() + { + var services = new ServiceCollection(); + var config = new ConfigurationBuilder().AddInMemoryCollection([ + new("Authentication:Schemes:Bearer:Authority", "https://localhost:5001"), + new("Authentication:Schemes:Bearer:ValidateIssuer", "false"), + new("Authentication:Schemes:Bearer:ValidateAudience", "false"), + ]).Build(); + services.AddSingleton(config); + + // Act + RegisterAuth(services.AddAuthentication()); + var sp = services.BuildServiceProvider(); + + // Assert + var jwtBearerOptions = sp.GetRequiredService>().Get(JwtBearerDefaults.AuthenticationScheme); + Assert.Equal("https://localhost:5001", jwtBearerOptions.Authority); + Assert.False(jwtBearerOptions.TokenValidationParameters.ValidateIssuer); + Assert.False(jwtBearerOptions.TokenValidationParameters.ValidateAudience); + } + class InvalidTokenValidator : TokenHandler { public InvalidTokenValidator() From e4c2e6487687313348d21604d12a85a6f741c59c Mon Sep 17 00:00:00 2001 From: Stephen Halter Date: Mon, 29 Apr 2024 14:33:20 -0700 Subject: [PATCH 02/38] Fix typo in test comment --- src/Security/Authentication/test/JwtBearerTests_Handler.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Security/Authentication/test/JwtBearerTests_Handler.cs b/src/Security/Authentication/test/JwtBearerTests_Handler.cs index bce43d0c48da..60001e54f3cd 100644 --- a/src/Security/Authentication/test/JwtBearerTests_Handler.cs +++ b/src/Security/Authentication/test/JwtBearerTests_Handler.cs @@ -978,7 +978,7 @@ public void CanReadJwtBearerOptionsFromConfig() Assert.Equal(jwtBearerOptions.BackchannelTimeout, TimeSpan.FromSeconds(60)); Assert.False(jwtBearerOptions.RequireHttpsMetadata); Assert.True(jwtBearerOptions.SaveToken); - // ValidateIssuerSignInKey should always be set to its non-default value of true if options are read from config. + // ValidateIssuerSigningKey should always be set to its non-default value of true if options are read from config. Assert.True(jwtBearerOptions.TokenValidationParameters.ValidateIssuerSigningKey); // Assert default values for other options are respected. Assert.True(jwtBearerOptions.MapInboundClaims); From 50554f37024442c834a79c8335a1f809305efd35 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Thu, 2 May 2024 09:16:43 -0700 Subject: [PATCH 03/38] Update branding to 8.0.6 (#55472) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 3b9147c36523..bb027536e097 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,10 +8,10 @@ 8 0 - 5 + 6 - true + false 7.1.2 - - @@ -30,10 +28,8 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bb53cf158231..3c94ec36695c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -189,9 +189,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 2d7eea252964e69be94cb9c847b371b23e4dd470 - + https://github.com/dotnet/source-build-externals - 300e99190e6ae1983681694dbdd5f75f0c692081 + 908177a58a41532b3302c17f1e1a8cf1c1234545 diff --git a/eng/Versions.props b/eng/Versions.props index bb027536e097..d5cfe172142d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -165,7 +165,7 @@ 8.0.0-beta.24204.3 8.0.0-beta.24204.3 - 8.0.0-alpha.1.24175.3 + 8.0.0-alpha.1.24216.1 8.0.0-alpha.1.24163.3 From 12adf59a0b12c5899308f7bc5d9364336cce02fc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 May 2024 09:43:13 -0700 Subject: [PATCH 09/38] [release/8.0] Handle rejected promises inside incoming Invocation messages (#55230) * Handle rejected promises inside incoming Invocation messages Incoming messages of Invocation type result in executing a clientMethod promise, but promise rejections are unhandled. This can result in a unhandled rejected promise, potentially resulting in Node.js process crashing. Note, this was previously detected via eslint and suppressed in code. To avoid this, catch promise rejections and log the failure. One scenario this case can happen is, if during the clientMethod call, the server connection is disconnected, the invokation will still attempt to send a completion message (through _sendWithProtocol). This will then result in a promise rejection, such as the following: ``` Cannot send data if the connection is not in the 'Connected' State. at HttpConnection.send (node_modules\@microsoft\signalr\dist\cjs\HttpConnection.js:95:35) at HubConnection._sendMessage (node_modules\@microsoft\signalr\dist\cjs\HubConnection.js:266:32) at HubConnection._sendWithProtocol (node_modules\@microsoft\signalr\dist\cjs\HubConnection.js:273:21) at HubConnection._invokeClientMethod (node_modules\@microsoft\signalr\dist\cjs\HubConnection.js:577:24) at processTicksAndRejections (node:internal/process/task_queues:95:5) ``` * Add test of callback sending response with a rejected promise Adds a test covering when callback invoked when server invokes a method on the client and then handles rejected promise on send When the unhandled promise fix is not applied to HubConnection, the following error fails the HubConnection.test.ts test suite: Send error 831 | connection.send = () => { 832 | promiseRejected = true; > 833 | return Promise.reject(new Error("Send error")); | ^ 834 | } 835 | p.resolve(); 836 | }); at TestConnection.connection.send (signalr/tests/HubConnection.test.ts:833:51) at HubConnection.send [as _sendMessage] (signalr/src/HubConnection.ts:422:32) at HubConnection._sendMessage [as _sendWithProtocol] (signalr/src/HubConnection.ts:433:25) at HubConnection._sendWithProtocol [as _invokeClientMethod] (signalr/src/HubConnection.ts:808:24) --------- Co-authored-by: Danny Amirault --- .../clients/ts/signalr/src/HubConnection.ts | 6 ++-- .../ts/signalr/tests/HubConnection.test.ts | 32 +++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/src/SignalR/clients/ts/signalr/src/HubConnection.ts b/src/SignalR/clients/ts/signalr/src/HubConnection.ts index 3612759b72c9..4ea7a78acaaa 100644 --- a/src/SignalR/clients/ts/signalr/src/HubConnection.ts +++ b/src/SignalR/clients/ts/signalr/src/HubConnection.ts @@ -614,8 +614,10 @@ export class HubConnection { switch (message.type) { case MessageType.Invocation: - // eslint-disable-next-line @typescript-eslint/no-floating-promises - this._invokeClientMethod(message); + this._invokeClientMethod(message) + .catch((e) => { + this._logger.log(LogLevel.Error, `Invoke client method threw error: ${getErrorString(e)}`) + }); break; case MessageType.StreamItem: case MessageType.Completion: { diff --git a/src/SignalR/clients/ts/signalr/tests/HubConnection.test.ts b/src/SignalR/clients/ts/signalr/tests/HubConnection.test.ts index f382a805fc00..f01d68687421 100644 --- a/src/SignalR/clients/ts/signalr/tests/HubConnection.test.ts +++ b/src/SignalR/clients/ts/signalr/tests/HubConnection.test.ts @@ -818,6 +818,38 @@ describe("HubConnection", () => { }); }); + it("callback invoked when server invokes a method on the client and then handles rejected promise on send", async () => { + await VerifyLogger.run(async (logger) => { + const connection = new TestConnection(); + const hubConnection = createHubConnection(connection, logger); + let promiseRejected = false; + try { + await hubConnection.start(); + const p = new PromiseSource(); + hubConnection.on("message", async () => { + // Force sending of response to error + connection.send = () => { + promiseRejected = true; + return Promise.reject(new Error("Send error")); + } + p.resolve(); + }); + connection.receive({ + arguments: ["test"], + nonblocking: true, + target: "message", + invocationId: "0", + type: MessageType.Invocation, + }); + + await p; + expect(promiseRejected).toBe(true); + } finally { + await hubConnection.stop(); + } + }, new RegExp("Invoke client method threw error: Error: Send error")); + }); + it("stop on handshake error", async () => { await VerifyLogger.run(async (logger) => { const connection = new TestConnection(false); From 909f8a8c1bf3d7db8e2998f2e040c6876e4c683f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 3 May 2024 10:46:26 -0700 Subject: [PATCH 10/38] [release/8.0] Add missing registry keys for Microsoft.AspNetCore.App (#55501) * Add missing registry keys for Microsoft.AspNetCore.App * Fixup * Capitalization * Fixup * PackageVersion * Targetdir * Try this --------- Co-authored-by: wtgodbe --- src/Installers/Windows/SharedFramework/Product.wxs | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/Installers/Windows/SharedFramework/Product.wxs b/src/Installers/Windows/SharedFramework/Product.wxs index ae95ee10ae9c..30d8d6025817 100644 --- a/src/Installers/Windows/SharedFramework/Product.wxs +++ b/src/Installers/Windows/SharedFramework/Product.wxs @@ -60,6 +60,7 @@ + @@ -73,6 +74,12 @@ + + + + + + @@ -110,5 +117,11 @@ + + + + + + From 5c525f2d4dfb786123fff7a30e59f9db891a6900 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Fri, 3 May 2024 21:47:14 +0000 Subject: [PATCH 11/38] Merged PR 39362: [release/8.0] Add direct references to S.T.J in tools --- src/Tools/dotnet-user-jwts/src/dotnet-user-jwts.csproj | 1 + src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj | 1 + 2 files changed, 2 insertions(+) diff --git a/src/Tools/dotnet-user-jwts/src/dotnet-user-jwts.csproj b/src/Tools/dotnet-user-jwts/src/dotnet-user-jwts.csproj index 119c210c6eae..d32c05dcb54a 100644 --- a/src/Tools/dotnet-user-jwts/src/dotnet-user-jwts.csproj +++ b/src/Tools/dotnet-user-jwts/src/dotnet-user-jwts.csproj @@ -28,6 +28,7 @@ + diff --git a/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj b/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj index 01716ab85f0b..1a60f3aa072d 100644 --- a/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj +++ b/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj @@ -29,6 +29,7 @@ + From ead2a0f56499a1377e86e77600a1bdd2924d04d0 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Fri, 3 May 2024 16:34:54 -0700 Subject: [PATCH 12/38] [release/8.0] Add internal pipeline to test IdentityModel nightlies (#55504) * Add internal identity pipeline * 1es-ify IdentityModel test pipeline * Fix template path * Fix everything * Fix args * More arg fixing * Really skip template tests * NoWarn --- .azure/pipelines/helix-matrix.yml | 1 - .../pipelines/identitymodel-helix-matrix.yml | 101 ++++++++++++++++++ Directory.Build.props | 2 + eng/Versions.props | 3 +- eng/helix/helix.proj | 2 +- eng/scripts/SetupIdentitySources.ps1 | 46 ++++++++ eng/targets/Helix.targets | 2 +- .../Templates.Blazor.Tests.csproj | 1 + ...lates.Blazor.WebAssembly.Auth.Tests.csproj | 1 + .../Templates.Blazor.WebAssembly.Tests.csproj | 1 + .../Templates.Mvc.Tests.csproj | 1 + .../Templates.Tests/Templates.Tests.csproj | 1 + 12 files changed, 158 insertions(+), 4 deletions(-) create mode 100644 .azure/pipelines/identitymodel-helix-matrix.yml create mode 100644 eng/scripts/SetupIdentitySources.ps1 diff --git a/.azure/pipelines/helix-matrix.yml b/.azure/pipelines/helix-matrix.yml index b2c9c1a4cc06..33b1a3c483fa 100644 --- a/.azure/pipelines/helix-matrix.yml +++ b/.azure/pipelines/helix-matrix.yml @@ -12,7 +12,6 @@ schedules: branches: include: - release/6.0 - - release/7.0 - release/8.0 always: false diff --git a/.azure/pipelines/identitymodel-helix-matrix.yml b/.azure/pipelines/identitymodel-helix-matrix.yml new file mode 100644 index 000000000000..55f0f8dd8063 --- /dev/null +++ b/.azure/pipelines/identitymodel-helix-matrix.yml @@ -0,0 +1,101 @@ +# We only want to run IdentityModel matrix on main +pr: none +trigger: none +schedules: +# Cron timezone is UTC. +- cron: "0 */12 * * *" + branches: + include: + - release/8.0 + always: true + +variables: +- name: _UseHelixOpenQueues + value: false +- group: DotNet-HelixApi-Access +- template: /eng/common/templates-official/variables/pool-providers.yml@self + +resources: + repositories: + # Repo: 1ESPipelineTemplates/1ESPipelineTemplates + - repository: 1esPipelines + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release + +extends: + template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines + parameters: + sdl: + sourceAnalysisPool: + name: NetCore1ESPool-Svc-Internal + image: 1es-windows-2022 + os: windows + codeql: + compiled: + enabled: false + justificationForDisabling: 'This is a test-only pipeline. The same product code is already scanned in the main pipeline (aspnetcore-ci)' + + stages: + - stage: build + displayName: Build + jobs: + - template: .azure/pipelines/jobs/default-build.yml@self + parameters: + jobName: IdentityModel_helix_matrix_x64 + jobDisplayName: 'Tests: IdentityModel nightlies helix full matrix x64' + agentOs: Windows + timeoutInMinutes: 300 + steps: + - task: NuGetAuthenticate@1 + inputs: + forceReinstallCredentialProvider: true + - task: NuGetCommand@2 + displayName: Install Microsoft.IdentityModel.Logging + inputs: + command: 'custom' + arguments: 'install Microsoft.IdentityModel.Logging + -Source https://pkgs.dev.azure.com/dnceng/internal/_packaging/identitymodel-nightlies/nuget/v3/index.json + -DependencyVersion Highest -OutputDirectory $(Build.StagingDirectory) -PreRelease' + - task: NuGetCommand@2 + displayName: Install Microsoft.IdentityModel.Protocols.OpenIdConnect + inputs: + command: 'custom' + arguments: 'install Microsoft.IdentityModel.Protocols.OpenIdConnect + -Source https://pkgs.dev.azure.com/dnceng/internal/_packaging/identitymodel-nightlies/nuget/v3/index.json + -DependencyVersion Highest -OutputDirectory $(Build.StagingDirectory) -PreRelease' + - task: NuGetCommand@2 + displayName: Install Microsoft.IdentityModel.Protocols.WsFederation + inputs: + command: 'custom' + arguments: 'install Microsoft.IdentityModel.Protocols.WsFederation + -Source https://pkgs.dev.azure.com/dnceng/internal/_packaging/identitymodel-nightlies/nuget/v3/index.json + -DependencyVersion Highest -OutputDirectory $(Build.StagingDirectory) -PreRelease' + - task: NuGetCommand@2 + displayName: System.IdentityModel.Tokens.Jwt + inputs: + command: 'custom' + arguments: 'install System.IdentityModel.Tokens.Jwt + -Source https://pkgs.dev.azure.com/dnceng/internal/_packaging/identitymodel-nightlies/nuget/v3/index.json + -DependencyVersion Highest -OutputDirectory $(Build.StagingDirectory) -PreRelease' + - task: PowerShell@2 + displayName: Add IdentityModel feel to NuGet.config + inputs: + filePath: $(Build.SourcesDirectory)/eng/scripts/SetupIdentitySources.ps1 + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -IdentityModelPackageSource $(Build.StagingDirectory) + # Build the shared framework + - script: ./eng/build.cmd -ci -nobl -all -pack -arch x64 + /p:CrossgenOutput=false /p:IsIdentityModelTestJob=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log + displayName: Build shared fx + # -noBuildRepoTasks -noBuildNative -noBuild to avoid repeating work done in the previous step. + - script: .\eng\build.cmd -ci -nobl -all -noBuildRepoTasks -noBuildNative -noBuild -test + -projects eng\helix\helix.proj /p:IsHelixJob=true /p:RunTemplateTests=false + /p:CrossgenOutput=false /p:IsIdentityModelTestJob=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log + displayName: Run build.cmd helix target + env: + HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues + SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops + artifacts: + - name: Helix_logs + path: artifacts/log/ + publishOnError: true \ No newline at end of file diff --git a/Directory.Build.props b/Directory.Build.props index 9ae6760c645e..d080a9e0fb8e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -117,6 +117,8 @@ $(NoWarn.Replace('1591', '')) $(NoWarn);0105 + + $(NoWarn);NU5104 $(WarningsNotAsErrors);CS1591 diff --git a/eng/Versions.props b/eng/Versions.props index d5cfe172142d..c403cd48e0fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,8 @@ false - 7.1.2 + 7.1.2 + *-* diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj index 73ed73a32068..99254551279f 100644 --- a/eng/helix/helix.proj +++ b/eng/helix/helix.proj @@ -21,7 +21,7 @@ - + diff --git a/eng/scripts/SetupIdentitySources.ps1 b/eng/scripts/SetupIdentitySources.ps1 new file mode 100644 index 000000000000..58a4e690d7b1 --- /dev/null +++ b/eng/scripts/SetupIdentitySources.ps1 @@ -0,0 +1,46 @@ +[CmdletBinding()] +param ( + [Parameter(Mandatory = $true)][string]$ConfigFile, + [Parameter(Mandatory = $true)][string]$IdentityModelPackageSource +) + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 + +# Add source entry to PackageSources +function AddPackageSource($sources, $SourceName, $SourceEndPoint) { + $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']") + + if ($packageSource -eq $null) + { + $packageSource = $doc.CreateElement("add") + $packageSource.SetAttribute("key", $SourceName) + $packageSource.SetAttribute("value", $SourceEndPoint) + $sources.AppendChild($packageSource) | Out-Null + } + else { + Write-Host "Package source $SourceName already present." + } +} + +if (!(Test-Path $ConfigFile -PathType Leaf)) { + Write-PipelineTelemetryError -Category 'Build' -Message "eng/scripts/SetupIdentitySources.ps1 returned a non-zero exit code. Couldn't find the NuGet config file: $ConfigFile" + ExitWithExitCode 1 +} + +# Load NuGet.config +$doc = New-Object System.Xml.XmlDocument +$filename = (Get-Item $ConfigFile).FullName +$doc.Load($filename) + +# Get reference to or create one if none exist already +$sources = $doc.DocumentElement.SelectSingleNode("packageSources") +if ($sources -eq $null) { + $sources = $doc.CreateElement("packageSources") + $doc.DocumentElement.AppendChild($sources) | Out-Null +} + +AddPackageSource -Sources $sources -SourceName "identitymodel-nightlies" -SourceEndPoint $IdentityModelPackageSource + +$doc.Save($filename) \ No newline at end of file diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets index 35c116026c62..ee73eb8ac8a3 100644 --- a/eng/targets/Helix.targets +++ b/eng/targets/Helix.targets @@ -141,7 +141,7 @@ <_Temp Include="@(HelixAvailableTargetQueue)" /> - + diff --git a/src/ProjectTemplates/test/Templates.Blazor.Tests/Templates.Blazor.Tests.csproj b/src/ProjectTemplates/test/Templates.Blazor.Tests/Templates.Blazor.Tests.csproj index 368459e98c90..1db85d5286fe 100644 --- a/src/ProjectTemplates/test/Templates.Blazor.Tests/Templates.Blazor.Tests.csproj +++ b/src/ProjectTemplates/test/Templates.Blazor.Tests/Templates.Blazor.Tests.csproj @@ -9,6 +9,7 @@ true $(RunTemplateTests) true + false diff --git a/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Auth.Tests/Templates.Blazor.WebAssembly.Auth.Tests.csproj b/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Auth.Tests/Templates.Blazor.WebAssembly.Auth.Tests.csproj index 3754aee3abd4..3d0831a1001a 100644 --- a/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Auth.Tests/Templates.Blazor.WebAssembly.Auth.Tests.csproj +++ b/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Auth.Tests/Templates.Blazor.WebAssembly.Auth.Tests.csproj @@ -9,6 +9,7 @@ true true + false diff --git a/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Tests/Templates.Blazor.WebAssembly.Tests.csproj b/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Tests/Templates.Blazor.WebAssembly.Tests.csproj index 44348f90847a..b42866c3a78f 100644 --- a/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Tests/Templates.Blazor.WebAssembly.Tests.csproj +++ b/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Tests/Templates.Blazor.WebAssembly.Tests.csproj @@ -9,6 +9,7 @@ true true + false diff --git a/src/ProjectTemplates/test/Templates.Mvc.Tests/Templates.Mvc.Tests.csproj b/src/ProjectTemplates/test/Templates.Mvc.Tests/Templates.Mvc.Tests.csproj index 880e1bb68d6b..152c0d7b0d07 100644 --- a/src/ProjectTemplates/test/Templates.Mvc.Tests/Templates.Mvc.Tests.csproj +++ b/src/ProjectTemplates/test/Templates.Mvc.Tests/Templates.Mvc.Tests.csproj @@ -9,6 +9,7 @@ true true + false diff --git a/src/ProjectTemplates/test/Templates.Tests/Templates.Tests.csproj b/src/ProjectTemplates/test/Templates.Tests/Templates.Tests.csproj index d7c3c354d144..fb297bfae7c5 100644 --- a/src/ProjectTemplates/test/Templates.Tests/Templates.Tests.csproj +++ b/src/ProjectTemplates/test/Templates.Tests/Templates.Tests.csproj @@ -9,6 +9,7 @@ true true + false From f9fe44ddda3a6dedac222b10e55798656cc3b0f6 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 5 May 2024 04:48:05 +0000 Subject: [PATCH 13/38] Merged PR 39318: [internal/release/8.0] Update dependencies from dnceng/internal/dotnet-efcore, dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:e179a2a7-bc5d-4498-2467-08dbd53ba9ce) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - **Subscription**: e179a2a7-bc5d-4498-2467-08dbd53ba9ce - **Build**: 20240503.7 - **Date Produced**: May 3, 2024 9:24:14 PM UTC - **Commit**: 79322f37015c26b5dc05bee854fcdac1e7042b58 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-ef**: [from 8.0.5 to 8.0.6][12] - **Microsoft.EntityFrameworkCore**: [from 8.0.5 to 8.0.6][12] - **Microsoft.EntityFrameworkCore.Design**: [from 8.0.5 to 8.0.6][12] - **Microsoft.EntityFrameworkCore.InMemory**: [from 8.0.5 to 8.0.6][12] - **Microsoft.EntityFrameworkCore.Relational**: [from 8.0.5 to 8.0.6][12] - **Microsoft.EntityFrameworkCore.Sqlite**: [from 8.0.5 to 8.0.6][12] - **Microsoft.EntityFrameworkCore.SqlServer**: [from 8.0.5 to 8.0.6][12] - **Microsoft.EntityFrameworkCore.Tools**: [from 8.0.5 to 8.0.6][12] [12]: https://dev.azure.com/dnceng/internal/_git/dotnet-efcore/branches?baseVersion=GCf42a208554fed9bb37603c5ed4f02206b2b1b9fa&targetVersion=GC79322f37015c26b5dc05bee854fcdac1e7042b58&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:e179a2a7-bc5d-4498-2467-08dbd53ba9ce) [marker]: <> (Begin:83131e87-e80d-4d5b-f426-08dbd53b3319) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 83131e87-e80d-4d5b-f426-08dbd53b3319 - **Build**: 20240503.6 - **Date Produced**: May 3, 2024 7:30:41 PM UTC - **Commit**: fa5b0d8f4a8b424732cc992158aa92842f8a2846 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Extensions.Configuration.Binder**: [from 8.0.1 to 8.0.2][8] - **Microsoft.Extensions.Configuration.FileExtensions**: [from 8.0.0 to 8.0.1][9] - **Microsoft.Extensions.DependencyModel**: [from 8.0.0 to 8.0.1][9] - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 8.0.5-servicing.24216.15 to 8.0.6-servicing.24253.6][10] - **Microsoft.Internal.Runtime.AspNetCore.Transport**: [from 8.0.5-servicing.24216.15 to 8.0.6-servicing.24253.6][10] - **Microsoft.NET.Runtime.MonoAOTCompiler.Task**: [from 8.0.5 to 8.0.6][10] - **Microsoft.NET.Runtime.WebAssembly.Sdk**: [from 8.0.5 to 8.0.6][10] - **Microsoft.NETCore.App.Ref**: [from 8.0.5 to 8.0.6][10] - **Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm**: [from 8.0.5 to 8.0.6][10] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.5 to 8.0.6][10] - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 8.0.5-servicing.24216.15 to 8.0.6-servicing.24253.6][10] - **Microsoft.NETCore.Platforms**: [from 8.0.5-servicing.24216.15 to 8.0.6-servicing.24253.6][10] - **System.Security.Cryptography.Xml**: [from 8.0.1 to 8.0.1][10] - **System.Text.Json**: [from 8.0.3 to 8.0.4][11] - **Microsoft.SourceBuild.Intermediate.runtime.linux-x... --- NuGet.config | 8 ++-- eng/Version.Details.xml | 90 ++++++++++++++++++++--------------------- eng/Versions.props | 44 ++++++++++---------- 3 files changed, 71 insertions(+), 71 deletions(-) diff --git a/NuGet.config b/NuGet.config index a67fb5e3b1f1..56def1947ce9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,10 +6,10 @@ - + - + @@ -30,10 +30,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8165a50d2627..ea439acf8b88 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,37 +9,37 @@ --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f42a208554fed9bb37603c5ed4f02206b2b1b9fa + 79322f37015c26b5dc05bee854fcdac1e7042b58 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f42a208554fed9bb37603c5ed4f02206b2b1b9fa + 79322f37015c26b5dc05bee854fcdac1e7042b58 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f42a208554fed9bb37603c5ed4f02206b2b1b9fa + 79322f37015c26b5dc05bee854fcdac1e7042b58 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f42a208554fed9bb37603c5ed4f02206b2b1b9fa + 79322f37015c26b5dc05bee854fcdac1e7042b58 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f42a208554fed9bb37603c5ed4f02206b2b1b9fa + 79322f37015c26b5dc05bee854fcdac1e7042b58 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f42a208554fed9bb37603c5ed4f02206b2b1b9fa + 79322f37015c26b5dc05bee854fcdac1e7042b58 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f42a208554fed9bb37603c5ed4f02206b2b1b9fa + 79322f37015c26b5dc05bee854fcdac1e7042b58 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f42a208554fed9bb37603c5ed4f02206b2b1b9fa + 79322f37015c26b5dc05bee854fcdac1e7042b58 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -53,9 +53,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + fa5b0d8f4a8b424732cc992158aa92842f8a2846 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -65,9 +65,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + fa5b0d8f4a8b424732cc992158aa92842f8a2846 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -121,9 +121,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + fa5b0d8f4a8b424732cc992158aa92842f8a2846 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -185,9 +185,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + fa5b0d8f4a8b424732cc992158aa92842f8a2846 https://github.com/dotnet/source-build-externals @@ -241,7 +241,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + fa5b0d8f4a8b424732cc992158aa92842f8a2846 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -255,9 +255,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + fa5b0d8f4a8b424732cc992158aa92842f8a2846 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -271,21 +271,21 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + fa5b0d8f4a8b424732cc992158aa92842f8a2846 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + fa5b0d8f4a8b424732cc992158aa92842f8a2846 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + fa5b0d8f4a8b424732cc992158aa92842f8a2846 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + fa5b0d8f4a8b424732cc992158aa92842f8a2846 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -316,22 +316,22 @@ Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime. All Runtime.$rid packages should have the same version. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + fa5b0d8f4a8b424732cc992158aa92842f8a2846 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + fa5b0d8f4a8b424732cc992158aa92842f8a2846 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + fa5b0d8f4a8b424732cc992158aa92842f8a2846 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + fa5b0d8f4a8b424732cc992158aa92842f8a2846 https://github.com/dotnet/xdt @@ -368,9 +368,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + fa5b0d8f4a8b424732cc992158aa92842f8a2846 https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 138a9144ab30..0b9fdcd4d553 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,20 +65,20 @@ --> - 8.0.0 - 8.0.5 - 8.0.5 - 8.0.5 - 8.0.5 - 8.0.5 - 8.0.5-servicing.24216.15 + 8.0.1 + 8.0.6 + 8.0.6 + 8.0.6 + 8.0.6 + 8.0.6 + 8.0.6-servicing.24253.6 8.0.0 8.0.0 8.0.0 - 8.0.1 + 8.0.2 8.0.0 8.0.0 - 8.0.0 + 8.0.1 8.0.0 8.0.0 8.0.0 @@ -92,7 +92,7 @@ 8.0.0 8.0.0 8.0.0 - 8.0.5-servicing.24216.15 + 8.0.6-servicing.24253.6 8.0.0 8.0.0 8.0.0 @@ -108,7 +108,7 @@ 8.0.0 8.0.2 8.0.0 - 8.0.5-servicing.24216.15 + 8.0.6-servicing.24253.6 8.0.0 8.0.1 8.0.0 @@ -124,13 +124,13 @@ 8.0.0 8.0.0 8.0.0 - 8.0.3 + 8.0.4 8.0.0 8.0.0 8.0.0 - 8.0.5-servicing.24216.15 + 8.0.6-servicing.24253.6 - 8.0.5-servicing.24216.15 + 8.0.6-servicing.24253.6 8.0.0 8.0.1 @@ -142,14 +142,14 @@ 8.1.0-preview.23604.1 8.1.0-preview.23604.1 - 8.0.5 - 8.0.5 - 8.0.5 - 8.0.5 - 8.0.5 - 8.0.5 - 8.0.5 - 8.0.5 + 8.0.6 + 8.0.6 + 8.0.6 + 8.0.6 + 8.0.6 + 8.0.6 + 8.0.6 + 8.0.6 4.8.0-3.23518.7 4.8.0-3.23518.7 From 0df4d2c533dda87132569d4d3d4a0a0b01eb5e57 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 9 May 2024 15:29:00 -0700 Subject: [PATCH 14/38] [release/8.0] Update dependencies from dotnet/source-build-reference-packages (#55516) * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240501.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24163.3 -> To Version 8.0.0-alpha.1.24251.1 * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240501.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24163.3 -> To Version 8.0.0-alpha.1.24251.1 * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240501.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24163.3 -> To Version 8.0.0-alpha.1.24251.1 * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240501.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24163.3 -> To Version 8.0.0-alpha.1.24251.1 * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240506.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24163.3 -> To Version 8.0.0-alpha.1.24256.1 * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240507.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24163.3 -> To Version 8.0.0-alpha.1.24257.2 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3c94ec36695c..14e0a4b37a59 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -338,9 +338,9 @@ 9a1c3e1b7f0c8763d4c96e593961a61a72679a7b - + https://github.com/dotnet/source-build-reference-packages - 79827eed138fd2575a8b24820b4f385ee4ffb6e6 + 6ed73280a6d70f7e7ac39c86f2abe8c10983f0bb diff --git a/eng/Versions.props b/eng/Versions.props index c403cd48e0fa..137f17242010 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -168,7 +168,7 @@ 8.0.0-alpha.1.24216.1 - 8.0.0-alpha.1.24163.3 + 8.0.0-alpha.1.24257.2 2.0.0-beta-23228-03 From e3e668fcb129d1e7392503fb34f79f36d1dc92a8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 9 May 2024 15:29:09 -0700 Subject: [PATCH 15/38] Update dependencies from https://github.com/dotnet/source-build-externals build 20240506.1 (#55555) Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24216.1 -> To Version 8.0.0-alpha.1.24256.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 14e0a4b37a59..299178abfe38 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -189,9 +189,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 2d7eea252964e69be94cb9c847b371b23e4dd470 - + https://github.com/dotnet/source-build-externals - 908177a58a41532b3302c17f1e1a8cf1c1234545 + 2b7510ccda2be01e2a2b48598498dca24fb69c3a diff --git a/eng/Versions.props b/eng/Versions.props index 137f17242010..055198d452c9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,7 +166,7 @@ 8.0.0-beta.24204.3 8.0.0-beta.24204.3 - 8.0.0-alpha.1.24216.1 + 8.0.0-alpha.1.24256.1 8.0.0-alpha.1.24257.2 From ba6b2a3d5076df90b198f4143890ff54d02c5d3b Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Thu, 9 May 2024 22:59:56 +0000 Subject: [PATCH 16/38] Merged PR 39446: Add more System.Text.Json references Test build: https://dev.azure.com/dnceng/internal/_build/results?buildId=2447753&view=results --- .../Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj | 1 + .../Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj | 1 + .../Microsoft.dotnet-openapi/src/Microsoft.dotnet-openapi.csproj | 1 + src/Tools/dotnet-sql-cache/src/dotnet-sql-cache.csproj | 1 + 4 files changed, 4 insertions(+) diff --git a/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj b/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj index dbc464028962..fe1c0f19275e 100644 --- a/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj +++ b/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj @@ -13,6 +13,7 @@ + diff --git a/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj b/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj index 8267a699183b..ebd48678889a 100644 --- a/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj +++ b/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj @@ -21,6 +21,7 @@ + diff --git a/src/Tools/Microsoft.dotnet-openapi/src/Microsoft.dotnet-openapi.csproj b/src/Tools/Microsoft.dotnet-openapi/src/Microsoft.dotnet-openapi.csproj index 660d406692e2..3dda9082146e 100644 --- a/src/Tools/Microsoft.dotnet-openapi/src/Microsoft.dotnet-openapi.csproj +++ b/src/Tools/Microsoft.dotnet-openapi/src/Microsoft.dotnet-openapi.csproj @@ -18,6 +18,7 @@ + diff --git a/src/Tools/dotnet-sql-cache/src/dotnet-sql-cache.csproj b/src/Tools/dotnet-sql-cache/src/dotnet-sql-cache.csproj index 91c5ec3c5fe4..d753a475d044 100644 --- a/src/Tools/dotnet-sql-cache/src/dotnet-sql-cache.csproj +++ b/src/Tools/dotnet-sql-cache/src/dotnet-sql-cache.csproj @@ -17,6 +17,7 @@ + From d6c333e067b42cf61218126c3232cfc4c844cde2 Mon Sep 17 00:00:00 2001 From: Brennan Date: Mon, 13 May 2024 11:29:31 -0700 Subject: [PATCH 17/38] Revert "Remove __non_webpack_require__ workaround and split Node dependencies correctly (#48154)" (#55229) This reverts commit 93520b67ad15b45b1fb39fe45fd97c06ebece7e7. --- src/SignalR/clients/ts/signalr/package.json | 9 ---- .../ts/signalr/src/DynamicImports.browser.ts | 22 -------- .../clients/ts/signalr/src/DynamicImports.ts | 54 ------------------- .../clients/ts/signalr/src/FetchHttpClient.ts | 38 +++++++++---- .../clients/ts/signalr/src/HttpConnection.ts | 8 +-- 5 files changed, 33 insertions(+), 98 deletions(-) delete mode 100644 src/SignalR/clients/ts/signalr/src/DynamicImports.browser.ts delete mode 100644 src/SignalR/clients/ts/signalr/src/DynamicImports.ts diff --git a/src/SignalR/clients/ts/signalr/package.json b/src/SignalR/clients/ts/signalr/package.json index db9d0bd3cade..3a4f43382c3a 100644 --- a/src/SignalR/clients/ts/signalr/package.json +++ b/src/SignalR/clients/ts/signalr/package.json @@ -59,14 +59,5 @@ }, "resolutions": { "ansi-regex": "5.0.1" - }, - "browser": { - "./src/DynamicImports.ts": "./src/DynamicImports.browser.ts", - "abort-controller": false, - "eventsource": false, - "fetch-cookie": false, - "node-fetch": false, - "ws": false, - "tough-cookie": false } } diff --git a/src/SignalR/clients/ts/signalr/src/DynamicImports.browser.ts b/src/SignalR/clients/ts/signalr/src/DynamicImports.browser.ts deleted file mode 100644 index 376783f4a4d6..000000000000 --- a/src/SignalR/clients/ts/signalr/src/DynamicImports.browser.ts +++ /dev/null @@ -1,22 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -/** @private */ -export function configureFetch(): boolean { - return false; -} - -/** @private */ -export function configureAbortController(): boolean { - return false; -} - -/** @private */ -export function getWS(): any { - throw new Error("Trying to import 'ws' in the browser."); -} - -/** @private */ -export function getEventSource(): any { - throw new Error("Trying to import 'eventsource' in the browser."); -} \ No newline at end of file diff --git a/src/SignalR/clients/ts/signalr/src/DynamicImports.ts b/src/SignalR/clients/ts/signalr/src/DynamicImports.ts deleted file mode 100644 index 8ae470578a54..000000000000 --- a/src/SignalR/clients/ts/signalr/src/DynamicImports.ts +++ /dev/null @@ -1,54 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -// @ts-ignore: This will be removed from built files and is here to make the types available during dev work -import { CookieJar } from "@types/tough-cookie"; -import { Platform } from "./Utils"; - -/** @private */ -export function configureFetch(obj: { _fetchType?: (input: RequestInfo, init?: RequestInit) => Promise, - _jar?: CookieJar }): boolean -{ - // Node added a fetch implementation to the global scope starting in v18. - // We need to add a cookie jar in node to be able to share cookies with WebSocket - if (typeof fetch === "undefined" || Platform.isNode) { - // Cookies aren't automatically handled in Node so we need to add a CookieJar to preserve cookies across requests - // eslint-disable-next-line @typescript-eslint/no-var-requires - obj._jar = new (require("tough-cookie")).CookieJar(); - - if (typeof fetch === "undefined") { - // eslint-disable-next-line @typescript-eslint/no-var-requires - obj._fetchType = require("node-fetch"); - } else { - // Use fetch from Node if available - obj._fetchType = fetch; - } - - // node-fetch doesn't have a nice API for getting and setting cookies - // fetch-cookie will wrap a fetch implementation with a default CookieJar or a provided one - // eslint-disable-next-line @typescript-eslint/no-var-requires - obj._fetchType = require("fetch-cookie")(obj._fetchType, obj._jar); - return true; - } - return false; -} - -/** @private */ -export function configureAbortController(obj: { _abortControllerType: { prototype: AbortController, new(): AbortController } }): boolean { - if (typeof AbortController === "undefined") { - // Node needs EventListener methods on AbortController which our custom polyfill doesn't provide - obj._abortControllerType = require("abort-controller"); - return true; - } - return false; -} - -/** @private */ -export function getWS(): any { - return require("ws"); -} - -/** @private */ -export function getEventSource(): any { - return require("eventsource"); -} \ No newline at end of file diff --git a/src/SignalR/clients/ts/signalr/src/FetchHttpClient.ts b/src/SignalR/clients/ts/signalr/src/FetchHttpClient.ts index 9b26e98c3a78..d6a94fc10239 100644 --- a/src/SignalR/clients/ts/signalr/src/FetchHttpClient.ts +++ b/src/SignalR/clients/ts/signalr/src/FetchHttpClient.ts @@ -8,7 +8,6 @@ import { AbortError, HttpError, TimeoutError } from "./Errors"; import { HttpClient, HttpRequest, HttpResponse } from "./HttpClient"; import { ILogger, LogLevel } from "./ILogger"; import { Platform, getGlobalThis, isArrayBuffer } from "./Utils"; -import { configureAbortController, configureFetch } from "./DynamicImports"; export class FetchHttpClient extends HttpClient { private readonly _abortControllerType: { prototype: AbortController, new(): AbortController }; @@ -21,19 +20,38 @@ export class FetchHttpClient extends HttpClient { super(); this._logger = logger; - // This is how you do "reference" arguments - const fetchObj = { _fetchType: undefined, _jar: undefined }; - if (configureFetch(fetchObj)) { - this._fetchType = fetchObj._fetchType!; - this._jar = fetchObj._jar; + // Node added a fetch implementation to the global scope starting in v18. + // We need to add a cookie jar in node to be able to share cookies with WebSocket + if (typeof fetch === "undefined" || Platform.isNode) { + // In order to ignore the dynamic require in webpack builds we need to do this magic + // @ts-ignore: TS doesn't know about these names + const requireFunc = typeof __webpack_require__ === "function" ? __non_webpack_require__ : require; + + // Cookies aren't automatically handled in Node so we need to add a CookieJar to preserve cookies across requests + this._jar = new (requireFunc("tough-cookie")).CookieJar(); + + if (typeof fetch === "undefined") { + this._fetchType = requireFunc("node-fetch"); + } else { + // Use fetch from Node if available + this._fetchType = fetch; + } + + // node-fetch doesn't have a nice API for getting and setting cookies + // fetch-cookie will wrap a fetch implementation with a default CookieJar or a provided one + this._fetchType = requireFunc("fetch-cookie")(this._fetchType, this._jar); } else { this._fetchType = fetch.bind(getGlobalThis()); } + if (typeof AbortController === "undefined") { + // In order to ignore the dynamic require in webpack builds we need to do this magic + // @ts-ignore: TS doesn't know about these names + const requireFunc = typeof __webpack_require__ === "function" ? __non_webpack_require__ : require; - this._abortControllerType = AbortController; - const abortObj = { _abortControllerType: this._abortControllerType }; - if (configureAbortController(abortObj)) { - this._abortControllerType = abortObj._abortControllerType; + // Node needs EventListener methods on AbortController which our custom polyfill doesn't provide + this._abortControllerType = requireFunc("abort-controller"); + } else { + this._abortControllerType = AbortController; } } diff --git a/src/SignalR/clients/ts/signalr/src/HttpConnection.ts b/src/SignalR/clients/ts/signalr/src/HttpConnection.ts index 3e48a83d61f4..f8397f4d65b5 100644 --- a/src/SignalR/clients/ts/signalr/src/HttpConnection.ts +++ b/src/SignalR/clients/ts/signalr/src/HttpConnection.ts @@ -3,7 +3,6 @@ import { AccessTokenHttpClient } from "./AccessTokenHttpClient"; import { DefaultHttpClient } from "./DefaultHttpClient"; -import { getEventSource, getWS } from "./DynamicImports"; import { AggregateErrors, DisabledTransportError, FailedToNegotiateWithServerError, FailedToStartTransportError, HttpError, UnsupportedTransportError, AbortError } from "./Errors"; import { IConnection } from "./IConnection"; import { IHttpConnectionOptions } from "./IHttpConnectionOptions"; @@ -88,8 +87,11 @@ export class HttpConnection implements IConnection { let eventSourceModule: any = null; if (Platform.isNode && typeof require !== "undefined") { - webSocketModule = getWS(); - eventSourceModule = getEventSource(); + // In order to ignore the dynamic require in webpack builds we need to do this magic + // @ts-ignore: TS doesn't know about these names + const requireFunc = typeof __webpack_require__ === "function" ? __non_webpack_require__ : require; + webSocketModule = requireFunc("ws"); + eventSourceModule = requireFunc("eventsource"); } if (!Platform.isNode && typeof WebSocket !== "undefined" && !options.WebSocket) { From c2f6ade250dd90796f4c17cd104f794b82dd87fd Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 14 May 2024 16:25:13 -0700 Subject: [PATCH 18/38] Update baseline, SDK --- eng/Baseline.Designer.props | 432 ++++++++++++++++++------------------ eng/Baseline.xml | 212 +++++++++--------- eng/Versions.props | 2 +- global.json | 4 +- 4 files changed, 325 insertions(+), 325 deletions(-) diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 49210d5502a1..a89151e8a015 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,117 +2,117 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - + - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 @@ -120,137 +120,137 @@ - 8.0.4 + 8.0.5 - + - + - + - 8.0.4 + 8.0.5 - + - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - + - 8.0.4 + 8.0.5 - - + + - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - - + + - 8.0.4 + 8.0.5 - + - 8.0.4 + 8.0.5 - + - 8.0.4 + 8.0.5 - + - 8.0.4 + 8.0.5 - - + + - 8.0.4 + 8.0.5 - - - + + + - 8.0.4 + 8.0.5 - - + + - 8.0.4 + 8.0.5 - - + + - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - - + + @@ -258,7 +258,7 @@ - 8.0.4 + 8.0.5 @@ -267,133 +267,133 @@ - 8.0.4 + 8.0.5 - + - + - + - + - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - + - + - + - 8.0.4 + 8.0.5 - - + + - + - - + + - + - - + + - + - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - - + + - 8.0.4 + 8.0.5 - + - + - + - 8.0.4 + 8.0.5 - + - + - + - 8.0.4 + 8.0.5 - + - 8.0.4 + 8.0.5 @@ -402,7 +402,7 @@ - 8.0.4 + 8.0.5 @@ -410,71 +410,71 @@ - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - + - + - + - + - 8.0.4 + 8.0.5 - + - + - + - 8.0.4 + 8.0.5 - - + + - 8.0.4 + 8.0.5 - - + + - 8.0.4 + 8.0.5 @@ -490,27 +490,27 @@ - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - + - 8.0.4 + 8.0.5 @@ -519,23 +519,23 @@ - 8.0.4 + 8.0.5 - + - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 @@ -544,54 +544,54 @@ - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - - + + - - + + - - + + - 8.0.4 + 8.0.5 - - + + - - + + - - + + - - + + @@ -599,83 +599,83 @@ - 8.0.4 + 8.0.5 - + - + - + - 8.0.4 + 8.0.5 - + - + - + - 8.0.4 + 8.0.5 - + - + - + - 8.0.4 + 8.0.5 - + - + - + - 8.0.4 + 8.0.5 - - - - + + + + - 8.0.4 + 8.0.5 @@ -684,64 +684,64 @@ - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - + - 8.0.4 + 8.0.5 - + - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 @@ -763,7 +763,7 @@ - 8.0.4 + 8.0.5 @@ -785,7 +785,7 @@ - 8.0.4 + 8.0.5 @@ -801,23 +801,23 @@ - 8.0.4 + 8.0.5 - + - + - + @@ -825,24 +825,24 @@ - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - - - + + + - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 @@ -852,7 +852,7 @@ - 8.0.4 + 8.0.5 @@ -861,73 +861,73 @@ - 8.0.4 + 8.0.5 - + - + - + - 8.0.4 + 8.0.5 - + - + - + - 8.0.4 + 8.0.5 - + - + - + - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 @@ -956,11 +956,11 @@ - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 @@ -978,18 +978,18 @@ - 8.0.4 + 8.0.5 - 8.0.4 + 8.0.5 - + - 8.0.4 + 8.0.5 diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 110083387ae6..7d886afd31fc 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -4,110 +4,110 @@ This file contains a list of all the packages and their versions which were rele Update this list when preparing for a new patch. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eng/Versions.props b/eng/Versions.props index 50ae6bac99ee..52f4edb24715 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ 6 - false + true 7.1.2 *-* - + @@ -30,7 +30,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f2e08fc373c5..8bdb38439dca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 79322f37015c26b5dc05bee854fcdac1e7042b58 + b5e3d6fd4f2cb30a78bbc275d033dbebfad4bb4c https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 79322f37015c26b5dc05bee854fcdac1e7042b58 + b5e3d6fd4f2cb30a78bbc275d033dbebfad4bb4c https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 79322f37015c26b5dc05bee854fcdac1e7042b58 + b5e3d6fd4f2cb30a78bbc275d033dbebfad4bb4c https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 79322f37015c26b5dc05bee854fcdac1e7042b58 + b5e3d6fd4f2cb30a78bbc275d033dbebfad4bb4c https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 79322f37015c26b5dc05bee854fcdac1e7042b58 + b5e3d6fd4f2cb30a78bbc275d033dbebfad4bb4c https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 79322f37015c26b5dc05bee854fcdac1e7042b58 + b5e3d6fd4f2cb30a78bbc275d033dbebfad4bb4c https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 79322f37015c26b5dc05bee854fcdac1e7042b58 + b5e3d6fd4f2cb30a78bbc275d033dbebfad4bb4c https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 79322f37015c26b5dc05bee854fcdac1e7042b58 + b5e3d6fd4f2cb30a78bbc275d033dbebfad4bb4c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 142b847749343babac8e396a5d67b7a8b2910573 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 17 May 2024 19:29:39 +0000 Subject: [PATCH 20/38] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20240517.8 dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 8.0.6 -> To Version 8.0.6 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8c1b6e5493e9..cba3d2fd8982 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8bdb38439dca..5d77d2a498cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - b5e3d6fd4f2cb30a78bbc275d033dbebfad4bb4c + bcda97958e9c7f9796281c171232698076645e81 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - b5e3d6fd4f2cb30a78bbc275d033dbebfad4bb4c + bcda97958e9c7f9796281c171232698076645e81 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - b5e3d6fd4f2cb30a78bbc275d033dbebfad4bb4c + bcda97958e9c7f9796281c171232698076645e81 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - b5e3d6fd4f2cb30a78bbc275d033dbebfad4bb4c + bcda97958e9c7f9796281c171232698076645e81 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - b5e3d6fd4f2cb30a78bbc275d033dbebfad4bb4c + bcda97958e9c7f9796281c171232698076645e81 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - b5e3d6fd4f2cb30a78bbc275d033dbebfad4bb4c + bcda97958e9c7f9796281c171232698076645e81 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - b5e3d6fd4f2cb30a78bbc275d033dbebfad4bb4c + bcda97958e9c7f9796281c171232698076645e81 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - b5e3d6fd4f2cb30a78bbc275d033dbebfad4bb4c + bcda97958e9c7f9796281c171232698076645e81 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 5ef70788429ca1ccc10d89e9cafde4752fb16f22 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 17 May 2024 23:15:03 +0000 Subject: [PATCH 21/38] Merged PR 39707: [internal/release/8.0] Update dependencies from dnceng/internal/dotnet-efcore This pull request updates the following dependencies [marker]: <> (Begin:e179a2a7-bc5d-4498-2467-08dbd53ba9ce) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - **Subscription**: e179a2a7-bc5d-4498-2467-08dbd53ba9ce - **Build**: 20240517.12 - **Date Produced**: May 17, 2024 10:07:23 PM UTC - **Commit**: f87585ffdb215ff006620ef20be71d30fe5f6271 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-ef**: [from 8.0.6 to 8.0.7][1] - **Microsoft.EntityFrameworkCore**: [from 8.0.6 to 8.0.7][1] - **Microsoft.EntityFrameworkCore.Design**: [from 8.0.6 to 8.0.7][1] - **Microsoft.EntityFrameworkCore.InMemory**: [from 8.0.6 to 8.0.7][1] - **Microsoft.EntityFrameworkCore.Relational**: [from 8.0.6 to 8.0.7][1] - **Microsoft.EntityFrameworkCore.Sqlite**: [from 8.0.6 to 8.0.7][1] - **Microsoft.EntityFrameworkCore.SqlServer**: [from 8.0.6 to 8.0.7][1] - **Microsoft.EntityFrameworkCore.Tools**: [from 8.0.6 to 8.0.7][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-efcore/branches?baseVersion=GCbcda97958e9c7f9796281c171232698076645e81&targetVersion=GCf87585ffdb215ff006620ef20be71d30fe5f6271&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:e179a2a7-bc5d-4498-2467-08dbd53ba9ce) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index cba3d2fd8982..ac22b71466cb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5d77d2a498cb..279409867c70 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,37 +9,37 @@ --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - bcda97958e9c7f9796281c171232698076645e81 + f87585ffdb215ff006620ef20be71d30fe5f6271 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - bcda97958e9c7f9796281c171232698076645e81 + f87585ffdb215ff006620ef20be71d30fe5f6271 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - bcda97958e9c7f9796281c171232698076645e81 + f87585ffdb215ff006620ef20be71d30fe5f6271 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - bcda97958e9c7f9796281c171232698076645e81 + f87585ffdb215ff006620ef20be71d30fe5f6271 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - bcda97958e9c7f9796281c171232698076645e81 + f87585ffdb215ff006620ef20be71d30fe5f6271 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - bcda97958e9c7f9796281c171232698076645e81 + f87585ffdb215ff006620ef20be71d30fe5f6271 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - bcda97958e9c7f9796281c171232698076645e81 + f87585ffdb215ff006620ef20be71d30fe5f6271 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - bcda97958e9c7f9796281c171232698076645e81 + f87585ffdb215ff006620ef20be71d30fe5f6271 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index f46ac8f1663d..ab8e70ed57f5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,14 +143,14 @@ 8.1.0-preview.23604.1 8.1.0-preview.23604.1 - 8.0.6 - 8.0.6 - 8.0.6 - 8.0.6 - 8.0.6 - 8.0.6 - 8.0.6 - 8.0.6 + 8.0.7 + 8.0.7 + 8.0.7 + 8.0.7 + 8.0.7 + 8.0.7 + 8.0.7 + 8.0.7 4.8.0-3.23518.7 4.8.0-3.23518.7 From aa6b3d420ca47bc7362606dd8a43e37c9f52dd1e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 18 May 2024 04:51:31 +0000 Subject: [PATCH 22/38] Merged PR 39726: [internal/release/8.0] Update dependencies from dnceng/internal/dotnet-efcore, dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:83131e87-e80d-4d5b-f426-08dbd53b3319) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 83131e87-e80d-4d5b-f426-08dbd53b3319 - **Build**: 20240517.24 - **Date Produced**: May 18, 2024 12:46:12 AM UTC - **Commit**: cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Extensions.Configuration.Binder**: [from 8.0.2 to 8.0.2][1] - **Microsoft.Extensions.Configuration.FileExtensions**: [from 8.0.1 to 8.0.1][1] - **Microsoft.Extensions.DependencyModel**: [from 8.0.1 to 8.0.1][1] - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 8.0.6-servicing.24253.6 to 8.0.7-servicing.24267.24][1] - **Microsoft.Internal.Runtime.AspNetCore.Transport**: [from 8.0.6-servicing.24253.6 to 8.0.7-servicing.24267.24][1] - **Microsoft.NET.Runtime.MonoAOTCompiler.Task**: [from 8.0.6 to 8.0.7][1] - **Microsoft.NET.Runtime.WebAssembly.Sdk**: [from 8.0.6 to 8.0.7][1] - **Microsoft.NETCore.App.Ref**: [from 8.0.6 to 8.0.7][1] - **Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm**: [from 8.0.6 to 8.0.7][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.6 to 8.0.7][1] - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 8.0.6-servicing.24253.6 to 8.0.7-servicing.24267.24][1] - **Microsoft.NETCore.Platforms**: [from 8.0.6-servicing.24253.6 to 8.0.7-servicing.24267.24][1] - **System.Security.Cryptography.Xml**: [from 8.0.1 to 8.0.1][1] - **System.Text.Json**: [from 8.0.4 to 8.0.4][1] - **Microsoft.SourceBuild.Intermediate.runtime.linux-x64**: [from 8.0.6-servicing.24253.6 to 8.0.7-servicing.24267.24][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCfa5b0d8f4a8b424732cc992158aa92842f8a2846&targetVersion=GCcb4ec67fd1784497c953f65bfc390eb8bfdf6c6b&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:83131e87-e80d-4d5b-f426-08dbd53b3319) [marker]: <> (Begin:e179a2a7-bc5d-4498-2467-08dbd53ba9ce) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - **Subscription**: e179a2a7-bc5d-4498-2467-08dbd53ba9ce - **Build**: 20240517.14 - **Date Produced**: May 18, 2024 2:59:38 AM UTC - **Commit**: b3a7017957b0f21a0fb5ff610b708319f5a71b5a - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-ef**: [from 8.0.7 to 8.0.7][2] - **Microsoft.EntityFrameworkCore**: [from 8.0.7 to 8.0.7][2] - **Microsoft.EntityFrameworkCore.Design**: [from 8.0.7 to 8.0.7][2] - **Microsoft.EntityFrameworkCore.InMemory**: [from 8.0.7 to 8.0.7][2] - **Microsoft.EntityFrameworkCore.Relational**: [from 8.0.7 to 8.0.7][2] - **Microsoft.EntityFrameworkCore.Sqlite**: [from 8.0.7 to 8.0.7][2] - **Microsoft.EntityFrameworkCore.SqlServer**: [from 8.0.7 to 8.0.7][2] - **Microsoft.Entity... --- NuGet.config | 8 ++--- eng/Version.Details.xml | 66 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++------- 3 files changed, 47 insertions(+), 47 deletions(-) diff --git a/NuGet.config b/NuGet.config index ac22b71466cb..b109ebba5e9b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,10 +6,10 @@ - + - + @@ -30,10 +30,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 279409867c70..090cb0f5e7c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f87585ffdb215ff006620ef20be71d30fe5f6271 + b3a7017957b0f21a0fb5ff610b708319f5a71b5a https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f87585ffdb215ff006620ef20be71d30fe5f6271 + b3a7017957b0f21a0fb5ff610b708319f5a71b5a https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f87585ffdb215ff006620ef20be71d30fe5f6271 + b3a7017957b0f21a0fb5ff610b708319f5a71b5a https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f87585ffdb215ff006620ef20be71d30fe5f6271 + b3a7017957b0f21a0fb5ff610b708319f5a71b5a https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f87585ffdb215ff006620ef20be71d30fe5f6271 + b3a7017957b0f21a0fb5ff610b708319f5a71b5a https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f87585ffdb215ff006620ef20be71d30fe5f6271 + b3a7017957b0f21a0fb5ff610b708319f5a71b5a https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f87585ffdb215ff006620ef20be71d30fe5f6271 + b3a7017957b0f21a0fb5ff610b708319f5a71b5a https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f87585ffdb215ff006620ef20be71d30fe5f6271 + b3a7017957b0f21a0fb5ff610b708319f5a71b5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -55,7 +55,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa5b0d8f4a8b424732cc992158aa92842f8a2846 + cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -67,7 +67,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa5b0d8f4a8b424732cc992158aa92842f8a2846 + cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -121,9 +121,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa5b0d8f4a8b424732cc992158aa92842f8a2846 + cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -185,9 +185,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa5b0d8f4a8b424732cc992158aa92842f8a2846 + cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b https://github.com/dotnet/source-build-externals @@ -241,7 +241,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa5b0d8f4a8b424732cc992158aa92842f8a2846 + cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -257,7 +257,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa5b0d8f4a8b424732cc992158aa92842f8a2846 + cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -273,19 +273,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa5b0d8f4a8b424732cc992158aa92842f8a2846 + cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa5b0d8f4a8b424732cc992158aa92842f8a2846 + cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa5b0d8f4a8b424732cc992158aa92842f8a2846 + cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa5b0d8f4a8b424732cc992158aa92842f8a2846 + cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -316,22 +316,22 @@ Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime. All Runtime.$rid packages should have the same version. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa5b0d8f4a8b424732cc992158aa92842f8a2846 + cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa5b0d8f4a8b424732cc992158aa92842f8a2846 + cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa5b0d8f4a8b424732cc992158aa92842f8a2846 + cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa5b0d8f4a8b424732cc992158aa92842f8a2846 + cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b https://github.com/dotnet/xdt @@ -368,9 +368,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa5b0d8f4a8b424732cc992158aa92842f8a2846 + cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index ab8e70ed57f5..ee38f6c6395f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,12 +67,12 @@ 8.0.1 - 8.0.6 - 8.0.6 - 8.0.6 - 8.0.6 - 8.0.6 - 8.0.6-servicing.24253.6 + 8.0.7 + 8.0.7 + 8.0.7 + 8.0.7 + 8.0.7 + 8.0.7-servicing.24267.24 8.0.0 8.0.0 8.0.0 @@ -93,7 +93,7 @@ 8.0.0 8.0.0 8.0.0 - 8.0.6-servicing.24253.6 + 8.0.7-servicing.24267.24 8.0.0 8.0.0 8.0.0 @@ -109,7 +109,7 @@ 8.0.0 8.0.2 8.0.0 - 8.0.6-servicing.24253.6 + 8.0.7-servicing.24267.24 8.0.0 8.0.1 8.0.0 @@ -129,9 +129,9 @@ 8.0.0 8.0.0 8.0.0 - 8.0.6-servicing.24253.6 + 8.0.7-servicing.24267.24 - 8.0.6-servicing.24253.6 + 8.0.7-servicing.24267.24 8.0.0 8.0.1 From a1af44bd53fa27448c1535ebcab74fa20179f259 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Mon, 20 May 2024 11:18:37 -0700 Subject: [PATCH 23/38] Update branding to 8.0.7 (#55759) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 52f4edb24715..85cf989b9934 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,10 +8,10 @@ 8 0 - 6 + 7 - true + false 7.1.2 *-* - + @@ -30,7 +30,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 090cb0f5e7c9..fe7f1225a854 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - b3a7017957b0f21a0fb5ff610b708319f5a71b5a + 1b046b4dd8ba051569eaf0e5a5dc6fc47156a1de https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - b3a7017957b0f21a0fb5ff610b708319f5a71b5a + 1b046b4dd8ba051569eaf0e5a5dc6fc47156a1de https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - b3a7017957b0f21a0fb5ff610b708319f5a71b5a + 1b046b4dd8ba051569eaf0e5a5dc6fc47156a1de https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - b3a7017957b0f21a0fb5ff610b708319f5a71b5a + 1b046b4dd8ba051569eaf0e5a5dc6fc47156a1de https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - b3a7017957b0f21a0fb5ff610b708319f5a71b5a + 1b046b4dd8ba051569eaf0e5a5dc6fc47156a1de https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - b3a7017957b0f21a0fb5ff610b708319f5a71b5a + 1b046b4dd8ba051569eaf0e5a5dc6fc47156a1de https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - b3a7017957b0f21a0fb5ff610b708319f5a71b5a + 1b046b4dd8ba051569eaf0e5a5dc6fc47156a1de https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - b3a7017957b0f21a0fb5ff610b708319f5a71b5a + 1b046b4dd8ba051569eaf0e5a5dc6fc47156a1de https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 1e33c982e28ad7b6367533b1644a0ee6b04da1fb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 11:38:16 -0700 Subject: [PATCH 25/38] Update dependencies from https://github.com/dotnet/arcade build 20240516.3 (#55796) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor From Version 8.0.0-beta.24204.3 -> To Version 8.0.0-beta.24266.3 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 4 -- eng/Version.Details.xml | 20 ++++---- eng/Versions.props | 6 +-- .../job/source-index-stage1.yml | 49 +++++++++++++------ .../templates/job/source-index-stage1.yml | 44 ++++++++++++----- global.json | 4 +- 6 files changed, 79 insertions(+), 48 deletions(-) diff --git a/NuGet.config b/NuGet.config index a67fb5e3b1f1..1c2f27eb90ce 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,10 +6,8 @@ - - @@ -30,10 +28,8 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ddd0576df75e..d213589f4935 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -376,26 +376,26 @@ https://github.com/dotnet/winforms abda8e3bfa78319363526b5a5f86863ec979940e - + https://github.com/dotnet/arcade - 188340e12c0a372b1681ad6a5e72c608021efdba + e6f70c7dd528f05cd28cec2a179d58c22e91d9ac - + https://github.com/dotnet/arcade - 188340e12c0a372b1681ad6a5e72c608021efdba + e6f70c7dd528f05cd28cec2a179d58c22e91d9ac - + https://github.com/dotnet/arcade - 188340e12c0a372b1681ad6a5e72c608021efdba + e6f70c7dd528f05cd28cec2a179d58c22e91d9ac - + https://github.com/dotnet/arcade - 188340e12c0a372b1681ad6a5e72c608021efdba + e6f70c7dd528f05cd28cec2a179d58c22e91d9ac - + https://github.com/dotnet/arcade - 188340e12c0a372b1681ad6a5e72c608021efdba + e6f70c7dd528f05cd28cec2a179d58c22e91d9ac https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index 85cf989b9934..7b1d05748214 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -162,9 +162,9 @@ 6.2.4 6.2.4 - 8.0.0-beta.24204.3 - 8.0.0-beta.24204.3 - 8.0.0-beta.24204.3 + 8.0.0-beta.24266.3 + 8.0.0-beta.24266.3 + 8.0.0-beta.24266.3 8.0.0-alpha.1.24256.1 diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml index f0513aee5b0d..43ee0c202fc7 100644 --- a/eng/common/templates-official/job/source-index-stage1.yml +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -1,6 +1,7 @@ parameters: runAsPublic: false - sourceIndexPackageVersion: 1.0.1-20230228.2 + sourceIndexUploadPackageVersion: 2.0.0-20240502.12 + sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] @@ -14,15 +15,15 @@ jobs: dependsOn: ${{ parameters.dependsOn }} condition: ${{ parameters.condition }} variables: - - name: SourceIndexPackageVersion - value: ${{ parameters.sourceIndexPackageVersion }} + - name: SourceIndexUploadPackageVersion + value: ${{ parameters.sourceIndexUploadPackageVersion }} + - name: SourceIndexProcessBinlogPackageVersion + value: ${{ parameters.sourceIndexProcessBinlogPackageVersion }} - name: SourceIndexPackageSource value: ${{ parameters.sourceIndexPackageSource }} - name: BinlogPath value: ${{ parameters.binlogPath }} - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: source-dot-net stage1 variables - - template: /eng/common/templates-official/variables/pool-providers.yml + - template: /eng/common/templates/variables/pool-providers.yml ${{ if ne(parameters.pool, '') }}: pool: ${{ parameters.pool }} @@ -33,24 +34,23 @@ jobs: demands: ImageOverride -equals windows.vs2019.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) - image: windows.vs2022.amd64 - os: windows + demands: ImageOverride -equals windows.vs2019.amd64 steps: - ${{ each preStep in parameters.preSteps }}: - ${{ preStep }} - task: UseDotNet@2 - displayName: Use .NET Core SDK 6 + displayName: Use .NET 8 SDK inputs: packageType: sdk - version: 6.0.x + version: 8.0.x installationPath: $(Agent.TempDirectory)/dotnet workingDirectory: $(Agent.TempDirectory) - script: | - $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools - $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(sourceIndexProcessBinlogPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(sourceIndexUploadPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools displayName: Download Tools # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. workingDirectory: $(Agent.TempDirectory) @@ -62,7 +62,24 @@ jobs: displayName: Process Binlog into indexable sln - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) - displayName: Upload stage1 artifacts to source index - env: - BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url) + - task: AzureCLI@2 + displayName: Get stage 1 auth token + inputs: + azureSubscription: 'SourceDotNet Stage1 Publish' + addSpnToEnvironment: true + scriptType: 'ps' + scriptLocation: 'inlineScript' + inlineScript: | + echo "##vso[task.setvariable variable=ARM_CLIENT_ID]$env:servicePrincipalId" + echo "##vso[task.setvariable variable=ARM_ID_TOKEN]$env:idToken" + echo "##vso[task.setvariable variable=ARM_TENANT_ID]$env:tenantId" + + - script: | + echo "Client ID: $(ARM_CLIENT_ID)" + echo "ID Token: $(ARM_ID_TOKEN)" + echo "Tenant ID: $(ARM_TENANT_ID)" + az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN) + displayName: "Login to Azure" + + - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1 + displayName: Upload stage1 artifacts to source index \ No newline at end of file diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index b98202aa02d8..43ee0c202fc7 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -1,6 +1,7 @@ parameters: runAsPublic: false - sourceIndexPackageVersion: 1.0.1-20230228.2 + sourceIndexUploadPackageVersion: 2.0.0-20240502.12 + sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] @@ -14,14 +15,14 @@ jobs: dependsOn: ${{ parameters.dependsOn }} condition: ${{ parameters.condition }} variables: - - name: SourceIndexPackageVersion - value: ${{ parameters.sourceIndexPackageVersion }} + - name: SourceIndexUploadPackageVersion + value: ${{ parameters.sourceIndexUploadPackageVersion }} + - name: SourceIndexProcessBinlogPackageVersion + value: ${{ parameters.sourceIndexProcessBinlogPackageVersion }} - name: SourceIndexPackageSource value: ${{ parameters.sourceIndexPackageSource }} - name: BinlogPath value: ${{ parameters.binlogPath }} - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: source-dot-net stage1 variables - template: /eng/common/templates/variables/pool-providers.yml ${{ if ne(parameters.pool, '') }}: @@ -40,16 +41,16 @@ jobs: - ${{ preStep }} - task: UseDotNet@2 - displayName: Use .NET Core SDK 6 + displayName: Use .NET 8 SDK inputs: packageType: sdk - version: 6.0.x + version: 8.0.x installationPath: $(Agent.TempDirectory)/dotnet workingDirectory: $(Agent.TempDirectory) - script: | - $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools - $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(sourceIndexProcessBinlogPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(sourceIndexUploadPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools displayName: Download Tools # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. workingDirectory: $(Agent.TempDirectory) @@ -61,7 +62,24 @@ jobs: displayName: Process Binlog into indexable sln - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) - displayName: Upload stage1 artifacts to source index - env: - BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url) + - task: AzureCLI@2 + displayName: Get stage 1 auth token + inputs: + azureSubscription: 'SourceDotNet Stage1 Publish' + addSpnToEnvironment: true + scriptType: 'ps' + scriptLocation: 'inlineScript' + inlineScript: | + echo "##vso[task.setvariable variable=ARM_CLIENT_ID]$env:servicePrincipalId" + echo "##vso[task.setvariable variable=ARM_ID_TOKEN]$env:idToken" + echo "##vso[task.setvariable variable=ARM_TENANT_ID]$env:tenantId" + + - script: | + echo "Client ID: $(ARM_CLIENT_ID)" + echo "ID Token: $(ARM_ID_TOKEN)" + echo "Tenant ID: $(ARM_TENANT_ID)" + az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN) + displayName: "Login to Azure" + + - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1 + displayName: Upload stage1 artifacts to source index \ No newline at end of file diff --git a/global.json b/global.json index f9f458b5413b..bfd92fee2223 100644 --- a/global.json +++ b/global.json @@ -27,7 +27,7 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.22.19", - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24204.3", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24204.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24266.3", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24266.3" } } From 0b462a402736844d26639ebd49950f2badb9c9f0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 20 May 2024 23:13:36 +0000 Subject: [PATCH 26/38] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20240520.7 Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , System.Security.Cryptography.Xml , System.Text.Json , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 8.0.2 -> To Version 8.0.2 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 10 +++++----- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7edcb47f2675..43ace9a91375 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d0634d71aa0..67ceaa7e3346 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,7 +55,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b + 6d230cdb65dee13db6779749580d02bcd413af70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -67,7 +67,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b + 6d230cdb65dee13db6779749580d02bcd413af70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -121,9 +121,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b + 6d230cdb65dee13db6779749580d02bcd413af70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -185,9 +185,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b + 6d230cdb65dee13db6779749580d02bcd413af70 https://github.com/dotnet/source-build-externals @@ -241,7 +241,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b + 6d230cdb65dee13db6779749580d02bcd413af70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -257,7 +257,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b + 6d230cdb65dee13db6779749580d02bcd413af70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -273,19 +273,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b + 6d230cdb65dee13db6779749580d02bcd413af70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b + 6d230cdb65dee13db6779749580d02bcd413af70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b + 6d230cdb65dee13db6779749580d02bcd413af70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b + 6d230cdb65dee13db6779749580d02bcd413af70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -318,20 +318,20 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b + 6d230cdb65dee13db6779749580d02bcd413af70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b + 6d230cdb65dee13db6779749580d02bcd413af70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b + 6d230cdb65dee13db6779749580d02bcd413af70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b + 6d230cdb65dee13db6779749580d02bcd413af70 https://github.com/dotnet/xdt @@ -368,9 +368,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b + 6d230cdb65dee13db6779749580d02bcd413af70 https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 4882877bc2e5..d7c4c6e3c652 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,7 +72,7 @@ 8.0.7 8.0.7 8.0.7 - 8.0.7-servicing.24267.24 + 8.0.7-servicing.24270.7 8.0.0 8.0.0 8.0.0 @@ -93,7 +93,7 @@ 8.0.0 8.0.0 8.0.0 - 8.0.7-servicing.24267.24 + 8.0.7-servicing.24270.7 8.0.0 8.0.0 8.0.0 @@ -109,7 +109,7 @@ 8.0.0 8.0.2 8.0.0 - 8.0.7-servicing.24267.24 + 8.0.7-servicing.24270.7 8.0.0 8.0.1 8.0.0 @@ -129,9 +129,9 @@ 8.0.0 8.0.0 8.0.0 - 8.0.7-servicing.24267.24 + 8.0.7-servicing.24270.7 - 8.0.7-servicing.24267.24 + 8.0.7-servicing.24270.7 8.0.0 8.0.1 From 20436bf9d92d82ab3336c1461c90c06c1b688377 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 21 May 2024 01:08:23 +0000 Subject: [PATCH 27/38] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20240520.7 dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 8.0.7 -> To Version 8.0.7 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 43ace9a91375..f80054a3c02a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 67ceaa7e3346..223afdbed4b3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1b046b4dd8ba051569eaf0e5a5dc6fc47156a1de + e60bce54547ab8c7f4238d46ad43a49d289d9c76 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1b046b4dd8ba051569eaf0e5a5dc6fc47156a1de + e60bce54547ab8c7f4238d46ad43a49d289d9c76 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1b046b4dd8ba051569eaf0e5a5dc6fc47156a1de + e60bce54547ab8c7f4238d46ad43a49d289d9c76 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1b046b4dd8ba051569eaf0e5a5dc6fc47156a1de + e60bce54547ab8c7f4238d46ad43a49d289d9c76 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1b046b4dd8ba051569eaf0e5a5dc6fc47156a1de + e60bce54547ab8c7f4238d46ad43a49d289d9c76 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1b046b4dd8ba051569eaf0e5a5dc6fc47156a1de + e60bce54547ab8c7f4238d46ad43a49d289d9c76 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1b046b4dd8ba051569eaf0e5a5dc6fc47156a1de + e60bce54547ab8c7f4238d46ad43a49d289d9c76 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1b046b4dd8ba051569eaf0e5a5dc6fc47156a1de + e60bce54547ab8c7f4238d46ad43a49d289d9c76 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 8f1406d2b6613b19af66d91a6ed0c9331f9a09e9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 21 May 2024 01:58:13 +0000 Subject: [PATCH 28/38] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20240520.14 Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , System.Security.Cryptography.Xml , System.Text.Json , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 8.0.2 -> To Version 8.0.2 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 10 +++++----- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index f80054a3c02a..d9719c8c1d7a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 223afdbed4b3..46b5cced6381 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,7 +55,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6d230cdb65dee13db6779749580d02bcd413af70 + 63d80966a9f0d15e057d0d146702405b19c82533 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -67,7 +67,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6d230cdb65dee13db6779749580d02bcd413af70 + 63d80966a9f0d15e057d0d146702405b19c82533 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -121,9 +121,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6d230cdb65dee13db6779749580d02bcd413af70 + 63d80966a9f0d15e057d0d146702405b19c82533 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -185,9 +185,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6d230cdb65dee13db6779749580d02bcd413af70 + 63d80966a9f0d15e057d0d146702405b19c82533 https://github.com/dotnet/source-build-externals @@ -241,7 +241,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6d230cdb65dee13db6779749580d02bcd413af70 + 63d80966a9f0d15e057d0d146702405b19c82533 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -257,7 +257,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6d230cdb65dee13db6779749580d02bcd413af70 + 63d80966a9f0d15e057d0d146702405b19c82533 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -273,19 +273,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6d230cdb65dee13db6779749580d02bcd413af70 + 63d80966a9f0d15e057d0d146702405b19c82533 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6d230cdb65dee13db6779749580d02bcd413af70 + 63d80966a9f0d15e057d0d146702405b19c82533 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6d230cdb65dee13db6779749580d02bcd413af70 + 63d80966a9f0d15e057d0d146702405b19c82533 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6d230cdb65dee13db6779749580d02bcd413af70 + 63d80966a9f0d15e057d0d146702405b19c82533 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -318,20 +318,20 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6d230cdb65dee13db6779749580d02bcd413af70 + 63d80966a9f0d15e057d0d146702405b19c82533 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6d230cdb65dee13db6779749580d02bcd413af70 + 63d80966a9f0d15e057d0d146702405b19c82533 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6d230cdb65dee13db6779749580d02bcd413af70 + 63d80966a9f0d15e057d0d146702405b19c82533 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6d230cdb65dee13db6779749580d02bcd413af70 + 63d80966a9f0d15e057d0d146702405b19c82533 https://github.com/dotnet/xdt @@ -368,9 +368,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6d230cdb65dee13db6779749580d02bcd413af70 + 63d80966a9f0d15e057d0d146702405b19c82533 https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index d7c4c6e3c652..244e009f6e53 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,7 +72,7 @@ 8.0.7 8.0.7 8.0.7 - 8.0.7-servicing.24270.7 + 8.0.7-servicing.24270.14 8.0.0 8.0.0 8.0.0 @@ -93,7 +93,7 @@ 8.0.0 8.0.0 8.0.0 - 8.0.7-servicing.24270.7 + 8.0.7-servicing.24270.14 8.0.0 8.0.0 8.0.0 @@ -109,7 +109,7 @@ 8.0.0 8.0.2 8.0.0 - 8.0.7-servicing.24270.7 + 8.0.7-servicing.24270.14 8.0.0 8.0.1 8.0.0 @@ -129,9 +129,9 @@ 8.0.0 8.0.0 8.0.0 - 8.0.7-servicing.24270.7 + 8.0.7-servicing.24270.14 - 8.0.7-servicing.24270.7 + 8.0.7-servicing.24270.14 8.0.0 8.0.1 From f24c4cd7035845d55865dba3e11aca7b32afd34b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 21 May 2024 02:53:27 +0000 Subject: [PATCH 29/38] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20240520.9 dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 8.0.7 -> To Version 8.0.7 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index d9719c8c1d7a..976529505a8e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 46b5cced6381..65dfad1f1e98 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e60bce54547ab8c7f4238d46ad43a49d289d9c76 + 87dd6eca401243365826d433c983154dbe4c1474 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e60bce54547ab8c7f4238d46ad43a49d289d9c76 + 87dd6eca401243365826d433c983154dbe4c1474 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e60bce54547ab8c7f4238d46ad43a49d289d9c76 + 87dd6eca401243365826d433c983154dbe4c1474 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e60bce54547ab8c7f4238d46ad43a49d289d9c76 + 87dd6eca401243365826d433c983154dbe4c1474 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e60bce54547ab8c7f4238d46ad43a49d289d9c76 + 87dd6eca401243365826d433c983154dbe4c1474 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e60bce54547ab8c7f4238d46ad43a49d289d9c76 + 87dd6eca401243365826d433c983154dbe4c1474 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e60bce54547ab8c7f4238d46ad43a49d289d9c76 + 87dd6eca401243365826d433c983154dbe4c1474 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e60bce54547ab8c7f4238d46ad43a49d289d9c76 + 87dd6eca401243365826d433c983154dbe4c1474 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From c242f36344e7cc6b157e46ca2d9d86b40e7e0071 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Jun 2024 12:24:35 -0700 Subject: [PATCH 30/38] [release/8.0] (deps): Bump src/submodules/googletest (#56007) Bumps [src/submodules/googletest](https://github.com/google/googletest) from `d83fee1` to `a7f443b`. - [Release notes](https://github.com/google/googletest/releases) - [Commits](https://github.com/google/googletest/compare/d83fee138a9ae6cb7c03688a2d08d4043a39815d...a7f443b80b105f940225332ed3c31f2790092f47) --- updated-dependencies: - dependency-name: src/submodules/googletest dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/submodules/googletest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/submodules/googletest b/src/submodules/googletest index d83fee138a9a..a7f443b80b10 160000 --- a/src/submodules/googletest +++ b/src/submodules/googletest @@ -1 +1 @@ -Subproject commit d83fee138a9ae6cb7c03688a2d08d4043a39815d +Subproject commit a7f443b80b105f940225332ed3c31f2790092f47 From 489a3733d5fa19a73a679192ff3592d5db4c0b5a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 4 Jun 2024 12:25:13 -0700 Subject: [PATCH 31/38] [release/8.0] Update dependencies from dotnet/source-build-externals (#55691) * Update dependencies from https://github.com/dotnet/source-build-externals build 20240513.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24256.1 -> To Version 8.0.0-alpha.1.24263.1 * Update dependencies from https://github.com/dotnet/source-build-externals build 20240519.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24256.1 -> To Version 8.0.0-alpha.1.24269.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d213589f4935..029e9bf19b7c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -189,9 +189,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 087e15321bb712ef6fe8b0ba6f8bd12facf92629 - + https://github.com/dotnet/source-build-externals - 2b7510ccda2be01e2a2b48598498dca24fb69c3a + 4f2151df120194f0268944f1b723c14820738fc8 diff --git a/eng/Versions.props b/eng/Versions.props index 7b1d05748214..37cdd2d80e04 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,7 +166,7 @@ 8.0.0-beta.24266.3 8.0.0-beta.24266.3 - 8.0.0-alpha.1.24256.1 + 8.0.0-alpha.1.24269.1 8.0.0-alpha.1.24257.2 From c5721fb7a65ddc13d1b445c2c08c27b72ab57cdc Mon Sep 17 00:00:00 2001 From: Brennan Conroy Date: Thu, 6 Jun 2024 15:57:28 +0000 Subject: [PATCH 32/38] Merged PR 40029: Lock around Http3Stream data frame processing Follows the same pattern as Http2Stream: https://github.com/dotnet/aspnetcore/blob/main/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Stream.cs#L463 and https://github.com/dotnet/aspnetcore/blob/38fe7dd594bde10cc9c9c3c710947af14d3117b3/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Stream.cs#L490 --- .../Core/src/Internal/Http3/Http3Stream.cs | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/Servers/Kestrel/Core/src/Internal/Http3/Http3Stream.cs b/src/Servers/Kestrel/Core/src/Internal/Http3/Http3Stream.cs index e0810f4ffd62..bb42d0e18e6d 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http3/Http3Stream.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http3/Http3Stream.cs @@ -63,6 +63,7 @@ internal abstract partial class Http3Stream : HttpProtocol, IHttp3Stream, IHttpS public bool EndStreamReceived => (_completionState & StreamCompletionFlags.EndStreamReceived) == StreamCompletionFlags.EndStreamReceived; public bool IsAborted => (_completionState & StreamCompletionFlags.Aborted) == StreamCompletionFlags.Aborted; + private bool IsAbortedRead => (_completionState & StreamCompletionFlags.AbortedRead) == StreamCompletionFlags.AbortedRead; public bool IsCompleted => (_completionState & StreamCompletionFlags.Completed) == StreamCompletionFlags.Completed; public Pipe RequestBodyPipe { get; private set; } = default!; @@ -892,12 +893,20 @@ private Task ProcessDataFrameAsync(in ReadOnlySequence payload) InputRemaining -= payload.Length; } - foreach (var segment in payload) + lock (_completionLock) { - RequestBodyPipe.Writer.Write(segment.Span); - } + if (IsAborted || IsAbortedRead) + { + return Task.CompletedTask; + } - return RequestBodyPipe.Writer.FlushAsync().GetAsTask(); + foreach (var segment in payload) + { + RequestBodyPipe.Writer.Write(segment.Span); + } + + return RequestBodyPipe.Writer.FlushAsync().GetAsTask(); + } } protected override void OnReset() From ba94792835910ce8d4ac066f051cc9b50cb3bca9 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 6 Jun 2024 15:52:17 -0700 Subject: [PATCH 33/38] Remove references to obsolete storage account variables (#56101) --- .azure/pipelines/blazor-daily-tests.yml | 1 - .azure/pipelines/signalr-daily-tests.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.azure/pipelines/blazor-daily-tests.yml b/.azure/pipelines/blazor-daily-tests.yml index c22f30db60dd..df3d335489d2 100644 --- a/.azure/pipelines/blazor-daily-tests.yml +++ b/.azure/pipelines/blazor-daily-tests.yml @@ -7,7 +7,6 @@ # We just need one Windows machine because all it does is trigger SauceLabs. variables: - ${{ if ne(variables['System.TeamProject'], 'public') }}: - - group: DotNet-MSRC-Storage - group: AzureDevOps-Artifact-Feeds-Pats - name: SAUCE_CONNECT_DOWNLOAD_ON_INSTALL value: true diff --git a/.azure/pipelines/signalr-daily-tests.yml b/.azure/pipelines/signalr-daily-tests.yml index 5bedd10fc3f4..ad33363fad91 100644 --- a/.azure/pipelines/signalr-daily-tests.yml +++ b/.azure/pipelines/signalr-daily-tests.yml @@ -6,7 +6,6 @@ variables: - ${{ if ne(variables['System.TeamProject'], 'public') }}: - - group: DotNet-MSRC-Storage - group: AzureDevOps-Artifact-Feeds-Pats - template: /eng/common/templates/variables/pool-providers.yml From a2ca3fb80b0555bb411cb048bbcfe6f2a74f24e6 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 12 Jun 2024 02:54:32 +0000 Subject: [PATCH 34/38] Merged PR 40093: [internal/release/8.0] Update dependencies from dnceng/internal/dotnet-efcore, dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:e179a2a7-bc5d-4498-2467-08dbd53ba9ce) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - **Subscription**: e179a2a7-bc5d-4498-2467-08dbd53ba9ce - **Build**: 20240611.12 - **Date Produced**: June 12, 2024 1:40:31 AM UTC - **Commit**: 7b638e5601fef91e2baf5c52a3f3f9b89903cff2 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-ef**: [from 8.0.7 to 8.0.7][5] - **Microsoft.EntityFrameworkCore**: [from 8.0.7 to 8.0.7][5] - **Microsoft.EntityFrameworkCore.Design**: [from 8.0.7 to 8.0.7][5] - **Microsoft.EntityFrameworkCore.InMemory**: [from 8.0.7 to 8.0.7][5] - **Microsoft.EntityFrameworkCore.Relational**: [from 8.0.7 to 8.0.7][5] - **Microsoft.EntityFrameworkCore.Sqlite**: [from 8.0.7 to 8.0.7][5] - **Microsoft.EntityFrameworkCore.SqlServer**: [from 8.0.7 to 8.0.7][5] - **Microsoft.EntityFrameworkCore.Tools**: [from 8.0.7 to 8.0.7][5] [5]: https://dev.azure.com/dnceng/internal/_git/dotnet-efcore/branches?baseVersion=GC87dd6eca401243365826d433c983154dbe4c1474&targetVersion=GC7b638e5601fef91e2baf5c52a3f3f9b89903cff2&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:e179a2a7-bc5d-4498-2467-08dbd53ba9ce) [marker]: <> (Begin:83131e87-e80d-4d5b-f426-08dbd53b3319) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 83131e87-e80d-4d5b-f426-08dbd53b3319 - **Build**: 20240611.13 - **Date Produced**: June 11, 2024 11:27:10 PM UTC - **Commit**: e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Extensions.Configuration.Binder**: [from 8.0.2 to 8.0.2][3] - **Microsoft.Extensions.Configuration.FileExtensions**: [from 8.0.1 to 8.0.1][3] - **Microsoft.Extensions.DependencyModel**: [from 8.0.1 to 8.0.1][3] - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 8.0.7-servicing.24270.14 to 8.0.7-servicing.24311.13][3] - **Microsoft.Internal.Runtime.AspNetCore.Transport**: [from 8.0.7-servicing.24270.14 to 8.0.7-servicing.24311.13][3] - **Microsoft.NET.Runtime.MonoAOTCompiler.Task**: [from 8.0.7 to 8.0.7][3] - **Microsoft.NET.Runtime.WebAssembly.Sdk**: [from 8.0.7 to 8.0.7][3] - **Microsoft.NETCore.App.Ref**: [from 8.0.7 to 8.0.7][3] - **Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm**: [from 8.0.7 to 8.0.7][3] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.7 to 8.0.7][3] - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 8.0.7-servicing.24270.14 to 8.0.7-servicing.24311.13][3] - **Microsoft.NETCore.Platforms**: [from 8.0.7-servicing.24270.14 to 8.0.7-servicing.24311.13][3] - **System.Net.Http.WinHttpHandler**: [from 8.0.0 to 8.0.1][4] - **System.Security.Cryptography.Xml**: [from 8.0.1 to 8.0.1][3] - **System.Text.Json**: [from 8.0.4 to 8.0.4]... --- NuGet.config | 8 +++--- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 12 ++++----- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/NuGet.config b/NuGet.config index 976529505a8e..ead8a890bc2c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,10 +6,10 @@ - + - + @@ -30,10 +30,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4137b3637bc6..344000651568 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 87dd6eca401243365826d433c983154dbe4c1474 + 7b638e5601fef91e2baf5c52a3f3f9b89903cff2 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 87dd6eca401243365826d433c983154dbe4c1474 + 7b638e5601fef91e2baf5c52a3f3f9b89903cff2 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 87dd6eca401243365826d433c983154dbe4c1474 + 7b638e5601fef91e2baf5c52a3f3f9b89903cff2 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 87dd6eca401243365826d433c983154dbe4c1474 + 7b638e5601fef91e2baf5c52a3f3f9b89903cff2 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 87dd6eca401243365826d433c983154dbe4c1474 + 7b638e5601fef91e2baf5c52a3f3f9b89903cff2 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 87dd6eca401243365826d433c983154dbe4c1474 + 7b638e5601fef91e2baf5c52a3f3f9b89903cff2 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 87dd6eca401243365826d433c983154dbe4c1474 + 7b638e5601fef91e2baf5c52a3f3f9b89903cff2 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 87dd6eca401243365826d433c983154dbe4c1474 + 7b638e5601fef91e2baf5c52a3f3f9b89903cff2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -55,7 +55,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 63d80966a9f0d15e057d0d146702405b19c82533 + e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -67,7 +67,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 63d80966a9f0d15e057d0d146702405b19c82533 + e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -121,9 +121,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 63d80966a9f0d15e057d0d146702405b19c82533 + e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -185,9 +185,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 63d80966a9f0d15e057d0d146702405b19c82533 + e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d https://github.com/dotnet/source-build-externals @@ -223,9 +223,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -241,7 +241,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 63d80966a9f0d15e057d0d146702405b19c82533 + e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -257,7 +257,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 63d80966a9f0d15e057d0d146702405b19c82533 + e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -273,19 +273,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 63d80966a9f0d15e057d0d146702405b19c82533 + e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 63d80966a9f0d15e057d0d146702405b19c82533 + e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 63d80966a9f0d15e057d0d146702405b19c82533 + e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 63d80966a9f0d15e057d0d146702405b19c82533 + e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -318,20 +318,20 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 63d80966a9f0d15e057d0d146702405b19c82533 + e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 63d80966a9f0d15e057d0d146702405b19c82533 + e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 63d80966a9f0d15e057d0d146702405b19c82533 + e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 63d80966a9f0d15e057d0d146702405b19c82533 + e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d https://github.com/dotnet/xdt @@ -368,9 +368,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 63d80966a9f0d15e057d0d146702405b19c82533 + e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 53b11150448e..4516852198a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,7 +72,7 @@ 8.0.7 8.0.7 8.0.7 - 8.0.7-servicing.24270.14 + 8.0.7-servicing.24311.13 8.0.0 8.0.0 8.0.0 @@ -93,7 +93,7 @@ 8.0.0 8.0.0 8.0.0 - 8.0.7-servicing.24270.14 + 8.0.7-servicing.24311.13 8.0.0 8.0.0 8.0.0 @@ -109,7 +109,7 @@ 8.0.0 8.0.2 8.0.0 - 8.0.7-servicing.24270.14 + 8.0.7-servicing.24311.13 8.0.0 8.0.1 8.0.0 @@ -117,7 +117,7 @@ 8.0.0-rtm.23520.14 8.0.0 8.0.0 - 8.0.0 + 8.0.1 8.0.0 8.0.0 8.0.0 @@ -129,9 +129,9 @@ 8.0.0 8.0.0 8.0.0 - 8.0.7-servicing.24270.14 + 8.0.7-servicing.24311.13 - 8.0.7-servicing.24270.14 + 8.0.7-servicing.24311.13 8.0.0 8.0.1 From fd0d853b41be6248ed1eba9daad13df8a0a9898a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 12 Jun 2024 21:40:36 +0000 Subject: [PATCH 35/38] Merged PR 40323: [internal/release/8.0] Update dependencies from dnceng/internal/dotnet-efcore This pull request updates the following dependencies [marker]: <> (Begin:e179a2a7-bc5d-4498-2467-08dbd53ba9ce) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - **Subscription**: e179a2a7-bc5d-4498-2467-08dbd53ba9ce - **Build**: 20240612.5 - **Date Produced**: June 12, 2024 7:24:33 PM UTC - **Commit**: 648ca5cd684fb237379ee2c38911d9b3e780b36f - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-ef**: [from 8.0.7 to 8.0.7][1] - **Microsoft.EntityFrameworkCore**: [from 8.0.7 to 8.0.7][1] - **Microsoft.EntityFrameworkCore.Design**: [from 8.0.7 to 8.0.7][1] - **Microsoft.EntityFrameworkCore.InMemory**: [from 8.0.7 to 8.0.7][1] - **Microsoft.EntityFrameworkCore.Relational**: [from 8.0.7 to 8.0.7][1] - **Microsoft.EntityFrameworkCore.Sqlite**: [from 8.0.7 to 8.0.7][1] - **Microsoft.EntityFrameworkCore.SqlServer**: [from 8.0.7 to 8.0.7][1] - **Microsoft.EntityFrameworkCore.Tools**: [from 8.0.7 to 8.0.7][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-efcore/branches?baseVersion=GC7b638e5601fef91e2baf5c52a3f3f9b89903cff2&targetVersion=GC648ca5cd684fb237379ee2c38911d9b3e780b36f&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:e179a2a7-bc5d-4498-2467-08dbd53ba9ce) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index ead8a890bc2c..69155a729fd8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 344000651568..f1b9f9d40e38 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 7b638e5601fef91e2baf5c52a3f3f9b89903cff2 + 648ca5cd684fb237379ee2c38911d9b3e780b36f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 7b638e5601fef91e2baf5c52a3f3f9b89903cff2 + 648ca5cd684fb237379ee2c38911d9b3e780b36f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 7b638e5601fef91e2baf5c52a3f3f9b89903cff2 + 648ca5cd684fb237379ee2c38911d9b3e780b36f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 7b638e5601fef91e2baf5c52a3f3f9b89903cff2 + 648ca5cd684fb237379ee2c38911d9b3e780b36f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 7b638e5601fef91e2baf5c52a3f3f9b89903cff2 + 648ca5cd684fb237379ee2c38911d9b3e780b36f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 7b638e5601fef91e2baf5c52a3f3f9b89903cff2 + 648ca5cd684fb237379ee2c38911d9b3e780b36f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 7b638e5601fef91e2baf5c52a3f3f9b89903cff2 + 648ca5cd684fb237379ee2c38911d9b3e780b36f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 7b638e5601fef91e2baf5c52a3f3f9b89903cff2 + 648ca5cd684fb237379ee2c38911d9b3e780b36f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From c9d6b23f71dca6c300e6ac3fab6f636d97cf6072 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 13 Jun 2024 13:55:50 +0000 Subject: [PATCH 36/38] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20240612.14 Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , System.Net.Http.WinHttpHandler , System.Security.Cryptography.Xml , System.Text.Json , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 8.0.2 -> To Version 8.0.2 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 42 ++++++++++++++++++++--------------------- eng/Versions.props | 10 +++++----- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 69155a729fd8..cf679a5eb351 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f1b9f9d40e38..1ae6764f2cdf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,7 +55,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d + cc6880ce36d783678284d36e8397fc30fda93c8a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -67,7 +67,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d + cc6880ce36d783678284d36e8397fc30fda93c8a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -121,9 +121,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d + cc6880ce36d783678284d36e8397fc30fda93c8a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -185,9 +185,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d + cc6880ce36d783678284d36e8397fc30fda93c8a https://github.com/dotnet/source-build-externals @@ -225,7 +225,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d + cc6880ce36d783678284d36e8397fc30fda93c8a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -241,7 +241,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d + cc6880ce36d783678284d36e8397fc30fda93c8a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -257,7 +257,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d + cc6880ce36d783678284d36e8397fc30fda93c8a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -273,19 +273,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d + cc6880ce36d783678284d36e8397fc30fda93c8a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d + cc6880ce36d783678284d36e8397fc30fda93c8a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d + cc6880ce36d783678284d36e8397fc30fda93c8a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d + cc6880ce36d783678284d36e8397fc30fda93c8a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -318,20 +318,20 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d + cc6880ce36d783678284d36e8397fc30fda93c8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d + cc6880ce36d783678284d36e8397fc30fda93c8a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d + cc6880ce36d783678284d36e8397fc30fda93c8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d + cc6880ce36d783678284d36e8397fc30fda93c8a https://github.com/dotnet/xdt @@ -368,9 +368,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d + cc6880ce36d783678284d36e8397fc30fda93c8a https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 4516852198a9..ac07a607f732 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,7 +72,7 @@ 8.0.7 8.0.7 8.0.7 - 8.0.7-servicing.24311.13 + 8.0.7-servicing.24312.14 8.0.0 8.0.0 8.0.0 @@ -93,7 +93,7 @@ 8.0.0 8.0.0 8.0.0 - 8.0.7-servicing.24311.13 + 8.0.7-servicing.24312.14 8.0.0 8.0.0 8.0.0 @@ -109,7 +109,7 @@ 8.0.0 8.0.2 8.0.0 - 8.0.7-servicing.24311.13 + 8.0.7-servicing.24312.14 8.0.0 8.0.1 8.0.0 @@ -129,9 +129,9 @@ 8.0.0 8.0.0 8.0.0 - 8.0.7-servicing.24311.13 + 8.0.7-servicing.24312.14 - 8.0.7-servicing.24311.13 + 8.0.7-servicing.24312.14 8.0.0 8.0.1 From ebc1c7b090d8b339738d2f31f6f06a0cc81d1b00 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Jun 2024 00:28:48 +0000 Subject: [PATCH 37/38] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20240613.11 Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , System.Net.Http.WinHttpHandler , System.Security.Cryptography.Xml , System.Text.Json , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 8.0.2 -> To Version 8.0.2 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 42 ++++++++++++++++++++--------------------- eng/Versions.props | 10 +++++----- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index cf679a5eb351..8f00beab1038 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ae6764f2cdf..67a027eb3714 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,7 +55,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cc6880ce36d783678284d36e8397fc30fda93c8a + 2aade6beb02ea367fd97c4070a4198802fe61c03 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -67,7 +67,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cc6880ce36d783678284d36e8397fc30fda93c8a + 2aade6beb02ea367fd97c4070a4198802fe61c03 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -121,9 +121,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cc6880ce36d783678284d36e8397fc30fda93c8a + 2aade6beb02ea367fd97c4070a4198802fe61c03 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -185,9 +185,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cc6880ce36d783678284d36e8397fc30fda93c8a + 2aade6beb02ea367fd97c4070a4198802fe61c03 https://github.com/dotnet/source-build-externals @@ -225,7 +225,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cc6880ce36d783678284d36e8397fc30fda93c8a + 2aade6beb02ea367fd97c4070a4198802fe61c03 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -241,7 +241,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cc6880ce36d783678284d36e8397fc30fda93c8a + 2aade6beb02ea367fd97c4070a4198802fe61c03 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -257,7 +257,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cc6880ce36d783678284d36e8397fc30fda93c8a + 2aade6beb02ea367fd97c4070a4198802fe61c03 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -273,19 +273,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cc6880ce36d783678284d36e8397fc30fda93c8a + 2aade6beb02ea367fd97c4070a4198802fe61c03 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cc6880ce36d783678284d36e8397fc30fda93c8a + 2aade6beb02ea367fd97c4070a4198802fe61c03 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cc6880ce36d783678284d36e8397fc30fda93c8a + 2aade6beb02ea367fd97c4070a4198802fe61c03 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cc6880ce36d783678284d36e8397fc30fda93c8a + 2aade6beb02ea367fd97c4070a4198802fe61c03 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -318,20 +318,20 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cc6880ce36d783678284d36e8397fc30fda93c8a + 2aade6beb02ea367fd97c4070a4198802fe61c03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cc6880ce36d783678284d36e8397fc30fda93c8a + 2aade6beb02ea367fd97c4070a4198802fe61c03 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cc6880ce36d783678284d36e8397fc30fda93c8a + 2aade6beb02ea367fd97c4070a4198802fe61c03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cc6880ce36d783678284d36e8397fc30fda93c8a + 2aade6beb02ea367fd97c4070a4198802fe61c03 https://github.com/dotnet/xdt @@ -368,9 +368,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cc6880ce36d783678284d36e8397fc30fda93c8a + 2aade6beb02ea367fd97c4070a4198802fe61c03 https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index ac07a607f732..74cc2f6bc296 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,7 +72,7 @@ 8.0.7 8.0.7 8.0.7 - 8.0.7-servicing.24312.14 + 8.0.7-servicing.24313.11 8.0.0 8.0.0 8.0.0 @@ -93,7 +93,7 @@ 8.0.0 8.0.0 8.0.0 - 8.0.7-servicing.24312.14 + 8.0.7-servicing.24313.11 8.0.0 8.0.0 8.0.0 @@ -109,7 +109,7 @@ 8.0.0 8.0.2 8.0.0 - 8.0.7-servicing.24312.14 + 8.0.7-servicing.24313.11 8.0.0 8.0.1 8.0.0 @@ -129,9 +129,9 @@ 8.0.0 8.0.0 8.0.0 - 8.0.7-servicing.24312.14 + 8.0.7-servicing.24313.11 - 8.0.7-servicing.24312.14 + 8.0.7-servicing.24313.11 8.0.0 8.0.1 From a718af35f93dfa3d8a01046ad9f4087b3839a484 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Jun 2024 16:55:17 +0000 Subject: [PATCH 38/38] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20240614.4 dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 8.0.7 -> To Version 8.0.7 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8f00beab1038..0049dc24f34d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 67a027eb3714..66d02fcb8180 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 648ca5cd684fb237379ee2c38911d9b3e780b36f + 0d1256be4658567c8a24b4c027bdbb3dbd6de656 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 648ca5cd684fb237379ee2c38911d9b3e780b36f + 0d1256be4658567c8a24b4c027bdbb3dbd6de656 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 648ca5cd684fb237379ee2c38911d9b3e780b36f + 0d1256be4658567c8a24b4c027bdbb3dbd6de656 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 648ca5cd684fb237379ee2c38911d9b3e780b36f + 0d1256be4658567c8a24b4c027bdbb3dbd6de656 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 648ca5cd684fb237379ee2c38911d9b3e780b36f + 0d1256be4658567c8a24b4c027bdbb3dbd6de656 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 648ca5cd684fb237379ee2c38911d9b3e780b36f + 0d1256be4658567c8a24b4c027bdbb3dbd6de656 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 648ca5cd684fb237379ee2c38911d9b3e780b36f + 0d1256be4658567c8a24b4c027bdbb3dbd6de656 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 648ca5cd684fb237379ee2c38911d9b3e780b36f + 0d1256be4658567c8a24b4c027bdbb3dbd6de656 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime