From 3c1caa3b0f93b02d88c428ddabd9a5eb4519bd0b Mon Sep 17 00:00:00 2001 From: Stephen Halter Date: Sat, 10 Sep 2022 14:00:47 +0000 Subject: [PATCH 1/5] Use Path.GetTempFileName() for 600 Unix file mode --- .../Repositories/FileSystemXmlRepository.cs | 9 ++++++ .../FileSystemXmlRepositoryTests.cs | 19 +++++++++++++ .../src/FileBufferingReadStream.cs | 9 ++++++ .../src/FileBufferingWriteStream.cs | 9 ++++++ .../test/FileBufferingReadStreamTests.cs | 28 +++++++++++++++++++ .../test/FileBufferingWriteStreamTests.cs | 18 ++++++++++++ .../CertificateManager.cs | 17 +++++++++++ .../test/CertificateManagerTests.cs | 26 +++++++++++++++++ .../src/Commands/CreateCommand.cs | 9 +++--- .../dotnet-user-jwts/src/Helpers/JwtStore.cs | 16 ++++++++++- src/Tools/dotnet-user-jwts/src/Program.cs | 5 +++- .../dotnet-user-jwts/test/UserJwtsTests.cs | 15 ++++++++++ .../src/Internal/SecretsStore.cs | 11 ++++++++ src/Tools/dotnet-user-secrets/src/Program.cs | 7 +++++ .../test/SecretManagerTests.cs | 13 +++++++++ 15 files changed, 205 insertions(+), 6 deletions(-) diff --git a/src/DataProtection/DataProtection/src/Repositories/FileSystemXmlRepository.cs b/src/DataProtection/DataProtection/src/Repositories/FileSystemXmlRepository.cs index 472f45694e3d..7520bf1562b0 100644 --- a/src/DataProtection/DataProtection/src/Repositories/FileSystemXmlRepository.cs +++ b/src/DataProtection/DataProtection/src/Repositories/FileSystemXmlRepository.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; +using System.Runtime.InteropServices; using System.Xml.Linq; using Microsoft.AspNetCore.DataProtection.Internal; using Microsoft.Extensions.Logging; @@ -131,9 +132,17 @@ private void StoreElementCore(XElement element, string filename) // crashes mid-write, we won't end up with a corrupt .xml file. Directory.Create(); // won't throw if the directory already exists + var tempFilename = Path.Combine(Directory.FullName, Guid.NewGuid().ToString() + ".tmp"); var finalFilename = Path.Combine(Directory.FullName, filename + ".xml"); + // Create a temp file with the correct Unix file mode before moving it to the expected finalFilename. + if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + var tempTempFilename = Path.GetTempFileName(); + File.Move(tempTempFilename, tempFilename); + } + try { using (var tempFileStream = File.OpenWrite(tempFilename)) diff --git a/src/DataProtection/DataProtection/test/Repositories/FileSystemXmlRepositoryTests.cs b/src/DataProtection/DataProtection/test/Repositories/FileSystemXmlRepositoryTests.cs index de3a4ddaf74d..18ce2991d6ec 100644 --- a/src/DataProtection/DataProtection/test/Repositories/FileSystemXmlRepositoryTests.cs +++ b/src/DataProtection/DataProtection/test/Repositories/FileSystemXmlRepositoryTests.cs @@ -155,6 +155,25 @@ public void Logs_DockerEphemeralFolders() }); } + [ConditionalFact] + [OSSkipCondition(OperatingSystems.Windows, SkipReason = "UnixFileMode is not supported on Windows.")] + public void StoreElement_CreatesFileWithUserOnlyUnixFileMode() + { + WithUniqueTempDirectory(dirInfo => + { + // Arrange + var element = XElement.Parse(""); + var repository = new FileSystemXmlRepository(dirInfo, NullLoggerFactory.Instance); + + // Act + repository.StoreElement(element, "friendly-name"); + + // Assert + var fileInfo = Assert.Single(dirInfo.GetFiles()); + Assert.Equal(UnixFileMode.UserRead | UnixFileMode.UserWrite, fileInfo.UnixFileMode); + }); + } + /// /// Runs a test and cleans up the temp directory afterward. /// diff --git a/src/Http/WebUtilities/src/FileBufferingReadStream.cs b/src/Http/WebUtilities/src/FileBufferingReadStream.cs index 11828e046f3a..898b6299a754 100644 --- a/src/Http/WebUtilities/src/FileBufferingReadStream.cs +++ b/src/Http/WebUtilities/src/FileBufferingReadStream.cs @@ -4,6 +4,7 @@ using System.Buffers; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; +using System.Runtime.InteropServices; using Microsoft.AspNetCore.Internal; namespace Microsoft.AspNetCore.WebUtilities; @@ -254,6 +255,14 @@ private Stream CreateTempFile() } _tempFileName = Path.Combine(_tempFileDirectory, "ASPNETCORE_" + Guid.NewGuid().ToString() + ".tmp"); + + // Create a temp file with the correct Unix file mode before moving it to the assigned _tempFileName in the _tempFileDirectory. + if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + var tempTempFileName = Path.GetTempFileName(); + File.Move(tempTempFileName, _tempFileName); + } + return new FileStream(_tempFileName, FileMode.Create, FileAccess.ReadWrite, FileShare.Delete, 1024 * 16, FileOptions.Asynchronous | FileOptions.DeleteOnClose | FileOptions.SequentialScan); } diff --git a/src/Http/WebUtilities/src/FileBufferingWriteStream.cs b/src/Http/WebUtilities/src/FileBufferingWriteStream.cs index d73e7a2c392e..1d760cb269e9 100644 --- a/src/Http/WebUtilities/src/FileBufferingWriteStream.cs +++ b/src/Http/WebUtilities/src/FileBufferingWriteStream.cs @@ -5,6 +5,7 @@ using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.IO.Pipelines; +using System.Runtime.InteropServices; using Microsoft.AspNetCore.Internal; namespace Microsoft.AspNetCore.WebUtilities; @@ -271,6 +272,14 @@ private void EnsureFileStream() { var tempFileDirectory = _tempFileDirectoryAccessor(); var tempFileName = Path.Combine(tempFileDirectory, "ASPNETCORE_" + Guid.NewGuid() + ".tmp"); + + // Create a temp file with the correct Unix file mode before moving it to the assigned tempFileName in the _tempFileDirectory. + if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + var tempTempFileName = Path.GetTempFileName(); + File.Move(tempTempFileName, tempFileName); + } + FileStream = new FileStream( tempFileName, FileMode.Create, diff --git a/src/Http/WebUtilities/test/FileBufferingReadStreamTests.cs b/src/Http/WebUtilities/test/FileBufferingReadStreamTests.cs index c4bffe076f14..260b29feb9c0 100644 --- a/src/Http/WebUtilities/test/FileBufferingReadStreamTests.cs +++ b/src/Http/WebUtilities/test/FileBufferingReadStreamTests.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Buffers; +using Microsoft.AspNetCore.Testing; using Moq; namespace Microsoft.AspNetCore.WebUtilities; @@ -599,6 +600,33 @@ public async Task PartialReadAsyncThenSeekReplaysBuffer() Assert.Equal(data.AsMemory(0, read2).ToArray(), buffer2.AsMemory(0, read2).ToArray()); } + [ConditionalFact] + [OSSkipCondition(OperatingSystems.Windows, SkipReason = "UnixFileMode is not supported on Windows.")] + public void Read_BufferingContentToDisk_CreatesFileWithUserOnlyUnixFileMode() + { + var inner = MakeStream(1024 * 2); + string tempFileName; + using (var stream = new FileBufferingReadStream(inner, 1024, null, GetCurrentDirectory())) + { + var bytes = new byte[1024 * 2]; + var read0 = stream.Read(bytes, 0, bytes.Length); + Assert.Equal(bytes.Length, read0); + Assert.Equal(read0, stream.Length); + Assert.Equal(read0, stream.Position); + Assert.False(stream.InMemory); + Assert.NotNull(stream.TempFileName); + + var read1 = stream.Read(bytes, 0, bytes.Length); + Assert.Equal(0, read1); + + tempFileName = stream.TempFileName!; + Assert.True(File.Exists(tempFileName)); + Assert.Equal(UnixFileMode.UserRead | UnixFileMode.UserWrite, File.GetUnixFileMode(tempFileName)); + } + + Assert.False(File.Exists(tempFileName)); + } + private static string GetCurrentDirectory() { return AppContext.BaseDirectory; diff --git a/src/Http/WebUtilities/test/FileBufferingWriteStreamTests.cs b/src/Http/WebUtilities/test/FileBufferingWriteStreamTests.cs index 9fe101f07a05..5cbfee0090fd 100644 --- a/src/Http/WebUtilities/test/FileBufferingWriteStreamTests.cs +++ b/src/Http/WebUtilities/test/FileBufferingWriteStreamTests.cs @@ -3,6 +3,7 @@ using System.Buffers; using System.Text; +using Microsoft.AspNetCore.Testing; namespace Microsoft.AspNetCore.WebUtilities; @@ -365,6 +366,23 @@ public async Task DrainBufferAsync_WithContentInDisk_CopiesContentFromMemoryStre Assert.Equal(0, bufferingStream.Length); } + [ConditionalFact] + [OSSkipCondition(OperatingSystems.Windows, SkipReason = "UnixFileMode is not supported on Windows.")] + public void Write_BufferingContentToDisk_CreatesFileWithUserOnlyUnixFileMode() + { + // Arrange + var input = new byte[] { 1, 2, 3, }; + using var bufferingStream = new FileBufferingWriteStream(memoryThreshold: 2, tempFileDirectoryAccessor: () => TempDirectory); + bufferingStream.Write(input, 0, 2); + + // Act + bufferingStream.Write(input, 2, 1); + + // Assert + Assert.NotNull(bufferingStream.FileStream); + Assert.Equal(UnixFileMode.UserRead | UnixFileMode.UserWrite, File.GetUnixFileMode(bufferingStream.FileStream.SafeFileHandle)); + } + public void Dispose() { try diff --git a/src/Shared/CertificateGeneration/CertificateManager.cs b/src/Shared/CertificateGeneration/CertificateManager.cs index 0bd57f57de22..c34d88f8c00c 100644 --- a/src/Shared/CertificateGeneration/CertificateManager.cs +++ b/src/Shared/CertificateGeneration/CertificateManager.cs @@ -5,6 +5,7 @@ using System.Diagnostics.CodeAnalysis; using System.Diagnostics.Tracing; using System.Linq; +using System.Runtime.InteropServices; using System.Security.Cryptography; using System.Security.Cryptography.X509Certificates; using System.Text; @@ -548,6 +549,14 @@ internal static void ExportCertificate(X509Certificate2 certificate, string path try { Log.WriteCertificateToDisk(path); + + // Create a temp file with the correct Unix file mode before moving it to the expected path. + if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + var tempFilename = Path.GetTempFileName(); + File.Move(tempFilename, path, overwrite: true); + } + File.WriteAllBytes(path, bytes); } catch (Exception ex) when (Log.IsEnabled()) @@ -568,6 +577,14 @@ internal static void ExportCertificate(X509Certificate2 certificate, string path { var keyPath = Path.ChangeExtension(path, ".key"); Log.WritePemKeyToDisk(keyPath); + + // Create a temp file with the correct Unix file mode before moving it to the expected path. + if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + var tempFilename = Path.GetTempFileName(); + File.Move(tempFilename, keyPath, overwrite: true); + } + File.WriteAllBytes(keyPath, pemEnvelope); } catch (Exception ex) when (Log.IsEnabled()) diff --git a/src/Tools/FirstRunCertGenerator/test/CertificateManagerTests.cs b/src/Tools/FirstRunCertGenerator/test/CertificateManagerTests.cs index 0dacfb93fffb..568bd4d4753c 100644 --- a/src/Tools/FirstRunCertGenerator/test/CertificateManagerTests.cs +++ b/src/Tools/FirstRunCertGenerator/test/CertificateManagerTests.cs @@ -418,6 +418,32 @@ public void ListCertificates_AlwaysReturnsTheCertificate_WithHighestVersion() e.Oid.Value == CertificateManager.AspNetHttpsOid && e.RawData[0] == 1); } + + [ConditionalFact] + [OSSkipCondition(OperatingSystems.Windows, SkipReason = "UnixFileMode is not supported on Windows.")] + [OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "https://github.com/dotnet/aspnetcore/issues/6720")] + public void EnsureCreateHttpsCertificate_CreatesFilesWithUserOnlyUnixFileMode() + { + _fixture.CleanupCertificates(); + + const string CertificateName = nameof(EnsureCreateHttpsCertificate_CreatesFilesWithUserOnlyUnixFileMode) + ".pem"; + const string KeyName = nameof(EnsureCreateHttpsCertificate_CreatesFilesWithUserOnlyUnixFileMode) + ".key"; + + var certificatePassword = Guid.NewGuid().ToString(); + var now = DateTimeOffset.UtcNow; + now = new DateTimeOffset(now.Year, now.Month, now.Day, now.Hour, now.Minute, now.Second, 0, now.Offset); + + var result = _manager + .EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), CertificateName, trust: false, includePrivateKey: true, password: certificatePassword, keyExportFormat: CertificateKeyExportFormat.Pem, isInteractive: false); + + Assert.Equal(EnsureCertificateResult.Succeeded, result); + + Assert.True(File.Exists(CertificateName)); + Assert.Equal(UnixFileMode.UserRead | UnixFileMode.UserWrite, File.GetUnixFileMode(CertificateName)); + + Assert.True(File.Exists(KeyName)); + Assert.Equal(UnixFileMode.UserRead | UnixFileMode.UserWrite, File.GetUnixFileMode(KeyName)); + } } public class CertFixture : IDisposable diff --git a/src/Tools/dotnet-user-jwts/src/Commands/CreateCommand.cs b/src/Tools/dotnet-user-jwts/src/Commands/CreateCommand.cs index efe415057f3a..ff8a1c4c8f17 100644 --- a/src/Tools/dotnet-user-jwts/src/Commands/CreateCommand.cs +++ b/src/Tools/dotnet-user-jwts/src/Commands/CreateCommand.cs @@ -20,7 +20,7 @@ internal sealed class CreateCommand @"s\s" }; - public static void Register(ProjectCommandLineApplication app) + public static void Register(ProjectCommandLineApplication app, Program program) { app.Command("create", cmd => { @@ -94,7 +94,7 @@ public static void Register(ProjectCommandLineApplication app) return 1; } - return Execute(cmd.Reporter, cmd.ProjectOption.Value(), options, optionsString, outputOption.Value()); + return Execute(cmd.Reporter, cmd.ProjectOption.Value(), options, optionsString, outputOption.Value(), program); }); }); } @@ -227,7 +227,8 @@ private static int Execute( string projectPath, JwtCreatorOptions options, string optionsString, - string outputFormat) + string outputFormat, + Program program) { if (!DevJwtCliHelpers.GetProjectAndSecretsId(projectPath, reporter, out var project, out var userSecretsId)) { @@ -238,7 +239,7 @@ private static int Execute( var jwtIssuer = new JwtIssuer(options.Issuer, keyMaterial); var jwtToken = jwtIssuer.Create(options); - var jwtStore = new JwtStore(userSecretsId); + var jwtStore = new JwtStore(userSecretsId, program); var jwt = Jwt.Create(options.Scheme, jwtToken, JwtIssuer.WriteToken(jwtToken), options.Scopes, options.Roles, options.Claims); if (options.Claims is { } customClaims) { diff --git a/src/Tools/dotnet-user-jwts/src/Helpers/JwtStore.cs b/src/Tools/dotnet-user-jwts/src/Helpers/JwtStore.cs index 8bffc9d9c2ce..d9d2d68de794 100644 --- a/src/Tools/dotnet-user-jwts/src/Helpers/JwtStore.cs +++ b/src/Tools/dotnet-user-jwts/src/Helpers/JwtStore.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System.Runtime.InteropServices; using System.Text.Json; using Microsoft.Extensions.Configuration.UserSecrets; @@ -12,11 +13,17 @@ public class JwtStore private readonly string _userSecretsId; private readonly string _filePath; - public JwtStore(string userSecretsId) + public JwtStore(string userSecretsId, Program program = null) { _userSecretsId = userSecretsId; _filePath = Path.Combine(Path.GetDirectoryName(PathHelper.GetSecretsPathFromSecretsId(userSecretsId)), FileName); Load(); + + // For testing. + if (program is not null) + { + program.UserJwtsFilePath = _filePath; + } } public IDictionary Jwts { get; private set; } = new Dictionary(); @@ -37,6 +44,13 @@ public void Save() { if (Jwts is not null) { + // Create a temp file with the correct Unix file mode before moving it to the expected _filePath. + if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + var tempFilename = Path.GetTempFileName(); + File.Move(tempFilename, _filePath, overwrite: true); + } + using var fileStream = new FileStream(_filePath, FileMode.Create, FileAccess.Write); JsonSerializer.Serialize(fileStream, Jwts); } diff --git a/src/Tools/dotnet-user-jwts/src/Program.cs b/src/Tools/dotnet-user-jwts/src/Program.cs index 96ce31449cef..74ead8876d97 100644 --- a/src/Tools/dotnet-user-jwts/src/Program.cs +++ b/src/Tools/dotnet-user-jwts/src/Program.cs @@ -17,6 +17,9 @@ public Program(IConsole console) _reporter = new ConsoleReporter(console); } + // For testing. + internal string UserJwtsFilePath { get; set; } + public static void Main(string[] args) { new Program(PhysicalConsole.Singleton).Run(args); @@ -34,7 +37,7 @@ public void Run(string[] args) // dotnet user-jwts list ListCommand.Register(userJwts); // dotnet user-jwts create - CreateCommand.Register(userJwts); + CreateCommand.Register(userJwts, this); // dotnet user-jwts print ecd045 PrintCommand.Register(userJwts); // dotnet user-jwts remove ecd045 diff --git a/src/Tools/dotnet-user-jwts/test/UserJwtsTests.cs b/src/Tools/dotnet-user-jwts/test/UserJwtsTests.cs index 83b48764baf0..b7ec36953e1b 100644 --- a/src/Tools/dotnet-user-jwts/test/UserJwtsTests.cs +++ b/src/Tools/dotnet-user-jwts/test/UserJwtsTests.cs @@ -555,4 +555,19 @@ public void List_CanHandleNoProjectOptionProvided_WithNoProjects() Assert.Contains("No project found at `-p|--project` path or current directory.", _console.GetOutput()); } + + [ConditionalFact] + [OSSkipCondition(OperatingSystems.Windows, SkipReason = "UnixFileMode is not supported on Windows.")] + public void Create_CreatesFileWithUserOnlyUnixFileMode() + { + var project = Path.Combine(_fixture.CreateProject(), "TestProject.csproj"); + var app = new Program(_console); + + app.Run(new[] { "create", "--project", project }); + + Assert.Contains("New JWT saved", _console.GetOutput()); + + Assert.NotNull(app.UserJwtsFilePath); + Assert.Equal(UnixFileMode.UserRead | UnixFileMode.UserWrite, File.GetUnixFileMode(app.UserJwtsFilePath)); + } } diff --git a/src/Tools/dotnet-user-secrets/src/Internal/SecretsStore.cs b/src/Tools/dotnet-user-secrets/src/Internal/SecretsStore.cs index 9135afd0edd6..44313122bd01 100644 --- a/src/Tools/dotnet-user-secrets/src/Internal/SecretsStore.cs +++ b/src/Tools/dotnet-user-secrets/src/Internal/SecretsStore.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; +using System.Runtime.InteropServices; using System.Text; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration.UserSecrets; @@ -46,6 +47,9 @@ public string this[string key] public int Count => _secrets.Count; + // For testing. + internal string SecretsFilePath => _secretsFilePath; + public bool ContainsKey(string key) => _secrets.ContainsKey(key); public IEnumerable> AsEnumerable() => _secrets; @@ -75,6 +79,13 @@ public virtual void Save() } } + // Create a temp file with the correct Unix file mode before moving it to the expected _filePath. + if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + var tempFilename = Path.GetTempFileName(); + File.Move(tempFilename, _secretsFilePath, overwrite: true); + } + File.WriteAllText(_secretsFilePath, contents.ToString(), Encoding.UTF8); } diff --git a/src/Tools/dotnet-user-secrets/src/Program.cs b/src/Tools/dotnet-user-secrets/src/Program.cs index d6102f51631d..f01b7e434678 100644 --- a/src/Tools/dotnet-user-secrets/src/Program.cs +++ b/src/Tools/dotnet-user-secrets/src/Program.cs @@ -27,6 +27,9 @@ public Program(IConsole console, string workingDirectory) _workingDirectory = workingDirectory; } + // For testing. + internal string SecretsFilePath { get; private set; } + public bool TryRun(string[] args, out int returnCode) { try @@ -85,6 +88,10 @@ internal int RunInternal(params string[] args) var store = new SecretsStore(userSecretsId, reporter); var context = new Internal.CommandContext(store, reporter, _console); options.Command.Execute(context); + + // For testing. + SecretsFilePath = store.SecretsFilePath; + return 0; } diff --git a/src/Tools/dotnet-user-secrets/test/SecretManagerTests.cs b/src/Tools/dotnet-user-secrets/test/SecretManagerTests.cs index d16b9173f496..7edb30549141 100644 --- a/src/Tools/dotnet-user-secrets/test/SecretManagerTests.cs +++ b/src/Tools/dotnet-user-secrets/test/SecretManagerTests.cs @@ -338,4 +338,17 @@ public void Init_When_Project_Has_No_Secrets_Id() Assert.DoesNotContain(Resources.FormatError_ProjectMissingId(project), _console.GetOutput()); Assert.DoesNotContain("--help", _console.GetOutput()); } + + [ConditionalFact] + [OSSkipCondition(OperatingSystems.Windows, SkipReason = "UnixFileMode is not supported on Windows.")] + public void SetSecrets_CreatesFileWithUserOnlyUnixFileMode() + { + var projectPath = _fixture.GetTempSecretProject(); + var secretManager = new Program(_console, projectPath); + + secretManager.RunInternal("set", "key1", Guid.NewGuid().ToString(), "--verbose"); + + Assert.NotNull(secretManager.SecretsFilePath); + Assert.Equal(UnixFileMode.UserRead | UnixFileMode.UserWrite, File.GetUnixFileMode(secretManager.SecretsFilePath)); + } } From 4b5d52d13a8cf83e13c8f3b1358ddb1d7322722d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 18 Oct 2022 00:10:57 +0000 Subject: [PATCH 2/5] Merged PR 26779: [internal/release/7.0] Update dependencies from dnceng/internal/dotnet-runtime dnceng/internal/dotnet-efcore This pull request updates the following dependencies [marker]: <> (Begin:2802be6f-a6f7-477e-8165-08da7ef6284d) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 2802be6f-a6f7-477e-8165-08da7ef6284d - **Build**: 20221013.8 - **Date Produced**: October 14, 2022 10:52:24 PM UTC - **Commit**: bebb59597c8f98828b4cf2ae7724b277b15c47ee - **Branch**: refs/heads/internal/release/7.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Extensions.Caching.Abstractions**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Caching.Memory**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Configuration**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Configuration.Abstractions**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Configuration.Binder**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Configuration.CommandLine**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Configuration.EnvironmentVariables**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Configuration.FileExtensions**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Configuration.Ini**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Configuration.Json**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Configuration.UserSecrets**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Configuration.Xml**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.DependencyInjection**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.DependencyInjection.Abstractions**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.DependencyModel**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.FileProviders.Abstractions**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.FileProviders.Composite**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.FileProviders.Physical**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.FileSystemGlobbing**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 7.0.0-rtm.22513.12 to 7.0.0-rtm.22513.8][1] - **Microsoft.Extensions.Hosting**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Hosting.Abstractions**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Http**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Logging**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Logging.Abstractions**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Logging.Configuration**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Logging.Console**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Logging.Debug**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Logging.EventLog**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Logging.EventSource**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Logging.TraceSource**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Options**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Options.ConfigurationExtensions**: [from 7... --- .azure/pipelines/ci.yml | 14 +- .azure/pipelines/jobs/default-build.yml | 3 + NuGet.config | 12 +- eng/Version.Details.xml | 282 ++++++++++++------------ eng/Versions.props | 8 +- eng/helix/helix.proj | 5 + 6 files changed, 170 insertions(+), 154 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 3ac92b9a12b1..43ab17a2c709 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -112,17 +112,17 @@ variables: - name: _InternalRuntimeDownloadCodeSignArgs value: '' - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - - group: DotNet-MSRC-Storage + - group: DotNetBuilds storage account read tokens - name: _InternalRuntimeDownloadArgs - value: -RuntimeSourceFeed https://dotnetclimsrc.blob.core.windows.net/dotnet - -RuntimeSourceFeedKey $(dotnetclimsrc-read-sas-token-base64) - /p:DotNetAssetRootAccessTokenSuffix='$(dotnetclimsrc-read-sas-token-base64)' + value: -RuntimeSourceFeed https://dotnetbuilds.blob.core.windows.net/internal + -RuntimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64) + /p:DotNetAssetRootAccessTokenSuffix='$(dotnetbuilds-internal-container-read-token-base64)' # The code signing doesn't use the aspnet build scripts, so the msbuild parameters have to be passed directly. This # is awkward but necessary because the eng/common/ build scripts don't add the msbuild properties automatically. - name: _InternalRuntimeDownloadCodeSignArgs value: $(_InternalRuntimeDownloadArgs) - /p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet - /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64) + /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal + /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) - group: DotNet-HelixApi-Access - ${{ if notin(variables['Build.Reason'], 'PullRequest') }}: - name: _SignType @@ -717,7 +717,7 @@ stages: platform: name: 'Managed' container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-20220809204800-17a4aab' - buildScript: './eng/build.sh $(_PublishArgs) --no-build-repo-tasks' + buildScript: './eng/build.sh $(_PublishArgs) --no-build-repo-tasks $(_InternalRuntimeDownloadArgs)' skipPublishValidation: true timeoutInMinutes: 120 diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index b7d491276187..945da645f1b3 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -224,6 +224,7 @@ jobs: # Include the variables we always want. COMPlus_DbgEnableMiniDump: 1 COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core" + DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token) # Expand provided `env:` properties, if any. ${{ if step.env }}: ${{ step.env }} @@ -235,12 +236,14 @@ jobs: env: COMPlus_DbgEnableMiniDump: 1 COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core" + DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token) - ${{ if ne(parameters.agentOs, 'Windows') }}: - script: $(BuildDirectory)/build.sh --ci --nobl --configuration $(BuildConfiguration) $(BuildScriptArgs) displayName: Run build.sh env: COMPlus_DbgEnableMiniDump: 1 COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core" + DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token) - ${{ parameters.afterBuild }} diff --git a/NuGet.config b/NuGet.config index 4c9c7a31cd75..015cf4973c60 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,10 @@ - + - + @@ -27,5 +27,13 @@ + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 665843ccd4de..5d52de420790 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,176 +10,176 @@ - https://github.com/dotnet/efcore - 1f5aa6c6eb22d8a5f94adc9639f882ee01ae375a + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + bb2cde3d5471a821a6cb3ad24f33df76eca9001e - https://github.com/dotnet/efcore - 1f5aa6c6eb22d8a5f94adc9639f882ee01ae375a + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + bb2cde3d5471a821a6cb3ad24f33df76eca9001e - https://github.com/dotnet/efcore - 1f5aa6c6eb22d8a5f94adc9639f882ee01ae375a + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + bb2cde3d5471a821a6cb3ad24f33df76eca9001e - https://github.com/dotnet/efcore - 1f5aa6c6eb22d8a5f94adc9639f882ee01ae375a + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + bb2cde3d5471a821a6cb3ad24f33df76eca9001e - https://github.com/dotnet/efcore - 1f5aa6c6eb22d8a5f94adc9639f882ee01ae375a + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + bb2cde3d5471a821a6cb3ad24f33df76eca9001e - https://github.com/dotnet/efcore - 1f5aa6c6eb22d8a5f94adc9639f882ee01ae375a + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + bb2cde3d5471a821a6cb3ad24f33df76eca9001e - https://github.com/dotnet/efcore - 1f5aa6c6eb22d8a5f94adc9639f882ee01ae375a + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + bb2cde3d5471a821a6cb3ad24f33df76eca9001e - https://github.com/dotnet/efcore - 1f5aa6c6eb22d8a5f94adc9639f882ee01ae375a + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + bb2cde3d5471a821a6cb3ad24f33df76eca9001e - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee https://github.com/dotnet/source-build-externals @@ -187,108 +187,108 @@ - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee https://github.com/dotnet/xdt @@ -299,8 +299,8 @@ - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 2a71bdcb1f5e..1d8d46dc0163 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,7 +68,7 @@ 7.0.0 7.0.0 7.0.0 - 7.0.0-rtm.22513.12 + 7.0.0-rtm.22513.8 7.0.0 7.0.0 7.0.0 @@ -87,7 +87,7 @@ 7.0.0 7.0.0 7.0.0 - 7.0.0-rtm.22513.12 + 7.0.0-rtm.22513.8 7.0.0 7.0.0 7.0.0 @@ -103,7 +103,7 @@ 7.0.0 7.0.0 7.0.0 - 7.0.0-rtm.22513.12 + 7.0.0-rtm.22513.8 7.0.0 7.0.0 7.0.0 @@ -300,6 +300,6 @@ https://dotnetbuilds.azureedge.net/public/ - https://dotnetclimsrc.blob.core.windows.net/dotnet/ + https://dotnetbuilds.azureedge.net/internal/ diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj index bd87b1cb4575..187baceb68c1 100644 --- a/eng/helix/helix.proj +++ b/eng/helix/helix.proj @@ -58,6 +58,11 @@ runtime + + $([System.Environment]::GetEnvironmentVariable('DotNetBuildsInternalReadSasToken')) + + From 2d456a1df1619622ab8c25566aa3f1deab7c0736 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 18 Oct 2022 22:10:55 +0000 Subject: [PATCH 3/5] Merged PR 26843: [internal/release/7.0] Update dependencies from dnceng/internal/dotnet-efcore This pull request updates the following dependencies [marker]: <> (Begin:10156ce0-bf6e-4dac-1399-08da7ef5fa55) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - **Subscription**: 10156ce0-bf6e-4dac-1399-08da7ef5fa55 - **Build**: 20221018.4 - **Date Produced**: October 18, 2022 7:41:46 PM UTC - **Commit**: 131bdb4a7c6c9618e594e7299739fddfe4679a46 - **Branch**: refs/heads/internal/release/7.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-ef**: [from 7.0.0 to 7.0.0][2] - **Microsoft.EntityFrameworkCore**: [from 7.0.0 to 7.0.0][2] - **Microsoft.EntityFrameworkCore.Design**: [from 7.0.0 to 7.0.0][2] - **Microsoft.EntityFrameworkCore.InMemory**: [from 7.0.0 to 7.0.0][2] - **Microsoft.EntityFrameworkCore.Relational**: [from 7.0.0 to 7.0.0][2] - **Microsoft.EntityFrameworkCore.Sqlite**: [from 7.0.0 to 7.0.0][2] - **Microsoft.EntityFrameworkCore.SqlServer**: [from 7.0.0 to 7.0.0][2] - **Microsoft.EntityFrameworkCore.Tools**: [from 7.0.0 to 7.0.0][2] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-efcore/branches?baseVersion=GCbb2cde3&targetVersion=GC131bdb4&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:10156ce0-bf6e-4dac-1399-08da7ef5fa55) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 015cf4973c60..c54bcbeb7807 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -29,7 +29,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5d52de420790..ed52f889384d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - bb2cde3d5471a821a6cb3ad24f33df76eca9001e + 131bdb4a7c6c9618e594e7299739fddfe4679a46 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - bb2cde3d5471a821a6cb3ad24f33df76eca9001e + 131bdb4a7c6c9618e594e7299739fddfe4679a46 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - bb2cde3d5471a821a6cb3ad24f33df76eca9001e + 131bdb4a7c6c9618e594e7299739fddfe4679a46 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - bb2cde3d5471a821a6cb3ad24f33df76eca9001e + 131bdb4a7c6c9618e594e7299739fddfe4679a46 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - bb2cde3d5471a821a6cb3ad24f33df76eca9001e + 131bdb4a7c6c9618e594e7299739fddfe4679a46 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - bb2cde3d5471a821a6cb3ad24f33df76eca9001e + 131bdb4a7c6c9618e594e7299739fddfe4679a46 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - bb2cde3d5471a821a6cb3ad24f33df76eca9001e + 131bdb4a7c6c9618e594e7299739fddfe4679a46 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - bb2cde3d5471a821a6cb3ad24f33df76eca9001e + 131bdb4a7c6c9618e594e7299739fddfe4679a46 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From f868541c5fd78a3d111bc4cf7304b2b01ee448a0 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 02:35:50 +0000 Subject: [PATCH 4/5] Merged PR 26861: [internal/release/7.0] Update dependencies from dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:2802be6f-a6f7-477e-8165-08da7ef6284d) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 2802be6f-a6f7-477e-8165-08da7ef6284d - **Build**: 20221018.5 - **Date Produced**: October 18, 2022 11:53:13 PM UTC - **Commit**: d099f075e45d2aa6007a22b71b45a08758559f80 - **Branch**: refs/heads/internal/release/7.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Extensions.Caching.Abstractions**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Caching.Memory**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Configuration**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Configuration.Abstractions**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Configuration.Binder**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Configuration.CommandLine**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Configuration.EnvironmentVariables**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Configuration.FileExtensions**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Configuration.Ini**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Configuration.Json**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Configuration.UserSecrets**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Configuration.Xml**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.DependencyInjection**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.DependencyInjection.Abstractions**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.DependencyModel**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.FileProviders.Abstractions**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.FileProviders.Composite**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.FileProviders.Physical**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.FileSystemGlobbing**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 7.0.0-rtm.22513.8 to 7.0.0-rtm.22518.5][1] - **Microsoft.Extensions.Hosting**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Hosting.Abstractions**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Http**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Logging**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Logging.Abstractions**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Logging.Configuration**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Logging.Console**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Logging.Debug**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Logging.EventLog**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Logging.EventSource**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Logging.TraceSource**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Options**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Options.ConfigurationExtensions**: [from 7.... --- NuGet.config | 4 +- eng/Version.Details.xml | 128 ++++++++++++++++++++-------------------- eng/Versions.props | 6 +- 3 files changed, 69 insertions(+), 69 deletions(-) diff --git a/NuGet.config b/NuGet.config index c54bcbeb7807..9f2fe22d8699 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -32,7 +32,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ed52f889384d..3b426b6526e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,143 +43,143 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://github.com/dotnet/source-build-externals @@ -188,91 +188,91 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://github.com/dotnet/xdt @@ -300,7 +300,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 1d8d46dc0163..c8f8f7021569 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,7 +68,7 @@ 7.0.0 7.0.0 7.0.0 - 7.0.0-rtm.22513.8 + 7.0.0-rtm.22518.5 7.0.0 7.0.0 7.0.0 @@ -87,7 +87,7 @@ 7.0.0 7.0.0 7.0.0 - 7.0.0-rtm.22513.8 + 7.0.0-rtm.22518.5 7.0.0 7.0.0 7.0.0 @@ -103,7 +103,7 @@ 7.0.0 7.0.0 7.0.0 - 7.0.0-rtm.22513.8 + 7.0.0-rtm.22518.5 7.0.0 7.0.0 7.0.0 From bb01bbf4433e27289b99001b7de6a582879d1835 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 04:17:01 +0000 Subject: [PATCH 5/5] Merged PR 26876: [internal/release/7.0] Update dependencies from dnceng/internal/dotnet-efcore This pull request updates the following dependencies [marker]: <> (Begin:10156ce0-bf6e-4dac-1399-08da7ef5fa55) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - **Subscription**: 10156ce0-bf6e-4dac-1399-08da7ef5fa55 - **Build**: 20221018.7 - **Date Produced**: October 19, 2022 3:14:54 AM UTC - **Commit**: 865c6a897058a6ee4c7e014c0cefdcb04dc5e292 - **Branch**: refs/heads/internal/release/7.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-ef**: [from 7.0.0 to 7.0.0][1] - **Microsoft.EntityFrameworkCore**: [from 7.0.0 to 7.0.0][1] - **Microsoft.EntityFrameworkCore.Design**: [from 7.0.0 to 7.0.0][1] - **Microsoft.EntityFrameworkCore.InMemory**: [from 7.0.0 to 7.0.0][1] - **Microsoft.EntityFrameworkCore.Relational**: [from 7.0.0 to 7.0.0][1] - **Microsoft.EntityFrameworkCore.Sqlite**: [from 7.0.0 to 7.0.0][1] - **Microsoft.EntityFrameworkCore.SqlServer**: [from 7.0.0 to 7.0.0][1] - **Microsoft.EntityFrameworkCore.Tools**: [from 7.0.0 to 7.0.0][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-efcore/branches?baseVersion=GC131bdb4&targetVersion=GC865c6a8&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:10156ce0-bf6e-4dac-1399-08da7ef5fa55) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9f2fe22d8699..4febaf49618f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -29,7 +29,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3b426b6526e2..ae7bf522c30d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 131bdb4a7c6c9618e594e7299739fddfe4679a46 + 865c6a897058a6ee4c7e014c0cefdcb04dc5e292 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 131bdb4a7c6c9618e594e7299739fddfe4679a46 + 865c6a897058a6ee4c7e014c0cefdcb04dc5e292 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 131bdb4a7c6c9618e594e7299739fddfe4679a46 + 865c6a897058a6ee4c7e014c0cefdcb04dc5e292 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 131bdb4a7c6c9618e594e7299739fddfe4679a46 + 865c6a897058a6ee4c7e014c0cefdcb04dc5e292 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 131bdb4a7c6c9618e594e7299739fddfe4679a46 + 865c6a897058a6ee4c7e014c0cefdcb04dc5e292 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 131bdb4a7c6c9618e594e7299739fddfe4679a46 + 865c6a897058a6ee4c7e014c0cefdcb04dc5e292 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 131bdb4a7c6c9618e594e7299739fddfe4679a46 + 865c6a897058a6ee4c7e014c0cefdcb04dc5e292 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 131bdb4a7c6c9618e594e7299739fddfe4679a46 + 865c6a897058a6ee4c7e014c0cefdcb04dc5e292 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime