Microsoft.NET.Workload.Emscripten.net6.Manifest

- - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff -Nru dotnet7-7.0.113/src/arcade/src/Microsoft.DotNet.GitSync.CommitManager/CommandLineOptions.cs dotnet7-7.0.114/src/arcade/src/Microsoft.DotNet.GitSync.CommitManager/CommandLineOptions.cs --- dotnet7-7.0.113/src/arcade/src/Microsoft.DotNet.GitSync.CommitManager/CommandLineOptions.cs 2023-10-20 21:29:10.000000000 +0000 +++ dotnet7-7.0.114/src/arcade/src/Microsoft.DotNet.GitSync.CommitManager/CommandLineOptions.cs 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -using CommandLine; - -namespace Microsoft.DotNet.GitSync.CommitManager -{ - internal class CommandLineOptions - { - [Option('k', "azureKey", Required = true, HelpText = "Azure Account Key")] - public string Key { get; set; } - - [Option('u', "azureAccount", Required = true, HelpText = "Azure Account Name")] - public string Username { get; set; } - - [Option('r', "repo", Required = true, HelpText = "Repo to which commit was made")] - public string Repository { get; set; } - - [Option('b', "branch", Required = true, HelpText = "Branch to Mirror")] - public string Branch { get; set; } - - [Option('c', "commits", Required = true, HelpText = "Sha of commit(s) concatenated by ;")] - public string Commit { get; set; } - } -} diff -Nru dotnet7-7.0.113/src/arcade/src/Microsoft.DotNet.GitSync.CommitManager/CommitEntity.cs dotnet7-7.0.114/src/arcade/src/Microsoft.DotNet.GitSync.CommitManager/CommitEntity.cs --- dotnet7-7.0.113/src/arcade/src/Microsoft.DotNet.GitSync.CommitManager/CommitEntity.cs 2023-10-20 21:29:10.000000000 +0000 +++ dotnet7-7.0.114/src/arcade/src/Microsoft.DotNet.GitSync.CommitManager/CommitEntity.cs 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -using System; -using Azure; -using Azure.Data.Tables; - -namespace Microsoft.DotNet.GitSync.CommitManager -{ - public class CommitEntity : ITableEntity - { - public CommitEntity(string sourceRepo, string targetRepo, string commitId, string branch) - { - this.SourceRepo = sourceRepo; - this.PartitionKey = targetRepo; - this.RowKey = commitId; - this.Branch = branch; - this.PR = string.Empty; - } - - public CommitEntity() { } - public string SourceRepo { get; set; } - public string Branch { get; set; } - public bool Mirrored { get; set; } - public string PR { get; set; } - public string PartitionKey { get; set; } - public string RowKey { get; set; } - public DateTimeOffset? Timestamp { get; set; } - public ETag ETag { get; set; } - } -} diff -Nru dotnet7-7.0.113/src/arcade/src/Microsoft.DotNet.GitSync.CommitManager/Microsoft.DotNet.GitSync.CommitManager.csproj dotnet7-7.0.114/src/arcade/src/Microsoft.DotNet.GitSync.CommitManager/Microsoft.DotNet.GitSync.CommitManager.csproj --- dotnet7-7.0.113/src/arcade/src/Microsoft.DotNet.GitSync.CommitManager/Microsoft.DotNet.GitSync.CommitManager.csproj 2023-10-20 21:29:10.000000000 +0000 +++ dotnet7-7.0.114/src/arcade/src/Microsoft.DotNet.GitSync.CommitManager/Microsoft.DotNet.GitSync.CommitManager.csproj 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ - - - - Exe - $(TargetFrameworkForNETSDK) - latest - true - - - - - - - - - - - - - - - diff -Nru dotnet7-7.0.113/src/arcade/src/Microsoft.DotNet.GitSync.CommitManager/Program.cs dotnet7-7.0.114/src/arcade/src/Microsoft.DotNet.GitSync.CommitManager/Program.cs --- dotnet7-7.0.113/src/arcade/src/Microsoft.DotNet.GitSync.CommitManager/Program.cs 2023-10-20 21:29:10.000000000 +0000 +++ dotnet7-7.0.114/src/arcade/src/Microsoft.DotNet.GitSync.CommitManager/Program.cs 1970-01-01 00:00:00.000000000 +0000 @@ -1,88 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Reflection; -using System.Threading.Tasks; -using Azure; -using Azure.Data.Tables; -using CommandLine; -using log4net; -using log4net.Config; - -namespace Microsoft.DotNet.GitSync.CommitManager -{ - public class Program - { - private const string _cloudTableName = "CommitHistory"; - private const string _repoTableName = "MirrorBranchRepos"; - private static Table s_table { get; set; } - private static Dictionary<(string, string), List> s_repos { get; set; } = new Dictionary<(string, string), List>(); - private static ILog s_logger = LogManager.GetLogger(typeof(Program)); - - public static async Task Main(string[] args) - { - CommandLineOptions myOptions = null; - Parser.Default.ParseArguments(args).WithParsed(opts => myOptions = opts); - - if (myOptions != null) - { - await SetupAsync(myOptions.Username, myOptions.Key); - await InsertCommitsAsync(myOptions.Repository, myOptions.Commit, myOptions.Branch); - } - } - - private static async Task SetupAsync(string username, string key) - { - var logRepository = LogManager.GetRepository(Assembly.GetEntryAssembly()); - XmlConfigurator.Configure(logRepository, new FileInfo("log4net.config")); - - s_table = new Table(username, key, _cloudTableName, _repoTableName); - await s_table.CommitTable.CreateIfNotExistsAsync(); - await s_table.RepoTable.CreateIfNotExistsAsync(); - - - string getAllMirrorPairs = TableClient.CreateQueryFilter(ent => ent.PartitionKey != null); - - AsyncPageable queryResultsMaxPerPage = s_table.RepoTable.QueryAsync(getAllMirrorPairs); - - await foreach (Page page in queryResultsMaxPerPage.AsPages()) - { - foreach (TableEntity item in page.Values) - { - s_repos.Add((item.PartitionKey, item.GetString("Branch")), item.GetString("ReposToMirrorInto").Split(';').ToList()); - s_logger.Info($"The commits in {item.PartitionKey} repo will be mirrored into {item.GetString("ReposToMirrorInto")} Repos"); - } - } - } - - private static async Task InsertCommitsAsync(string sourceRepoFullname, string commitList, string branch) - { - string sourceRepo = sourceRepoFullname.Split("/")[1]; - foreach (string repo in s_repos[(sourceRepo, branch)]) - { - foreach (var commitId in commitList.Split(";")) - { - CommitEntity entry = new CommitEntity(sourceRepo, repo, commitId, branch); - - try - { - await s_table.CommitTable.AddEntityAsync(entry); - s_logger.Info($"Commit {commitId} added to table to get mirrored from {sourceRepo} to {repo}"); - } - catch (WindowsAzure.Storage.StorageException) - { - s_logger.Warn($"The commit {commitId} already exists in {repo}"); - } - catch (Exception ex) - { - s_logger.Warn($"Insert Operation for commit {commitId} for {repo}\n" + ex.Message); - } - } - } - } - } -} diff -Nru dotnet7-7.0.113/src/arcade/src/Microsoft.DotNet.GitSync.CommitManager/README.md dotnet7-7.0.114/src/arcade/src/Microsoft.DotNet.GitSync.CommitManager/README.md --- dotnet7-7.0.113/src/arcade/src/Microsoft.DotNet.GitSync.CommitManager/README.md 2023-10-20 21:29:10.000000000 +0000 +++ dotnet7-7.0.114/src/arcade/src/Microsoft.DotNet.GitSync.CommitManager/README.md 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -# Microsoft.DotNet.GitSync.CommitManager - -It runs on maestro triggers. It adds commits that need to be ported to the Azure storage table. -Webhook sends the payload to the maestro after every push event in any of the 3 repositories (corefx, coreclr, corert). -The payload contains the path of the changed files in that commit. If any of these path is in the shared folder, then that commit is a candidate for Azure table. - -## Arguments -The Arguments that need to be supplied to this tool are - -- -k = Azure Account Key -- -u = Azure Account Name -- -r = Repository to which commit is made -- -b = Branch to which commit is made -- -c = Sha of Commit(s) - -``` -dotnet run Microsoft.DotNet.GitSync.CommitManager.csproj -- -u $(AccountName) -k *** -r dotnet/coreclr -c 5d31194880e800a9df8eef76e7a0a53646aa72d3 -b master -``` - -## How to handle failures -The tool is currently being run as a build definition. You can look at the logs of the build definition in order to get more info about the failure. The information about the build definition is present [here](https://github.com/dotnet/versions/blob/master/Maestro/subscriptions.json#L153) - -## How to use it for other repos -In order to use this tool for any other pair of repos, you need to take following actions :- - -- You first need an Azure storage account. You then need to create an Azure cosmos db table with columns such as TargetRepo(PartitionKey), commitID(RowKey), Branch, Mirrored, PR and SourceRepo. -- You also need another table with information about repositories i.e. which repos need to be mirrored into which repos. The columns required will be SourceRepo and ReposToMirrorInto. -- You also need to setup the [webhook](https://developer.github.com/webhooks/creating/) in all the repos whose commits need to be mirrored. You then need to check if the commit is in the shared path by looking at the webhook payload. -- If the commit is in the shared path, you need to build and run this tool with appropriate arguments. -- The webhook part could be done through [maestro](https://github.com/dotnet/versions/tree/master/Maestro) or you can write an Azure function which receives the webhook payload and takes the required actions. - -[Related Documentation](../../Documentation/GitSyncTools.md ) diff -Nru dotnet7-7.0.113/src/arcade/src/Microsoft.DotNet.GitSync.CommitManager/Table.cs dotnet7-7.0.114/src/arcade/src/Microsoft.DotNet.GitSync.CommitManager/Table.cs --- dotnet7-7.0.113/src/arcade/src/Microsoft.DotNet.GitSync.CommitManager/Table.cs 2023-10-20 21:29:10.000000000 +0000 +++ dotnet7-7.0.114/src/arcade/src/Microsoft.DotNet.GitSync.CommitManager/Table.cs 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -using Azure.Data.Tables; - -namespace Microsoft.DotNet.GitSync.CommitManager -{ - internal class Table - { - public Table(string accountName, string accountKey, string tableName, string repoTableName) - { - var tableServiceClient = new TableServiceClient("DefaultEndpointsProtocol=https;AccountName=" + accountName + ";AccountKey=" + accountKey + ";TableEndpoint=https://" + accountName + ".table.cosmosdb.azure.com:443/;"); - CommitTable = tableServiceClient.GetTableClient(tableName); - RepoTable = tableServiceClient.GetTableClient(repoTableName); - } - - public TableClient CommitTable { get; set; } - - public TableClient RepoTable { get; set; } - } -} diff -Nru dotnet7-7.0.113/src/arcade/src/Microsoft.DotNet.GitSync.CommitManager/log4net.config dotnet7-7.0.114/src/arcade/src/Microsoft.DotNet.GitSync.CommitManager/log4net.config --- dotnet7-7.0.113/src/arcade/src/Microsoft.DotNet.GitSync.CommitManager/log4net.config 2023-10-20 21:29:10.000000000 +0000 +++ dotnet7-7.0.114/src/arcade/src/Microsoft.DotNet.GitSync.CommitManager/log4net.config 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff -Nru dotnet7-7.0.113/src/arcade/src/Microsoft.DotNet.Helix/Sdk/Microsoft.DotNet.Helix.Sdk.csproj dotnet7-7.0.114/src/arcade/src/Microsoft.DotNet.Helix/Sdk/Microsoft.DotNet.Helix.Sdk.csproj --- dotnet7-7.0.113/src/arcade/src/Microsoft.DotNet.Helix/Sdk/Microsoft.DotNet.Helix.Sdk.csproj 2023-10-20 21:29:10.000000000 +0000 +++ dotnet7-7.0.114/src/arcade/src/Microsoft.DotNet.Helix/Sdk/Microsoft.DotNet.Helix.Sdk.csproj 2023-10-24 04:48:23.000000000 +0000 @@ -13,7 +13,7 @@ - + diff -Nru dotnet7-7.0.113/src/arcade/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests.csproj dotnet7-7.0.114/src/arcade/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests.csproj --- dotnet7-7.0.113/src/arcade/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests.csproj 2023-10-20 21:29:10.000000000 +0000 +++ dotnet7-7.0.114/src/arcade/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests.csproj 2023-10-24 04:48:23.000000000 +0000 @@ -13,7 +13,7 @@ - + diff -Nru dotnet7-7.0.113/src/arcade/src/SignCheck/Microsoft.SignCheck/Microsoft.DotNet.SignCheckLibrary.csproj dotnet7-7.0.114/src/arcade/src/SignCheck/Microsoft.SignCheck/Microsoft.DotNet.SignCheckLibrary.csproj --- dotnet7-7.0.113/src/arcade/src/SignCheck/Microsoft.SignCheck/Microsoft.DotNet.SignCheckLibrary.csproj 2023-10-20 21:29:10.000000000 +0000 +++ dotnet7-7.0.114/src/arcade/src/SignCheck/Microsoft.SignCheck/Microsoft.DotNet.SignCheckLibrary.csproj 2023-10-24 04:48:23.000000000 +0000 @@ -18,11 +18,11 @@ - - - - - + + + + + diff -Nru dotnet7-7.0.113/src/arcade/src/SignCheck/Microsoft.SignCheck/Verification/NupkgVerifier.cs dotnet7-7.0.114/src/arcade/src/SignCheck/Microsoft.SignCheck/Verification/NupkgVerifier.cs --- dotnet7-7.0.113/src/arcade/src/SignCheck/Microsoft.SignCheck/Verification/NupkgVerifier.cs 2023-10-20 21:29:10.000000000 +0000 +++ dotnet7-7.0.114/src/arcade/src/SignCheck/Microsoft.SignCheck/Verification/NupkgVerifier.cs 2023-10-24 04:48:23.000000000 +0000 @@ -1,12 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. - using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; using Microsoft.SignCheck.Logging; -using NuGet.Common; using NuGet.Packaging; using NuGet.Packaging.Signing; @@ -14,12 +12,12 @@ { public class NupkgVerifier : ArchiveVerifier { - public NupkgVerifier(Log log, Exclusions exclusions, SignatureVerificationOptions options) : base(log, exclusions, options, fileExtension: ".nupkg") + public NupkgVerifier(Log log, Exclusions exclusions, SignatureVerificationOptions options) : + base(log, exclusions, options, fileExtension: ".nupkg") { - } - public override SignatureVerificationResult VerifySignature(string path, string parent, string virtualPath) + public override SignatureVerificationResult VerifySignature(string path, string parent, string virtualPath) { SignatureVerificationResult svr = new SignatureVerificationResult(path, parent, virtualPath); string fullPath = svr.FullPath; @@ -31,20 +29,25 @@ return svr; } + // This method and SignatureVerificationResult.IsSigned are slightly misnamed. Signature validity is just as + // important as signature existence. The new VerifySignatureResult.IsSigned property would _not_ be correct + // to use here. private bool IsSigned(string path) { - IEnumerable providers = SignatureVerificationProviderFactory.GetSignatureVerificationProviders(); + IEnumerable providers = new ISignatureVerificationProvider[] { + new IntegrityVerificationProvider(), + new SignatureTrustAndValidityVerificationProvider(allowUntrustedRootList: null), + new AllowListVerificationProvider(allowList: null), + }; var packageSignatureVerifier = new PackageSignatureVerifier(providers); var verifierSettings = SignedPackageVerifierSettings.GetVerifyCommandDefaultPolicy(); - IEnumerable verificationProviders = SignatureVerificationProviderFactory.GetSignatureVerificationProviders(); - var verifier = new PackageSignatureVerifier(verificationProviders); using (var pr = new PackageArchiveReader(path)) { Task verifySignatureResult = packageSignatureVerifier.VerifySignaturesAsync(pr, verifierSettings, CancellationToken.None); - return verifySignatureResult.Result.Valid; + return verifySignatureResult.Result.IsValid; } } } diff -Nru dotnet7-7.0.113/src/aspnetcore/.git/FETCH_HEAD dotnet7-7.0.114/src/aspnetcore/.git/FETCH_HEAD --- dotnet7-7.0.113/src/aspnetcore/.git/FETCH_HEAD 2023-10-20 21:27:49.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/.git/FETCH_HEAD 2023-10-24 04:47:11.000000000 +0000 @@ -1 +1 @@ -d634f2bd1ad6e319f26ff0f1d7ada5539158a19f 'd634f2bd1ad6e319f26ff0f1d7ada5539158a19f' of https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore +0a715692d8e2536c899faa0bb4f0cec2c2e33e36 '0a715692d8e2536c899faa0bb4f0cec2c2e33e36' of https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore Binary files /tmp/tmp6ypwwmzi/_rCMALy1fo/dotnet7-7.0.113/src/aspnetcore/.git/index and /tmp/tmp6ypwwmzi/0qgonBF_sg/dotnet7-7.0.114/src/aspnetcore/.git/index differ diff -Nru dotnet7-7.0.113/src/aspnetcore/.git/logs/HEAD dotnet7-7.0.114/src/aspnetcore/.git/logs/HEAD --- dotnet7-7.0.113/src/aspnetcore/.git/logs/HEAD 2023-10-20 21:27:50.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/.git/logs/HEAD 2023-10-24 04:47:12.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 d634f2bd1ad6e319f26ff0f1d7ada5539158a19f cloudtest_azpcontainer 1697837270 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 cloudtest_azpcontainer 1698122832 +0000 reset: moving to FETCH_HEAD diff -Nru dotnet7-7.0.113/src/aspnetcore/.git/logs/refs/heads/master dotnet7-7.0.114/src/aspnetcore/.git/logs/refs/heads/master --- dotnet7-7.0.113/src/aspnetcore/.git/logs/refs/heads/master 2023-10-20 21:27:50.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/.git/logs/refs/heads/master 2023-10-24 04:47:12.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 d634f2bd1ad6e319f26ff0f1d7ada5539158a19f cloudtest_azpcontainer 1697837270 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 cloudtest_azpcontainer 1698122832 +0000 reset: moving to FETCH_HEAD Binary files /tmp/tmp6ypwwmzi/_rCMALy1fo/dotnet7-7.0.113/src/aspnetcore/.git/modules/src/submodules/MessagePack-CSharp/index and /tmp/tmp6ypwwmzi/0qgonBF_sg/dotnet7-7.0.114/src/aspnetcore/.git/modules/src/submodules/MessagePack-CSharp/index differ diff -Nru dotnet7-7.0.113/src/aspnetcore/.git/modules/src/submodules/MessagePack-CSharp/logs/HEAD dotnet7-7.0.114/src/aspnetcore/.git/modules/src/submodules/MessagePack-CSharp/logs/HEAD --- dotnet7-7.0.113/src/aspnetcore/.git/modules/src/submodules/MessagePack-CSharp/logs/HEAD 2023-10-20 21:27:52.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/.git/modules/src/submodules/MessagePack-CSharp/logs/HEAD 2023-10-24 04:47:14.000000000 +0000 @@ -1,2 +1,2 @@ -0000000000000000000000000000000000000000 ecc4e18ad7a0c7db51cd7e3d2997a291ed01444d cloudtest_azpcontainer 1697837270 +0000 clone: from https://github.com/aspnet/MessagePack-CSharp.git -ecc4e18ad7a0c7db51cd7e3d2997a291ed01444d ecc4e18ad7a0c7db51cd7e3d2997a291ed01444d cloudtest_azpcontainer 1697837272 +0000 checkout: moving from master to ecc4e18ad7a0c7db51cd7e3d2997a291ed01444d +0000000000000000000000000000000000000000 ecc4e18ad7a0c7db51cd7e3d2997a291ed01444d cloudtest_azpcontainer 1698122833 +0000 clone: from https://github.com/aspnet/MessagePack-CSharp.git +ecc4e18ad7a0c7db51cd7e3d2997a291ed01444d ecc4e18ad7a0c7db51cd7e3d2997a291ed01444d cloudtest_azpcontainer 1698122834 +0000 checkout: moving from master to ecc4e18ad7a0c7db51cd7e3d2997a291ed01444d diff -Nru dotnet7-7.0.113/src/aspnetcore/.git/modules/src/submodules/MessagePack-CSharp/logs/refs/heads/master dotnet7-7.0.114/src/aspnetcore/.git/modules/src/submodules/MessagePack-CSharp/logs/refs/heads/master --- dotnet7-7.0.113/src/aspnetcore/.git/modules/src/submodules/MessagePack-CSharp/logs/refs/heads/master 2023-10-20 21:27:50.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/.git/modules/src/submodules/MessagePack-CSharp/logs/refs/heads/master 2023-10-24 04:47:13.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 ecc4e18ad7a0c7db51cd7e3d2997a291ed01444d cloudtest_azpcontainer 1697837270 +0000 clone: from https://github.com/aspnet/MessagePack-CSharp.git +0000000000000000000000000000000000000000 ecc4e18ad7a0c7db51cd7e3d2997a291ed01444d cloudtest_azpcontainer 1698122833 +0000 clone: from https://github.com/aspnet/MessagePack-CSharp.git diff -Nru dotnet7-7.0.113/src/aspnetcore/.git/modules/src/submodules/MessagePack-CSharp/logs/refs/remotes/origin/HEAD dotnet7-7.0.114/src/aspnetcore/.git/modules/src/submodules/MessagePack-CSharp/logs/refs/remotes/origin/HEAD --- dotnet7-7.0.113/src/aspnetcore/.git/modules/src/submodules/MessagePack-CSharp/logs/refs/remotes/origin/HEAD 2023-10-20 21:27:50.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/.git/modules/src/submodules/MessagePack-CSharp/logs/refs/remotes/origin/HEAD 2023-10-24 04:47:13.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 ecc4e18ad7a0c7db51cd7e3d2997a291ed01444d cloudtest_azpcontainer 1697837270 +0000 clone: from https://github.com/aspnet/MessagePack-CSharp.git +0000000000000000000000000000000000000000 ecc4e18ad7a0c7db51cd7e3d2997a291ed01444d cloudtest_azpcontainer 1698122833 +0000 clone: from https://github.com/aspnet/MessagePack-CSharp.git diff -Nru dotnet7-7.0.113/src/aspnetcore/.git/modules/src/submodules/googletest/FETCH_HEAD dotnet7-7.0.114/src/aspnetcore/.git/modules/src/submodules/googletest/FETCH_HEAD --- dotnet7-7.0.113/src/aspnetcore/.git/modules/src/submodules/googletest/FETCH_HEAD 2023-10-20 21:27:53.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/.git/modules/src/submodules/googletest/FETCH_HEAD 2023-10-24 04:47:15.000000000 +0000 @@ -1 +1 @@ -6f6ab4212aa02cfe02e480711246da4fc17b0761 '6f6ab4212aa02cfe02e480711246da4fc17b0761' of https://github.com/google/googletest +7e33b6a1c497ced1e98fc60175aeb4678419281c '7e33b6a1c497ced1e98fc60175aeb4678419281c' of https://github.com/google/googletest diff -Nru dotnet7-7.0.113/src/aspnetcore/.git/modules/src/submodules/googletest/HEAD dotnet7-7.0.114/src/aspnetcore/.git/modules/src/submodules/googletest/HEAD --- dotnet7-7.0.113/src/aspnetcore/.git/modules/src/submodules/googletest/HEAD 2023-10-20 21:27:53.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/.git/modules/src/submodules/googletest/HEAD 2023-10-24 04:47:15.000000000 +0000 @@ -1 +1 @@ -6f6ab4212aa02cfe02e480711246da4fc17b0761 +7e33b6a1c497ced1e98fc60175aeb4678419281c Binary files /tmp/tmp6ypwwmzi/_rCMALy1fo/dotnet7-7.0.113/src/aspnetcore/.git/modules/src/submodules/googletest/index and /tmp/tmp6ypwwmzi/0qgonBF_sg/dotnet7-7.0.114/src/aspnetcore/.git/modules/src/submodules/googletest/index differ diff -Nru dotnet7-7.0.113/src/aspnetcore/.git/modules/src/submodules/googletest/logs/HEAD dotnet7-7.0.114/src/aspnetcore/.git/modules/src/submodules/googletest/logs/HEAD --- dotnet7-7.0.113/src/aspnetcore/.git/modules/src/submodules/googletest/logs/HEAD 2023-10-20 21:27:53.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/.git/modules/src/submodules/googletest/logs/HEAD 2023-10-24 04:47:15.000000000 +0000 @@ -1,2 +1,2 @@ -0000000000000000000000000000000000000000 116b7e55281c4200151524b093ecc03757a4ffda cloudtest_azpcontainer 1697837271 +0000 clone: from https://github.com/google/googletest -116b7e55281c4200151524b093ecc03757a4ffda 6f6ab4212aa02cfe02e480711246da4fc17b0761 cloudtest_azpcontainer 1697837273 +0000 checkout: moving from main to 6f6ab4212aa02cfe02e480711246da4fc17b0761 +0000000000000000000000000000000000000000 518387203b573f35477fa6872dd54620e70d2bdb cloudtest_azpcontainer 1698122833 +0000 clone: from https://github.com/google/googletest +518387203b573f35477fa6872dd54620e70d2bdb 7e33b6a1c497ced1e98fc60175aeb4678419281c cloudtest_azpcontainer 1698122835 +0000 checkout: moving from main to 7e33b6a1c497ced1e98fc60175aeb4678419281c diff -Nru dotnet7-7.0.113/src/aspnetcore/.git/modules/src/submodules/googletest/logs/refs/heads/main dotnet7-7.0.114/src/aspnetcore/.git/modules/src/submodules/googletest/logs/refs/heads/main --- dotnet7-7.0.113/src/aspnetcore/.git/modules/src/submodules/googletest/logs/refs/heads/main 2023-10-20 21:27:51.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/.git/modules/src/submodules/googletest/logs/refs/heads/main 2023-10-24 04:47:13.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 116b7e55281c4200151524b093ecc03757a4ffda cloudtest_azpcontainer 1697837271 +0000 clone: from https://github.com/google/googletest +0000000000000000000000000000000000000000 518387203b573f35477fa6872dd54620e70d2bdb cloudtest_azpcontainer 1698122833 +0000 clone: from https://github.com/google/googletest diff -Nru dotnet7-7.0.113/src/aspnetcore/.git/modules/src/submodules/googletest/logs/refs/remotes/origin/HEAD dotnet7-7.0.114/src/aspnetcore/.git/modules/src/submodules/googletest/logs/refs/remotes/origin/HEAD --- dotnet7-7.0.113/src/aspnetcore/.git/modules/src/submodules/googletest/logs/refs/remotes/origin/HEAD 2023-10-20 21:27:51.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/.git/modules/src/submodules/googletest/logs/refs/remotes/origin/HEAD 2023-10-24 04:47:13.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 116b7e55281c4200151524b093ecc03757a4ffda cloudtest_azpcontainer 1697837271 +0000 clone: from https://github.com/google/googletest +0000000000000000000000000000000000000000 518387203b573f35477fa6872dd54620e70d2bdb cloudtest_azpcontainer 1698122833 +0000 clone: from https://github.com/google/googletest diff -Nru dotnet7-7.0.113/src/aspnetcore/.git/modules/src/submodules/googletest/packed-refs dotnet7-7.0.114/src/aspnetcore/.git/modules/src/submodules/googletest/packed-refs --- dotnet7-7.0.113/src/aspnetcore/.git/modules/src/submodules/googletest/packed-refs 2023-10-20 21:27:51.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/.git/modules/src/submodules/googletest/packed-refs 2023-10-24 04:47:13.000000000 +0000 @@ -1,2 +1,2 @@ # pack-refs with: peeled fully-peeled sorted -116b7e55281c4200151524b093ecc03757a4ffda refs/remotes/origin/main +518387203b573f35477fa6872dd54620e70d2bdb refs/remotes/origin/main diff -Nru dotnet7-7.0.113/src/aspnetcore/.git/modules/src/submodules/googletest/refs/heads/main dotnet7-7.0.114/src/aspnetcore/.git/modules/src/submodules/googletest/refs/heads/main --- dotnet7-7.0.113/src/aspnetcore/.git/modules/src/submodules/googletest/refs/heads/main 2023-10-20 21:27:51.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/.git/modules/src/submodules/googletest/refs/heads/main 2023-10-24 04:47:13.000000000 +0000 @@ -1 +1 @@ -116b7e55281c4200151524b093ecc03757a4ffda +518387203b573f35477fa6872dd54620e70d2bdb diff -Nru dotnet7-7.0.113/src/aspnetcore/.git/modules/src/submodules/googletest/shallow dotnet7-7.0.114/src/aspnetcore/.git/modules/src/submodules/googletest/shallow --- dotnet7-7.0.113/src/aspnetcore/.git/modules/src/submodules/googletest/shallow 2023-10-20 21:27:53.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/.git/modules/src/submodules/googletest/shallow 2023-10-24 04:47:15.000000000 +0000 @@ -1,2 +1,2 @@ -116b7e55281c4200151524b093ecc03757a4ffda -6f6ab4212aa02cfe02e480711246da4fc17b0761 +518387203b573f35477fa6872dd54620e70d2bdb +7e33b6a1c497ced1e98fc60175aeb4678419281c Binary files /tmp/tmp6ypwwmzi/_rCMALy1fo/dotnet7-7.0.113/src/aspnetcore/.git/modules/src/submodules/spa-templates/index and /tmp/tmp6ypwwmzi/0qgonBF_sg/dotnet7-7.0.114/src/aspnetcore/.git/modules/src/submodules/spa-templates/index differ diff -Nru dotnet7-7.0.113/src/aspnetcore/.git/modules/src/submodules/spa-templates/logs/HEAD dotnet7-7.0.114/src/aspnetcore/.git/modules/src/submodules/spa-templates/logs/HEAD --- dotnet7-7.0.113/src/aspnetcore/.git/modules/src/submodules/spa-templates/logs/HEAD 2023-10-20 21:27:54.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/.git/modules/src/submodules/spa-templates/logs/HEAD 2023-10-24 04:47:16.000000000 +0000 @@ -1,2 +1,2 @@ -0000000000000000000000000000000000000000 0eca1b1214501b90eeb0fb26cbfce59dec76ef45 cloudtest_azpcontainer 1697837271 +0000 clone: from https://github.com/dotnet/spa-templates.git -0eca1b1214501b90eeb0fb26cbfce59dec76ef45 68cd408c62c6a881a58f41a6f6f5f8b73b6ae515 cloudtest_azpcontainer 1697837274 +0000 checkout: moving from main to 68cd408c62c6a881a58f41a6f6f5f8b73b6ae515 +0000000000000000000000000000000000000000 0eca1b1214501b90eeb0fb26cbfce59dec76ef45 cloudtest_azpcontainer 1698122834 +0000 clone: from https://github.com/dotnet/spa-templates.git +0eca1b1214501b90eeb0fb26cbfce59dec76ef45 68cd408c62c6a881a58f41a6f6f5f8b73b6ae515 cloudtest_azpcontainer 1698122836 +0000 checkout: moving from main to 68cd408c62c6a881a58f41a6f6f5f8b73b6ae515 diff -Nru dotnet7-7.0.113/src/aspnetcore/.git/modules/src/submodules/spa-templates/logs/refs/heads/main dotnet7-7.0.114/src/aspnetcore/.git/modules/src/submodules/spa-templates/logs/refs/heads/main --- dotnet7-7.0.113/src/aspnetcore/.git/modules/src/submodules/spa-templates/logs/refs/heads/main 2023-10-20 21:27:51.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/.git/modules/src/submodules/spa-templates/logs/refs/heads/main 2023-10-24 04:47:14.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 0eca1b1214501b90eeb0fb26cbfce59dec76ef45 cloudtest_azpcontainer 1697837271 +0000 clone: from https://github.com/dotnet/spa-templates.git +0000000000000000000000000000000000000000 0eca1b1214501b90eeb0fb26cbfce59dec76ef45 cloudtest_azpcontainer 1698122834 +0000 clone: from https://github.com/dotnet/spa-templates.git diff -Nru dotnet7-7.0.113/src/aspnetcore/.git/modules/src/submodules/spa-templates/logs/refs/remotes/origin/HEAD dotnet7-7.0.114/src/aspnetcore/.git/modules/src/submodules/spa-templates/logs/refs/remotes/origin/HEAD --- dotnet7-7.0.113/src/aspnetcore/.git/modules/src/submodules/spa-templates/logs/refs/remotes/origin/HEAD 2023-10-20 21:27:51.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/.git/modules/src/submodules/spa-templates/logs/refs/remotes/origin/HEAD 2023-10-24 04:47:14.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 0eca1b1214501b90eeb0fb26cbfce59dec76ef45 cloudtest_azpcontainer 1697837271 +0000 clone: from https://github.com/dotnet/spa-templates.git +0000000000000000000000000000000000000000 0eca1b1214501b90eeb0fb26cbfce59dec76ef45 cloudtest_azpcontainer 1698122834 +0000 clone: from https://github.com/dotnet/spa-templates.git diff -Nru dotnet7-7.0.113/src/aspnetcore/.git/refs/heads/master dotnet7-7.0.114/src/aspnetcore/.git/refs/heads/master --- dotnet7-7.0.113/src/aspnetcore/.git/refs/heads/master 2023-10-20 21:27:50.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/.git/refs/heads/master 2023-10-24 04:47:12.000000000 +0000 @@ -1 +1 @@ -d634f2bd1ad6e319f26ff0f1d7ada5539158a19f +0a715692d8e2536c899faa0bb4f0cec2c2e33e36 diff -Nru dotnet7-7.0.113/src/aspnetcore/.git/shallow dotnet7-7.0.114/src/aspnetcore/.git/shallow --- dotnet7-7.0.113/src/aspnetcore/.git/shallow 2023-10-20 21:27:46.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/.git/shallow 2023-10-24 04:47:06.000000000 +0000 @@ -1 +1 @@ -d634f2bd1ad6e319f26ff0f1d7ada5539158a19f +0a715692d8e2536c899faa0bb4f0cec2c2e33e36 diff -Nru dotnet7-7.0.113/src/aspnetcore/NuGet.config dotnet7-7.0.114/src/aspnetcore/NuGet.config --- dotnet7-7.0.113/src/aspnetcore/NuGet.config 2023-10-20 21:27:49.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/NuGet.config 2023-10-24 04:47:11.000000000 +0000 @@ -4,10 +4,10 @@ - + - + @@ -26,10 +26,10 @@ - + - + diff -Nru dotnet7-7.0.113/src/aspnetcore/eng/Baseline.Designer.props dotnet7-7.0.114/src/aspnetcore/eng/Baseline.Designer.props --- dotnet7-7.0.113/src/aspnetcore/eng/Baseline.Designer.props 2023-10-20 21:27:49.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/eng/Baseline.Designer.props 2023-10-24 04:47:11.000000000 +0000 @@ -2,28 +2,28 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - - - + + + @@ -35,105 +35,105 @@ - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - + - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 @@ -141,121 +141,121 @@ - 7.0.11 + 7.0.12 - + - + - + - 7.0.11 + 7.0.12 - + - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - + - 7.0.11 + 7.0.12 - - + + - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - - + + - 7.0.11 + 7.0.12 - + - 7.0.11 + 7.0.12 - + - 7.0.11 + 7.0.12 - - - + + + - 7.0.11 + 7.0.12 - - + + - 7.0.11 + 7.0.12 - - + + - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - - + + @@ -263,7 +263,7 @@ - 7.0.11 + 7.0.12 @@ -272,50 +272,50 @@ - 7.0.11 + 7.0.12 - + - + - + - + - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - + - + - + - 7.0.11 + 7.0.12 - - + + @@ -325,8 +325,8 @@ - - + + @@ -334,8 +334,8 @@ - - + + @@ -346,58 +346,58 @@ - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - - + + - 7.0.11 + 7.0.12 - + - + - + - 7.0.11 + 7.0.12 - + - + - + - 7.0.11 + 7.0.12 - + - 7.0.11 + 7.0.12 @@ -414,7 +414,7 @@ - 7.0.11 + 7.0.12 @@ -422,71 +422,71 @@ - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - + - + - + - + - 7.0.11 + 7.0.12 - + - + - + - 7.0.11 + 7.0.12 - - + + - 7.0.11 + 7.0.12 - - + + - 7.0.11 + 7.0.12 @@ -502,27 +502,27 @@ - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - + - 7.0.11 + 7.0.12 @@ -531,151 +531,151 @@ - 7.0.11 + 7.0.12 - + - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - - + + - - + + - - + + - 7.0.11 + 7.0.12 - - + + - - + + - - + + - - + + - 7.0.11 + 7.0.12 - + - + - + - 7.0.11 + 7.0.12 - + - + - + - 7.0.11 + 7.0.12 - + - + - + - 7.0.11 + 7.0.12 - + - + - + - 7.0.11 + 7.0.12 - - - - + + + + - 7.0.11 + 7.0.12 @@ -684,60 +684,60 @@ - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - + - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 @@ -756,7 +756,7 @@ - 7.0.11 + 7.0.12 @@ -778,7 +778,7 @@ - 7.0.11 + 7.0.12 @@ -794,46 +794,46 @@ - 7.0.11 + 7.0.12 - + - + - + - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - - - + + + - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 @@ -843,7 +843,7 @@ - 7.0.11 + 7.0.12 @@ -852,73 +852,73 @@ - 7.0.11 + 7.0.12 - + - + - + - 7.0.11 + 7.0.12 - + - + - + - 7.0.11 + 7.0.12 - + - + - + - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 @@ -947,11 +947,11 @@ - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 @@ -969,13 +969,13 @@ - 7.0.11 + 7.0.12 - 7.0.11 + 7.0.12 - + \ No newline at end of file diff -Nru dotnet7-7.0.113/src/aspnetcore/eng/Baseline.xml dotnet7-7.0.114/src/aspnetcore/eng/Baseline.xml --- dotnet7-7.0.113/src/aspnetcore/eng/Baseline.xml 2023-10-20 21:27:49.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/eng/Baseline.xml 2023-10-24 04:47:11.000000000 +0000 @@ -4,109 +4,109 @@ Update this list when preparing for a new patch. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -Nru dotnet7-7.0.113/src/aspnetcore/eng/Version.Details.xml dotnet7-7.0.114/src/aspnetcore/eng/Version.Details.xml --- dotnet7-7.0.113/src/aspnetcore/eng/Version.Details.xml 2023-10-20 21:27:49.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/eng/Version.Details.xml 2023-10-24 04:47:11.000000000 +0000 @@ -9,37 +9,37 @@ --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f64d1aae5f715503729c769a666e0a1289566ac1 + 31662b30f1a4497db482b3aed8ed4c4aa6de801b - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f64d1aae5f715503729c769a666e0a1289566ac1 + 31662b30f1a4497db482b3aed8ed4c4aa6de801b - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f64d1aae5f715503729c769a666e0a1289566ac1 + 31662b30f1a4497db482b3aed8ed4c4aa6de801b - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f64d1aae5f715503729c769a666e0a1289566ac1 + 31662b30f1a4497db482b3aed8ed4c4aa6de801b - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f64d1aae5f715503729c769a666e0a1289566ac1 + 31662b30f1a4497db482b3aed8ed4c4aa6de801b - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f64d1aae5f715503729c769a666e0a1289566ac1 + 31662b30f1a4497db482b3aed8ed4c4aa6de801b - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f64d1aae5f715503729c769a666e0a1289566ac1 + 31662b30f1a4497db482b3aed8ed4c4aa6de801b - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f64d1aae5f715503729c769a666e0a1289566ac1 + 31662b30f1a4497db482b3aed8ed4c4aa6de801b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -177,9 +177,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3f73a2f186e08c905aba441ea5545295ca261730 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 https://github.com/dotnet/source-build-externals @@ -242,9 +242,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -262,33 +262,33 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3f73a2f186e08c905aba441ea5545295ca261730 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3f73a2f186e08c905aba441ea5545295ca261730 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3f73a2f186e08c905aba441ea5545295ca261730 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3f73a2f186e08c905aba441ea5545295ca261730 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3f73a2f186e08c905aba441ea5545295ca261730 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3f73a2f186e08c905aba441ea5545295ca261730 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 https://github.com/dotnet/xdt @@ -302,22 +302,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8587d13a2764c025277d628471984bae8e16427c - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + acb831a5b31a3cc4a744a8944b6bd172e6969234 - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + acb831a5b31a3cc4a744a8944b6bd172e6969234 - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + acb831a5b31a3cc4a744a8944b6bd172e6969234 - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + acb831a5b31a3cc4a744a8944b6bd172e6969234 diff -Nru dotnet7-7.0.113/src/aspnetcore/eng/Versions.props dotnet7-7.0.114/src/aspnetcore/eng/Versions.props --- dotnet7-7.0.113/src/aspnetcore/eng/Versions.props 2023-10-20 21:27:49.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/eng/Versions.props 2023-10-24 04:47:11.000000000 +0000 @@ -8,7 +8,7 @@ 7 0 - 13 + 14 false 7.0.0 - 7.0.13 - 7.0.13 - 7.0.13 - 7.0.13 - 7.0.13 - 7.0.13-servicing.23518.16 + 7.0.14 + 7.0.14 + 7.0.14 + 7.0.14 + 7.0.14 + 7.0.14-servicing.23519.10 7.0.0 7.0.0 7.0.0 @@ -103,7 +103,7 @@ 7.0.0 7.0.1 7.0.0 - 7.0.13-servicing.23518.16 + 7.0.14-servicing.23519.10 7.0.0 7.0.2 7.0.0 @@ -118,24 +118,24 @@ 7.0.0 7.0.1 7.0.0 - 7.0.3 + 7.0.4 7.0.1 7.0.0 7.0.1 7.0.4 - 7.0.13 - 7.0.13 - 7.0.13 - 7.0.13 - 7.0.13 - 7.0.13 - 7.0.13 - 7.0.13 + 7.0.14 + 7.0.14 + 7.0.14 + 7.0.14 + 7.0.14 + 7.0.14 + 7.0.14 + 7.0.14 - 7.0.0-beta.23408.3 - 7.0.0-beta.23408.3 + 7.0.0-beta.23511.9 + 7.0.0-beta.23511.9 7.0.0-alpha.1.22505.1 diff -Nru dotnet7-7.0.113/src/aspnetcore/global.json dotnet7-7.0.114/src/aspnetcore/global.json --- dotnet7-7.0.113/src/aspnetcore/global.json 2023-10-20 21:27:49.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/global.json 2023-10-24 04:47:11.000000000 +0000 @@ -1,9 +1,9 @@ { "sdk": { - "version": "7.0.111" + "version": "7.0.112" }, "tools": { - "dotnet": "7.0.111", + "dotnet": "7.0.112", "runtimes": { "dotnet/x86": [ "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)" @@ -27,7 +27,7 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.22.10", - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23408.3", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23408.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23511.9", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23511.9" } } diff -Nru dotnet7-7.0.113/src/aspnetcore/src/Components/Components/src/ComponentBase.cs dotnet7-7.0.114/src/aspnetcore/src/Components/Components/src/ComponentBase.cs --- dotnet7-7.0.113/src/aspnetcore/src/Components/Components/src/ComponentBase.cs 2023-10-20 21:27:49.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/src/Components/Components/src/ComponentBase.cs 2023-10-24 04:47:11.000000000 +0000 @@ -326,4 +326,7 @@ // have to use "async void" and do their own exception handling in // the case where they want to start an async task. } + + // Exists for 6.0/7.0 patch only. A different solution is used from .NET 8 onwards. + internal bool IsComponentDisposed() => _renderHandle.IsComponentDisposed(); } diff -Nru dotnet7-7.0.113/src/aspnetcore/src/Components/Components/src/RenderHandle.cs dotnet7-7.0.114/src/aspnetcore/src/Components/Components/src/RenderHandle.cs --- dotnet7-7.0.113/src/aspnetcore/src/Components/Components/src/RenderHandle.cs 2023-10-20 21:27:49.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/src/Components/Components/src/RenderHandle.cs 2023-10-24 04:47:11.000000000 +0000 @@ -70,4 +70,7 @@ { throw new InvalidOperationException("The render handle is not yet assigned."); } + + // Exists for 6.0/7.0 patch only. A different solution is used from .NET 8 onwards. + internal bool IsComponentDisposed() => _renderer?.IsComponentDisposed(_componentId) ?? false; } diff -Nru dotnet7-7.0.113/src/aspnetcore/src/Components/Components/src/RenderTree/Renderer.cs dotnet7-7.0.114/src/aspnetcore/src/Components/Components/src/RenderTree/Renderer.cs --- dotnet7-7.0.113/src/aspnetcore/src/Components/Components/src/RenderTree/Renderer.cs 2023-10-20 21:27:49.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/src/Components/Components/src/RenderTree/Renderer.cs 2023-10-24 04:47:11.000000000 +0000 @@ -1119,4 +1119,8 @@ } } } + + // Exists for 6.0/7.0 patch only. A different solution is used from .NET 8 onwards. + internal bool IsComponentDisposed(int componentId) + => !_componentStateById.ContainsKey(componentId); } diff -Nru dotnet7-7.0.113/src/aspnetcore/src/Components/Web/src/Forms/EditForm.cs dotnet7-7.0.114/src/aspnetcore/src/Components/Web/src/Forms/EditForm.cs --- dotnet7-7.0.113/src/aspnetcore/src/Components/Web/src/Forms/EditForm.cs 2023-10-20 21:27:49.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/src/Components/Web/src/Forms/EditForm.cs 2023-10-24 04:47:11.000000000 +0000 @@ -136,6 +136,12 @@ { Debug.Assert(_editContext != null); + // Exists for 6.0/7.0 patch only. A different solution is used from .NET 8 onwards. + if (IsComponentDisposed()) + { + return; + } + if (OnSubmit.HasDelegate) { // When using OnSubmit, the developer takes control of the validation lifecycle diff -Nru dotnet7-7.0.113/src/aspnetcore/src/Components/test/E2ETest/Tests/EventTest.cs dotnet7-7.0.114/src/aspnetcore/src/Components/test/E2ETest/Tests/EventTest.cs --- dotnet7-7.0.113/src/aspnetcore/src/Components/test/E2ETest/Tests/EventTest.cs 2023-10-20 21:27:49.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/src/Components/test/E2ETest/Tests/EventTest.cs 2023-10-24 04:47:11.000000000 +0000 @@ -215,8 +215,8 @@ var actions = new Actions(Browser).DragAndDrop(input, target); actions.Perform(); - // drop doesn't seem to trigger in Selenium. But it's sufficient to determine "any" drag event works - Browser.Equal("dragstart,", () => output.Text); + // drop doesn't reliably trigger in Selenium. But it's sufficient to determine "any" drag event works + Browser.True(() => output.Text.StartsWith("dragstart,", StringComparison.Ordinal)); } // Skipped because it will never pass because Selenium doesn't support this kind of event diff -Nru dotnet7-7.0.113/src/aspnetcore/src/Components/test/E2ETest/Tests/FormsTest.cs dotnet7-7.0.114/src/aspnetcore/src/Components/test/E2ETest/Tests/FormsTest.cs --- dotnet7-7.0.113/src/aspnetcore/src/Components/test/E2ETest/Tests/FormsTest.cs 2023-10-20 21:27:49.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/src/Components/test/E2ETest/Tests/FormsTest.cs 2023-10-24 04:47:11.000000000 +0000 @@ -809,6 +809,39 @@ Browser.Collection(logEntries, x => Assert.Equal("OnValidSubmit", x)); } + [Fact] + public async Task CannotSubmitEditFormSynchronouslyAfterItWasRemoved() + { + var appElement = MountSimpleValidationComponent(); + + var submitButtonFinder = By.CssSelector("button[type=submit]"); + Browser.Exists(submitButtonFinder); + + // Remove the form then immediately also submit it, so the server receives both + // the 'remove' and 'submit' commands (in that order) before it updates the UI + appElement.FindElement(By.Id("remove-form")).Click(); + + try + { + appElement.FindElement(submitButtonFinder).Click(); + } + catch (NoSuchElementException) + { + // This should happen on WebAssembly because the form will be removed synchronously + // That means the test has passed + return; + } + + // Wait for the removal to complete, which is intentionally delayed to ensure + // this test can submit a second instruction before the first is processed. Then + // wait a bit more to be really sure the second instruction was processed. + Browser.DoesNotExist(submitButtonFinder); + await Task.Delay(1000); + + // Verify that the form submit event was not processed + Browser.DoesNotExist(By.Id("last-callback")); + } + private Func CreateValidationMessagesAccessor(IWebElement appElement, string messageSelector = ".validation-message") { return () => appElement.FindElements(By.CssSelector(messageSelector)) diff -Nru dotnet7-7.0.113/src/aspnetcore/src/Components/test/testassets/BasicTestApp/FormsTest/SimpleValidationComponent.razor dotnet7-7.0.114/src/aspnetcore/src/Components/test/testassets/BasicTestApp/FormsTest/SimpleValidationComponent.razor --- dotnet7-7.0.113/src/aspnetcore/src/Components/test/testassets/BasicTestApp/FormsTest/SimpleValidationComponent.razor 2023-10-20 21:27:49.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/src/Components/test/testassets/BasicTestApp/FormsTest/SimpleValidationComponent.razor 2023-10-24 04:47:11.000000000 +0000 @@ -1,6 +1,8 @@ @using System.ComponentModel.DataAnnotations @using Microsoft.AspNetCore.Components.Forms +@if (!removeForm) +{ @@ -22,16 +24,20 @@ +} @if (lastCallback != null) { @lastCallback } +

+ @code { protected virtual bool UseExperimentalValidator => false; string lastCallback; + bool removeForm; [Required(ErrorMessage = "Please choose a username")] public string UserName { get; set; } @@ -49,4 +55,10 @@ { lastCallback = "OnInvalidSubmit"; } + + void RemoveForm() + { + removeForm = true; + Thread.Sleep(1000); // To ensure we can dispatch another event before this completes + } } diff -Nru dotnet7-7.0.113/src/aspnetcore/src/Shared/HttpSys/RequestProcessing/NativeRequestContext.cs dotnet7-7.0.114/src/aspnetcore/src/Shared/HttpSys/RequestProcessing/NativeRequestContext.cs --- dotnet7-7.0.113/src/aspnetcore/src/Shared/HttpSys/RequestProcessing/NativeRequestContext.cs 2023-10-20 21:27:49.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/src/Shared/HttpSys/RequestProcessing/NativeRequestContext.cs 2023-10-24 04:47:12.000000000 +0000 @@ -555,9 +555,12 @@ var info = new Dictionary>(count); + long fixup = (byte*)nativeRequest - (byte*)baseAddress; + var pRequestInfo = (HttpApiTypes.HTTP_REQUEST_INFO*)((byte*)nativeRequest->pRequestInfo + fixup); + for (var i = 0; i < count; i++) { - var requestInfo = nativeRequest->pRequestInfo[i]; + var requestInfo = pRequestInfo[i]; var offset = (long)requestInfo.pInfo - (long)baseAddress; info.Add( (int)requestInfo.InfoType, diff -Nru dotnet7-7.0.113/src/aspnetcore/src/SignalR/clients/csharp/Client.Core/src/HubConnection.cs dotnet7-7.0.114/src/aspnetcore/src/SignalR/clients/csharp/Client.Core/src/HubConnection.cs --- dotnet7-7.0.113/src/aspnetcore/src/SignalR/clients/csharp/Client.Core/src/HubConnection.cs 2023-10-20 21:27:49.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/src/SignalR/clients/csharp/Client.Core/src/HubConnection.cs 2023-10-24 04:47:12.000000000 +0000 @@ -777,7 +777,7 @@ } } - return CommonStreaming(connectionState, streamId, ReadChannelStream); + return CommonStreaming(connectionState, streamId, ReadChannelStream, tokenSource); } // this is called via reflection using the `_sendIAsyncStreamItemsMethod` field @@ -794,11 +794,14 @@ } } - return CommonStreaming(connectionState, streamId, ReadAsyncEnumerableStream); + return CommonStreaming(connectionState, streamId, ReadAsyncEnumerableStream, tokenSource); } - private async Task CommonStreaming(ConnectionState connectionState, string streamId, Func createAndConsumeStream) + private async Task CommonStreaming(ConnectionState connectionState, string streamId, Func createAndConsumeStream, CancellationTokenSource cts) { + // make sure we dispose the CTS created by StreamAsyncCore once streaming completes + using var _ = cts; + Log.StartingStream(_logger, streamId); string? responseError = null; try diff -Nru dotnet7-7.0.113/src/aspnetcore/src/submodules/googletest/CMakeLists.txt dotnet7-7.0.114/src/aspnetcore/src/submodules/googletest/CMakeLists.txt --- dotnet7-7.0.113/src/aspnetcore/src/submodules/googletest/CMakeLists.txt 2023-10-20 21:27:53.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/src/submodules/googletest/CMakeLists.txt 2023-10-24 04:47:15.000000000 +0000 @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.13) project(googletest-distribution) -set(GOOGLETEST_VERSION 1.13.0) +set(GOOGLETEST_VERSION 1.14.0) if(NOT CYGWIN AND NOT MSYS AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL QNX) set(CMAKE_CXX_EXTENSIONS OFF) diff -Nru dotnet7-7.0.113/src/aspnetcore/src/submodules/googletest/README.md dotnet7-7.0.114/src/aspnetcore/src/submodules/googletest/README.md --- dotnet7-7.0.113/src/aspnetcore/src/submodules/googletest/README.md 2023-10-20 21:27:53.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/src/submodules/googletest/README.md 2023-10-24 04:47:15.000000000 +0000 @@ -9,7 +9,7 @@ We recommend [updating to the latest commit in the `main` branch as often as possible](https://github.com/abseil/abseil-cpp/blob/master/FAQ.md#what-is-live-at-head-and-how-do-i-do-it). We do publish occasional semantic versions, tagged with -`v${major}.${minor}.${patch}` (e.g. `v1.13.0`). +`v${major}.${minor}.${patch}` (e.g. `v1.14.0`). #### Documentation Updates @@ -17,12 +17,12 @@ https://google.github.io/googletest/. We recommend browsing the documentation on GitHub Pages rather than directly in the repository. -#### Release 1.13.0 +#### Release 1.14.0 -[Release 1.13.0](https://github.com/google/googletest/releases/tag/v1.13.0) is +[Release 1.14.0](https://github.com/google/googletest/releases/tag/v1.14.0) is now available. -The 1.13.x branch requires at least C++14. +The 1.14.x branch requires at least C++14. #### Continuous Integration diff -Nru dotnet7-7.0.113/src/aspnetcore/src/submodules/googletest/WORKSPACE dotnet7-7.0.114/src/aspnetcore/src/submodules/googletest/WORKSPACE --- dotnet7-7.0.113/src/aspnetcore/src/submodules/googletest/WORKSPACE 2023-10-20 21:27:53.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/src/submodules/googletest/WORKSPACE 2023-10-24 04:47:15.000000000 +0000 @@ -6,22 +6,22 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( - name = "rules_python", # 2023-01-10T22:00:51Z - sha256 = "5de54486a60ad8948dabe49605bb1c08053e04001a431ab3e96745b4d97a4419", - strip_prefix = "rules_python-70cce26432187a60b4e950118791385e6fb3c26f", - urls = ["https://github.com/bazelbuild/rules_python/archive/70cce26432187a60b4e950118791385e6fb3c26f.zip"], + name = "rules_python", # 2023-07-31T20:39:27Z + sha256 = "1250b59a33c591a1c4ba68c62e95fc88a84c334ec35a2e23f46cbc1b9a5a8b55", + strip_prefix = "rules_python-e355becc30275939d87116a4ec83dad4bb50d9e1", + urls = ["https://github.com/bazelbuild/rules_python/archive/e355becc30275939d87116a4ec83dad4bb50d9e1.zip"], ) http_archive( - name = "bazel_skylib", # 2022-11-16T18:29:32Z - sha256 = "a22290c26d29d3ecca286466f7f295ac6cbe32c0a9da3a91176a90e0725e3649", - strip_prefix = "bazel-skylib-5bfcb1a684550626ce138fe0fe8f5f702b3764c3", - urls = ["https://github.com/bazelbuild/bazel-skylib/archive/5bfcb1a684550626ce138fe0fe8f5f702b3764c3.zip"], + name = "bazel_skylib", # 2023-05-31T19:24:07Z + sha256 = "08c0386f45821ce246bbbf77503c973246ed6ee5c3463e41efc197fa9bc3a7f4", + strip_prefix = "bazel-skylib-288731ef9f7f688932bd50e704a91a45ec185f9b", + urls = ["https://github.com/bazelbuild/bazel-skylib/archive/288731ef9f7f688932bd50e704a91a45ec185f9b.zip"], ) http_archive( - name = "platforms", # 2022-11-09T19:18:22Z - sha256 = "b4a3b45dc4202e2b3e34e3bc49d2b5b37295fc23ea58d88fb9e01f3642ad9b55", - strip_prefix = "platforms-3fbc687756043fb58a407c2ea8c944bc2fe1d922", - urls = ["https://github.com/bazelbuild/platforms/archive/3fbc687756043fb58a407c2ea8c944bc2fe1d922.zip"], + name = "platforms", # 2023-07-28T19:44:27Z + sha256 = "40eb313613ff00a5c03eed20aba58890046f4d38dec7344f00bb9a8867853526", + strip_prefix = "platforms-4ad40ef271da8176d4fc0194d2089b8a76e19d7b", + urls = ["https://github.com/bazelbuild/platforms/archive/4ad40ef271da8176d4fc0194d2089b8a76e19d7b.zip"], ) diff -Nru dotnet7-7.0.113/src/aspnetcore/src/submodules/googletest/docs/advanced.md dotnet7-7.0.114/src/aspnetcore/src/submodules/googletest/docs/advanced.md --- dotnet7-7.0.113/src/aspnetcore/src/submodules/googletest/docs/advanced.md 2023-10-20 21:27:53.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/src/submodules/googletest/docs/advanced.md 2023-10-24 04:47:15.000000000 +0000 @@ -899,10 +899,10 @@ variables to hold the shared resources. 2. Outside your test fixture class (typically just below it), define those member variables, optionally giving them initial values. -3. In the same test fixture class, define a `static void SetUpTestSuite()` - function (remember not to spell it as **`SetupTestSuite`** with a small - `u`!) to set up the shared resources and a `static void TearDownTestSuite()` - function to tear them down. +3. In the same test fixture class, define a public member function `static void + SetUpTestSuite()` (remember not to spell it as **`SetupTestSuite`** with a + small `u`!) to set up the shared resources and a `static void + TearDownTestSuite()` function to tear them down. That's it! GoogleTest automatically calls `SetUpTestSuite()` before running the *first test* in the `FooTest` test suite (i.e. before creating the first diff -Nru dotnet7-7.0.113/src/aspnetcore/src/submodules/googletest/docs/reference/assertions.md dotnet7-7.0.114/src/aspnetcore/src/submodules/googletest/docs/reference/assertions.md --- dotnet7-7.0.113/src/aspnetcore/src/submodules/googletest/docs/reference/assertions.md 2023-10-20 21:27:53.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/src/submodules/googletest/docs/reference/assertions.md 2023-10-24 04:47:15.000000000 +0000 @@ -1,7 +1,7 @@ # Assertions Reference This page lists the assertion macros provided by GoogleTest for verifying code -behavior. To use them, include the header `gtest/gtest.h`. +behavior. To use them, add `#include `. The majority of the macros listed below come as a pair with an `EXPECT_` variant and an `ASSERT_` variant. Upon failure, `EXPECT_` macros generate nonfatal diff -Nru dotnet7-7.0.113/src/aspnetcore/src/submodules/googletest/docs/reference/mocking.md dotnet7-7.0.114/src/aspnetcore/src/submodules/googletest/docs/reference/mocking.md --- dotnet7-7.0.113/src/aspnetcore/src/submodules/googletest/docs/reference/mocking.md 2023-10-20 21:27:53.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/src/submodules/googletest/docs/reference/mocking.md 2023-10-24 04:47:15.000000000 +0000 @@ -1,8 +1,7 @@ # Mocking Reference This page lists the facilities provided by GoogleTest for creating and working -with mock objects. To use them, include the header -`gmock/gmock.h`. +with mock objects. To use them, add `#include `. ## Macros {#macros} diff -Nru dotnet7-7.0.113/src/aspnetcore/src/submodules/googletest/docs/reference/testing.md dotnet7-7.0.114/src/aspnetcore/src/submodules/googletest/docs/reference/testing.md --- dotnet7-7.0.113/src/aspnetcore/src/submodules/googletest/docs/reference/testing.md 2023-10-20 21:27:53.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/src/submodules/googletest/docs/reference/testing.md 2023-10-24 04:47:15.000000000 +0000 @@ -3,7 +3,7 @@ This page lists the facilities provided by GoogleTest for writing test programs. -To use them, include the header `gtest/gtest.h`. +To use them, add `#include `. ## Macros diff -Nru dotnet7-7.0.113/src/aspnetcore/src/submodules/googletest/googlemock/include/gmock/gmock-actions.h dotnet7-7.0.114/src/aspnetcore/src/submodules/googletest/googlemock/include/gmock/gmock-actions.h --- dotnet7-7.0.113/src/aspnetcore/src/submodules/googletest/googlemock/include/gmock/gmock-actions.h 2023-10-20 21:27:53.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/src/submodules/googletest/googlemock/include/gmock/gmock-actions.h 2023-10-24 04:47:15.000000000 +0000 @@ -175,9 +175,15 @@ static T Get() { Assert(false, __FILE__, __LINE__, "Default action undefined for the function return type."); - return internal::Invalid(); +#if defined(__GNUC__) || defined(__clang__) + __builtin_unreachable(); +#elif defined(_MSC_VER) + __assume(0); +#else + return Invalid(); // The above statement will never be reached, but is required in // order for this function to compile. +#endif } }; diff -Nru dotnet7-7.0.113/src/aspnetcore/src/submodules/googletest/googletest/README.md dotnet7-7.0.114/src/aspnetcore/src/submodules/googletest/googletest/README.md --- dotnet7-7.0.113/src/aspnetcore/src/submodules/googletest/googletest/README.md 2023-10-20 21:27:53.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/src/submodules/googletest/googletest/README.md 2023-10-24 04:47:15.000000000 +0000 @@ -25,7 +25,7 @@ with ``` -git clone https://github.com/google/googletest.git -b v1.13.0 +git clone https://github.com/google/googletest.git -b v1.14.0 cd googletest # Main directory of the cloned repository. mkdir build # Create a directory to hold the build output. cd build diff -Nru dotnet7-7.0.113/src/aspnetcore/src/submodules/googletest/googletest/include/gtest/gtest-message.h dotnet7-7.0.114/src/aspnetcore/src/submodules/googletest/googletest/include/gtest/gtest-message.h --- dotnet7-7.0.113/src/aspnetcore/src/submodules/googletest/googletest/include/gtest/gtest-message.h 2023-10-20 21:27:53.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/src/submodules/googletest/googletest/include/gtest/gtest-message.h 2023-10-24 04:47:15.000000000 +0000 @@ -56,6 +56,13 @@ #include "gtest/internal/gtest-port.h" +#ifdef GTEST_HAS_ABSL +#include + +#include "absl/strings/internal/has_absl_stringify.h" +#include "absl/strings/str_cat.h" +#endif // GTEST_HAS_ABSL + GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \ /* class A needs to have dll-interface to be used by clients of class B */) @@ -111,8 +118,17 @@ *ss_ << str; } - // Streams a non-pointer value to this object. - template + // Streams a non-pointer value to this object. If building a version of + // GoogleTest with ABSL, this overload is only enabled if the value does not + // have an AbslStringify definition. + template ::value, // NOLINT + int>::type = 0 +#endif // GTEST_HAS_ABSL + > inline Message& operator<<(const T& val) { // Some libraries overload << for STL containers. These // overloads are defined in the global namespace instead of ::std. @@ -133,6 +149,22 @@ return *this; } +#ifdef GTEST_HAS_ABSL + // Streams a non-pointer value with an AbslStringify definition to this + // object. + template ::value, // NOLINT + int>::type = 0> + inline Message& operator<<(const T& val) { + // ::operator<< is needed here for a similar reason as with the non-Abseil + // version above + using ::operator<<; + *ss_ << absl::StrCat(val); + return *this; + } +#endif // GTEST_HAS_ABSL + // Streams a pointer value to this object. // // This function is an overload of the previous one. When you diff -Nru dotnet7-7.0.113/src/aspnetcore/src/submodules/googletest/googletest/include/gtest/gtest.h dotnet7-7.0.114/src/aspnetcore/src/submodules/googletest/googletest/include/gtest/gtest.h --- dotnet7-7.0.113/src/aspnetcore/src/submodules/googletest/googletest/include/gtest/gtest.h 2023-10-20 21:27:53.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/src/submodules/googletest/googletest/include/gtest/gtest.h 2023-10-24 04:47:15.000000000 +0000 @@ -51,7 +51,6 @@ #include #include -#include #include #include #include @@ -1574,12 +1573,12 @@ } ::std::stringstream lhs_ss; - lhs_ss << std::setprecision(std::numeric_limits::digits10 + 2) - << lhs_value; + lhs_ss.precision(std::numeric_limits::digits10 + 2); + lhs_ss << lhs_value; ::std::stringstream rhs_ss; - rhs_ss << std::setprecision(std::numeric_limits::digits10 + 2) - << rhs_value; + rhs_ss.precision(std::numeric_limits::digits10 + 2); + rhs_ss << rhs_value; return EqFailure(lhs_expression, rhs_expression, StringStreamToString(&lhs_ss), StringStreamToString(&rhs_ss), diff -Nru dotnet7-7.0.113/src/aspnetcore/src/submodules/googletest/googletest/include/gtest/internal/gtest-internal.h dotnet7-7.0.114/src/aspnetcore/src/submodules/googletest/googletest/include/gtest/internal/gtest-internal.h --- dotnet7-7.0.113/src/aspnetcore/src/submodules/googletest/googletest/include/gtest/internal/gtest-internal.h 2023-10-20 21:27:53.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/src/submodules/googletest/googletest/include/gtest/internal/gtest-internal.h 2023-10-24 04:47:15.000000000 +0000 @@ -58,7 +58,6 @@ #include #include -#include #include #include #include diff -Nru dotnet7-7.0.113/src/aspnetcore/src/submodules/googletest/googletest/include/gtest/internal/gtest-port.h dotnet7-7.0.114/src/aspnetcore/src/submodules/googletest/googletest/include/gtest/internal/gtest-port.h --- dotnet7-7.0.113/src/aspnetcore/src/submodules/googletest/googletest/include/gtest/internal/gtest-port.h 2023-10-20 21:27:53.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/src/submodules/googletest/googletest/include/gtest/internal/gtest-port.h 2023-10-24 04:47:15.000000000 +0000 @@ -220,7 +220,6 @@ // GTEST_HAS_ALT_PATH_SEP_ - Always defined to 0 or 1. // GTEST_WIDE_STRING_USES_UTF16_ - Always defined to 0 or 1. // GTEST_HAS_MUTEX_AND_THREAD_LOCAL_ - Always defined to 0 or 1. -// GTEST_HAS_DOWNCAST_ - Always defined to 0 or 1. // GTEST_HAS_NOTIFICATION_- Always defined to 0 or 1. // // Synchronization: @@ -313,10 +312,6 @@ #include "gtest/internal/custom/gtest-port.h" #include "gtest/internal/gtest-port-arch.h" -#ifndef GTEST_HAS_DOWNCAST_ -#define GTEST_HAS_DOWNCAST_ 0 -#endif - #ifndef GTEST_HAS_MUTEX_AND_THREAD_LOCAL_ #define GTEST_HAS_MUTEX_AND_THREAD_LOCAL_ 0 #endif @@ -1153,17 +1148,12 @@ // check to enforce this. template Derived* CheckedDowncastToActualType(Base* base) { + static_assert(std::is_base_of::value, + "target type not derived from source type"); #if GTEST_HAS_RTTI - GTEST_CHECK_(typeid(*base) == typeid(Derived)); -#endif - -#if GTEST_HAS_DOWNCAST_ - return ::down_cast(base); -#elif GTEST_HAS_RTTI - return dynamic_cast(base); // NOLINT -#else - return static_cast(base); // Poor man's downcast. + GTEST_CHECK_(base == nullptr || dynamic_cast(base) != nullptr); #endif + return static_cast(base); } #if GTEST_HAS_STREAM_REDIRECTION diff -Nru dotnet7-7.0.113/src/aspnetcore/src/submodules/googletest/googletest/test/BUILD.bazel dotnet7-7.0.114/src/aspnetcore/src/submodules/googletest/googletest/test/BUILD.bazel --- dotnet7-7.0.113/src/aspnetcore/src/submodules/googletest/googletest/test/BUILD.bazel 2023-10-20 21:27:53.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/src/submodules/googletest/googletest/test/BUILD.bazel 2023-10-24 04:47:15.000000000 +0000 @@ -64,6 +64,7 @@ "googletest-global-environment-unittest_.cc", "googletest-break-on-failure-unittest_.cc", "googletest-listener-test.cc", + "googletest-message-test.cc", "googletest-output-test_.cc", "googletest-list-tests-unittest_.cc", "googletest-shuffle-test_.cc", diff -Nru dotnet7-7.0.113/src/aspnetcore/src/submodules/googletest/googletest/test/googletest-message-test.cc dotnet7-7.0.114/src/aspnetcore/src/submodules/googletest/googletest/test/googletest-message-test.cc --- dotnet7-7.0.113/src/aspnetcore/src/submodules/googletest/googletest/test/googletest-message-test.cc 2023-10-20 21:27:53.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/src/submodules/googletest/googletest/test/googletest-message-test.cc 2023-10-24 04:47:15.000000000 +0000 @@ -36,10 +36,26 @@ #include "gtest/gtest-message.h" #include "gtest/gtest.h" +#ifdef GTEST_HAS_ABSL +#include "absl/strings/str_format.h" +#endif // GTEST_HAS_ABSL + namespace { using ::testing::Message; +#ifdef GTEST_HAS_ABSL +struct AbslStringifiablePoint { + template + friend void AbslStringify(Sink& sink, const AbslStringifiablePoint& p) { + absl::Format(&sink, "(%d, %d)", p.x, p.y); + } + + int x; + int y; +}; +#endif // GTEST_HAS_ABSL + // Tests the testing::Message class // Tests the default constructor. @@ -128,6 +144,13 @@ EXPECT_EQ("123", (Message() << 123).GetString()); } +#ifdef GTEST_HAS_ABSL +// Tests streaming a type with an AbslStringify definition. +TEST(MessageTest, StreamsAbslStringify) { + EXPECT_EQ("(1, 2)", (Message() << AbslStringifiablePoint{1, 2}).GetString()); +} +#endif // GTEST_HAS_ABSL + // Tests that basic IO manipulators (endl, ends, and flush) can be // streamed to Message. TEST(MessageTest, StreamsBasicIoManip) { diff -Nru dotnet7-7.0.113/src/aspnetcore/src/submodules/googletest/googletest/test/gtest_unittest.cc dotnet7-7.0.114/src/aspnetcore/src/submodules/googletest/googletest/test/gtest_unittest.cc --- dotnet7-7.0.113/src/aspnetcore/src/submodules/googletest/googletest/test/gtest_unittest.cc 2023-10-20 21:27:53.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/src/submodules/googletest/googletest/test/gtest_unittest.cc 2023-10-24 04:47:15.000000000 +0000 @@ -4113,7 +4113,7 @@ EXPECT_THROW(throw 1, int); EXPECT_NONFATAL_FAILURE(EXPECT_THROW(n++, int), ""); - EXPECT_NONFATAL_FAILURE(EXPECT_THROW(throw 1, const char*), ""); + EXPECT_NONFATAL_FAILURE(EXPECT_THROW(throw n, const char*), ""); EXPECT_NO_THROW(n++); EXPECT_NONFATAL_FAILURE(EXPECT_NO_THROW(throw 1), ""); EXPECT_ANY_THROW(throw 1); diff -Nru dotnet7-7.0.113/src/aspnetcore/src/submodules/googletest/googletest_deps.bzl dotnet7-7.0.114/src/aspnetcore/src/submodules/googletest/googletest_deps.bzl --- dotnet7-7.0.113/src/aspnetcore/src/submodules/googletest/googletest_deps.bzl 2023-10-20 21:27:53.000000000 +0000 +++ dotnet7-7.0.114/src/aspnetcore/src/submodules/googletest/googletest_deps.bzl 2023-10-24 04:47:15.000000000 +0000 @@ -7,16 +7,16 @@ if not native.existing_rule("com_googlesource_code_re2"): http_archive( - name = "com_googlesource_code_re2", # 2023-06-01 - sha256 = "1726508efc93a50854c92e3f7ac66eb28f0e57652e413f11d7c1e28f97d997ba", - strip_prefix = "re2-03da4fc0857c285e3a26782f6bc8931c4c950df4", - urls = ["https://github.com/google/re2/archive/03da4fc0857c285e3a26782f6bc8931c4c950df4.zip"], + name = "com_googlesource_code_re2", # 2023-03-17T11:36:51Z + sha256 = "cb8b5312a65f2598954545a76e8bce913f35fbb3a21a5c88797a4448e9f9b9d9", + strip_prefix = "re2-578843a516fd1da7084ae46209a75f3613b6065e", + urls = ["https://github.com/google/re2/archive/578843a516fd1da7084ae46209a75f3613b6065e.zip"], ) if not native.existing_rule("com_google_absl"): http_archive( - name = "com_google_absl", # 2023-04-06T14:42:25Z - sha256 = "a50452f02402262f9a61a8eedda60f76dda6b9538d36b34b55bce9f74a4d5ef8", - strip_prefix = "abseil-cpp-e73b9139ee9b853a4bd7812531442c138da09084", - urls = ["https://github.com/abseil/abseil-cpp/archive/e73b9139ee9b853a4bd7812531442c138da09084.zip"], + name = "com_google_absl", # 2023-08-01T14:59:13Z + sha256 = "d2c09bf3b3aba57ad87a56082020bee2948445407756e92ddaf3595396086853", + strip_prefix = "abseil-cpp-22091f4c0d6626b3ef40446ce3d4ccab19425ca3", + urls = ["https://github.com/abseil/abseil-cpp/archive/22091f4c0d6626b3ef40446ce3d4ccab19425ca3.zip"], ) Binary files /tmp/tmp6ypwwmzi/_rCMALy1fo/dotnet7-7.0.113/src/command-line-api/.git/index and /tmp/tmp6ypwwmzi/0qgonBF_sg/dotnet7-7.0.114/src/command-line-api/.git/index differ diff -Nru dotnet7-7.0.113/src/command-line-api/.git/logs/HEAD dotnet7-7.0.114/src/command-line-api/.git/logs/HEAD --- dotnet7-7.0.113/src/command-line-api/.git/logs/HEAD 2023-10-20 21:28:03.000000000 +0000 +++ dotnet7-7.0.114/src/command-line-api/.git/logs/HEAD 2023-10-24 04:47:26.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 605dd1d76ddfea34aa42b4337dfb3f7b467acb0d cloudtest_azpcontainer 1697837283 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 605dd1d76ddfea34aa42b4337dfb3f7b467acb0d cloudtest_azpcontainer 1698122846 +0000 reset: moving to FETCH_HEAD diff -Nru dotnet7-7.0.113/src/command-line-api/.git/logs/refs/heads/master dotnet7-7.0.114/src/command-line-api/.git/logs/refs/heads/master --- dotnet7-7.0.113/src/command-line-api/.git/logs/refs/heads/master 2023-10-20 21:28:03.000000000 +0000 +++ dotnet7-7.0.114/src/command-line-api/.git/logs/refs/heads/master 2023-10-24 04:47:26.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 605dd1d76ddfea34aa42b4337dfb3f7b467acb0d cloudtest_azpcontainer 1697837283 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 605dd1d76ddfea34aa42b4337dfb3f7b467acb0d cloudtest_azpcontainer 1698122846 +0000 reset: moving to FETCH_HEAD Binary files /tmp/tmp6ypwwmzi/_rCMALy1fo/dotnet7-7.0.113/src/deployment-tools/.git/index and /tmp/tmp6ypwwmzi/0qgonBF_sg/dotnet7-7.0.114/src/deployment-tools/.git/index differ diff -Nru dotnet7-7.0.113/src/deployment-tools/.git/logs/HEAD dotnet7-7.0.114/src/deployment-tools/.git/logs/HEAD --- dotnet7-7.0.113/src/deployment-tools/.git/logs/HEAD 2023-10-20 21:28:51.000000000 +0000 +++ dotnet7-7.0.114/src/deployment-tools/.git/logs/HEAD 2023-10-24 04:48:06.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 c3ad00ae84489071080a606f6a8e43c9a91a5cc2 cloudtest_azpcontainer 1697837331 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 c3ad00ae84489071080a606f6a8e43c9a91a5cc2 cloudtest_azpcontainer 1698122886 +0000 reset: moving to FETCH_HEAD diff -Nru dotnet7-7.0.113/src/deployment-tools/.git/logs/refs/heads/master dotnet7-7.0.114/src/deployment-tools/.git/logs/refs/heads/master --- dotnet7-7.0.113/src/deployment-tools/.git/logs/refs/heads/master 2023-10-20 21:28:51.000000000 +0000 +++ dotnet7-7.0.114/src/deployment-tools/.git/logs/refs/heads/master 2023-10-24 04:48:06.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 c3ad00ae84489071080a606f6a8e43c9a91a5cc2 cloudtest_azpcontainer 1697837331 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 c3ad00ae84489071080a606f6a8e43c9a91a5cc2 cloudtest_azpcontainer 1698122886 +0000 reset: moving to FETCH_HEAD Binary files /tmp/tmp6ypwwmzi/_rCMALy1fo/dotnet7-7.0.113/src/diagnostics/.git/index and /tmp/tmp6ypwwmzi/0qgonBF_sg/dotnet7-7.0.114/src/diagnostics/.git/index differ diff -Nru dotnet7-7.0.113/src/diagnostics/.git/logs/HEAD dotnet7-7.0.114/src/diagnostics/.git/logs/HEAD --- dotnet7-7.0.113/src/diagnostics/.git/logs/HEAD 2023-10-20 21:28:11.000000000 +0000 +++ dotnet7-7.0.114/src/diagnostics/.git/logs/HEAD 2023-10-24 04:47:33.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 e3e1490a23f27a6e0ed30d323035660c3ffc52cd cloudtest_azpcontainer 1697837291 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 e3e1490a23f27a6e0ed30d323035660c3ffc52cd cloudtest_azpcontainer 1698122853 +0000 reset: moving to FETCH_HEAD diff -Nru dotnet7-7.0.113/src/diagnostics/.git/logs/refs/heads/master dotnet7-7.0.114/src/diagnostics/.git/logs/refs/heads/master --- dotnet7-7.0.113/src/diagnostics/.git/logs/refs/heads/master 2023-10-20 21:28:11.000000000 +0000 +++ dotnet7-7.0.114/src/diagnostics/.git/logs/refs/heads/master 2023-10-24 04:47:33.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 e3e1490a23f27a6e0ed30d323035660c3ffc52cd cloudtest_azpcontainer 1697837291 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 e3e1490a23f27a6e0ed30d323035660c3ffc52cd cloudtest_azpcontainer 1698122853 +0000 reset: moving to FETCH_HEAD Binary files /tmp/tmp6ypwwmzi/_rCMALy1fo/dotnet7-7.0.113/src/format/.git/index and /tmp/tmp6ypwwmzi/0qgonBF_sg/dotnet7-7.0.114/src/format/.git/index differ diff -Nru dotnet7-7.0.113/src/format/.git/logs/HEAD dotnet7-7.0.114/src/format/.git/logs/HEAD --- dotnet7-7.0.113/src/format/.git/logs/HEAD 2023-10-20 21:29:08.000000000 +0000 +++ dotnet7-7.0.114/src/format/.git/logs/HEAD 2023-10-24 04:48:21.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 6a22157622e5da71ba0c43d23269352210bdb277 cloudtest_azpcontainer 1697837348 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 6a22157622e5da71ba0c43d23269352210bdb277 cloudtest_azpcontainer 1698122901 +0000 reset: moving to FETCH_HEAD diff -Nru dotnet7-7.0.113/src/format/.git/logs/refs/heads/master dotnet7-7.0.114/src/format/.git/logs/refs/heads/master --- dotnet7-7.0.113/src/format/.git/logs/refs/heads/master 2023-10-20 21:29:08.000000000 +0000 +++ dotnet7-7.0.114/src/format/.git/logs/refs/heads/master 2023-10-24 04:48:21.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 6a22157622e5da71ba0c43d23269352210bdb277 cloudtest_azpcontainer 1697837348 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 6a22157622e5da71ba0c43d23269352210bdb277 cloudtest_azpcontainer 1698122901 +0000 reset: moving to FETCH_HEAD Binary files /tmp/tmp6ypwwmzi/_rCMALy1fo/dotnet7-7.0.113/src/fsharp/.git/index and /tmp/tmp6ypwwmzi/0qgonBF_sg/dotnet7-7.0.114/src/fsharp/.git/index differ diff -Nru dotnet7-7.0.113/src/fsharp/.git/logs/HEAD dotnet7-7.0.114/src/fsharp/.git/logs/HEAD --- dotnet7-7.0.113/src/fsharp/.git/logs/HEAD 2023-10-20 21:28:08.000000000 +0000 +++ dotnet7-7.0.114/src/fsharp/.git/logs/HEAD 2023-10-24 04:47:29.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 1d892dd78d5dcb261a1d26f72efb333834436a02 cloudtest_azpcontainer 1697837288 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 1d892dd78d5dcb261a1d26f72efb333834436a02 cloudtest_azpcontainer 1698122849 +0000 reset: moving to FETCH_HEAD diff -Nru dotnet7-7.0.113/src/fsharp/.git/logs/refs/heads/master dotnet7-7.0.114/src/fsharp/.git/logs/refs/heads/master --- dotnet7-7.0.113/src/fsharp/.git/logs/refs/heads/master 2023-10-20 21:28:08.000000000 +0000 +++ dotnet7-7.0.114/src/fsharp/.git/logs/refs/heads/master 2023-10-24 04:47:29.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 1d892dd78d5dcb261a1d26f72efb333834436a02 cloudtest_azpcontainer 1697837288 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 1d892dd78d5dcb261a1d26f72efb333834436a02 cloudtest_azpcontainer 1698122849 +0000 reset: moving to FETCH_HEAD diff -Nru dotnet7-7.0.113/src/installer/.git/HEAD dotnet7-7.0.114/src/installer/.git/HEAD --- dotnet7-7.0.113/src/installer/.git/HEAD 2023-10-20 21:27:26.000000000 +0000 +++ dotnet7-7.0.114/src/installer/.git/HEAD 2023-10-24 04:46:48.000000000 +0000 @@ -1 +1 @@ -e24ee34c8ea5d0c17c95868396b2529194ecec2f +b2a71039cd0ad21507999d0d722e558e3ea61ca2 diff -Nru dotnet7-7.0.113/src/installer/.git/ORIG_HEAD dotnet7-7.0.114/src/installer/.git/ORIG_HEAD --- dotnet7-7.0.113/src/installer/.git/ORIG_HEAD 2023-10-20 21:27:26.000000000 +0000 +++ dotnet7-7.0.114/src/installer/.git/ORIG_HEAD 2023-10-24 04:46:48.000000000 +0000 @@ -1 +1 @@ -e24ee34c8ea5d0c17c95868396b2529194ecec2f +b2a71039cd0ad21507999d0d722e558e3ea61ca2 Binary files /tmp/tmp6ypwwmzi/_rCMALy1fo/dotnet7-7.0.113/src/installer/.git/index and /tmp/tmp6ypwwmzi/0qgonBF_sg/dotnet7-7.0.114/src/installer/.git/index differ diff -Nru dotnet7-7.0.113/src/installer/.git/logs/HEAD dotnet7-7.0.114/src/installer/.git/logs/HEAD --- dotnet7-7.0.113/src/installer/.git/logs/HEAD 2023-10-20 21:27:26.000000000 +0000 +++ dotnet7-7.0.114/src/installer/.git/logs/HEAD 2023-10-24 04:46:48.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 e24ee34c8ea5d0c17c95868396b2529194ecec2f cloudtest_azpcontainer 1697837246 +0000 clone: from /__w/1/s/./.git +0000000000000000000000000000000000000000 b2a71039cd0ad21507999d0d722e558e3ea61ca2 cloudtest_azpcontainer 1698122808 +0000 clone: from /__w/1/s/./.git diff -Nru dotnet7-7.0.113/src/installer/NuGet.config dotnet7-7.0.114/src/installer/NuGet.config --- dotnet7-7.0.113/src/installer/NuGet.config 2023-10-20 21:27:26.000000000 +0000 +++ dotnet7-7.0.114/src/installer/NuGet.config 2023-10-24 04:46:48.000000000 +0000 @@ -7,24 +7,22 @@ - + - - - + - + - + - + @@ -46,15 +44,15 @@ - + - + - + - + diff -Nru dotnet7-7.0.113/src/installer/eng/ManualVersions.props dotnet7-7.0.114/src/installer/eng/ManualVersions.props --- dotnet7-7.0.113/src/installer/eng/ManualVersions.props 2023-10-20 21:27:26.000000000 +0000 +++ dotnet7-7.0.114/src/installer/eng/ManualVersions.props 2023-10-24 04:46:48.000000000 +0000 @@ -9,11 +9,11 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.29 - 10.0.18362.29 - 10.0.19041.29 - 10.0.20348.29 - 10.0.22000.29 - 10.0.22621.29 + 10.0.17763.31 + 10.0.18362.31 + 10.0.19041.31 + 10.0.20348.31 + 10.0.22000.31 + 10.0.22621.31 diff -Nru dotnet7-7.0.113/src/installer/eng/Version.Details.xml dotnet7-7.0.114/src/installer/eng/Version.Details.xml --- dotnet7-7.0.113/src/installer/eng/Version.Details.xml 2023-10-20 21:27:26.000000000 +0000 +++ dotnet7-7.0.114/src/installer/eng/Version.Details.xml 2023-10-24 04:46:48.000000000 +0000 @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 389f0c6968be9e1e447db8316106529640b246ae + 496fa854ae2f96619af99b5256fde77bc1a58f36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 389f0c6968be9e1e447db8316106529640b246ae + 496fa854ae2f96619af99b5256fde77bc1a58f36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 389f0c6968be9e1e447db8316106529640b246ae + 496fa854ae2f96619af99b5256fde77bc1a58f36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 389f0c6968be9e1e447db8316106529640b246ae + 496fa854ae2f96619af99b5256fde77bc1a58f36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3f73a2f186e08c905aba441ea5545295ca261730 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3f73a2f186e08c905aba441ea5545295ca261730 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3f73a2f186e08c905aba441ea5545295ca261730 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3f73a2f186e08c905aba441ea5545295ca261730 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3f73a2f186e08c905aba441ea5545295ca261730 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3f73a2f186e08c905aba441ea5545295ca261730 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d634f2bd1ad6e319f26ff0f1d7ada5539158a19f + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d634f2bd1ad6e319f26ff0f1d7ada5539158a19f + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d634f2bd1ad6e319f26ff0f1d7ada5539158a19f + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d634f2bd1ad6e319f26ff0f1d7ada5539158a19f + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d634f2bd1ad6e319f26ff0f1d7ada5539158a19f + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d634f2bd1ad6e319f26ff0f1d7ada5539158a19f + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d634f2bd1ad6e319f26ff0f1d7ada5539158a19f + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5797090b9a6668c2aa48d4314a19f75f7571a7e0 + 5a4609a27acc779cb68107922b00418cc6b907a9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5797090b9a6668c2aa48d4314a19f75f7571a7e0 + 5a4609a27acc779cb68107922b00418cc6b907a9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5797090b9a6668c2aa48d4314a19f75f7571a7e0 + 5a4609a27acc779cb68107922b00418cc6b907a9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5797090b9a6668c2aa48d4314a19f75f7571a7e0 + 5a4609a27acc779cb68107922b00418cc6b907a9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - e64f396b895c1cb61753f816b805291f225c7e8a + f1570f38b63db12bfd8714a942ec33de2275edf6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5a86bed8dd2c24aa3557cd2f1244fe7f66e87725 + 8784c26bc219f5b75f1315e1b6b7c1da924d5e32 https://github.com/dotnet/fsharp @@ -163,13 +163,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 6f67d4ab0e07dcc604a884d42fb74414800ddc6f + 942bfc8cb73e3cfea523cb0a2f08b415b2220358 - + https://github.com/dotnet/emsdk - 6f67d4ab0e07dcc604a884d42fb74414800ddc6f + 942bfc8cb73e3cfea523cb0a2f08b415b2220358 https://github.com/dotnet/deployment-tools @@ -194,18 +194,18 @@ - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + acb831a5b31a3cc4a744a8944b6bd172e6969234 - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + acb831a5b31a3cc4a744a8944b6bd172e6969234 - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + acb831a5b31a3cc4a744a8944b6bd172e6969234 https://github.com/dotnet/source-build-reference-packages diff -Nru dotnet7-7.0.113/src/installer/eng/Versions.props dotnet7-7.0.114/src/installer/eng/Versions.props --- dotnet7-7.0.113/src/installer/eng/Versions.props 2023-10-20 21:27:26.000000000 +0000 +++ dotnet7-7.0.114/src/installer/eng/Versions.props 2023-10-24 04:46:48.000000000 +0000 @@ -8,7 +8,7 @@ 7 0 1 - 13 + 14 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing @@ -33,15 +33,15 @@ - 7.0.0-beta.23408.3 + 7.0.0-beta.23511.9 - 7.0.13-servicing.23518.11 + 7.0.14-servicing.23520.9 - 7.0.13-servicing.23518.15 + 7.0.14-servicing.23520.2 @@ -56,22 +56,22 @@ - 7.0.13 - 7.0.13 - 7.0.13-servicing.23520.7 - 7.0.13-servicing.23520.7 - 7.0.13-servicing.23520.7 - 7.0.13-servicing.23520.7 - 7.0.13-servicing.23520.7 + 7.0.14 + 7.0.14 + 7.0.14-servicing.23523.16 + 7.0.14-servicing.23523.16 + 7.0.14-servicing.23523.16 + 7.0.14-servicing.23523.16 + 7.0.14-servicing.23523.16 0.2.0 - 7.0.113 - 7.0.113-servicing.23520.29 - 7.0.113-servicing.23520.29 + 7.0.114 + 7.0.114-servicing.23523.36 + 7.0.114-servicing.23523.36 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,20 +82,20 @@ - 7.0.13-servicing.23518.16 - 7.0.13-servicing.23518.16 - 7.0.13 - 7.0.13 - 7.0.13 - 7.0.13 + 7.0.14-servicing.23519.10 + 7.0.14-servicing.23519.10 + 7.0.14 + 7.0.14 + 7.0.14 + 7.0.14 2.1.0 - 7.0.13-servicing.23518.16 - 7.0.13-servicing.23518.16 - 7.0.13 - 7.0.13 + 7.0.14-servicing.23520.7 + 7.0.14-servicing.23520.7 + 7.0.14 + 7.0.14 @@ -215,8 +215,8 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 7.0.111 - 7.0.111 + 7.0.112 + 7.0.112 @@ -228,8 +228,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.13 - 7.0.13 + 7.0.14 + 7.0.14 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) diff -Nru dotnet7-7.0.113/src/installer/global.json dotnet7-7.0.114/src/installer/global.json --- dotnet7-7.0.113/src/installer/global.json 2023-10-20 21:27:26.000000000 +0000 +++ dotnet7-7.0.114/src/installer/global.json 2023-10-24 04:46:48.000000000 +0000 @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.110", + "dotnet": "7.0.112", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23408.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23408.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23511.9", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23511.9" } } diff -Nru dotnet7-7.0.113/src/installer/src/SourceBuild/tarball/content/global.json dotnet7-7.0.114/src/installer/src/SourceBuild/tarball/content/global.json --- dotnet7-7.0.113/src/installer/src/SourceBuild/tarball/content/global.json 2023-10-20 21:27:26.000000000 +0000 +++ dotnet7-7.0.114/src/installer/src/SourceBuild/tarball/content/global.json 2023-10-24 04:46:48.000000000 +0000 @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.111" + "dotnet": "7.0.112" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", Binary files /tmp/tmp6ypwwmzi/_rCMALy1fo/dotnet7-7.0.113/src/linker/.git/index and /tmp/tmp6ypwwmzi/0qgonBF_sg/dotnet7-7.0.114/src/linker/.git/index differ diff -Nru dotnet7-7.0.113/src/linker/.git/logs/HEAD dotnet7-7.0.114/src/linker/.git/logs/HEAD --- dotnet7-7.0.113/src/linker/.git/logs/HEAD 2023-10-20 21:28:14.000000000 +0000 +++ dotnet7-7.0.114/src/linker/.git/logs/HEAD 2023-10-24 04:47:34.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 19fa656d35252ccf926e6a6d783b16a2f094aaef cloudtest_azpcontainer 1697837294 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 19fa656d35252ccf926e6a6d783b16a2f094aaef cloudtest_azpcontainer 1698122854 +0000 reset: moving to FETCH_HEAD diff -Nru dotnet7-7.0.113/src/linker/.git/logs/refs/heads/master dotnet7-7.0.114/src/linker/.git/logs/refs/heads/master --- dotnet7-7.0.113/src/linker/.git/logs/refs/heads/master 2023-10-20 21:28:14.000000000 +0000 +++ dotnet7-7.0.114/src/linker/.git/logs/refs/heads/master 2023-10-24 04:47:34.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 19fa656d35252ccf926e6a6d783b16a2f094aaef cloudtest_azpcontainer 1697837294 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 19fa656d35252ccf926e6a6d783b16a2f094aaef cloudtest_azpcontainer 1698122854 +0000 reset: moving to FETCH_HEAD Binary files /tmp/tmp6ypwwmzi/_rCMALy1fo/dotnet7-7.0.113/src/linker/.git/modules/cecil/index and /tmp/tmp6ypwwmzi/0qgonBF_sg/dotnet7-7.0.114/src/linker/.git/modules/cecil/index differ diff -Nru dotnet7-7.0.113/src/linker/.git/modules/cecil/logs/HEAD dotnet7-7.0.114/src/linker/.git/modules/cecil/logs/HEAD --- dotnet7-7.0.113/src/linker/.git/modules/cecil/logs/HEAD 2023-10-20 21:28:19.000000000 +0000 +++ dotnet7-7.0.114/src/linker/.git/modules/cecil/logs/HEAD 2023-10-24 04:47:36.000000000 +0000 @@ -1,2 +1,2 @@ -0000000000000000000000000000000000000000 78ecb3ba9c8ca5ca1d055a4c9fbe2ce9fe24ad69 cloudtest_azpcontainer 1697837298 +0000 clone: from https://github.com/mono/cecil.git -78ecb3ba9c8ca5ca1d055a4c9fbe2ce9fe24ad69 1840b7410d37a613e684b6f9650e39e2d4950bbb cloudtest_azpcontainer 1697837299 +0000 checkout: moving from main to 1840b7410d37a613e684b6f9650e39e2d4950bbb +0000000000000000000000000000000000000000 69c2edb6aa48a46b9af156c4fe7dce2a727ea059 cloudtest_azpcontainer 1698122855 +0000 clone: from https://github.com/mono/cecil.git +69c2edb6aa48a46b9af156c4fe7dce2a727ea059 1840b7410d37a613e684b6f9650e39e2d4950bbb cloudtest_azpcontainer 1698122856 +0000 checkout: moving from main to 1840b7410d37a613e684b6f9650e39e2d4950bbb diff -Nru dotnet7-7.0.113/src/linker/.git/modules/cecil/logs/refs/heads/main dotnet7-7.0.114/src/linker/.git/modules/cecil/logs/refs/heads/main --- dotnet7-7.0.113/src/linker/.git/modules/cecil/logs/refs/heads/main 2023-10-20 21:28:18.000000000 +0000 +++ dotnet7-7.0.114/src/linker/.git/modules/cecil/logs/refs/heads/main 2023-10-24 04:47:35.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 78ecb3ba9c8ca5ca1d055a4c9fbe2ce9fe24ad69 cloudtest_azpcontainer 1697837298 +0000 clone: from https://github.com/mono/cecil.git +0000000000000000000000000000000000000000 69c2edb6aa48a46b9af156c4fe7dce2a727ea059 cloudtest_azpcontainer 1698122855 +0000 clone: from https://github.com/mono/cecil.git diff -Nru dotnet7-7.0.113/src/linker/.git/modules/cecil/logs/refs/remotes/origin/HEAD dotnet7-7.0.114/src/linker/.git/modules/cecil/logs/refs/remotes/origin/HEAD --- dotnet7-7.0.113/src/linker/.git/modules/cecil/logs/refs/remotes/origin/HEAD 2023-10-20 21:28:18.000000000 +0000 +++ dotnet7-7.0.114/src/linker/.git/modules/cecil/logs/refs/remotes/origin/HEAD 2023-10-24 04:47:35.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 78ecb3ba9c8ca5ca1d055a4c9fbe2ce9fe24ad69 cloudtest_azpcontainer 1697837298 +0000 clone: from https://github.com/mono/cecil.git +0000000000000000000000000000000000000000 69c2edb6aa48a46b9af156c4fe7dce2a727ea059 cloudtest_azpcontainer 1698122855 +0000 clone: from https://github.com/mono/cecil.git diff -Nru dotnet7-7.0.113/src/linker/.git/modules/cecil/packed-refs dotnet7-7.0.114/src/linker/.git/modules/cecil/packed-refs --- dotnet7-7.0.113/src/linker/.git/modules/cecil/packed-refs 2023-10-20 21:28:18.000000000 +0000 +++ dotnet7-7.0.114/src/linker/.git/modules/cecil/packed-refs 2023-10-24 04:47:35.000000000 +0000 @@ -1,2 +1,2 @@ # pack-refs with: peeled fully-peeled sorted -78ecb3ba9c8ca5ca1d055a4c9fbe2ce9fe24ad69 refs/remotes/origin/main +69c2edb6aa48a46b9af156c4fe7dce2a727ea059 refs/remotes/origin/main diff -Nru dotnet7-7.0.113/src/linker/.git/modules/cecil/refs/heads/main dotnet7-7.0.114/src/linker/.git/modules/cecil/refs/heads/main --- dotnet7-7.0.113/src/linker/.git/modules/cecil/refs/heads/main 2023-10-20 21:28:18.000000000 +0000 +++ dotnet7-7.0.114/src/linker/.git/modules/cecil/refs/heads/main 2023-10-24 04:47:35.000000000 +0000 @@ -1 +1 @@ -78ecb3ba9c8ca5ca1d055a4c9fbe2ce9fe24ad69 +69c2edb6aa48a46b9af156c4fe7dce2a727ea059 diff -Nru dotnet7-7.0.113/src/linker/.git/modules/cecil/shallow dotnet7-7.0.114/src/linker/.git/modules/cecil/shallow --- dotnet7-7.0.113/src/linker/.git/modules/cecil/shallow 2023-10-20 21:28:19.000000000 +0000 +++ dotnet7-7.0.114/src/linker/.git/modules/cecil/shallow 2023-10-24 04:47:36.000000000 +0000 @@ -1,2 +1,2 @@ 1840b7410d37a613e684b6f9650e39e2d4950bbb -78ecb3ba9c8ca5ca1d055a4c9fbe2ce9fe24ad69 +69c2edb6aa48a46b9af156c4fe7dce2a727ea059 Binary files /tmp/tmp6ypwwmzi/_rCMALy1fo/dotnet7-7.0.113/src/msbuild/.git/index and /tmp/tmp6ypwwmzi/0qgonBF_sg/dotnet7-7.0.114/src/msbuild/.git/index differ diff -Nru dotnet7-7.0.113/src/msbuild/.git/logs/HEAD dotnet7-7.0.114/src/msbuild/.git/logs/HEAD --- dotnet7-7.0.113/src/msbuild/.git/logs/HEAD 2023-10-20 21:28:41.000000000 +0000 +++ dotnet7-7.0.114/src/msbuild/.git/logs/HEAD 2023-10-24 04:47:55.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 6918b863aa37ad0699f98482fbab9f7a52e65a92 cloudtest_azpcontainer 1697837321 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 6918b863aa37ad0699f98482fbab9f7a52e65a92 cloudtest_azpcontainer 1698122875 +0000 reset: moving to FETCH_HEAD diff -Nru dotnet7-7.0.113/src/msbuild/.git/logs/refs/heads/master dotnet7-7.0.114/src/msbuild/.git/logs/refs/heads/master --- dotnet7-7.0.113/src/msbuild/.git/logs/refs/heads/master 2023-10-20 21:28:41.000000000 +0000 +++ dotnet7-7.0.114/src/msbuild/.git/logs/refs/heads/master 2023-10-24 04:47:55.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 6918b863aa37ad0699f98482fbab9f7a52e65a92 cloudtest_azpcontainer 1697837321 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 6918b863aa37ad0699f98482fbab9f7a52e65a92 cloudtest_azpcontainer 1698122875 +0000 reset: moving to FETCH_HEAD Binary files /tmp/tmp6ypwwmzi/_rCMALy1fo/dotnet7-7.0.113/src/nuget-client/.git/index and /tmp/tmp6ypwwmzi/0qgonBF_sg/dotnet7-7.0.114/src/nuget-client/.git/index differ diff -Nru dotnet7-7.0.113/src/nuget-client/.git/logs/HEAD dotnet7-7.0.114/src/nuget-client/.git/logs/HEAD --- dotnet7-7.0.113/src/nuget-client/.git/logs/HEAD 2023-10-20 21:28:43.000000000 +0000 +++ dotnet7-7.0.114/src/nuget-client/.git/logs/HEAD 2023-10-24 04:47:58.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 24f8150c97f9d26a7b5d77e983938e18d48e7d9f cloudtest_azpcontainer 1697837323 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 24f8150c97f9d26a7b5d77e983938e18d48e7d9f cloudtest_azpcontainer 1698122878 +0000 reset: moving to FETCH_HEAD diff -Nru dotnet7-7.0.113/src/nuget-client/.git/logs/refs/heads/master dotnet7-7.0.114/src/nuget-client/.git/logs/refs/heads/master --- dotnet7-7.0.113/src/nuget-client/.git/logs/refs/heads/master 2023-10-20 21:28:43.000000000 +0000 +++ dotnet7-7.0.114/src/nuget-client/.git/logs/refs/heads/master 2023-10-24 04:47:58.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 24f8150c97f9d26a7b5d77e983938e18d48e7d9f cloudtest_azpcontainer 1697837323 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 24f8150c97f9d26a7b5d77e983938e18d48e7d9f cloudtest_azpcontainer 1698122878 +0000 reset: moving to FETCH_HEAD Binary files /tmp/tmp6ypwwmzi/_rCMALy1fo/dotnet7-7.0.113/src/nuget-client/.git/modules/submodules/Common/index and /tmp/tmp6ypwwmzi/0qgonBF_sg/dotnet7-7.0.114/src/nuget-client/.git/modules/submodules/Common/index differ diff -Nru dotnet7-7.0.113/src/nuget-client/.git/modules/submodules/Common/logs/HEAD dotnet7-7.0.114/src/nuget-client/.git/modules/submodules/Common/logs/HEAD --- dotnet7-7.0.113/src/nuget-client/.git/modules/submodules/Common/logs/HEAD 2023-10-20 21:28:48.000000000 +0000 +++ dotnet7-7.0.114/src/nuget-client/.git/modules/submodules/Common/logs/HEAD 2023-10-24 04:48:03.000000000 +0000 @@ -1,2 +1,2 @@ -0000000000000000000000000000000000000000 261b3546ab8280dbecd77efcf063771649397fc3 cloudtest_azpcontainer 1697837324 +0000 clone: from https://github.com/aspnet/Common.git -261b3546ab8280dbecd77efcf063771649397fc3 e6fac8061686c18531e2621ccef97dd5e0687a65 cloudtest_azpcontainer 1697837328 +0000 checkout: moving from main to e6fac8061686c18531e2621ccef97dd5e0687a65 +0000000000000000000000000000000000000000 2521489db531649f4f22c696a314bbf2c670128e cloudtest_azpcontainer 1698122878 +0000 clone: from https://github.com/aspnet/Common.git +2521489db531649f4f22c696a314bbf2c670128e e6fac8061686c18531e2621ccef97dd5e0687a65 cloudtest_azpcontainer 1698122883 +0000 checkout: moving from main to e6fac8061686c18531e2621ccef97dd5e0687a65 diff -Nru dotnet7-7.0.113/src/nuget-client/.git/modules/submodules/Common/logs/refs/heads/main dotnet7-7.0.114/src/nuget-client/.git/modules/submodules/Common/logs/refs/heads/main --- dotnet7-7.0.113/src/nuget-client/.git/modules/submodules/Common/logs/refs/heads/main 2023-10-20 21:28:44.000000000 +0000 +++ dotnet7-7.0.114/src/nuget-client/.git/modules/submodules/Common/logs/refs/heads/main 2023-10-24 04:47:58.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 261b3546ab8280dbecd77efcf063771649397fc3 cloudtest_azpcontainer 1697837324 +0000 clone: from https://github.com/aspnet/Common.git +0000000000000000000000000000000000000000 2521489db531649f4f22c696a314bbf2c670128e cloudtest_azpcontainer 1698122878 +0000 clone: from https://github.com/aspnet/Common.git diff -Nru dotnet7-7.0.113/src/nuget-client/.git/modules/submodules/Common/logs/refs/remotes/origin/HEAD dotnet7-7.0.114/src/nuget-client/.git/modules/submodules/Common/logs/refs/remotes/origin/HEAD --- dotnet7-7.0.113/src/nuget-client/.git/modules/submodules/Common/logs/refs/remotes/origin/HEAD 2023-10-20 21:28:44.000000000 +0000 +++ dotnet7-7.0.114/src/nuget-client/.git/modules/submodules/Common/logs/refs/remotes/origin/HEAD 2023-10-24 04:47:58.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 261b3546ab8280dbecd77efcf063771649397fc3 cloudtest_azpcontainer 1697837324 +0000 clone: from https://github.com/aspnet/Common.git +0000000000000000000000000000000000000000 2521489db531649f4f22c696a314bbf2c670128e cloudtest_azpcontainer 1698122878 +0000 clone: from https://github.com/aspnet/Common.git diff -Nru dotnet7-7.0.113/src/nuget-client/.git/modules/submodules/Common/packed-refs dotnet7-7.0.114/src/nuget-client/.git/modules/submodules/Common/packed-refs --- dotnet7-7.0.113/src/nuget-client/.git/modules/submodules/Common/packed-refs 2023-10-20 21:28:44.000000000 +0000 +++ dotnet7-7.0.114/src/nuget-client/.git/modules/submodules/Common/packed-refs 2023-10-24 04:47:58.000000000 +0000 @@ -1,2 +1,2 @@ # pack-refs with: peeled fully-peeled sorted -261b3546ab8280dbecd77efcf063771649397fc3 refs/remotes/origin/main +2521489db531649f4f22c696a314bbf2c670128e refs/remotes/origin/main diff -Nru dotnet7-7.0.113/src/nuget-client/.git/modules/submodules/Common/refs/heads/main dotnet7-7.0.114/src/nuget-client/.git/modules/submodules/Common/refs/heads/main --- dotnet7-7.0.113/src/nuget-client/.git/modules/submodules/Common/refs/heads/main 2023-10-20 21:28:44.000000000 +0000 +++ dotnet7-7.0.114/src/nuget-client/.git/modules/submodules/Common/refs/heads/main 2023-10-24 04:47:58.000000000 +0000 @@ -1 +1 @@ -261b3546ab8280dbecd77efcf063771649397fc3 +2521489db531649f4f22c696a314bbf2c670128e diff -Nru dotnet7-7.0.113/src/nuget-client/.git/modules/submodules/Common/shallow dotnet7-7.0.114/src/nuget-client/.git/modules/submodules/Common/shallow --- dotnet7-7.0.113/src/nuget-client/.git/modules/submodules/Common/shallow 2023-10-20 21:28:48.000000000 +0000 +++ dotnet7-7.0.114/src/nuget-client/.git/modules/submodules/Common/shallow 2023-10-24 04:48:02.000000000 +0000 @@ -1,2 +1,2 @@ -261b3546ab8280dbecd77efcf063771649397fc3 +2521489db531649f4f22c696a314bbf2c670128e e6fac8061686c18531e2621ccef97dd5e0687a65 Binary files /tmp/tmp6ypwwmzi/_rCMALy1fo/dotnet7-7.0.113/src/nuget-client/.git/modules/submodules/FileSystem/index and /tmp/tmp6ypwwmzi/0qgonBF_sg/dotnet7-7.0.114/src/nuget-client/.git/modules/submodules/FileSystem/index differ diff -Nru dotnet7-7.0.113/src/nuget-client/.git/modules/submodules/FileSystem/logs/HEAD dotnet7-7.0.114/src/nuget-client/.git/modules/submodules/FileSystem/logs/HEAD --- dotnet7-7.0.113/src/nuget-client/.git/modules/submodules/FileSystem/logs/HEAD 2023-10-20 21:28:49.000000000 +0000 +++ dotnet7-7.0.114/src/nuget-client/.git/modules/submodules/FileSystem/logs/HEAD 2023-10-24 04:48:04.000000000 +0000 @@ -1,2 +1,2 @@ -0000000000000000000000000000000000000000 ab5c96bd032d8b144e041c38b9cf082068e9b1df cloudtest_azpcontainer 1697837325 +0000 clone: from https://github.com/NuGet/FileSystem.git -ab5c96bd032d8b144e041c38b9cf082068e9b1df f1f3f0820a573b96b2faaf5b7e6be9a036e4c7aa cloudtest_azpcontainer 1697837329 +0000 checkout: moving from dev to f1f3f0820a573b96b2faaf5b7e6be9a036e4c7aa +0000000000000000000000000000000000000000 ab5c96bd032d8b144e041c38b9cf082068e9b1df cloudtest_azpcontainer 1698122879 +0000 clone: from https://github.com/NuGet/FileSystem.git +ab5c96bd032d8b144e041c38b9cf082068e9b1df f1f3f0820a573b96b2faaf5b7e6be9a036e4c7aa cloudtest_azpcontainer 1698122884 +0000 checkout: moving from dev to f1f3f0820a573b96b2faaf5b7e6be9a036e4c7aa diff -Nru dotnet7-7.0.113/src/nuget-client/.git/modules/submodules/FileSystem/logs/refs/heads/dev dotnet7-7.0.114/src/nuget-client/.git/modules/submodules/FileSystem/logs/refs/heads/dev --- dotnet7-7.0.113/src/nuget-client/.git/modules/submodules/FileSystem/logs/refs/heads/dev 2023-10-20 21:28:45.000000000 +0000 +++ dotnet7-7.0.114/src/nuget-client/.git/modules/submodules/FileSystem/logs/refs/heads/dev 2023-10-24 04:47:59.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 ab5c96bd032d8b144e041c38b9cf082068e9b1df cloudtest_azpcontainer 1697837325 +0000 clone: from https://github.com/NuGet/FileSystem.git +0000000000000000000000000000000000000000 ab5c96bd032d8b144e041c38b9cf082068e9b1df cloudtest_azpcontainer 1698122879 +0000 clone: from https://github.com/NuGet/FileSystem.git diff -Nru dotnet7-7.0.113/src/nuget-client/.git/modules/submodules/FileSystem/logs/refs/remotes/origin/HEAD dotnet7-7.0.114/src/nuget-client/.git/modules/submodules/FileSystem/logs/refs/remotes/origin/HEAD --- dotnet7-7.0.113/src/nuget-client/.git/modules/submodules/FileSystem/logs/refs/remotes/origin/HEAD 2023-10-20 21:28:45.000000000 +0000 +++ dotnet7-7.0.114/src/nuget-client/.git/modules/submodules/FileSystem/logs/refs/remotes/origin/HEAD 2023-10-24 04:47:59.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 ab5c96bd032d8b144e041c38b9cf082068e9b1df cloudtest_azpcontainer 1697837325 +0000 clone: from https://github.com/NuGet/FileSystem.git +0000000000000000000000000000000000000000 ab5c96bd032d8b144e041c38b9cf082068e9b1df cloudtest_azpcontainer 1698122879 +0000 clone: from https://github.com/NuGet/FileSystem.git diff -Nru dotnet7-7.0.113/src/nuget-client/.git/modules/submodules/NuGet.Build.Localization/logs/HEAD dotnet7-7.0.114/src/nuget-client/.git/modules/submodules/NuGet.Build.Localization/logs/HEAD --- dotnet7-7.0.113/src/nuget-client/.git/modules/submodules/NuGet.Build.Localization/logs/HEAD 2023-10-20 21:28:51.000000000 +0000 +++ dotnet7-7.0.114/src/nuget-client/.git/modules/submodules/NuGet.Build.Localization/logs/HEAD 2023-10-24 04:48:05.000000000 +0000 @@ -1,2 +1,2 @@ -0000000000000000000000000000000000000000 eb9c53a915abef5b438d40ec68ad5f05f901d9cd cloudtest_azpcontainer 1697837327 +0000 clone: from https://github.com/NuGet/NuGet.Build.Localization.git -eb9c53a915abef5b438d40ec68ad5f05f901d9cd f15db7b7c6f5affbea268632ef8333d2687c8031 cloudtest_azpcontainer 1697837331 +0000 checkout: moving from dev to f15db7b7c6f5affbea268632ef8333d2687c8031 +0000000000000000000000000000000000000000 eb9c53a915abef5b438d40ec68ad5f05f901d9cd cloudtest_azpcontainer 1698122881 +0000 clone: from https://github.com/NuGet/NuGet.Build.Localization.git +eb9c53a915abef5b438d40ec68ad5f05f901d9cd f15db7b7c6f5affbea268632ef8333d2687c8031 cloudtest_azpcontainer 1698122885 +0000 checkout: moving from dev to f15db7b7c6f5affbea268632ef8333d2687c8031 diff -Nru dotnet7-7.0.113/src/nuget-client/.git/modules/submodules/NuGet.Build.Localization/logs/refs/heads/dev dotnet7-7.0.114/src/nuget-client/.git/modules/submodules/NuGet.Build.Localization/logs/refs/heads/dev --- dotnet7-7.0.113/src/nuget-client/.git/modules/submodules/NuGet.Build.Localization/logs/refs/heads/dev 2023-10-20 21:28:47.000000000 +0000 +++ dotnet7-7.0.114/src/nuget-client/.git/modules/submodules/NuGet.Build.Localization/logs/refs/heads/dev 2023-10-24 04:48:01.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 eb9c53a915abef5b438d40ec68ad5f05f901d9cd cloudtest_azpcontainer 1697837327 +0000 clone: from https://github.com/NuGet/NuGet.Build.Localization.git +0000000000000000000000000000000000000000 eb9c53a915abef5b438d40ec68ad5f05f901d9cd cloudtest_azpcontainer 1698122881 +0000 clone: from https://github.com/NuGet/NuGet.Build.Localization.git diff -Nru dotnet7-7.0.113/src/nuget-client/.git/modules/submodules/NuGet.Build.Localization/logs/refs/remotes/origin/HEAD dotnet7-7.0.114/src/nuget-client/.git/modules/submodules/NuGet.Build.Localization/logs/refs/remotes/origin/HEAD --- dotnet7-7.0.113/src/nuget-client/.git/modules/submodules/NuGet.Build.Localization/logs/refs/remotes/origin/HEAD 2023-10-20 21:28:47.000000000 +0000 +++ dotnet7-7.0.114/src/nuget-client/.git/modules/submodules/NuGet.Build.Localization/logs/refs/remotes/origin/HEAD 2023-10-24 04:48:01.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 eb9c53a915abef5b438d40ec68ad5f05f901d9cd cloudtest_azpcontainer 1697837327 +0000 clone: from https://github.com/NuGet/NuGet.Build.Localization.git +0000000000000000000000000000000000000000 eb9c53a915abef5b438d40ec68ad5f05f901d9cd cloudtest_azpcontainer 1698122881 +0000 clone: from https://github.com/NuGet/NuGet.Build.Localization.git Binary files /tmp/tmp6ypwwmzi/_rCMALy1fo/dotnet7-7.0.113/src/razor-compiler/.git/index and /tmp/tmp6ypwwmzi/0qgonBF_sg/dotnet7-7.0.114/src/razor-compiler/.git/index differ diff -Nru dotnet7-7.0.113/src/razor-compiler/.git/logs/HEAD dotnet7-7.0.114/src/razor-compiler/.git/logs/HEAD --- dotnet7-7.0.113/src/razor-compiler/.git/logs/HEAD 2023-10-20 21:28:01.000000000 +0000 +++ dotnet7-7.0.114/src/razor-compiler/.git/logs/HEAD 2023-10-24 04:47:23.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 9ce52f1afbfb819fc8499a590385200b97b13f33 cloudtest_azpcontainer 1697837281 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 9ce52f1afbfb819fc8499a590385200b97b13f33 cloudtest_azpcontainer 1698122843 +0000 reset: moving to FETCH_HEAD diff -Nru dotnet7-7.0.113/src/razor-compiler/.git/logs/refs/heads/master dotnet7-7.0.114/src/razor-compiler/.git/logs/refs/heads/master --- dotnet7-7.0.113/src/razor-compiler/.git/logs/refs/heads/master 2023-10-20 21:28:01.000000000 +0000 +++ dotnet7-7.0.114/src/razor-compiler/.git/logs/refs/heads/master 2023-10-24 04:47:23.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 9ce52f1afbfb819fc8499a590385200b97b13f33 cloudtest_azpcontainer 1697837281 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 9ce52f1afbfb819fc8499a590385200b97b13f33 cloudtest_azpcontainer 1698122843 +0000 reset: moving to FETCH_HEAD Binary files /tmp/tmp6ypwwmzi/_rCMALy1fo/dotnet7-7.0.113/src/roslyn/.git/index and /tmp/tmp6ypwwmzi/0qgonBF_sg/dotnet7-7.0.114/src/roslyn/.git/index differ diff -Nru dotnet7-7.0.113/src/roslyn/.git/logs/HEAD dotnet7-7.0.114/src/roslyn/.git/logs/HEAD --- dotnet7-7.0.113/src/roslyn/.git/logs/HEAD 2023-10-20 21:28:38.000000000 +0000 +++ dotnet7-7.0.114/src/roslyn/.git/logs/HEAD 2023-10-24 04:47:52.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 528676cdbf0bfcfdb9372dc57a047dd0edc6d4db cloudtest_azpcontainer 1697837318 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 528676cdbf0bfcfdb9372dc57a047dd0edc6d4db cloudtest_azpcontainer 1698122872 +0000 reset: moving to FETCH_HEAD diff -Nru dotnet7-7.0.113/src/roslyn/.git/logs/refs/heads/master dotnet7-7.0.114/src/roslyn/.git/logs/refs/heads/master --- dotnet7-7.0.113/src/roslyn/.git/logs/refs/heads/master 2023-10-20 21:28:38.000000000 +0000 +++ dotnet7-7.0.114/src/roslyn/.git/logs/refs/heads/master 2023-10-24 04:47:52.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 528676cdbf0bfcfdb9372dc57a047dd0edc6d4db cloudtest_azpcontainer 1697837318 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 528676cdbf0bfcfdb9372dc57a047dd0edc6d4db cloudtest_azpcontainer 1698122872 +0000 reset: moving to FETCH_HEAD Binary files /tmp/tmp6ypwwmzi/_rCMALy1fo/dotnet7-7.0.113/src/roslyn-analyzers/.git/index and /tmp/tmp6ypwwmzi/0qgonBF_sg/dotnet7-7.0.114/src/roslyn-analyzers/.git/index differ diff -Nru dotnet7-7.0.113/src/roslyn-analyzers/.git/logs/HEAD dotnet7-7.0.114/src/roslyn-analyzers/.git/logs/HEAD --- dotnet7-7.0.113/src/roslyn-analyzers/.git/logs/HEAD 2023-10-20 21:28:03.000000000 +0000 +++ dotnet7-7.0.114/src/roslyn-analyzers/.git/logs/HEAD 2023-10-24 04:47:25.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 31373ce8529c3d2f6b91e61585872160b0d7d7cd cloudtest_azpcontainer 1697837283 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 31373ce8529c3d2f6b91e61585872160b0d7d7cd cloudtest_azpcontainer 1698122845 +0000 reset: moving to FETCH_HEAD diff -Nru dotnet7-7.0.113/src/roslyn-analyzers/.git/logs/refs/heads/master dotnet7-7.0.114/src/roslyn-analyzers/.git/logs/refs/heads/master --- dotnet7-7.0.113/src/roslyn-analyzers/.git/logs/refs/heads/master 2023-10-20 21:28:03.000000000 +0000 +++ dotnet7-7.0.114/src/roslyn-analyzers/.git/logs/refs/heads/master 2023-10-24 04:47:25.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 31373ce8529c3d2f6b91e61585872160b0d7d7cd cloudtest_azpcontainer 1697837283 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 31373ce8529c3d2f6b91e61585872160b0d7d7cd cloudtest_azpcontainer 1698122845 +0000 reset: moving to FETCH_HEAD diff -Nru dotnet7-7.0.113/src/runtime/.config/dotnet-tools.json dotnet7-7.0.114/src/runtime/.config/dotnet-tools.json --- dotnet7-7.0.113/src/runtime/.config/dotnet-tools.json 2023-10-20 21:27:41.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/.config/dotnet-tools.json 2023-10-24 04:47:01.000000000 +0000 @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "7.0.0-prerelease.23407.3", + "version": "7.0.0-prerelease.23455.3", "commands": [ "xharness" ] diff -Nru dotnet7-7.0.113/src/runtime/.git/FETCH_HEAD dotnet7-7.0.114/src/runtime/.git/FETCH_HEAD --- dotnet7-7.0.113/src/runtime/.git/FETCH_HEAD 2023-10-20 21:27:41.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/.git/FETCH_HEAD 2023-10-24 04:47:01.000000000 +0000 @@ -1 +1 @@ -3f73a2f186e08c905aba441ea5545295ca261730 '3f73a2f186e08c905aba441ea5545295ca261730' of https://dev.azure.com/dnceng/internal/_git/dotnet-runtime +808851b07acfa1c5c94b0d4f9fb50debedb2df70 '808851b07acfa1c5c94b0d4f9fb50debedb2df70' of https://dev.azure.com/dnceng/internal/_git/dotnet-runtime Binary files /tmp/tmp6ypwwmzi/_rCMALy1fo/dotnet7-7.0.113/src/runtime/.git/index and /tmp/tmp6ypwwmzi/0qgonBF_sg/dotnet7-7.0.114/src/runtime/.git/index differ diff -Nru dotnet7-7.0.113/src/runtime/.git/logs/HEAD dotnet7-7.0.114/src/runtime/.git/logs/HEAD --- dotnet7-7.0.113/src/runtime/.git/logs/HEAD 2023-10-20 21:27:44.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/.git/logs/HEAD 2023-10-24 04:47:04.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 3f73a2f186e08c905aba441ea5545295ca261730 cloudtest_azpcontainer 1697837264 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 808851b07acfa1c5c94b0d4f9fb50debedb2df70 cloudtest_azpcontainer 1698122824 +0000 reset: moving to FETCH_HEAD diff -Nru dotnet7-7.0.113/src/runtime/.git/logs/refs/heads/master dotnet7-7.0.114/src/runtime/.git/logs/refs/heads/master --- dotnet7-7.0.113/src/runtime/.git/logs/refs/heads/master 2023-10-20 21:27:44.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/.git/logs/refs/heads/master 2023-10-24 04:47:04.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 3f73a2f186e08c905aba441ea5545295ca261730 cloudtest_azpcontainer 1697837264 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 808851b07acfa1c5c94b0d4f9fb50debedb2df70 cloudtest_azpcontainer 1698122824 +0000 reset: moving to FETCH_HEAD diff -Nru dotnet7-7.0.113/src/runtime/.git/refs/heads/master dotnet7-7.0.114/src/runtime/.git/refs/heads/master --- dotnet7-7.0.113/src/runtime/.git/refs/heads/master 2023-10-20 21:27:44.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/.git/refs/heads/master 2023-10-24 04:47:04.000000000 +0000 @@ -1 +1 @@ -3f73a2f186e08c905aba441ea5545295ca261730 +808851b07acfa1c5c94b0d4f9fb50debedb2df70 diff -Nru dotnet7-7.0.113/src/runtime/.git/shallow dotnet7-7.0.114/src/runtime/.git/shallow --- dotnet7-7.0.113/src/runtime/.git/shallow 2023-10-20 21:27:26.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/.git/shallow 2023-10-24 04:46:49.000000000 +0000 @@ -1 +1 @@ -3f73a2f186e08c905aba441ea5545295ca261730 +808851b07acfa1c5c94b0d4f9fb50debedb2df70 diff -Nru dotnet7-7.0.113/src/runtime/NuGet.config dotnet7-7.0.114/src/runtime/NuGet.config --- dotnet7-7.0.113/src/runtime/NuGet.config 2023-10-20 21:27:41.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/NuGet.config 2023-10-24 04:47:01.000000000 +0000 @@ -9,7 +9,7 @@ - + - 7.0.13 + 7.0.14 7 0 - 13 + 14 7.0.100 6.0.$([MSBuild]::Add($(PatchVersion), 11)) servicing @@ -22,8 +22,8 @@ false false $(AssemblyVersion) - 7.0.13 - 7.0.13 + 7.0.14 + 7.0.14 @@ -53,22 +53,22 @@ 7.0.100-rc.1.22402.1 - 7.0.0-beta.23408.3 - 7.0.0-beta.23408.3 - 7.0.0-beta.23408.3 - 7.0.0-beta.23408.3 - 7.0.0-beta.23408.3 - 7.0.0-beta.23408.3 - 2.5.1-beta.23408.3 - 7.0.0-beta.23408.3 - 7.0.0-beta.23408.3 - 7.0.0-beta.23408.3 - 7.0.0-beta.23408.3 - 7.0.0-beta.23408.3 - 7.0.0-beta.23408.3 - 7.0.0-beta.23408.3 - 7.0.0-beta.23408.3 - 7.0.0-beta.23408.3 + 7.0.0-beta.23511.9 + 7.0.0-beta.23511.9 + 7.0.0-beta.23511.9 + 7.0.0-beta.23511.9 + 7.0.0-beta.23511.9 + 7.0.0-beta.23511.9 + 2.5.1-beta.23511.9 + 7.0.0-beta.23511.9 + 7.0.0-beta.23511.9 + 7.0.0-beta.23511.9 + 7.0.0-beta.23511.9 + 7.0.0-beta.23511.9 + 7.0.0-beta.23511.9 + 7.0.0-beta.23511.9 + 7.0.0-beta.23511.9 + 7.0.0-beta.23511.9 6.0.0-preview.1.102 @@ -154,9 +154,9 @@ 1.1.0 17.4.0-preview-20220707-01 - 7.0.0-prerelease.23407.3 - 7.0.0-prerelease.23407.3 - 7.0.0-prerelease.23407.3 + 7.0.0-prerelease.23455.3 + 7.0.0-prerelease.23455.3 + 7.0.0-prerelease.23455.3 7.0.0-alpha.0.23411.1 2.4.2 1.0.0 @@ -177,9 +177,9 @@ 7.0.100-1.23401.1 $(MicrosoftNETILLinkTasksVersion) - 7.0.0-rtm.23409.2 + 7.0.0-rtm.23512.1 - 2.2.3-ci.391104 + 2.2.3 7.0.0-alpha.1.22459.1 11.1.0-alpha.1.23115.1 diff -Nru dotnet7-7.0.113/src/runtime/eng/pipelines/coreclr/templates/helix-queues-setup.yml dotnet7-7.0.114/src/runtime/eng/pipelines/coreclr/templates/helix-queues-setup.yml --- dotnet7-7.0.113/src/runtime/eng/pipelines/coreclr/templates/helix-queues-setup.yml 2023-10-20 21:27:41.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/eng/pipelines/coreclr/templates/helix-queues-setup.yml 2023-10-24 04:47:01.000000000 +0000 @@ -67,7 +67,7 @@ - ${{ if eq(variables['System.TeamProject'], 'public') }}: - (Alpine.314.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64 - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - - (Alpine.314.Amd64)ubuntu.1604.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64 + - (Alpine.314.Amd64)ubuntu.2204.amd64.svc@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64 # Linux musl arm32 - ${{ if eq(parameters.platform, 'Linux_musl_arm') }}: diff -Nru dotnet7-7.0.113/src/runtime/eng/pipelines/libraries/base-job.yml dotnet7-7.0.114/src/runtime/eng/pipelines/libraries/base-job.yml --- dotnet7-7.0.113/src/runtime/eng/pipelines/libraries/base-job.yml 2023-10-20 21:27:41.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/eng/pipelines/libraries/base-job.yml 2023-10-24 04:47:01.000000000 +0000 @@ -76,7 +76,7 @@ - _runtimeOSArg: /p:RuntimeOS=linux-musl - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, ''), eq(parameters.archType, 'arm')) }}: - - _runtimeOSArg: /p:RuntimeOS=ubuntu.16.04 + - _runtimeOSArg: /p:RuntimeOS=ubuntu.22.04 # force a value for OS when cross-building - ${{ if in(parameters.osGroup, 'Browser', 'iOS', 'tvOS', 'Android', 'FreeBSD') }}: diff -Nru dotnet7-7.0.113/src/runtime/eng/pipelines/libraries/helix-queues-setup.yml dotnet7-7.0.114/src/runtime/eng/pipelines/libraries/helix-queues-setup.yml --- dotnet7-7.0.113/src/runtime/eng/pipelines/libraries/helix-queues-setup.yml 2023-10-20 21:27:41.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/eng/pipelines/libraries/helix-queues-setup.yml 2023-10-24 04:47:01.000000000 +0000 @@ -71,10 +71,10 @@ - (Fedora.34.Amd64.Open)ubuntu.1804.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-34-helix - Ubuntu.2204.Amd64.Open - (Debian.11.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64 - - (Mariner.1.0.Amd64.Open)ubuntu.1604.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix - - (openSUSE.15.2.Amd64.Open)ubuntu.1604.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:opensuse-15.2-helix-amd64 + - (Mariner.1.0.Amd64.Open)ubuntu.2204.amd64.open.svc@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix + - (openSUSE.15.2.Amd64.Open)ubuntu.2204.amd64.open.svc@mcr.microsoft.com/dotnet-buildtools/prereqs:opensuse-15.2-helix-amd64 - ${{ if or(ne(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}: - - (Centos.7.Amd64.Open)Ubuntu.1604.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix + - (Centos.7.Amd64.Open)Ubuntu.2204.Amd64.Open.svc@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix - RedHat.7.Amd64.Open - (Debian.10.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-10-helix-amd64 - Ubuntu.1804.Amd64.Open diff -Nru dotnet7-7.0.113/src/runtime/eng/pipelines/runtime-wasm-perf.yml dotnet7-7.0.114/src/runtime/eng/pipelines/runtime-wasm-perf.yml --- dotnet7-7.0.113/src/runtime/eng/pipelines/runtime-wasm-perf.yml 2023-10-20 21:27:41.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/eng/pipelines/runtime-wasm-perf.yml 2023-10-24 04:47:01.000000000 +0000 @@ -3,6 +3,7 @@ # UI to this, and thus avoid any scheduled triggers trigger: none +pr: none variables: - template: /eng/pipelines/common/variables.yml diff -Nru dotnet7-7.0.113/src/runtime/global.json dotnet7-7.0.114/src/runtime/global.json --- dotnet7-7.0.113/src/runtime/global.json 2023-10-20 21:27:41.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/global.json 2023-10-24 04:47:01.000000000 +0000 @@ -1,16 +1,16 @@ { "sdk": { - "version": "7.0.110", + "version": "7.0.112", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "7.0.110" + "dotnet": "7.0.112" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23408.3", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23408.3", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.23408.3", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23511.9", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23511.9", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.23511.9", "Microsoft.Build.NoTargets": "3.5.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "7.0.0-rc.1.22414.6" diff -Nru dotnet7-7.0.113/src/runtime/src/coreclr/inc/clrconfigvalues.h dotnet7-7.0.114/src/runtime/src/coreclr/inc/clrconfigvalues.h --- dotnet7-7.0.113/src/runtime/src/coreclr/inc/clrconfigvalues.h 2023-10-20 21:27:41.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/coreclr/inc/clrconfigvalues.h 2023-10-24 04:47:01.000000000 +0000 @@ -542,6 +542,8 @@ #else // !TARGET_ARM64 RETAIL_CONFIG_DWORD_INFO(INTERNAL_ThreadPool_UnfairSemaphoreSpinLimit, W("ThreadPool_UnfairSemaphoreSpinLimit"), 0x46, "Maximum number of spins a thread pool worker thread performs before waiting for work") #endif // TARGET_ARM64 +RETAIL_CONFIG_DWORD_INFO_EX(EXTERNAL_ThreadPool_ThreadTimeoutMs, W("ThreadPool_ThreadTimeoutMs"), (DWORD)-2, "The amount of time in milliseconds a thread pool thread waits without having done any work before timing out and exiting. Set to -1 to disable the timeout. Applies to worker threads, completion port threads, and wait threads. Also see the ThreadPool_ThreadsToKeepAlive config value for relevant information.", CLRConfig::LookupOptions::ParseIntegerAsBase10) +RETAIL_CONFIG_DWORD_INFO_EX(EXTERNAL_ThreadPool_ThreadsToKeepAlive, W("ThreadPool_ThreadsToKeepAlive"), 0, "The number of worker or completion port threads to keep alive after they are created. Set to -1 to keep all created worker or completion port threads alive. When the ThreadPool_ThreadTimeoutMs config value is also set, for worker and completion port threads the timeout applies to threads in the respective pool that are in excess of the number configured for ThreadPool_ThreadsToKeepAlive.", CLRConfig::LookupOptions::ParseIntegerAsBase10) RETAIL_CONFIG_DWORD_INFO(INTERNAL_HillClimbing_Disable, W("HillClimbing_Disable"), 0, "Disables hill climbing for thread adjustments in the thread pool"); RETAIL_CONFIG_DWORD_INFO(INTERNAL_HillClimbing_WavePeriod, W("HillClimbing_WavePeriod"), 4, ""); diff -Nru dotnet7-7.0.113/src/runtime/src/coreclr/inc/safemath.h dotnet7-7.0.114/src/runtime/src/coreclr/inc/safemath.h --- dotnet7-7.0.113/src/runtime/src/coreclr/inc/safemath.h 2023-10-20 21:27:41.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/coreclr/inc/safemath.h 2023-10-24 04:47:01.000000000 +0000 @@ -688,6 +688,10 @@ INDEBUG( mutable bool m_checkedOverflow; ) }; +#if defined(_MSC_VER) && defined(HOST_ARM64) // Workaround for https://github.com/dotnet/runtime/issues/93442 +#pragma optimize("", off) +#endif + template <> inline bool ClrSafeInt::multiply(int64_t lhs, int64_t rhs, int64_t &result) { @@ -874,6 +878,10 @@ return true; } +#if defined(_MSC_VER) && defined(HOST_ARM64) // Workaround for https://github.com/dotnet/runtime/issues/93442 +#pragma optimize("", on) +#endif + // Allows creation of a ClrSafeInt corresponding to the type of the argument. template ClrSafeInt AsClrSafeInt(T t) diff -Nru dotnet7-7.0.113/src/runtime/src/coreclr/pal/src/include/pal/sharedmemory.h dotnet7-7.0.114/src/runtime/src/coreclr/pal/src/include/pal/sharedmemory.h --- dotnet7-7.0.113/src/runtime/src/coreclr/pal/src/include/pal/sharedmemory.h 2023-10-20 21:27:41.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/coreclr/pal/src/include/pal/sharedmemory.h 2023-10-24 04:47:01.000000000 +0000 @@ -88,11 +88,9 @@ class SharedMemoryHelpers { private: - static const mode_t PermissionsMask_CurrentUser_ReadWrite; static const mode_t PermissionsMask_CurrentUser_ReadWriteExecute; static const mode_t PermissionsMask_AllUsers_ReadWrite; static const mode_t PermissionsMask_AllUsers_ReadWriteExecute; - public: static const UINT32 InvalidProcessId; static const SIZE_T InvalidThreadId; @@ -108,12 +106,12 @@ static void BuildSharedFilesPath(PathCharString& destination, const char *suffix, int suffixByteCount); static bool AppendUInt32String(PathCharString& destination, UINT32 value); - static bool EnsureDirectoryExists(const char *path, bool isGlobalLockAcquired, bool hasCurrentUserAccessOnly, bool setStickyFlag, bool createIfNotExist = true, bool isSystemDirectory = false); + static bool EnsureDirectoryExists(const char *path, bool isGlobalLockAcquired, bool createIfNotExist = true, bool isSystemDirectory = false); private: static int Open(LPCSTR path, int flags, mode_t mode = static_cast(0)); public: static int OpenDirectory(LPCSTR path); - static int CreateOrOpenFile(LPCSTR path, bool createIfNotExist = true, bool isSessionScope = true, bool *createdRef = nullptr); + static int CreateOrOpenFile(LPCSTR path, bool createIfNotExist = true, bool *createdRef = nullptr); static void CloseFile(int fileDescriptor); static SIZE_T GetFileSize(int fileDescriptor); diff -Nru dotnet7-7.0.113/src/runtime/src/coreclr/pal/src/sharedmemory/sharedmemory.cpp dotnet7-7.0.114/src/runtime/src/coreclr/pal/src/sharedmemory/sharedmemory.cpp --- dotnet7-7.0.113/src/runtime/src/coreclr/pal/src/sharedmemory/sharedmemory.cpp 2023-10-20 21:27:41.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/coreclr/pal/src/sharedmemory/sharedmemory.cpp 2023-10-24 04:47:01.000000000 +0000 @@ -62,7 +62,6 @@ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // SharedMemoryHelpers -const mode_t SharedMemoryHelpers::PermissionsMask_CurrentUser_ReadWrite = S_IRUSR | S_IWUSR; const mode_t SharedMemoryHelpers::PermissionsMask_CurrentUser_ReadWriteExecute = S_IRUSR | S_IWUSR | S_IXUSR; const mode_t SharedMemoryHelpers::PermissionsMask_AllUsers_ReadWrite = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH; @@ -97,8 +96,6 @@ bool SharedMemoryHelpers::EnsureDirectoryExists( const char *path, bool isGlobalLockAcquired, - bool hasCurrentUserAccessOnly, - bool setStickyFlag, bool createIfNotExist, bool isSystemDirectory) { @@ -106,13 +103,6 @@ _ASSERTE(!(isSystemDirectory && createIfNotExist)); // should not create or change permissions on system directories _ASSERTE(SharedMemoryManager::IsCreationDeletionProcessLockAcquired()); _ASSERTE(!isGlobalLockAcquired || SharedMemoryManager::IsCreationDeletionFileLockAcquired()); - _ASSERTE(!(setStickyFlag && hasCurrentUserAccessOnly)); // Sticky bit doesn't make sense with current user access only - - mode_t mode = hasCurrentUserAccessOnly ? PermissionsMask_CurrentUser_ReadWriteExecute : PermissionsMask_AllUsers_ReadWriteExecute; - if (setStickyFlag) - { - mode |= S_ISVTX; - } // Check if the path already exists struct stat statInfo; @@ -133,11 +123,11 @@ if (isGlobalLockAcquired) { - if (mkdir(path, mode) != 0) + if (mkdir(path, PermissionsMask_AllUsers_ReadWriteExecute) != 0) { throw SharedMemoryException(static_cast(SharedMemoryError::IO)); } - if (chmod(path, mode) != 0) + if (chmod(path, PermissionsMask_AllUsers_ReadWriteExecute) != 0) { rmdir(path); throw SharedMemoryException(static_cast(SharedMemoryError::IO)); @@ -152,7 +142,7 @@ { throw SharedMemoryException(static_cast(SharedMemoryError::IO)); } - if (chmod(tempPath, mode) != 0) + if (chmod(tempPath, PermissionsMask_AllUsers_ReadWriteExecute) != 0) { rmdir(tempPath); throw SharedMemoryException(static_cast(SharedMemoryError::IO)); @@ -192,11 +182,11 @@ // For non-system directories (such as gSharedFilesPath/SHARED_MEMORY_RUNTIME_TEMP_DIRECTORY_NAME), // require sufficient permissions for all users and try to update them if requested to create the directory, so that // shared memory files may be shared by all processes on the system. - if ((statInfo.st_mode & mode) == mode) + if ((statInfo.st_mode & PermissionsMask_AllUsers_ReadWriteExecute) == PermissionsMask_AllUsers_ReadWriteExecute) { return true; } - if (!createIfNotExist || chmod(path, mode) != 0) + if (!createIfNotExist || chmod(path, PermissionsMask_AllUsers_ReadWriteExecute) != 0) { // We were not asked to create the path or we weren't able to set the new permissions. // As a last resort, check that at least the current user has full access. @@ -253,7 +243,7 @@ return fileDescriptor; } -int SharedMemoryHelpers::CreateOrOpenFile(LPCSTR path, bool createIfNotExist, bool isSessionScope, bool *createdRef) +int SharedMemoryHelpers::CreateOrOpenFile(LPCSTR path, bool createIfNotExist, bool *createdRef) { _ASSERTE(path != nullptr); _ASSERTE(path[0] != '\0'); @@ -283,13 +273,12 @@ // File does not exist, create the file openFlags |= O_CREAT | O_EXCL; - mode_t mode = isSessionScope ? PermissionsMask_CurrentUser_ReadWrite : PermissionsMask_AllUsers_ReadWrite; - fileDescriptor = Open(path, openFlags, mode); + fileDescriptor = Open(path, openFlags, PermissionsMask_AllUsers_ReadWrite); _ASSERTE(fileDescriptor != -1); // The permissions mask passed to open() is filtered by the process' permissions umask, so open() may not set all of // the requested permissions. Use chmod() to set the proper permissions. - if (chmod(path, mode) != 0) + if (chmod(path, PermissionsMask_AllUsers_ReadWrite) != 0) { CloseFile(fileDescriptor); unlink(path); @@ -675,7 +664,7 @@ SharedMemoryHelpers::VerifyStringOperation(SharedMemoryManager::CopySharedMemoryBasePath(filePath)); SharedMemoryHelpers::VerifyStringOperation(filePath.Append('/')); SharedMemoryHelpers::VerifyStringOperation(id.AppendSessionDirectoryName(filePath)); - if (!SharedMemoryHelpers::EnsureDirectoryExists(filePath, true /* isGlobalLockAcquired */, id.IsSessionScope(), false /* setStickyFlag */, createIfNotExist)) + if (!SharedMemoryHelpers::EnsureDirectoryExists(filePath, true /* isGlobalLockAcquired */, createIfNotExist)) { _ASSERTE(!createIfNotExist); return nullptr; @@ -688,7 +677,7 @@ SharedMemoryHelpers::VerifyStringOperation(filePath.Append(id.GetName(), id.GetNameCharCount())); bool createdFile; - int fileDescriptor = SharedMemoryHelpers::CreateOrOpenFile(filePath, createIfNotExist, id.IsSessionScope(), &createdFile); + int fileDescriptor = SharedMemoryHelpers::CreateOrOpenFile(filePath, createIfNotExist, &createdFile); if (fileDescriptor == -1) { _ASSERTE(!createIfNotExist); @@ -1163,8 +1152,6 @@ if (!SharedMemoryHelpers::EnsureDirectoryExists( *gSharedFilesPath, false /* isGlobalLockAcquired */, - false /* hasCurrentUserAccessOnly */, - true /* setStickyFlag */, false /* createIfNotExist */, true /* isSystemDirectory */)) { @@ -1172,14 +1159,10 @@ } SharedMemoryHelpers::EnsureDirectoryExists( *s_runtimeTempDirectoryPath, - false /* isGlobalLockAcquired */, - false /* hasCurrentUserAccessOnly */, - false /* setStickyFlag */); + false /* isGlobalLockAcquired */); SharedMemoryHelpers::EnsureDirectoryExists( *s_sharedMemoryDirectoryPath, - false /* isGlobalLockAcquired */, - false /* hasCurrentUserAccessOnly */, - true /* setStickyFlag */); + false /* isGlobalLockAcquired */); s_creationDeletionLockFileDescriptor = SharedMemoryHelpers::OpenDirectory(*s_sharedMemoryDirectoryPath); if (s_creationDeletionLockFileDescriptor == -1) { diff -Nru dotnet7-7.0.113/src/runtime/src/coreclr/pal/src/synchobj/mutex.cpp dotnet7-7.0.114/src/runtime/src/coreclr/pal/src/synchobj/mutex.cpp --- dotnet7-7.0.113/src/runtime/src/coreclr/pal/src/synchobj/mutex.cpp 2023-10-20 21:27:41.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/coreclr/pal/src/synchobj/mutex.cpp 2023-10-24 04:47:01.000000000 +0000 @@ -1117,7 +1117,7 @@ SharedMemoryHelpers::BuildSharedFilesPath(lockFilePath, SHARED_MEMORY_LOCK_FILES_DIRECTORY_NAME); if (created) { - SharedMemoryHelpers::EnsureDirectoryExists(lockFilePath, true /* isGlobalLockAcquired */, false /* hasCurrentUserAccessOnly */, true /* setStickyFlag */); + SharedMemoryHelpers::EnsureDirectoryExists(lockFilePath, true /* isGlobalLockAcquired */); } // Create the session directory @@ -1126,7 +1126,7 @@ SharedMemoryHelpers::VerifyStringOperation(id->AppendSessionDirectoryName(lockFilePath)); if (created) { - SharedMemoryHelpers::EnsureDirectoryExists(lockFilePath, true /* isGlobalLockAcquired */, id->IsSessionScope(), false /* setStickyFlag */); + SharedMemoryHelpers::EnsureDirectoryExists(lockFilePath, true /* isGlobalLockAcquired */); autoCleanup.m_lockFilePath = &lockFilePath; autoCleanup.m_sessionDirectoryPathCharCount = lockFilePath.GetCount(); } @@ -1134,7 +1134,7 @@ // Create or open the lock file SharedMemoryHelpers::VerifyStringOperation(lockFilePath.Append('/')); SharedMemoryHelpers::VerifyStringOperation(lockFilePath.Append(id->GetName(), id->GetNameCharCount())); - int lockFileDescriptor = SharedMemoryHelpers::CreateOrOpenFile(lockFilePath, created, id->IsSessionScope()); + int lockFileDescriptor = SharedMemoryHelpers::CreateOrOpenFile(lockFilePath, created); if (lockFileDescriptor == -1) { _ASSERTE(!created); diff -Nru dotnet7-7.0.113/src/runtime/src/coreclr/vm/comthreadpool.cpp dotnet7-7.0.114/src/runtime/src/coreclr/vm/comthreadpool.cpp --- dotnet7-7.0.113/src/runtime/src/coreclr/vm/comthreadpool.cpp 2023-10-20 21:27:41.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/coreclr/vm/comthreadpool.cpp 2023-10-24 04:47:02.000000000 +0000 @@ -192,6 +192,34 @@ case 19: if (TryGetConfig(CLRConfig::INTERNAL_HillClimbing_SampleIntervalHigh, false, W("System.Threading.ThreadPool.HillClimbing.SampleIntervalHigh"))) { return 20; } FALLTHROUGH; case 20: if (TryGetConfig(CLRConfig::INTERNAL_HillClimbing_GainExponent, false, W("System.Threading.ThreadPool.HillClimbing.GainExponent"))) { return 21; } FALLTHROUGH; + case 21: + { + int threadPoolThreadTimeoutMs = g_pConfig->ThreadPoolThreadTimeoutMs(); + if (threadPoolThreadTimeoutMs >= -1) + { + *configValueRef = (UINT32)threadPoolThreadTimeoutMs; + *isBooleanRef = false; + *appContextConfigNameRef = W("System.Threading.ThreadPool.ThreadTimeoutMs"); + return 22; + } + + FALLTHROUGH; + } + + case 22: + { + int threadPoolThreadsToKeepAlive = g_pConfig->ThreadPoolThreadsToKeepAlive(); + if (threadPoolThreadsToKeepAlive >= -1) + { + *configValueRef = (UINT32)threadPoolThreadsToKeepAlive; + *isBooleanRef = false; + *appContextConfigNameRef = W("System.Threading.ThreadPool.ThreadsToKeepAlive"); + return 23; + } + + FALLTHROUGH; + } + default: *configValueRef = 0; *isBooleanRef = false; diff -Nru dotnet7-7.0.113/src/runtime/src/coreclr/vm/eeconfig.cpp dotnet7-7.0.114/src/runtime/src/coreclr/vm/eeconfig.cpp --- dotnet7-7.0.113/src/runtime/src/coreclr/vm/eeconfig.cpp 2023-10-20 21:27:41.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/coreclr/vm/eeconfig.cpp 2023-10-24 04:47:02.000000000 +0000 @@ -225,6 +225,9 @@ bDiagnosticSuspend = false; #endif + threadPoolThreadTimeoutMs = -2; // not configured + threadPoolThreadsToKeepAlive = 0; + #if defined(FEATURE_TIERED_COMPILATION) fTieredCompilation = false; fTieredCompilation_QuickJit = false; @@ -668,6 +671,19 @@ #endif //_DEBUG + threadPoolThreadTimeoutMs = + (int)Configuration::GetKnobDWORDValue( + W("System.Threading.ThreadPool.ThreadTimeoutMs"), + CLRConfig::EXTERNAL_ThreadPool_ThreadTimeoutMs); + threadPoolThreadsToKeepAlive = + (int)Configuration::GetKnobDWORDValue( + W("System.Threading.ThreadPool.ThreadsToKeepAlive"), + CLRConfig::EXTERNAL_ThreadPool_ThreadsToKeepAlive); + if (threadPoolThreadsToKeepAlive < -1) + { + threadPoolThreadsToKeepAlive = 0; + } + m_fInteropValidatePinnedObjects = (CLRConfig::GetConfigValue(CLRConfig::UNSUPPORTED_InteropValidatePinnedObjects) != 0); m_fInteropLogArguments = (CLRConfig::GetConfigValue(CLRConfig::EXTERNAL_InteropLogArguments) != 0); diff -Nru dotnet7-7.0.113/src/runtime/src/coreclr/vm/eeconfig.h dotnet7-7.0.114/src/runtime/src/coreclr/vm/eeconfig.h --- dotnet7-7.0.113/src/runtime/src/coreclr/vm/eeconfig.h 2023-10-20 21:27:41.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/coreclr/vm/eeconfig.h 2023-10-24 04:47:02.000000000 +0000 @@ -469,6 +469,9 @@ #endif + int ThreadPoolThreadTimeoutMs() const { LIMITED_METHOD_CONTRACT; return threadPoolThreadTimeoutMs; } + int ThreadPoolThreadsToKeepAlive() const { LIMITED_METHOD_CONTRACT; return threadPoolThreadsToKeepAlive; } + private: //---------------------------------------------------------------- bool fInited; // have we synced to the registry at least once? @@ -644,6 +647,9 @@ DWORD testThreadAbort; #endif + int threadPoolThreadTimeoutMs; + int threadPoolThreadsToKeepAlive; + #if defined(FEATURE_TIERED_COMPILATION) bool fTieredCompilation; bool fTieredCompilation_QuickJit; diff -Nru dotnet7-7.0.113/src/runtime/src/coreclr/vm/ilmarshalers.h dotnet7-7.0.114/src/runtime/src/coreclr/vm/ilmarshalers.h --- dotnet7-7.0.113/src/runtime/src/coreclr/vm/ilmarshalers.h 2023-10-20 21:27:41.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/coreclr/vm/ilmarshalers.h 2023-10-24 04:47:02.000000000 +0000 @@ -3138,39 +3138,13 @@ void EmitClearNative(ILCodeStream* pslILEmit) override { WRAPPER_NO_CONTRACT; - ILCodeLabel* pNoManagedValueLabel = nullptr; - if (IsFieldMarshal(m_dwMarshalFlags)) - { - pNoManagedValueLabel = pslILEmit->NewCodeLabel(); - pslILEmit->EmitLDARG(StructMarshalStubs::MANAGED_STRUCT_ARGIDX); - pslILEmit->EmitBRFALSE(pNoManagedValueLabel); - } - EmitCallMngdMarshalerMethod(pslILEmit, GetClearNativeMethod()); - - if (IsFieldMarshal(m_dwMarshalFlags)) - { - pslILEmit->EmitLabel(pNoManagedValueLabel); - } } void EmitClearNativeContents(ILCodeStream* pslILEmit) override { WRAPPER_NO_CONTRACT; - ILCodeLabel* pNoManagedValueLabel = nullptr; - if (IsFieldMarshal(m_dwMarshalFlags)) - { - pNoManagedValueLabel = pslILEmit->NewCodeLabel(); - pslILEmit->EmitLDARG(StructMarshalStubs::MANAGED_STRUCT_ARGIDX); - pslILEmit->EmitBRFALSE(pNoManagedValueLabel); - } - EmitCallMngdMarshalerMethod(pslILEmit, GetClearNativeContentsMethod()); - - if (IsFieldMarshal(m_dwMarshalFlags)) - { - pslILEmit->EmitLabel(pNoManagedValueLabel); - } } bool NeedsClearCLR() override diff -Nru dotnet7-7.0.113/src/runtime/src/coreclr/vm/methodtablebuilder.cpp dotnet7-7.0.114/src/runtime/src/coreclr/vm/methodtablebuilder.cpp --- dotnet7-7.0.113/src/runtime/src/coreclr/vm/methodtablebuilder.cpp 2023-10-20 21:27:41.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/coreclr/vm/methodtablebuilder.cpp 2023-10-24 04:47:02.000000000 +0000 @@ -6871,9 +6871,15 @@ SIZE_T sizeOfMethodDescs = 0; // current running size of methodDesc chunk int startIndex = 0; // start of the current chunk (index into bmtMethod array) + // Limit the maximum MethodDescs per chunk by the number of precodes that can fit to a single memory page, + // since we allocate consecutive temporary entry points for all MethodDescs in the whole chunk. + DWORD maxPrecodesPerPage = Precode::GetMaxTemporaryEntryPointsCount(); + DWORD methodDescCount = 0; + DeclaredMethodIterator it(*this); while (it.Next()) { + DWORD currentSlotMethodDescCount = 1; int tokenRange = GetTokenRange(it.Token()); // This code assumes that iterator returns tokens in ascending order. If this assumption does not hold, @@ -6896,6 +6902,7 @@ // See comment in AllocAndInitMethodDescChunk if (NeedsTightlyBoundUnboxingStub(*it)) { + currentSlotMethodDescCount = 2; size *= 2; if (bmtGenerics->GetNumGenericArgs() == 0) { @@ -6907,7 +6914,8 @@ } if (tokenRange != currentTokenRange || - sizeOfMethodDescs + size > MethodDescChunk::MaxSizeOfMethodDescs) + sizeOfMethodDescs + size > MethodDescChunk::MaxSizeOfMethodDescs || + methodDescCount + currentSlotMethodDescCount > maxPrecodesPerPage) { if (sizeOfMethodDescs != 0) { @@ -6917,9 +6925,11 @@ currentTokenRange = tokenRange; sizeOfMethodDescs = 0; + methodDescCount = 0; } sizeOfMethodDescs += size; + methodDescCount += currentSlotMethodDescCount; } if (sizeOfMethodDescs != 0) diff -Nru dotnet7-7.0.113/src/runtime/src/coreclr/vm/win32threadpool.cpp dotnet7-7.0.114/src/runtime/src/coreclr/vm/win32threadpool.cpp --- dotnet7-7.0.113/src/runtime/src/coreclr/vm/win32threadpool.cpp 2023-10-20 21:27:41.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/coreclr/vm/win32threadpool.cpp 2023-10-24 04:47:02.000000000 +0000 @@ -125,6 +125,10 @@ unsigned int ThreadpoolMgr::LastCPThreadCreation=0; // last time a completion port thread was created unsigned int ThreadpoolMgr::NumberOfProcessors; // = NumberOfWorkerThreads - no. of blocked threads +DWORD ThreadpoolMgr::WorkerThreadTimeoutMs = 20 * 1000; +DWORD ThreadpoolMgr::IOCompletionThreadTimeoutMs = 15 * 1000; +int ThreadpoolMgr::NumWorkerThreadsBeingKeptAlive = 0; +int ThreadpoolMgr::NumIOCompletionThreadsBeingKeptAlive = 0; CrstStatic ThreadpoolMgr::WorkerCriticalSection; CLREvent * ThreadpoolMgr::RetiredCPWakeupEvent; // wakeup event for completion port threads @@ -344,6 +348,13 @@ NumberOfProcessors = GetCurrentProcessCpuCount(); InitPlatformVariables(); + int threadTimeoutMs = g_pConfig->ThreadPoolThreadTimeoutMs(); + if (threadTimeoutMs >= -1) + { + WorkerThreadTimeoutMs = (DWORD)threadTimeoutMs; + IOCompletionThreadTimeoutMs = (DWORD)threadTimeoutMs; + } + EX_TRY { if (!UsePortableThreadPool()) @@ -1747,6 +1758,9 @@ ThreadCounter::Counts counts, oldCounts, newCounts; bool foundWork = true, wasNotRecalled = true; + bool isThreadKeepAliveInitialized = false; + bool keepThreadAlive = false; + counts = WorkerCounter.GetCleanCounts(); if (ETW_EVENT_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context, ThreadPoolWorkerThreadStart)) FireEtwThreadPoolWorkerThreadStart(counts.NumActive, counts.NumRetired, GetClrInstanceId()); @@ -1803,6 +1817,35 @@ GCX_PREEMP_NO_DTOR(); _ASSERTE(pThread == NULL || !pThread->PreemptiveGCDisabled()); + if (!isThreadKeepAliveInitialized && fThreadInit) + { + // Determine whether to keep this thread alive. Some threads may always be kept alive based on config. + isThreadKeepAliveInitialized = true; + int threadsToKeepAlive = g_pConfig->ThreadPoolThreadsToKeepAlive(); + if (threadsToKeepAlive != 0) + { + if (threadsToKeepAlive < 0) + { + keepThreadAlive = true; + } + else + { + int count = VolatileLoadWithoutBarrier(&NumWorkerThreadsBeingKeptAlive); + while (count < threadsToKeepAlive) + { + int countBeforeUpdate = InterlockedCompareExchangeT(&NumWorkerThreadsBeingKeptAlive, count + 1, count); + if (countBeforeUpdate == count) + { + keepThreadAlive = true; + break; + } + + count = countBeforeUpdate; + } + } + } + } + // make sure there's really work. If not, go back to sleep // counts volatile read paired with CompareExchangeCounts loop set @@ -1889,7 +1932,7 @@ while (true) { RetryRetire: - if (RetiredWorkerSemaphore->Wait(WorkerTimeout)) + if (RetiredWorkerSemaphore->Wait(keepThreadAlive ? INFINITE : WorkerThreadTimeoutMs)) { foundWork = true; @@ -1966,7 +2009,7 @@ FireEtwThreadPoolWorkerThreadWait(counts.NumActive, counts.NumRetired, GetClrInstanceId()); RetryWaitForWork: - if (WorkerSemaphore->Wait(WorkerTimeout, WorkerThreadSpinLimit, NumberOfProcessors)) + if (WorkerSemaphore->Wait(keepThreadAlive ? INFINITE : WorkerThreadTimeoutMs, WorkerThreadSpinLimit, NumberOfProcessors)) { foundWork = true; goto Work; @@ -3080,13 +3123,13 @@ PIOCompletionContext context; BOOL fIsCompletionContext; - const DWORD CP_THREAD_WAIT = 15000; /* milliseconds */ - _ASSERTE(GlobalCompletionPort != NULL); BOOL fThreadInit = FALSE; Thread *pThread = NULL; + bool isThreadKeepAliveInitialized = false; + bool keepThreadAlive = false; DWORD cpThreadWait = 0; if (g_fEEStarted) { @@ -3123,7 +3166,7 @@ ThreadCounter::Counts oldCounts; ThreadCounter::Counts newCounts; - cpThreadWait = CP_THREAD_WAIT; + cpThreadWait = IOCompletionThreadTimeoutMs; for (;; ) { Top: @@ -3151,6 +3194,36 @@ GCX_PREEMP_NO_DTOR(); + if (!isThreadKeepAliveInitialized && fThreadInit) + { + // Determine whether to keep this thread alive. Some threads may always be kept alive based on config. + isThreadKeepAliveInitialized = true; + int threadsToKeepAlive = g_pConfig->ThreadPoolThreadsToKeepAlive(); + if (threadsToKeepAlive != 0) + { + if (threadsToKeepAlive < 0) + { + keepThreadAlive = true; + } + else + { + int count = VolatileLoadWithoutBarrier(&NumIOCompletionThreadsBeingKeptAlive); + while (count < threadsToKeepAlive) + { + int countBeforeUpdate = + InterlockedCompareExchangeT(&NumIOCompletionThreadsBeingKeptAlive, count + 1, count); + if (countBeforeUpdate == count) + { + keepThreadAlive = true; + break; + } + + count = countBeforeUpdate; + } + } + } + } + // // We're about to wait on the IOCP; mark ourselves as no longer "working." // @@ -3165,7 +3238,7 @@ // one thread listening for completions. So there's no point in having a timeout; it will // only use power unnecessarily. // - cpThreadWait = (newCounts.NumActive == 1) ? INFINITE : CP_THREAD_WAIT; + cpThreadWait = (newCounts.NumActive == 1 || keepThreadAlive) ? INFINITE : IOCompletionThreadTimeoutMs; if (oldCounts == CPThreadCounter.CompareExchangeCounts(newCounts, oldCounts)) break; diff -Nru dotnet7-7.0.113/src/runtime/src/coreclr/vm/win32threadpool.h dotnet7-7.0.114/src/runtime/src/coreclr/vm/win32threadpool.h --- dotnet7-7.0.113/src/runtime/src/coreclr/vm/win32threadpool.h 2023-10-20 21:27:41.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/coreclr/vm/win32threadpool.h 2023-10-24 04:47:02.000000000 +0000 @@ -971,6 +971,11 @@ static unsigned int LastCPThreadCreation; // last time a completion port thread was created static unsigned int NumberOfProcessors; // = NumberOfWorkerThreads - no. of blocked threads + static DWORD WorkerThreadTimeoutMs; + static DWORD IOCompletionThreadTimeoutMs; + static int NumWorkerThreadsBeingKeptAlive; + static int NumIOCompletionThreadsBeingKeptAlive; + static BOOL IsApcPendingOnWaitThread; // Indicates if an APC is pending on the wait thread // This needs to be non-hosted, because worker threads can run prior to EE startup. @@ -980,8 +985,6 @@ static CrstStatic WorkerCriticalSection; private: - static const DWORD WorkerTimeout = 20 * 1000; - DECLSPEC_ALIGN(MAX_CACHE_LINE_SIZE) SVAL_DECL(ThreadCounter,WorkerCounter); // diff -Nru dotnet7-7.0.113/src/runtime/src/installer/tests/HostActivation.Tests/FrameworkResolution/MultipleHives.cs dotnet7-7.0.114/src/runtime/src/installer/tests/HostActivation.Tests/FrameworkResolution/MultipleHives.cs --- dotnet7-7.0.113/src/runtime/src/installer/tests/HostActivation.Tests/FrameworkResolution/MultipleHives.cs 2023-10-20 21:27:41.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/installer/tests/HostActivation.Tests/FrameworkResolution/MultipleHives.cs 2023-10-24 04:47:02.000000000 +0000 @@ -59,7 +59,8 @@ .WithTfm(tfm) .WithFramework(MicrosoftNETCoreApp, requestedVersion), multiLevelLookup) - .ShouldHaveResolvedFramework(MicrosoftNETCoreApp, resolvedVersion); + .ShouldHaveResolvedFramework(MicrosoftNETCoreApp, resolvedVersion) + .And.HaveStdErrContaining($"Ignoring FX version [{requestedVersion}] without .deps.json"); } [Fact] @@ -164,7 +165,8 @@ new TestSettings().WithCommandLine("--list-runtimes"), multiLevelLookup, testApp: null) - .Should().HaveStdOut(expectedOutput); + .Should().HaveStdOut(expectedOutput) + .And.HaveStdErrContaining("Ignoring FX version [9999.9.9] without .deps.json"); } [Theory] @@ -187,7 +189,8 @@ new TestSettings().WithCommandLine("--info"), multiLevelLookup, testApp: null) - .Should().HaveStdOutContaining(expectedOutput); + .Should().HaveStdOutContaining(expectedOutput) + .And.HaveStdErrContaining("Ignoring FX version [9999.9.9] without .deps.json"); } [Theory] @@ -217,7 +220,8 @@ multiLevelLookup) .Should().Fail() .And.HaveStdErrContaining(expectedOutput) - .And.HaveStdErrContaining("https://aka.ms/dotnet/app-launch-failed"); + .And.HaveStdErrContaining("https://aka.ms/dotnet/app-launch-failed") + .And.HaveStdErrContaining("Ignoring FX version [9999.9.9] without .deps.json"); } private CommandResult RunTest(Func runtimeConfig, bool? multiLevelLookup = true) @@ -261,6 +265,14 @@ .AddMicrosoftNETCoreAppFrameworkMockHostPolicy("7.1.2") .Build(); + // Empty Microsoft.NETCore.App directory - should not be recognized as a valid framework + // Version is the best match for some test cases, but they should be ignored + string netCoreAppDir = Path.Combine(DotNetMainHive.BinPath, "shared", Constants.MicrosoftNETCoreApp); + Directory.CreateDirectory(Path.Combine(netCoreAppDir, "5.0.0")); + Directory.CreateDirectory(Path.Combine(netCoreAppDir, "6.0.0")); + Directory.CreateDirectory(Path.Combine(netCoreAppDir, "7.0.0")); + Directory.CreateDirectory(Path.Combine(netCoreAppDir, "9999.9.9")); + DotNetGlobalHive = DotNet("GlobalHive") .AddMicrosoftNETCoreAppFrameworkMockHostPolicy("5.1.2") .AddMicrosoftNETCoreAppFrameworkMockHostPolicy("6.1.4") diff -Nru dotnet7-7.0.113/src/runtime/src/installer/tests/HostActivation.Tests/NativeHostApis.cs dotnet7-7.0.114/src/runtime/src/installer/tests/HostActivation.Tests/NativeHostApis.cs --- dotnet7-7.0.113/src/runtime/src/installer/tests/HostActivation.Tests/NativeHostApis.cs 2023-10-20 21:27:41.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/installer/tests/HostActivation.Tests/NativeHostApis.cs 2023-10-24 04:47:02.000000000 +0000 @@ -114,12 +114,22 @@ foreach ((string fwName, string[] fwVersions) in ProgramFilesGlobalFrameworks) { foreach (string fwVersion in fwVersions) - Directory.CreateDirectory(Path.Combine(ProgramFilesGlobalFrameworksDir, fwName, fwVersion)); + AddFrameworkDirectory(ProgramFilesGlobalFrameworksDir, fwName, fwVersion); } foreach ((string fwName, string[] fwVersions) in LocalFrameworks) { foreach (string fwVersion in fwVersions) - Directory.CreateDirectory(Path.Combine(LocalFrameworksDir, fwName, fwVersion)); + AddFrameworkDirectory(LocalFrameworksDir, fwName, fwVersion); + + // Empty framework directory - this should not be recognized as a valid framework directory + Directory.CreateDirectory(Path.Combine(LocalFrameworksDir, fwName, "9.9.9")); + } + + static void AddFrameworkDirectory(string frameworkDir, string name, string version) + { + string versionDir = Path.Combine(frameworkDir, name, version); + Directory.CreateDirectory(versionDir); + File.WriteAllText(Path.Combine(versionDir, $"{name}.deps.json"), string.Empty); } } } diff -Nru dotnet7-7.0.113/src/runtime/src/installer/tests/TestUtils/DotNetBuilder.cs dotnet7-7.0.114/src/runtime/src/installer/tests/TestUtils/DotNetBuilder.cs --- dotnet7-7.0.113/src/runtime/src/installer/tests/TestUtils/DotNetBuilder.cs 2023-10-20 21:27:41.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/installer/tests/TestUtils/DotNetBuilder.cs 2023-10-24 04:47:02.000000000 +0000 @@ -51,8 +51,7 @@ public DotNetBuilder AddMicrosoftNETCoreAppFrameworkMockHostPolicy(string version) { // ./shared/Microsoft.NETCore.App/ - create a mock of the root framework - string netCoreAppPath = Path.Combine(_path, "shared", "Microsoft.NETCore.App", version); - Directory.CreateDirectory(netCoreAppPath); + string netCoreAppPath = AddFramework(Constants.MicrosoftNETCoreApp, version); // ./shared/Microsoft.NETCore.App//hostpolicy.dll - this is a mock, will not actually load CoreCLR string mockHostPolicyFileName = RuntimeInformationExtensions.GetSharedLibraryFileNameForCurrentPlatform("mockhostpolicy"); @@ -122,8 +121,7 @@ public DotNetBuilder AddMicrosoftNETCoreAppFrameworkMockCoreClr(string version, Action customizer = null) { // ./shared/Microsoft.NETCore.App/ - create a mock of the root framework - string netCoreAppPath = Path.Combine(_path, "shared", "Microsoft.NETCore.App", version); - Directory.CreateDirectory(netCoreAppPath); + string netCoreAppPath = AddFramework(Constants.MicrosoftNETCoreApp, version); string hostPolicyFileName = RuntimeInformationExtensions.GetSharedLibraryFileNameForCurrentPlatform("hostpolicy"); string coreclrFileName = RuntimeInformationExtensions.GetSharedLibraryFileNameForCurrentPlatform("coreclr"); @@ -131,9 +129,9 @@ string currentRid = _repoDirectories.TargetRID; - NetCoreAppBuilder.ForNETCoreApp("Microsoft.NETCore.App", currentRid) + NetCoreAppBuilder.ForNETCoreApp(Constants.MicrosoftNETCoreApp, currentRid) .WithStandardRuntimeFallbacks() - .WithProject("Microsoft.NETCore.App", version, p => p + .WithProject(Constants.MicrosoftNETCoreApp, version, p => p .WithNativeLibraryGroup(null, g => g // ./shared/Microsoft.NETCore.App//coreclr.dll - this is a mock, will not actually run CoreClr .WithAsset((new NetCoreAppBuilder.RuntimeFileBuilder($"runtimes/{currentRid}/native/{coreclrFileName}")) @@ -158,7 +156,7 @@ /// Framework version /// Customization function for the runtime config /// - /// The added mock framework will only contain a runtime.config.json file. + /// The added mock framework will only contain a deps.json and a runtime.config.json file. /// public DotNetBuilder AddFramework( string name, @@ -166,12 +164,11 @@ Action runtimeConfigCustomizer, Action frameworkCustomizer = null) { - // ./shared// - create a mock of effectively empty non-root framework - string path = Path.Combine(_path, "shared", name, version); - Directory.CreateDirectory(path); + // ./shared// - create a mock of the framework + string path = AddFramework(name, version); // ./shared///.runtimeconfig.json - runtime config which can be customized - RuntimeConfig runtimeConfig = new RuntimeConfig(Path.Combine(path, name + ".runtimeconfig.json")); + RuntimeConfig runtimeConfig = new RuntimeConfig(Path.Combine(path, $"{name}.runtimeconfig.json")); runtimeConfigCustomizer(runtimeConfig); runtimeConfig.Save(); @@ -197,6 +194,27 @@ return this; } + ///

+ /// Add a minimal mock framework with the specified framework name and version + ///

+ /// Framework name + /// Framework version + /// Framework directory + /// + /// The added mock framework will only contain a deps.json. + /// + private string AddFramework(string name, string version) + { + // ./shared// - create a mock of effectively the framework + string path = Path.Combine(_path, "shared", name, version); + Directory.CreateDirectory(path); + + // ./shared///.deps.json - empty file + File.WriteAllText(Path.Combine(path, $"{name}.deps.json"), string.Empty); + + return path; + } + public DotNetCli Build() { return new DotNetCli(_path); diff -Nru dotnet7-7.0.113/src/runtime/src/libraries/System.Diagnostics.Process/tests/ProcessTests.cs dotnet7-7.0.114/src/runtime/src/libraries/System.Diagnostics.Process/tests/ProcessTests.cs --- dotnet7-7.0.113/src/runtime/src/libraries/System.Diagnostics.Process/tests/ProcessTests.cs 2023-10-20 21:27:42.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/libraries/System.Diagnostics.Process/tests/ProcessTests.cs 2023-10-24 04:47:02.000000000 +0000 @@ -766,7 +766,25 @@ { CreateDefaultProcess(); - AssertNonZeroAllZeroDarwin(_process.PeakWorkingSet64); + if (OperatingSystem.IsMacOS()) + { + Assert.Equal(0, _process.PeakWorkingSet64); + return; + } + + // On recent Linux kernels (6.2+) working set can be zero just after the process started. + ExecuteWithRetryOnLinux(() => + { + try + { + Assert.NotEqual(0, _process.PeakWorkingSet64); + } + catch + { + _process.Refresh(); + throw; + } + }); } [Fact] @@ -819,7 +837,19 @@ return; } - Assert.InRange(_process.WorkingSet64, 1, long.MaxValue); + // On recent Linux kernels (6.2+) working set can be zero just after the process started. + ExecuteWithRetryOnLinux(() => + { + try + { + Assert.InRange(_process.WorkingSet64, 1, long.MaxValue); + } + catch + { + _process.Refresh(); + throw; + } + }); } [Fact] @@ -2011,9 +2041,29 @@ { CreateDefaultProcess(); + if (OperatingSystem.IsMacOS()) + { #pragma warning disable 0618 - AssertNonZeroAllZeroDarwin(_process.PeakWorkingSet); + Assert.Equal(0, _process.PeakWorkingSet); #pragma warning restore 0618 + return; + } + + // On recent Linux kernels (6.2+) working set can be zero just after the process started. + ExecuteWithRetryOnLinux(() => + { + try + { +#pragma warning disable 0618 + Assert.NotEqual(0, _process.PeakWorkingSet); +#pragma warning restore 0618 + } + catch + { + _process.Refresh(); + throw; + } + }); } [Fact] @@ -2077,9 +2127,21 @@ return; } + // On recent Linux kernels (6.2+) working set can be zero just after the process started. + ExecuteWithRetryOnLinux(() => + { + try + { #pragma warning disable 0618 - Assert.InRange(_process.WorkingSet, 1, int.MaxValue); + Assert.InRange(_process.WorkingSet, 1, int.MaxValue); #pragma warning restore 0618 + } + catch + { + _process.Refresh(); + throw; + } + }); } [Fact] @@ -2673,5 +2735,17 @@ return secureString; } + + private static void ExecuteWithRetryOnLinux(Action test) + { + if (OperatingSystem.IsLinux()) + { + RetryHelper.Execute(test, retryWhen: ex => ex is XunitException); + } + else + { + test(); + } + } } } diff -Nru dotnet7-7.0.113/src/runtime/src/libraries/System.Net.Http/src/System.Net.Http.csproj dotnet7-7.0.114/src/runtime/src/libraries/System.Net.Http/src/System.Net.Http.csproj --- dotnet7-7.0.113/src/runtime/src/libraries/System.Net.Http/src/System.Net.Http.csproj 2023-10-20 21:27:42.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/libraries/System.Net.Http/src/System.Net.Http.csproj 2023-10-24 04:47:02.000000000 +0000 @@ -309,11 +309,11 @@ - + - + - + diff -Nru dotnet7-7.0.113/src/runtime/src/libraries/System.Net.Requests/src/Resources/Strings.resx dotnet7-7.0.114/src/runtime/src/libraries/System.Net.Requests/src/Resources/Strings.resx --- dotnet7-7.0.113/src/runtime/src/libraries/System.Net.Requests/src/Resources/Strings.resx 2023-10-20 21:27:42.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/libraries/System.Net.Requests/src/Resources/Strings.resx 2023-10-24 04:47:02.000000000 +0000 @@ -207,6 +207,9 @@ The underlying connection was closed: An unexpected error occurred on a receive + + CRLF character pair is not allowed in FtpWebRequest inputs. + The remote name could not be resolved diff -Nru dotnet7-7.0.113/src/runtime/src/libraries/System.Net.Requests/src/System/Net/FtpControlStream.cs dotnet7-7.0.114/src/runtime/src/libraries/System.Net.Requests/src/System/Net/FtpControlStream.cs --- dotnet7-7.0.113/src/runtime/src/libraries/System.Net.Requests/src/System/Net/FtpControlStream.cs 2023-10-20 21:27:42.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/libraries/System.Net.Requests/src/System/Net/FtpControlStream.cs 2023-10-24 04:47:02.000000000 +0000 @@ -1115,6 +1115,11 @@ /// private static string FormatFtpCommand(string command, string? parameter) { + if (parameter is not null && parameter.Contains("\r\n", StringComparison.Ordinal)) + { + throw new FormatException(SR.net_ftp_no_newlines); + } + return string.IsNullOrEmpty(parameter) ? command + "\r\n" : command + " " + parameter + "\r\n"; diff -Nru dotnet7-7.0.113/src/runtime/src/libraries/System.Net.Requests/src/System/Net/FtpWebRequest.cs dotnet7-7.0.114/src/runtime/src/libraries/System.Net.Requests/src/System/Net/FtpWebRequest.cs --- dotnet7-7.0.113/src/runtime/src/libraries/System.Net.Requests/src/System/Net/FtpWebRequest.cs 2023-10-20 21:27:42.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/libraries/System.Net.Requests/src/System/Net/FtpWebRequest.cs 2023-10-24 04:47:02.000000000 +0000 @@ -494,6 +494,9 @@ if ((object)uri.Scheme != (object)Uri.UriSchemeFtp) throw new ArgumentOutOfRangeException(nameof(uri)); + if (uri.OriginalString.Contains("\r\n", StringComparison.Ordinal)) + throw new FormatException(SR.net_ftp_no_newlines); + _timerCallback = new TimerThread.Callback(TimerCallback); _syncObject = new object(); diff -Nru dotnet7-7.0.113/src/runtime/src/libraries/System.Net.Requests/tests/FtpWebRequestTest.cs dotnet7-7.0.114/src/runtime/src/libraries/System.Net.Requests/tests/FtpWebRequestTest.cs --- dotnet7-7.0.113/src/runtime/src/libraries/System.Net.Requests/tests/FtpWebRequestTest.cs 2023-10-20 21:27:42.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/libraries/System.Net.Requests/tests/FtpWebRequestTest.cs 2023-10-24 04:47:02.000000000 +0000 @@ -203,6 +203,27 @@ Assert.False(DirExists(mode, dir)); } + [Fact] + public void Ftp_Ignore_NewLine_Constructor_Throws_FormatException() + { + string uri = absoluteUri + Guid.NewGuid().ToString(); + + Assert.Throws(() => WebRequest.Create($"{uri}\r\n{WebRequestMethods.Ftp.AppendFile} {Guid.NewGuid().ToString()}")); + } + + [ConditionalFact(nameof(LocalServerAvailable))] + public void Ftp_Ignore_NewLine_GetRequestStream_And_GetResponse_Throws_FormatException_As_InnerException() + { + FtpWebRequest ftpWebRequest = (FtpWebRequest)WebRequest.Create(absoluteUri + Guid.NewGuid().ToString()); + ftpWebRequest.Method = "APPE"; + ftpWebRequest.Credentials = new NetworkCredential("test\r\ntest2", "test\r\ntest2"); + var requestException = Assert.Throws(() => ftpWebRequest.GetRequestStream()); + Assert.True(requestException.InnerException is FormatException); + + var responseException = Assert.Throws(() => ftpWebRequest.GetResponse()); + Assert.True(responseException.InnerException is FormatException); + } + private static async Task DoAsync(FtpWebRequest request, MemoryStream requestBody) { if (requestBody != null) diff -Nru dotnet7-7.0.113/src/runtime/src/libraries/System.Net.Security/src/System.Net.Security.csproj dotnet7-7.0.114/src/runtime/src/libraries/System.Net.Security/src/System.Net.Security.csproj --- dotnet7-7.0.113/src/runtime/src/libraries/System.Net.Security/src/System.Net.Security.csproj 2023-10-20 21:27:42.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/libraries/System.Net.Security/src/System.Net.Security.csproj 2023-10-24 04:47:02.000000000 +0000 @@ -12,7 +12,7 @@ SR.SystemNetSecurity_PlatformNotSupported $(DefineConstants);TARGET_WINDOWS true - true + true true $(DefineConstants);SYSNETSECURITY_NO_OPENSSL ReferenceAssemblyExclusions.txt diff -Nru dotnet7-7.0.113/src/runtime/src/libraries/System.Net.Sockets/tests/FunctionalTests/SendReceive/SendReceive.cs dotnet7-7.0.114/src/runtime/src/libraries/System.Net.Sockets/tests/FunctionalTests/SendReceive/SendReceive.cs --- dotnet7-7.0.113/src/runtime/src/libraries/System.Net.Sockets/tests/FunctionalTests/SendReceive/SendReceive.cs 2023-10-20 21:27:42.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/libraries/System.Net.Sockets/tests/FunctionalTests/SendReceive/SendReceive.cs 2023-10-24 04:47:02.000000000 +0000 @@ -1013,11 +1013,12 @@ return; } - // RHEL7 kernel has a bug preventing close(AF_UNKNOWN) to succeed with IPv6 sockets. - // In this case Dispose will trigger a graceful shutdown, which means that receive will succeed on socket2. - // This bug is fixed in kernel 3.10.0-1160.25+. - // TODO: Remove this, once CI machines are updated to a newer kernel. - bool mayShutdownGraceful = UsesSync && PlatformDetection.IsRedHatFamily7 && receiveOrSend && (ipv6Server || dualModeClient); + // .NET uses connect(AF_UNSPEC) to abort on-going operations on Linux. + // Linux 6.4+ introduced a change (4faeee0cf8a5d88d63cdbc3bab124fb0e6aed08c) which disallows + // this operation while operations are on-going. + // When the connect fails, .NET falls back to use shutdown(SHUT_RDWR). + // This causes the receive on socket2 to succeed instead of failing with ConnectionReset. + bool mayShutdownGraceful = UsesSync && PlatformDetection.IsLinux && receiveOrSend; // We try this a couple of times to deal with a timing race: if the Dispose happens // before the operation is started, the peer won't see a ConnectionReset SocketException and we won't diff -Nru dotnet7-7.0.113/src/runtime/src/libraries/System.Private.CoreLib/src/System/Threading/PortableThreadPool.WorkerThread.cs dotnet7-7.0.114/src/runtime/src/libraries/System.Private.CoreLib/src/System/Threading/PortableThreadPool.WorkerThread.cs --- dotnet7-7.0.113/src/runtime/src/libraries/System.Private.CoreLib/src/System/Threading/PortableThreadPool.WorkerThread.cs 2023-10-20 21:27:42.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/libraries/System.Private.CoreLib/src/System/Threading/PortableThreadPool.WorkerThread.cs 2023-10-24 04:47:02.000000000 +0000 @@ -7,6 +7,8 @@ { internal sealed partial class PortableThreadPool { + private int _numThreadsBeingKeptAlive; + ///

/// The worker thread infastructure for the CLR thread pool. ///

@@ -28,6 +30,22 @@ // preexisting threads from running out of memory when using new stack space in low-memory situations. public const int EstimatedAdditionalStackUsagePerThreadBytes = 64 << 10; // 64 KB + private static readonly short ThreadsToKeepAlive = DetermineThreadsToKeepAlive(); + + private static short DetermineThreadsToKeepAlive() + { + const short DefaultThreadsToKeepAlive = 0; + + // The number of worker threads to keep alive after they are created. Set to -1 to keep all created worker + // threads alive. When the ThreadTimeoutMs config value is also set, for worker threads the timeout applies to + // worker threads that are in excess of the number configured for ThreadsToKeepAlive. + short threadsToKeepAlive = + AppContextConfigHelper.GetInt16Config( + "System.Threading.ThreadPool.ThreadsToKeepAlive", + DefaultThreadsToKeepAlive); + return threadsToKeepAlive >= -1 ? threadsToKeepAlive : DefaultThreadsToKeepAlive; + } + ///

/// Semaphore for controlling how many threads are currently working. ///

@@ -65,10 +83,36 @@ LowLevelLock threadAdjustmentLock = threadPoolInstance._threadAdjustmentLock; LowLevelLifoSemaphore semaphore = s_semaphore; + // Determine the idle timeout to use for this thread. Some threads may always be kept alive based on config. + int timeoutMs = ThreadPoolThreadTimeoutMs; + if (ThreadsToKeepAlive != 0) + { + if (ThreadsToKeepAlive < 0) + { + timeoutMs = Timeout.Infinite; + } + else + { + int count = threadPoolInstance._numThreadsBeingKeptAlive; + while (count < ThreadsToKeepAlive) + { + int countBeforeUpdate = + Interlocked.CompareExchange(ref threadPoolInstance._numThreadsBeingKeptAlive, count + 1, count); + if (countBeforeUpdate == count) + { + timeoutMs = Timeout.Infinite; + break; + } + + count = countBeforeUpdate; + } + } + } + while (true) { bool spinWait = true; - while (semaphore.Wait(ThreadPoolThreadTimeoutMs, spinWait)) + while (semaphore.Wait(timeoutMs, spinWait)) { bool alreadyRemovedWorkingWorker = false; while (TakeActiveRequest(threadPoolInstance)) diff -Nru dotnet7-7.0.113/src/runtime/src/libraries/System.Private.CoreLib/src/System/Threading/PortableThreadPool.cs dotnet7-7.0.114/src/runtime/src/libraries/System.Private.CoreLib/src/System/Threading/PortableThreadPool.cs --- dotnet7-7.0.113/src/runtime/src/libraries/System.Private.CoreLib/src/System/Threading/PortableThreadPool.cs 2023-10-20 21:27:42.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/libraries/System.Private.CoreLib/src/System/Threading/PortableThreadPool.cs 2023-10-24 04:47:02.000000000 +0000 @@ -13,7 +13,6 @@ /// internal sealed partial class PortableThreadPool { - private const int ThreadPoolThreadTimeoutMs = 20 * 1000; // If you change this make sure to change the timeout times in the tests. private const int SmallStackSizeBytes = 256 * 1024; private const short MaxPossibleThreadCount = short.MaxValue; @@ -34,6 +33,22 @@ private static readonly short ForcedMaxWorkerThreads = AppContextConfigHelper.GetInt16Config("System.Threading.ThreadPool.MaxThreads", 0, false); + private static readonly int ThreadPoolThreadTimeoutMs = DetermineThreadPoolThreadTimeoutMs(); + + private static int DetermineThreadPoolThreadTimeoutMs() + { + const int DefaultThreadPoolThreadTimeoutMs = 20 * 1000; // If you change this make sure to change the timeout times in the tests. + + // The amount of time in milliseconds a thread pool thread waits without having done any work before timing out and + // exiting. Set to -1 to disable the timeout. Applies to worker threads and wait threads. Also see the + // ThreadsToKeepAlive config value for relevant information. + int timeoutMs = + AppContextConfigHelper.GetInt32Config( + "System.Threading.ThreadPool.ThreadTimeoutMs", + DefaultThreadPoolThreadTimeoutMs); + return timeoutMs >= -1 ? timeoutMs : DefaultThreadPoolThreadTimeoutMs; + } + [ThreadStatic] private static object? t_completionCountObject; diff -Nru dotnet7-7.0.113/src/runtime/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.CustomAttributeDelete/CustomAttributeDelete.cs dotnet7-7.0.114/src/runtime/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.CustomAttributeDelete/CustomAttributeDelete.cs --- dotnet7-7.0.113/src/runtime/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.CustomAttributeDelete/CustomAttributeDelete.cs 2023-10-20 21:27:42.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.CustomAttributeDelete/CustomAttributeDelete.cs 2023-10-24 04:47:03.000000000 +0000 @@ -5,7 +5,7 @@ namespace System.Reflection.Metadata.ApplyUpdate.Test { - [AttributeUsage (AttributeTargets.Method, AllowMultiple=true)] + [AttributeUsage (AttributeTargets.Method | AttributeTargets.Class, AllowMultiple=true)] public class MyDeleteAttribute : Attribute { public MyDeleteAttribute (string stringValue) { StringValue = stringValue; } @@ -19,6 +19,7 @@ public int IntValue {get; set; } } + [MyDeleteAttribute ("xyz")] public class ClassWithCustomAttributeDelete { [MyDeleteAttribute ("abcd")] diff -Nru dotnet7-7.0.113/src/runtime/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.CustomAttributeDelete/CustomAttributeDelete_v1.cs dotnet7-7.0.114/src/runtime/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.CustomAttributeDelete/CustomAttributeDelete_v1.cs --- dotnet7-7.0.113/src/runtime/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.CustomAttributeDelete/CustomAttributeDelete_v1.cs 2023-10-20 21:27:42.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.CustomAttributeDelete/CustomAttributeDelete_v1.cs 2023-10-24 04:47:03.000000000 +0000 @@ -5,7 +5,7 @@ namespace System.Reflection.Metadata.ApplyUpdate.Test { - [AttributeUsage (AttributeTargets.Method, AllowMultiple=true)] + [AttributeUsage (AttributeTargets.Method | AttributeTargets.Class, AllowMultiple=true)] public class MyDeleteAttribute : Attribute { public MyDeleteAttribute (string stringValue) { StringValue = stringValue; } diff -Nru dotnet7-7.0.113/src/runtime/src/libraries/System.Runtime.Loader/tests/ApplyUpdateTest.cs dotnet7-7.0.114/src/runtime/src/libraries/System.Runtime.Loader/tests/ApplyUpdateTest.cs --- dotnet7-7.0.113/src/runtime/src/libraries/System.Runtime.Loader/tests/ApplyUpdateTest.cs 2023-10-20 21:27:42.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/libraries/System.Runtime.Loader/tests/ApplyUpdateTest.cs 2023-10-24 04:47:03.000000000 +0000 @@ -200,18 +200,33 @@ { var assm = typeof(System.Reflection.Metadata.ApplyUpdate.Test.ClassWithCustomAttributeDelete).Assembly; + Type attrType = typeof(System.Reflection.Metadata.ApplyUpdate.Test.MyDeleteAttribute); + + Type preUpdateTy = assm.GetType("System.Reflection.Metadata.ApplyUpdate.Test.ClassWithCustomAttributeDelete"); + Assert.NotNull(preUpdateTy); + + // before the update the type has a MyDeleteAttribute on it + Attribute[] cattrs = Attribute.GetCustomAttributes(preUpdateTy, attrType); + Assert.NotNull(cattrs); + Assert.Equal(1, cattrs.Length); + ApplyUpdateUtil.ApplyUpdate(assm); ApplyUpdateUtil.ClearAllReflectionCaches(); - // Just check the updated value on one method - Type attrType = typeof(System.Reflection.Metadata.ApplyUpdate.Test.MyDeleteAttribute); Type ty = assm.GetType("System.Reflection.Metadata.ApplyUpdate.Test.ClassWithCustomAttributeDelete"); Assert.NotNull(ty); + // After the update, the type has no MyDeleteAttribute on it anymore + cattrs = Attribute.GetCustomAttributes(ty, attrType); + Assert.NotNull(cattrs); + Assert.Equal(0, cattrs.Length); + + // Just check the updated value on one method + MethodInfo mi1 = ty.GetMethod(nameof(System.Reflection.Metadata.ApplyUpdate.Test.ClassWithCustomAttributeDelete.Method1), BindingFlags.Public | BindingFlags.Static); Assert.NotNull(mi1); - Attribute[] cattrs = Attribute.GetCustomAttributes(mi1, attrType); + cattrs = Attribute.GetCustomAttributes(mi1, attrType); Assert.NotNull(cattrs); Assert.Equal(0, cattrs.Length); diff -Nru dotnet7-7.0.113/src/runtime/src/libraries/System.Security.Cryptography/src/System.Security.Cryptography.csproj dotnet7-7.0.114/src/runtime/src/libraries/System.Security.Cryptography/src/System.Security.Cryptography.csproj --- dotnet7-7.0.113/src/runtime/src/libraries/System.Security.Cryptography/src/System.Security.Cryptography.csproj 2023-10-20 21:27:42.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/libraries/System.Security.Cryptography/src/System.Security.Cryptography.csproj 2023-10-24 04:47:03.000000000 +0000 @@ -13,7 +13,7 @@ $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) SR.SystemSecurityCryptography_PlatformNotSupported true - true + true true true true diff -Nru dotnet7-7.0.113/src/runtime/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj dotnet7-7.0.114/src/runtime/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj --- dotnet7-7.0.113/src/runtime/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj 2023-10-20 21:27:42.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj 2023-10-24 04:47:03.000000000 +0000 @@ -11,7 +11,7 @@ $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) $(DefineConstants);Unix - true + true true diff -Nru dotnet7-7.0.113/src/runtime/src/libraries/System.Text.Json/src/System/Text/Json/Document/JsonDocument.cs dotnet7-7.0.114/src/runtime/src/libraries/System.Text.Json/src/System/Text/Json/Document/JsonDocument.cs --- dotnet7-7.0.113/src/runtime/src/libraries/System.Text.Json/src/System/Text/Json/Document/JsonDocument.cs 2023-10-20 21:27:42.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/libraries/System.Text.Json/src/System/Text/Json/Document/JsonDocument.cs 2023-10-24 04:47:03.000000000 +0000 @@ -27,8 +27,6 @@ private byte[]? _extraRentedArrayPoolBytes; private PooledByteBufferWriter? _extraPooledByteBufferWriter; - private (int, string?) _lastIndexAndString = (-1, null); - internal bool IsDisposable { get; } ///

@@ -266,14 +264,6 @@ { CheckNotDisposed(); - (int lastIdx, string? lastString) = _lastIndexAndString; - - if (lastIdx == index) - { - Debug.Assert(lastString != null); - return lastString; - } - DbRow row = _parsedData.Get(index); JsonTokenType tokenType = row.TokenType; @@ -288,18 +278,9 @@ ReadOnlySpan data = _utf8Json.Span; ReadOnlySpan segment = data.Slice(row.Location, row.SizeOrLength); - if (row.HasComplexChildren) - { - lastString = JsonReaderHelper.GetUnescapedString(segment); - } - else - { - lastString = JsonReaderHelper.TranscodeHelper(segment); - } - - Debug.Assert(lastString != null); - _lastIndexAndString = (index, lastString); - return lastString; + return row.HasComplexChildren + ? JsonReaderHelper.GetUnescapedString(segment) + : JsonReaderHelper.TranscodeHelper(segment); } internal bool TextEquals(int index, ReadOnlySpan otherText, bool isPropertyName) @@ -308,13 +289,6 @@ int matchIndex = isPropertyName ? index - DbRow.Size : index; - (int lastIdx, string? lastString) = _lastIndexAndString; - - if (lastIdx == matchIndex) - { - return otherText.SequenceEqual(lastString.AsSpan()); - } - byte[]? otherUtf8TextArray = null; int length = checked(otherText.Length * JsonConstants.MaxExpansionFactorWhileTranscoding); diff -Nru dotnet7-7.0.113/src/runtime/src/libraries/System.Text.Json/src/System.Text.Json.csproj dotnet7-7.0.114/src/runtime/src/libraries/System.Text.Json/src/System.Text.Json.csproj --- dotnet7-7.0.113/src/runtime/src/libraries/System.Text.Json/src/System.Text.Json.csproj 2023-10-20 21:27:42.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/libraries/System.Text.Json/src/System.Text.Json.csproj 2023-10-24 04:47:03.000000000 +0000 @@ -8,8 +8,8 @@ CS8969 true true - false - 3 + true + 4 true Provides high-performance and low-allocating types that serialize objects to JavaScript Object Notation (JSON) text and deserialize JSON text to objects, with UTF-8 support built-in. Also provides types to read and write JSON text encoded as UTF-8, and to create an in-memory document object model (DOM), that is read-only, for random access of the JSON elements within a structured view of the data. diff -Nru dotnet7-7.0.113/src/runtime/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonDocumentTests.cs dotnet7-7.0.114/src/runtime/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonDocumentTests.cs --- dotnet7-7.0.113/src/runtime/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonDocumentTests.cs 2023-10-20 21:27:42.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonDocumentTests.cs 2023-10-24 04:47:03.000000000 +0000 @@ -14,6 +14,7 @@ using System.Linq; using System.Runtime.InteropServices; using System.Threading.Tasks; +using System.Threading; namespace System.Text.Json.Tests { @@ -2744,11 +2745,9 @@ Assert.Equal(test, property.Value.GetInt32()); test++; - // Subsequent read of the same JsonProperty doesn't allocate a new string - // (if another property is inspected from the same document that guarantee - // doesn't hold). + // Subsequent read of the same JsonProperty should return an equal string string propertyName2 = property.Name; - Assert.Same(propertyName, propertyName2); + Assert.Equal(propertyName, propertyName2); } test = 0; @@ -3607,6 +3606,41 @@ } } + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))] + [OuterLoop] // thread-safety / stress test + public static async Task GetString_ConcurrentUse_ThreadSafe() + { + using (JsonDocument doc = JsonDocument.Parse(SR.SimpleObjectJson)) + { + JsonElement first = doc.RootElement.GetProperty("first"); + JsonElement last = doc.RootElement.GetProperty("last"); + + const int Iters = 10_000; + using (var gate = new Barrier(2)) + { + await Task.WhenAll( + Task.Factory.StartNew(() => + { + gate.SignalAndWait(); + for (int i = 0; i < Iters; i++) + { + Assert.Equal("John", first.GetString()); + Assert.True(first.ValueEquals("John")); + } + }, CancellationToken.None, TaskCreationOptions.LongRunning, TaskScheduler.Default), + Task.Factory.StartNew(() => + { + gate.SignalAndWait(); + for (int i = 0; i < Iters; i++) + { + Assert.Equal("Smith", last.GetString()); + Assert.True(last.ValueEquals("Smith")); + } + }, CancellationToken.None, TaskCreationOptions.LongRunning, TaskScheduler.Default)); + } + } + } + private static void BuildSegmentedReader( out Utf8JsonReader reader, ReadOnlyMemory data, diff -Nru dotnet7-7.0.113/src/runtime/src/mono/mono/component/hot_reload.c dotnet7-7.0.114/src/runtime/src/mono/mono/component/hot_reload.c --- dotnet7-7.0.113/src/runtime/src/mono/mono/component/hot_reload.c 2023-10-20 21:27:42.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/mono/mono/component/hot_reload.c 2023-10-24 04:47:03.000000000 +0000 @@ -1624,7 +1624,13 @@ i++; /* skip the next record */ continue; } - /* fallthru */ + // don't expect to see any other func codes with this table + g_assert (func_code == ENC_FUNC_DEFAULT); + // If it's an addition, it's an added type definition, continue. + + // If it's a modification, Roslyn sometimes sends this when a custom + // attribute is deleted from a type definition. + break; } default: if (!is_addition) { @@ -2244,16 +2250,42 @@ * especially since from the next generation's point of view * that's what adding a field/method will be. */ break; - case ENC_FUNC_ADD_EVENT: - g_assert_not_reached (); /* FIXME: implement me */ default: g_assert_not_reached (); /* unknown func_code */ } break; + } else { + switch (func_code) { + case ENC_FUNC_DEFAULT: + // Roslyn sends this sometimes when it deletes a custom + // attribute. In this case no rows of the table def have + // should have changed from the previous generation. + + // Note: we may want to check that Parent and Interfaces + // haven't changed. But note that's tricky to do: we can't + // just compare tokens: the parent could be a TypeRef token, + // and roslyn does send a new typeref row (that ends up + // referencing the same type definition). But we also don't + // want to convert to a `MonoClass*` too eagerly - if the + // class hasn't been used yet we don't want to kick off + // class initialization (which could mention the current + // class thanks to generic arguments - see class-init.c) + // Same with Interfaces. Fields and Methods in an EnC + // updated row are zero. So that only really leaves + // Attributes as the only column we can compare, which + // wouldn't tell us much (and perhaps in the future Roslyn + // could allow changing visibility, so we wouldn't want to + // compare for equality, anyway) So... we're done. + break; + case ENC_FUNC_ADD_METHOD: + case ENC_FUNC_ADD_FIELD: + /* modifying an existing class by adding a method or field, etc. */ + break; + default: + /* not expecting anything else */ + g_assert_not_reached (); + } } - /* modifying an existing class by adding a method or field, etc. */ - g_assert (!is_addition); - g_assert (func_code != ENC_FUNC_DEFAULT); break; } case MONO_TABLE_NESTEDCLASS: { diff -Nru dotnet7-7.0.113/src/runtime/src/mono/mono/mini/aot-runtime.c dotnet7-7.0.114/src/runtime/src/mono/mono/mini/aot-runtime.c --- dotnet7-7.0.113/src/runtime/src/mono/mono/mini/aot-runtime.c 2023-10-20 21:27:42.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/mono/mono/mini/aot-runtime.c 2023-10-24 04:47:03.000000000 +0000 @@ -4633,10 +4633,13 @@ * been initialized by load_method () for a static cctor before the cctor has * finished executing (#23242). */ - if (ji->type == MONO_PATCH_INFO_NONE) { - } else if (!got [got_slots [pindex]] || ji->type == MONO_PATCH_INFO_SFLDA) { + MonoJumpInfoType ji_type = ji->type; + LOAD_ACQUIRE_FENCE; + + if (ji_type == MONO_PATCH_INFO_NONE) { + } else if (!got [got_slots [pindex]] || ji_type == MONO_PATCH_INFO_SFLDA) { /* In llvm-only made, we might encounter shared methods */ - if (mono_llvm_only && ji->type == MONO_PATCH_INFO_METHOD && mono_method_check_context_used (ji->data.method)) { + if (mono_llvm_only && ji_type == MONO_PATCH_INFO_METHOD && mono_method_check_context_used (ji->data.method)) { g_assert (context); ji->data.method = mono_class_inflate_generic_method_checked (ji->data.method, context, error); if (!is_ok (error)) { @@ -4646,10 +4649,10 @@ } } /* This cannot be resolved in mono_resolve_patch_target () */ - if (ji->type == MONO_PATCH_INFO_AOT_JIT_INFO) { + if (ji_type == MONO_PATCH_INFO_AOT_JIT_INFO) { // FIXME: Lookup using the index jinfo = mono_aot_find_jit_info (amodule->assembly->image, code); - ji->type = MONO_PATCH_INFO_ABS; + ji->type = ji_type = MONO_PATCH_INFO_ABS; ji->data.target = jinfo; } addr = mono_resolve_patch_target (method, code, ji, TRUE, error); @@ -4658,18 +4661,19 @@ mono_mempool_destroy (mp); return FALSE; } - if (ji->type == MONO_PATCH_INFO_METHOD_JUMP) + if (ji_type == MONO_PATCH_INFO_METHOD_JUMP) { addr = mono_create_ftnptr (addr); - mono_memory_barrier (); - got [got_slots [pindex]] = addr; - if (ji->type == MONO_PATCH_INFO_METHOD_JUMP) register_jump_target_got_slot (ji->data.method, &(got [got_slots [pindex]])); - + } if (llvm) { void (*init_aotconst) (int, gpointer) = (void (*)(int, gpointer))amodule->info.llvm_init_aotconst; init_aotconst (got_slots [pindex], addr); } + mono_memory_barrier (); + got [got_slots [pindex]] = addr; } + + STORE_RELEASE_FENCE; ji->type = MONO_PATCH_INFO_NONE; } diff -Nru dotnet7-7.0.113/src/runtime/src/mono/mono/mini/mini-amd64.c dotnet7-7.0.114/src/runtime/src/mono/mono/mini/mini-amd64.c --- dotnet7-7.0.113/src/runtime/src/mono/mono/mini/mini-amd64.c 2023-10-20 21:27:42.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/mono/mono/mini/mini-amd64.c 2023-10-24 04:47:03.000000000 +0000 @@ -355,7 +355,7 @@ g_assert(info); for (guint32 i = 0; i < info->num_fields; ++i) { if (MONO_TYPE_ISSTRUCT (info->fields [i].field->type)) { - collect_field_info_nested (mono_class_from_mono_type_internal (info->fields [i].field->type), fields_array, info->fields [i].offset, pinvoke, unicode); + collect_field_info_nested (mono_class_from_mono_type_internal (info->fields [i].field->type), fields_array, (offset + info->fields [i].offset), pinvoke, unicode); } else { guint32 align; StructFieldInfo f; @@ -365,7 +365,7 @@ info->fields [i].mspec, &align, TRUE, unicode); f.offset = offset + info->fields [i].offset; - if (i == info->num_fields - 1 && f.size + f.offset < info->native_size) { + if ((i == info->num_fields - 1) && ((f.size + f.offset) < info->native_size)) { /* This can happen with .pack directives eg. 'fixed' arrays */ if (MONO_TYPE_IS_PRIMITIVE (f.type)) { /* Replicate the last field to fill out the remaining place, since the code in add_valuetype () needs type information */ diff -Nru dotnet7-7.0.113/src/runtime/src/mono/mono/tools/offsets-tool/clang/cindex.py dotnet7-7.0.114/src/runtime/src/mono/mono/tools/offsets-tool/clang/cindex.py --- dotnet7-7.0.113/src/runtime/src/mono/mono/tools/offsets-tool/clang/cindex.py 2023-10-20 21:27:42.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/mono/mono/tools/offsets-tool/clang/cindex.py 2023-10-24 04:47:03.000000000 +0000 @@ -646,6 +646,11 @@ @classmethod def from_id(cls, id): + if cls == CursorKind and id == 300: + # --- DOTNET change --- + # The id of CursorKind.TRANSLATION_UNIT changed in https://github.com/llvm/llvm-project/commit/bb83f8e70bd1d56152f02307adacd718cd67e312, + # add mapping from the old to the new value so using the binding with an older clang still works. + return cls._kinds[350] if id >= len(cls._kinds) or cls._kinds[id] is None: raise ValueError('Unknown template argument kind %d' % id) return cls._kinds[id] @@ -1312,7 +1317,7 @@ # # The translation unit cursor exists primarily to act as the root cursor for # traversing the contents of a translation unit. -CursorKind.TRANSLATION_UNIT = CursorKind(300) +CursorKind.TRANSLATION_UNIT = CursorKind(350) ### # Attributes @@ -1342,6 +1347,8 @@ CursorKind.DLLEXPORT_ATTR = CursorKind(418) CursorKind.DLLIMPORT_ATTR = CursorKind(419) +# Temporary fake value to work around xcode 15 beta / clang 15 +CursorKind.XCODEBETA_ATTR = CursorKind(437) CursorKind.CONVERGENT_ATTR = CursorKind(438) CursorKind.WARN_UNUSED_ATTR = CursorKind(439) CursorKind.WARN_UNUSED_RESULT_ATTR = CursorKind(440) @@ -2059,6 +2066,7 @@ TypeKind.OBJCSEL = TypeKind(29) TypeKind.FLOAT128 = TypeKind(30) TypeKind.HALF = TypeKind(31) +TypeKind.IBM128 = TypeKind(40) TypeKind.COMPLEX = TypeKind(100) TypeKind.POINTER = TypeKind(101) TypeKind.BLOCKPOINTER = TypeKind(102) @@ -2122,6 +2130,7 @@ TypeKind.OCLRESERVEID = TypeKind(160) TypeKind.EXTVECTOR = TypeKind(176) +TypeKind.ATOMIC = TypeKind(177) class RefQualifierKind(BaseEnumeration): """Describes a specific ref-qualifier of a type.""" diff -Nru dotnet7-7.0.113/src/runtime/src/mono/mono/tools/offsets-tool/offsets-tool.py dotnet7-7.0.114/src/runtime/src/mono/mono/tools/offsets-tool/offsets-tool.py --- dotnet7-7.0.113/src/runtime/src/mono/mono/tools/offsets-tool/offsets-tool.py 2023-10-20 21:27:42.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/mono/mono/tools/offsets-tool/offsets-tool.py 2023-10-24 04:47:03.000000000 +0000 @@ -365,8 +365,11 @@ if type.size == -1: continue f.write ("DECL_SIZE2(%s,%s)\n" % (type.name, type.size)) + done_fields = {} for field in type.fields: - f.write ("DECL_OFFSET2(%s,%s,%s)\n" % (type.name, field.name, field.offset)) + if field.name not in done_fields: + f.write ("DECL_OFFSET2(%s,%s,%s)\n" % (type.name, field.name, field.offset)) + done_fields [field.name] = field.name f.write ("#endif //disable metadata check\n") f.write ("#ifndef DISABLE_JIT_OFFSETS\n") @@ -376,8 +379,11 @@ if type.size == -1: continue f.write ("DECL_SIZE2(%s,%s)\n" % (type.name, type.size)) + done_fields = {} for field in type.fields: - f.write ("DECL_OFFSET2(%s,%s,%s)\n" % (type.name, field.name, field.offset)) + if field.name not in done_fields: + f.write ("DECL_OFFSET2(%s,%s,%s)\n" % (type.name, field.name, field.offset)) + done_fields [field.name] = field.name f.write ("#endif //disable jit check\n") f.write ("#endif //cross compiler checks\n") diff -Nru dotnet7-7.0.113/src/runtime/src/mono/wasm/debugger/BrowserDebugProxy/DebugStore.cs dotnet7-7.0.114/src/runtime/src/mono/wasm/debugger/BrowserDebugProxy/DebugStore.cs --- dotnet7-7.0.113/src/runtime/src/mono/wasm/debugger/BrowserDebugProxy/DebugStore.cs 2023-10-20 21:27:42.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/mono/wasm/debugger/BrowserDebugProxy/DebugStore.cs 2023-10-24 04:47:03.000000000 +0000 @@ -1491,50 +1491,24 @@ foreach (string url in asm_files) { - try - { - string candidate_pdb = Path.ChangeExtension(url, "pdb"); - string pdb = pdb_files.FirstOrDefault(n => n == candidate_pdb); + string candidate_pdb = Path.ChangeExtension(url, "pdb"); + string pdb = pdb_files.FirstOrDefault(n => n == candidate_pdb); - steps.Add( - new DebugItem - { - Url = url, - Data = Task.WhenAll(MonoProxy.HttpClient.GetByteArrayAsync(url, token), pdb != null ? MonoProxy.HttpClient.GetByteArrayAsync(pdb, token) : Task.FromResult(null)) - }); - } - catch (Exception e) - { - if (tryUseDebuggerProtocol) - { - try - { - string unescapedFileName = Uri.UnescapeDataString(url); - steps.Add( - new DebugItem - { - Url = url, - Data = context.SdbAgent.GetBytesFromAssemblyAndPdb(Path.GetFileName(unescapedFileName), token) - }); - } - catch (Exception ex) - { - logger.LogDebug($"Failed to get bytes using debugger protocol {url} ({ex.Message})"); - } - } - else + steps.Add( + new DebugItem { - logger.LogDebug($"Failed to read {url} ({e.Message})"); - } - } + Url = url, + Data = Task.WhenAll(MonoProxy.HttpClient.GetByteArrayAsync(url, token), pdb != null ? MonoProxy.HttpClient.GetByteArrayAsync(pdb, token) : Task.FromResult(null)) + }); } foreach (DebugItem step in steps) { AssemblyInfo assembly = null; + byte[][] bytes; try { - byte[][] bytes = await step.Data.ConfigureAwait(false); + bytes = await step.Data.ConfigureAwait(false); if (bytes[0] == null) { logger.LogDebug($"Bytes from assembly {step.Url} is NULL"); @@ -1544,7 +1518,23 @@ } catch (Exception e) { - logger.LogError($"Failed to load {step.Url} ({e.Message})"); + try + { + if (tryUseDebuggerProtocol) + { + string unescapedFileName = Uri.UnescapeDataString(step.Url); + bytes = await context.SdbAgent.GetBytesFromAssemblyAndPdb(Path.GetFileName(unescapedFileName), token).ConfigureAwait(false); + assembly = new AssemblyInfo(monoProxy, id, step.Url, bytes[0], bytes[1], logger, token); + } + else + { + logger.LogDebug($"Failed to read {step.Url} ({e})"); + } + } + catch (Exception ex) + { + logger.LogError($"Failed to load {step.Url} ({ex})"); + } } if (assembly == null) continue; diff -Nru dotnet7-7.0.113/src/runtime/src/native/corehost/fxr/framework_info.cpp dotnet7-7.0.114/src/runtime/src/native/corehost/fxr/framework_info.cpp --- dotnet7-7.0.113/src/runtime/src/native/corehost/fxr/framework_info.cpp 2023-10-20 21:27:42.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/native/corehost/fxr/framework_info.cpp 2023-10-24 04:47:03.000000000 +0000 @@ -34,7 +34,7 @@ /*static*/ void framework_info::get_all_framework_infos( const pal::string_t& own_dir, - const pal::string_t& fx_name, + const pal::char_t* fx_name, bool disable_multilevel_lookup, std::vector* framework_infos) { @@ -43,49 +43,58 @@ int32_t hive_depth = 0; - for (pal::string_t dir : hive_dir) + for (const pal::string_t& dir : hive_dir) { auto fx_shared_dir = dir; append_path(&fx_shared_dir, _X("shared")); - if (pal::directory_exists(fx_shared_dir)) + if (!pal::directory_exists(fx_shared_dir)) + continue; + + std::vector fx_names; + if (fx_name != nullptr) { - std::vector fx_names; - if (fx_name.length()) - { - // Use the provided framework name - fx_names.push_back(fx_name); - } - else - { - // Read all frameworks, including "Microsoft.NETCore.App" - pal::readdir_onlydirectories(fx_shared_dir, &fx_names); - } + // Use the provided framework name + fx_names.push_back(fx_name); + } + else + { + // Read all frameworks, including "Microsoft.NETCore.App" + pal::readdir_onlydirectories(fx_shared_dir, &fx_names); + } - for (pal::string_t fx_name_local : fx_names) - { - auto fx_dir = fx_shared_dir; - append_path(&fx_dir, fx_name_local.c_str()); + for (const pal::string_t& fx_name_local : fx_names) + { + auto fx_dir = fx_shared_dir; + append_path(&fx_dir, fx_name_local.c_str()); - if (pal::directory_exists(fx_dir)) - { - trace::verbose(_X("Gathering FX locations in [%s]"), fx_dir.c_str()); + if (!pal::directory_exists(fx_dir)) + continue; + + trace::verbose(_X("Gathering FX locations in [%s]"), fx_dir.c_str()); - std::vector versions; - pal::readdir_onlydirectories(fx_dir, &versions); - for (const auto& ver : versions) - { - // Make sure we filter out any non-version folders. - fx_ver_t parsed; - if (fx_ver_t::parse(ver, &parsed, false)) - { - trace::verbose(_X("Found FX version [%s]"), ver.c_str()); - - framework_info info(fx_name_local, fx_dir, parsed, hive_depth); - framework_infos->push_back(info); - } - } + std::vector versions; + pal::readdir_onlydirectories(fx_dir, &versions); + for (const pal::string_t& ver : versions) + { + // Make sure we filter out any non-version folders. + fx_ver_t parsed; + if (!fx_ver_t::parse(ver, &parsed, false)) + continue; + + // Check that the framework's .deps.json exists. + pal::string_t fx_version_dir = fx_dir; + append_path(&fx_version_dir, ver.c_str()); + if (!library_exists_in_dir(fx_version_dir, fx_name_local + _X(".deps.json"), nullptr)) + { + trace::verbose(_X("Ignoring FX version [%s] without .deps.json"), ver.c_str()); + continue; } + + trace::verbose(_X("Found FX version [%s]"), ver.c_str()); + + framework_info info(fx_name_local, fx_dir, parsed, hive_depth); + framework_infos->push_back(info); } } @@ -98,7 +107,7 @@ /*static*/ bool framework_info::print_all_frameworks(const pal::string_t& own_dir, const pal::string_t& leading_whitespace) { std::vector framework_infos; - get_all_framework_infos(own_dir, _X(""), /*disable_multilevel_lookup*/ true, &framework_infos); + get_all_framework_infos(own_dir, nullptr, /*disable_multilevel_lookup*/ true, &framework_infos); for (framework_info info : framework_infos) { trace::println(_X("%s%s %s [%s]"), leading_whitespace.c_str(), info.name.c_str(), info.version.as_str().c_str(), info.path.c_str()); diff -Nru dotnet7-7.0.113/src/runtime/src/native/corehost/fxr/framework_info.h dotnet7-7.0.114/src/runtime/src/native/corehost/fxr/framework_info.h --- dotnet7-7.0.113/src/runtime/src/native/corehost/fxr/framework_info.h 2023-10-20 21:27:42.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/native/corehost/fxr/framework_info.h 2023-10-24 04:47:03.000000000 +0000 @@ -17,7 +17,7 @@ static void get_all_framework_infos( const pal::string_t& own_dir, - const pal::string_t& fx_name, + const pal::char_t* fx_name, bool disable_multilevel_lookup, std::vector* framework_infos); diff -Nru dotnet7-7.0.113/src/runtime/src/native/corehost/fxr/fx_resolver.cpp dotnet7-7.0.114/src/runtime/src/native/corehost/fxr/fx_resolver.cpp --- dotnet7-7.0.113/src/runtime/src/native/corehost/fxr/fx_resolver.cpp 2023-10-20 21:27:42.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/native/corehost/fxr/fx_resolver.cpp 2023-10-24 04:47:03.000000000 +0000 @@ -174,9 +174,6 @@ if (best_match == fx_ver_t()) { - // This is not strictly necessary, we just need to return version which doesn't exist. - // But it's cleaner to return the desider reference then invalid -1.-1.-1 version. - best_match = fx_ref.get_fx_version_number(); trace::verbose(_X("Framework reference didn't resolve to any available version.")); } else if (trace::is_enabled()) @@ -212,7 +209,8 @@ pal::string_t selected_fx_version; fx_ver_t selected_ver; - for (pal::string_t dir : hive_dir) + pal::string_t deps_file_name = fx_ref.get_fx_name() + _X(".deps.json"); + for (pal::string_t& dir : hive_dir) { auto fx_dir = dir; trace::verbose(_X("Searching FX directory in [%s]"), fx_dir.c_str()); @@ -236,7 +234,7 @@ fx_ref.get_fx_version().c_str()); append_path(&fx_dir, fx_ref.get_fx_version().c_str()); - if (pal::directory_exists(fx_dir)) + if (library_exists_in_dir(fx_dir, deps_file_name, nullptr)) { selected_fx_dir = fx_dir; selected_fx_version = fx_ref.get_fx_version(); @@ -259,24 +257,39 @@ } fx_ver_t resolved_ver = resolve_framework_reference_from_version_list(version_list, fx_ref); - - pal::string_t resolved_ver_str = resolved_ver.as_str(); - append_path(&fx_dir, resolved_ver_str.c_str()); - - if (pal::directory_exists(fx_dir)) + while (resolved_ver != fx_ver_t()) { - if (selected_ver != fx_ver_t()) + pal::string_t resolved_ver_str = resolved_ver.as_str(); + pal::string_t resolved_fx_dir = fx_dir; + append_path(&resolved_fx_dir, resolved_ver_str.c_str()); + + // Check that the framework's .deps.json exists. To minimize the file checks done in the most common + // scenario (.deps.json exists), only check after resolving the version and if the .deps.json doesn't + // exist, attempt resolving again without that version. + if (!library_exists_in_dir(resolved_fx_dir, deps_file_name, nullptr)) { - // Compare the previous hive_dir selection with the current hive_dir to see which one is the better match - resolved_ver = resolve_framework_reference_from_version_list({ resolved_ver, selected_ver }, fx_ref); + // Remove the version and try resolving again + trace::verbose(_X("Ignoring FX version [%s] without .deps.json"), resolved_ver_str.c_str()); + version_list.erase(std::find(version_list.cbegin(), version_list.cend(), resolved_ver)); + resolved_ver = resolve_framework_reference_from_version_list(version_list, fx_ref); } - - if (resolved_ver != selected_ver) + else { - trace::verbose(_X("Changing Selected FX version from [%s] to [%s]"), selected_fx_dir.c_str(), fx_dir.c_str()); - selected_ver = resolved_ver; - selected_fx_dir = fx_dir; - selected_fx_version = resolved_ver_str; + if (selected_ver != fx_ver_t()) + { + // Compare the previous hive_dir selection with the current hive_dir to see which one is the better match + resolved_ver = resolve_framework_reference_from_version_list({ resolved_ver, selected_ver }, fx_ref); + } + + if (resolved_ver != selected_ver) + { + trace::verbose(_X("Changing Selected FX version from [%s] to [%s]"), selected_fx_dir.c_str(), resolved_fx_dir.c_str()); + selected_ver = resolved_ver; + selected_fx_dir = resolved_fx_dir; + selected_fx_version = resolved_ver_str; + } + + break; } } } diff -Nru dotnet7-7.0.113/src/runtime/src/native/corehost/fxr/fx_resolver.messages.cpp dotnet7-7.0.114/src/runtime/src/native/corehost/fxr/fx_resolver.messages.cpp --- dotnet7-7.0.113/src/runtime/src/native/corehost/fxr/fx_resolver.messages.cpp 2023-10-20 21:27:42.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/native/corehost/fxr/fx_resolver.messages.cpp 2023-10-24 04:47:03.000000000 +0000 @@ -101,14 +101,14 @@ if (fx_dir.length()) { fx_ver_dirs = fx_dir; - framework_info::get_all_framework_infos(get_directory(fx_dir), fx_name, disable_multilevel_lookup, &framework_infos); + framework_info::get_all_framework_infos(get_directory(fx_dir), fx_name.c_str(), disable_multilevel_lookup, &framework_infos); } else { fx_ver_dirs = dotnet_root; } - framework_info::get_all_framework_infos(dotnet_root, fx_name, disable_multilevel_lookup, &framework_infos); + framework_info::get_all_framework_infos(dotnet_root, fx_name.c_str(), disable_multilevel_lookup, &framework_infos); // Display the error message about missing FX. if (fx_version.length()) diff -Nru dotnet7-7.0.113/src/runtime/src/native/corehost/fxr/hostfxr.cpp dotnet7-7.0.114/src/runtime/src/native/corehost/fxr/hostfxr.cpp --- dotnet7-7.0.113/src/runtime/src/native/corehost/fxr/hostfxr.cpp 2023-10-20 21:27:42.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/native/corehost/fxr/hostfxr.cpp 2023-10-24 04:47:03.000000000 +0000 @@ -438,7 +438,7 @@ } std::vector framework_infos; - framework_info::get_all_framework_infos(dotnet_dir, _X(""), /*disable_multilevel_lookup*/ true, &framework_infos); + framework_info::get_all_framework_infos(dotnet_dir, nullptr, /*disable_multilevel_lookup*/ true, &framework_infos); std::vector environment_framework_infos; std::vector framework_versions; diff -Nru dotnet7-7.0.113/src/runtime/src/tests/Interop/StructMarshalling/PInvoke/GameControllerButtonBind.cs dotnet7-7.0.114/src/runtime/src/tests/Interop/StructMarshalling/PInvoke/GameControllerButtonBind.cs --- dotnet7-7.0.113/src/runtime/src/tests/Interop/StructMarshalling/PInvoke/GameControllerButtonBind.cs 1970-01-01 00:00:00.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/tests/Interop/StructMarshalling/PInvoke/GameControllerButtonBind.cs 2023-10-24 04:47:03.000000000 +0000 @@ -0,0 +1,63 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System; +using System.Runtime.InteropServices; +using System.Runtime.CompilerServices; +using System.Text; + +public unsafe partial struct GameControllerButtonBind +{ + public GameControllerButtonBind + ( + GameControllerBindType? bindType = null, + GameControllerButtonBindValue? value = null + ) : this() + { + if (bindType is not null) + { + BindType = bindType.Value; + } + + if (value is not null) + { + Value = value.Value; + } + } + + public GameControllerBindType BindType; + + public GameControllerButtonBindValue Value; +} + +public enum GameControllerBindType : int +{ + ControllerBindtypeNone = 0x0, + ControllerBindtypeButton = 0x1, + ControllerBindtypeAxis = 0x2, + ControllerBindtypeHat = 0x3, + None = 0x0, + Button = 0x1, + Axis = 0x2, + Hat = 0x3, +} + +[StructLayout(LayoutKind.Explicit)] +public unsafe partial struct GameControllerButtonBindValue +{ + [FieldOffset(0)] + public int Button; + + [FieldOffset(0)] + public int Axis; + + [FieldOffset(0)] + public GameControllerButtonBindValueHat Hat; +} + +public unsafe partial struct GameControllerButtonBindValueHat +{ + public int Hat; + + public int HatMask; +} diff -Nru dotnet7-7.0.113/src/runtime/src/tests/Interop/StructMarshalling/PInvoke/MarshalStructAsParamDLL.cpp dotnet7-7.0.114/src/runtime/src/tests/Interop/StructMarshalling/PInvoke/MarshalStructAsParamDLL.cpp --- dotnet7-7.0.113/src/runtime/src/tests/Interop/StructMarshalling/PInvoke/MarshalStructAsParamDLL.cpp 2023-10-20 21:27:43.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/tests/Interop/StructMarshalling/PInvoke/MarshalStructAsParamDLL.cpp 2023-10-24 04:47:03.000000000 +0000 @@ -1297,3 +1297,8 @@ { return { lhs.i + rhs.i, lhs.l + rhs.l }; } + +extern "C" DLL_EXPORT SDL_GameControllerBindType STDMETHODCALLTYPE getBindType(SDL_GameControllerButtonBind button) +{ + return button.bindType; +} diff -Nru dotnet7-7.0.113/src/runtime/src/tests/Interop/StructMarshalling/PInvoke/MarshalStructAsParamDLL.h dotnet7-7.0.114/src/runtime/src/tests/Interop/StructMarshalling/PInvoke/MarshalStructAsParamDLL.h --- dotnet7-7.0.113/src/runtime/src/tests/Interop/StructMarshalling/PInvoke/MarshalStructAsParamDLL.h 2023-10-20 21:27:43.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/tests/Interop/StructMarshalling/PInvoke/MarshalStructAsParamDLL.h 2023-10-24 04:47:03.000000000 +0000 @@ -974,3 +974,26 @@ int32_t i; long l; }; + +typedef enum +{ + SDL_CONTROLLER_BINDTYPE_NONE = 0, + SDL_CONTROLLER_BINDTYPE_BUTTON, + SDL_CONTROLLER_BINDTYPE_AXIS, + SDL_CONTROLLER_BINDTYPE_HAT +} SDL_GameControllerBindType; + +typedef struct SDL_GameControllerButtonBind +{ + SDL_GameControllerBindType bindType; + union + { + int button; + int axis; + struct { + int hat; + int hat_mask; + } hat; + } value; + +} SDL_GameControllerButtonBind; diff -Nru dotnet7-7.0.113/src/runtime/src/tests/Interop/StructMarshalling/PInvoke/NestedStruct.cs dotnet7-7.0.114/src/runtime/src/tests/Interop/StructMarshalling/PInvoke/NestedStruct.cs --- dotnet7-7.0.113/src/runtime/src/tests/Interop/StructMarshalling/PInvoke/NestedStruct.cs 1970-01-01 00:00:00.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/tests/Interop/StructMarshalling/PInvoke/NestedStruct.cs 2023-10-24 04:47:03.000000000 +0000 @@ -0,0 +1,27 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System; +using System.Runtime.InteropServices; +using Xunit; + +public class Managed +{ + [DllImport("MarshalStructAsParam")] + static extern GameControllerBindType getBindType (GameControllerButtonBind button); + + public static int Main() + { + GameControllerButtonBind button = new GameControllerButtonBind(GameControllerBindType.ControllerBindtypeAxis, null); + if (getBindType(button) == GameControllerBindType.ControllerBindtypeAxis) + { + Console.WriteLine("\nTEST PASSED!"); + return 100; + } + else + { + Console.WriteLine("\nTEST FAILED!"); + return 1; + } + } +} diff -Nru dotnet7-7.0.113/src/runtime/src/tests/Interop/StructMarshalling/PInvoke/NestedStruct.csproj dotnet7-7.0.114/src/runtime/src/tests/Interop/StructMarshalling/PInvoke/NestedStruct.csproj --- dotnet7-7.0.113/src/runtime/src/tests/Interop/StructMarshalling/PInvoke/NestedStruct.csproj 1970-01-01 00:00:00.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/tests/Interop/StructMarshalling/PInvoke/NestedStruct.csproj 2023-10-24 04:47:03.000000000 +0000 @@ -0,0 +1,14 @@ + + + exe + true + + + + + + + + + + diff -Nru dotnet7-7.0.113/src/runtime/src/tests/issues.targets dotnet7-7.0.114/src/runtime/src/tests/issues.targets --- dotnet7-7.0.113/src/runtime/src/tests/issues.targets 2023-10-20 21:27:44.000000000 +0000 +++ dotnet7-7.0.114/src/runtime/src/tests/issues.targets 2023-10-24 04:47:04.000000000 +0000 @@ -4062,6 +4062,9 @@ mobile and wasm don't support tests with native libraries. wasm also needs static linking + + https://github.com/dotnet/runtime/issues/64127 + diff -Nru dotnet7-7.0.113/src/sdk/.git/FETCH_HEAD dotnet7-7.0.114/src/sdk/.git/FETCH_HEAD --- dotnet7-7.0.113/src/sdk/.git/FETCH_HEAD 2023-10-20 21:27:58.000000000 +0000 +++ dotnet7-7.0.114/src/sdk/.git/FETCH_HEAD 2023-10-24 04:47:20.000000000 +0000 @@ -1 +1 @@ -5797090b9a6668c2aa48d4314a19f75f7571a7e0 '5797090b9a6668c2aa48d4314a19f75f7571a7e0' of https://dev.azure.com/dnceng/internal/_git/dotnet-sdk +5a4609a27acc779cb68107922b00418cc6b907a9 '5a4609a27acc779cb68107922b00418cc6b907a9' of https://dev.azure.com/dnceng/internal/_git/dotnet-sdk Binary files /tmp/tmp6ypwwmzi/_rCMALy1fo/dotnet7-7.0.113/src/sdk/.git/index and /tmp/tmp6ypwwmzi/0qgonBF_sg/dotnet7-7.0.114/src/sdk/.git/index differ diff -Nru dotnet7-7.0.113/src/sdk/.git/logs/HEAD dotnet7-7.0.114/src/sdk/.git/logs/HEAD --- dotnet7-7.0.113/src/sdk/.git/logs/HEAD 2023-10-20 21:27:58.000000000 +0000 +++ dotnet7-7.0.114/src/sdk/.git/logs/HEAD 2023-10-24 04:47:20.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 5797090b9a6668c2aa48d4314a19f75f7571a7e0 cloudtest_azpcontainer 1697837278 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 5a4609a27acc779cb68107922b00418cc6b907a9 cloudtest_azpcontainer 1698122840 +0000 reset: moving to FETCH_HEAD diff -Nru dotnet7-7.0.113/src/sdk/.git/logs/refs/heads/master dotnet7-7.0.114/src/sdk/.git/logs/refs/heads/master --- dotnet7-7.0.113/src/sdk/.git/logs/refs/heads/master 2023-10-20 21:27:58.000000000 +0000 +++ dotnet7-7.0.114/src/sdk/.git/logs/refs/heads/master 2023-10-24 04:47:20.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 5797090b9a6668c2aa48d4314a19f75f7571a7e0 cloudtest_azpcontainer 1697837278 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 5a4609a27acc779cb68107922b00418cc6b907a9 cloudtest_azpcontainer 1698122840 +0000 reset: moving to FETCH_HEAD diff -Nru dotnet7-7.0.113/src/sdk/.git/refs/heads/master dotnet7-7.0.114/src/sdk/.git/refs/heads/master --- dotnet7-7.0.113/src/sdk/.git/refs/heads/master 2023-10-20 21:27:58.000000000 +0000 +++ dotnet7-7.0.114/src/sdk/.git/refs/heads/master 2023-10-24 04:47:20.000000000 +0000 @@ -1 +1 @@ -5797090b9a6668c2aa48d4314a19f75f7571a7e0 +5a4609a27acc779cb68107922b00418cc6b907a9 diff -Nru dotnet7-7.0.113/src/sdk/.git/shallow dotnet7-7.0.114/src/sdk/.git/shallow --- dotnet7-7.0.113/src/sdk/.git/shallow 2023-10-20 21:27:56.000000000 +0000 +++ dotnet7-7.0.114/src/sdk/.git/shallow 2023-10-24 04:47:18.000000000 +0000 @@ -1 +1 @@ -5797090b9a6668c2aa48d4314a19f75f7571a7e0 +5a4609a27acc779cb68107922b00418cc6b907a9 diff -Nru dotnet7-7.0.113/src/sdk/NuGet.config dotnet7-7.0.114/src/sdk/NuGet.config --- dotnet7-7.0.113/src/sdk/NuGet.config 2023-10-20 21:27:58.000000000 +0000 +++ dotnet7-7.0.114/src/sdk/NuGet.config 2023-10-24 04:47:20.000000000 +0000 @@ -4,7 +4,7 @@ - + @@ -12,13 +12,13 @@ - + - + - + @@ -38,16 +38,16 @@ - + - + - + - + diff -Nru dotnet7-7.0.113/src/sdk/eng/Version.Details.xml dotnet7-7.0.114/src/sdk/eng/Version.Details.xml --- dotnet7-7.0.113/src/sdk/eng/Version.Details.xml 2023-10-20 21:27:58.000000000 +0000 +++ dotnet7-7.0.114/src/sdk/eng/Version.Details.xml 2023-10-24 04:47:20.000000000 +0000 @@ -1,54 +1,54 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0fc1c18622a562d02b4768511981644c55b5d5a1 + ce7e640c9736f1319d04c516b3a872ec4bb02d02 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0fc1c18622a562d02b4768511981644c55b5d5a1 + ce7e640c9736f1319d04c516b3a872ec4bb02d02 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0fc1c18622a562d02b4768511981644c55b5d5a1 + ce7e640c9736f1319d04c516b3a872ec4bb02d02 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3f73a2f186e08c905aba441ea5545295ca261730 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3f73a2f186e08c905aba441ea5545295ca261730 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3f73a2f186e08c905aba441ea5545295ca261730 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3f73a2f186e08c905aba441ea5545295ca261730 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3f73a2f186e08c905aba441ea5545295ca261730 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3f73a2f186e08c905aba441ea5545295ca261730 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3f73a2f186e08c905aba441ea5545295ca261730 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 https://github.com/dotnet/msbuild @@ -101,13 +101,13 @@ https://github.com/dotnet/roslyn 528676cdbf0bfcfdb9372dc57a047dd0edc6d4db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d634f2bd1ad6e319f26ff0f1d7ada5539158a19f + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d634f2bd1ad6e319f26ff0f1d7ada5539158a19f + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -122,9 +122,9 @@ 19fa656d35252ccf926e6a6d783b16a2f094aaef - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3f73a2f186e08c905aba441ea5545295ca261730 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 @@ -155,70 +155,70 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 389f0c6968be9e1e447db8316106529640b246ae + 496fa854ae2f96619af99b5256fde77bc1a58f36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 389f0c6968be9e1e447db8316106529640b246ae + 496fa854ae2f96619af99b5256fde77bc1a58f36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 389f0c6968be9e1e447db8316106529640b246ae + 496fa854ae2f96619af99b5256fde77bc1a58f36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 389f0c6968be9e1e447db8316106529640b246ae + 496fa854ae2f96619af99b5256fde77bc1a58f36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5a86bed8dd2c24aa3557cd2f1244fe7f66e87725 + 8784c26bc219f5b75f1315e1b6b7c1da924d5e32 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d634f2bd1ad6e319f26ff0f1d7ada5539158a19f + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d634f2bd1ad6e319f26ff0f1d7ada5539158a19f + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d634f2bd1ad6e319f26ff0f1d7ada5539158a19f + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d634f2bd1ad6e319f26ff0f1d7ada5539158a19f + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d634f2bd1ad6e319f26ff0f1d7ada5539158a19f + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d634f2bd1ad6e319f26ff0f1d7ada5539158a19f + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d634f2bd1ad6e319f26ff0f1d7ada5539158a19f + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d634f2bd1ad6e319f26ff0f1d7ada5539158a19f + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d634f2bd1ad6e319f26ff0f1d7ada5539158a19f + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d634f2bd1ad6e319f26ff0f1d7ada5539158a19f + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d634f2bd1ad6e319f26ff0f1d7ada5539158a19f + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 https://github.com/dotnet/razor-compiler @@ -237,21 +237,21 @@ https://github.com/dotnet/razor-compiler 9ce52f1afbfb819fc8499a590385200b97b13f33 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d634f2bd1ad6e319f26ff0f1d7ada5539158a19f + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d634f2bd1ad6e319f26ff0f1d7ada5539158a19f + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d634f2bd1ad6e319f26ff0f1d7ada5539158a19f + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d634f2bd1ad6e319f26ff0f1d7ada5539158a19f + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 https://github.com/dotnet/xdt @@ -283,22 +283,22 @@ - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + acb831a5b31a3cc4a744a8944b6bd172e6969234 - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + acb831a5b31a3cc4a744a8944b6bd172e6969234 - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + acb831a5b31a3cc4a744a8944b6bd172e6969234 - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + acb831a5b31a3cc4a744a8944b6bd172e6969234 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff -Nru dotnet7-7.0.113/src/sdk/eng/Versions.props dotnet7-7.0.114/src/sdk/eng/Versions.props --- dotnet7-7.0.113/src/sdk/eng/Versions.props 2023-10-20 21:27:58.000000000 +0000 +++ dotnet7-7.0.114/src/sdk/eng/Versions.props 2023-10-24 04:47:20.000000000 +0000 @@ -11,7 +11,7 @@ - 7.0.113 + 7.0.114 servicing @@ -34,7 +34,7 @@ 6.0.0 4.0.0 6.0.0 - 7.0.0-beta.23408.3 + 7.0.0-beta.23511.9 7.0.0-preview.22423.2 7.0.1 4.3.0 @@ -49,13 +49,13 @@ - 7.0.13 - 7.0.13-servicing.23518.16 - 7.0.13 + 7.0.14 + 7.0.14-servicing.23519.10 + 7.0.14 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 7.0.0 - 7.0.13 - 7.0.13-servicing.23518.16 + 7.0.14 + 7.0.14-servicing.23519.10 7.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 6.0.0 @@ -94,7 +94,7 @@ 7.0.0 7.0.0 7.0.0 - 7.0.13 + 7.0.14 @@ -126,14 +126,14 @@ - 7.0.113 + 7.0.114 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 7.0.113-servicing.23518.33 - 7.0.113-servicing.23518.33 + 7.0.114-servicing.23519.22 + 7.0.114-servicing.23519.22 @@ -152,12 +152,12 @@ - 7.0.13-servicing.23520.7 - 7.0.13-servicing.23520.7 - 7.0.13-servicing.23520.7 - 7.0.13-servicing.23520.7 - 7.0.13-servicing.23520.7 - 7.0.13 + 7.0.14-servicing.23523.16 + 7.0.14-servicing.23523.16 + 7.0.14-servicing.23523.16 + 7.0.14-servicing.23523.16 + 7.0.14-servicing.23523.16 + 7.0.14 @@ -168,7 +168,7 @@ - 7.0.13-servicing.23518.15 + 7.0.14-servicing.23520.2 @@ -187,7 +187,7 @@ 6.7.0 6.1.0 - 7.0.0-beta.23408.3 + 7.0.0-beta.23511.9 4.8.2 6.0.0-beta.22262.1 diff -Nru dotnet7-7.0.113/src/sdk/global.json dotnet7-7.0.114/src/sdk/global.json --- dotnet7-7.0.113/src/sdk/global.json 2023-10-20 21:27:58.000000000 +0000 +++ dotnet7-7.0.114/src/sdk/global.json 2023-10-24 04:47:20.000000000 +0000 @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.110", + "dotnet": "7.0.112", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23408.3", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23408.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23511.9", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23511.9" } } diff -Nru dotnet7-7.0.113/src/sdk/src/RazorSdk/Tool/ServerProtocol/ServerConnection.cs dotnet7-7.0.114/src/sdk/src/RazorSdk/Tool/ServerProtocol/ServerConnection.cs --- dotnet7-7.0.113/src/sdk/src/RazorSdk/Tool/ServerProtocol/ServerConnection.cs 2023-10-20 21:27:58.000000000 +0000 +++ dotnet7-7.0.114/src/sdk/src/RazorSdk/Tool/ServerProtocol/ServerConnection.cs 2023-10-24 04:47:20.000000000 +0000 @@ -281,6 +281,40 @@ } } + private static string FindDotNetExecutable() + { + var expectedPath = Environment.GetEnvironmentVariable("DOTNET_HOST_PATH"); + if (!string.IsNullOrEmpty(expectedPath)) + { + return expectedPath; + } + +#if NET + expectedPath = System.Environment.ProcessPath; +#else + expectedPath = Process.GetCurrentProcess().MainModule.FileName; +#endif + + if ("dotnet".Equals(Path.GetFileNameWithoutExtension(expectedPath), StringComparison.Ordinal)) + { + return expectedPath; + } + + // We were probably running from Visual Studio or Build Tools and found MSBuild instead of dotnet. Use the PATH... + var paths = Environment.GetEnvironmentVariable("PATH").Split(Path.PathSeparator); + var exeName = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "dotnet.exe" : "dotnet"; + foreach (string path in paths) + { + var dotnetPath = Path.Combine(path, exeName); + if (File.Exists(dotnetPath)) + { + return dotnetPath; + } + } + + return exeName; + } + // Internal for testing. internal static bool TryCreateServerCore(string clientDir, string pipeName, out int? processId, bool debug = false) { @@ -289,15 +323,7 @@ // The server should be in the same directory as the client var expectedCompilerPath = Path.Combine(clientDir, ServerName); - var expectedPath = Environment.GetEnvironmentVariable("DOTNET_HOST_PATH"); - if (string.IsNullOrEmpty(expectedPath)) - { -#if NET - expectedPath = System.Environment.ProcessPath; -#else - expectedPath = Process.GetCurrentProcess().MainModule.FileName; -#endif - } + var expectedPath = FindDotNetExecutable(); var argumentList = new string[] { Binary files /tmp/tmp6ypwwmzi/_rCMALy1fo/dotnet7-7.0.113/src/source-build-externals/.git/index and /tmp/tmp6ypwwmzi/0qgonBF_sg/dotnet7-7.0.114/src/source-build-externals/.git/index differ diff -Nru dotnet7-7.0.113/src/source-build-externals/.git/logs/HEAD dotnet7-7.0.114/src/source-build-externals/.git/logs/HEAD --- dotnet7-7.0.113/src/source-build-externals/.git/logs/HEAD 2023-10-20 21:28:52.000000000 +0000 +++ dotnet7-7.0.114/src/source-build-externals/.git/logs/HEAD 2023-10-24 04:48:06.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 c47ba6c19d50081f90008da8bc61b3ac20348f20 cloudtest_azpcontainer 1697837332 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 c47ba6c19d50081f90008da8bc61b3ac20348f20 cloudtest_azpcontainer 1698122886 +0000 reset: moving to FETCH_HEAD diff -Nru dotnet7-7.0.113/src/source-build-externals/.git/logs/refs/heads/master dotnet7-7.0.114/src/source-build-externals/.git/logs/refs/heads/master --- dotnet7-7.0.113/src/source-build-externals/.git/logs/refs/heads/master 2023-10-20 21:28:52.000000000 +0000 +++ dotnet7-7.0.114/src/source-build-externals/.git/logs/refs/heads/master 2023-10-24 04:48:06.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 c47ba6c19d50081f90008da8bc61b3ac20348f20 cloudtest_azpcontainer 1697837332 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 c47ba6c19d50081f90008da8bc61b3ac20348f20 cloudtest_azpcontainer 1698122886 +0000 reset: moving to FETCH_HEAD Binary files /tmp/tmp6ypwwmzi/_rCMALy1fo/dotnet7-7.0.113/src/source-build-externals/.git/modules/src/MSBuildLocator/index and /tmp/tmp6ypwwmzi/0qgonBF_sg/dotnet7-7.0.114/src/source-build-externals/.git/modules/src/MSBuildLocator/index differ diff -Nru dotnet7-7.0.113/src/source-build-externals/.git/modules/src/MSBuildLocator/logs/HEAD dotnet7-7.0.114/src/source-build-externals/.git/modules/src/MSBuildLocator/logs/HEAD --- dotnet7-7.0.113/src/source-build-externals/.git/modules/src/MSBuildLocator/logs/HEAD 2023-10-20 21:28:58.000000000 +0000 +++ dotnet7-7.0.114/src/source-build-externals/.git/modules/src/MSBuildLocator/logs/HEAD 2023-10-24 04:48:12.000000000 +0000 @@ -1,2 +1,2 @@ -0000000000000000000000000000000000000000 65af3233f4517425fc759726b99ba963a38ebc4b cloudtest_azpcontainer 1697837333 +0000 clone: from https://github.com/microsoft/MSBuildLocator -65af3233f4517425fc759726b99ba963a38ebc4b 47281c3de1c87a43ab946725d011b9dca4b6434a cloudtest_azpcontainer 1697837338 +0000 checkout: moving from master to 47281c3de1c87a43ab946725d011b9dca4b6434a +0000000000000000000000000000000000000000 1c7a1092bec4b57c37a2f54e8db091073724c342 cloudtest_azpcontainer 1698122887 +0000 clone: from https://github.com/microsoft/MSBuildLocator +1c7a1092bec4b57c37a2f54e8db091073724c342 47281c3de1c87a43ab946725d011b9dca4b6434a cloudtest_azpcontainer 1698122892 +0000 checkout: moving from master to 47281c3de1c87a43ab946725d011b9dca4b6434a diff -Nru dotnet7-7.0.113/src/source-build-externals/.git/modules/src/MSBuildLocator/logs/refs/heads/master dotnet7-7.0.114/src/source-build-externals/.git/modules/src/MSBuildLocator/logs/refs/heads/master --- dotnet7-7.0.113/src/source-build-externals/.git/modules/src/MSBuildLocator/logs/refs/heads/master 2023-10-20 21:28:53.000000000 +0000 +++ dotnet7-7.0.114/src/source-build-externals/.git/modules/src/MSBuildLocator/logs/refs/heads/master 2023-10-24 04:48:07.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 65af3233f4517425fc759726b99ba963a38ebc4b cloudtest_azpcontainer 1697837333 +0000 clone: from https://github.com/microsoft/MSBuildLocator +0000000000000000000000000000000000000000 1c7a1092bec4b57c37a2f54e8db091073724c342 cloudtest_azpcontainer 1698122887 +0000 clone: from https://github.com/microsoft/MSBuildLocator diff -Nru dotnet7-7.0.113/src/source-build-externals/.git/modules/src/MSBuildLocator/logs/refs/remotes/origin/HEAD dotnet7-7.0.114/src/source-build-externals/.git/modules/src/MSBuildLocator/logs/refs/remotes/origin/HEAD --- dotnet7-7.0.113/src/source-build-externals/.git/modules/src/MSBuildLocator/logs/refs/remotes/origin/HEAD 2023-10-20 21:28:53.000000000 +0000 +++ dotnet7-7.0.114/src/source-build-externals/.git/modules/src/MSBuildLocator/logs/refs/remotes/origin/HEAD 2023-10-24 04:48:07.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 65af3233f4517425fc759726b99ba963a38ebc4b cloudtest_azpcontainer 1697837333 +0000 clone: from https://github.com/microsoft/MSBuildLocator +0000000000000000000000000000000000000000 1c7a1092bec4b57c37a2f54e8db091073724c342 cloudtest_azpcontainer 1698122887 +0000 clone: from https://github.com/microsoft/MSBuildLocator diff -Nru dotnet7-7.0.113/src/source-build-externals/.git/modules/src/MSBuildLocator/packed-refs dotnet7-7.0.114/src/source-build-externals/.git/modules/src/MSBuildLocator/packed-refs --- dotnet7-7.0.113/src/source-build-externals/.git/modules/src/MSBuildLocator/packed-refs 2023-10-20 21:28:53.000000000 +0000 +++ dotnet7-7.0.114/src/source-build-externals/.git/modules/src/MSBuildLocator/packed-refs 2023-10-24 04:48:07.000000000 +0000 @@ -1,2 +1,2 @@ # pack-refs with: peeled fully-peeled sorted -65af3233f4517425fc759726b99ba963a38ebc4b refs/remotes/origin/master +1c7a1092bec4b57c37a2f54e8db091073724c342 refs/remotes/origin/master diff -Nru dotnet7-7.0.113/src/source-build-externals/.git/modules/src/MSBuildLocator/refs/heads/master dotnet7-7.0.114/src/source-build-externals/.git/modules/src/MSBuildLocator/refs/heads/master --- dotnet7-7.0.113/src/source-build-externals/.git/modules/src/MSBuildLocator/refs/heads/master 2023-10-20 21:28:53.000000000 +0000 +++ dotnet7-7.0.114/src/source-build-externals/.git/modules/src/MSBuildLocator/refs/heads/master 2023-10-24 04:48:07.000000000 +0000 @@ -1 +1 @@ -65af3233f4517425fc759726b99ba963a38ebc4b +1c7a1092bec4b57c37a2f54e8db091073724c342 diff -Nru dotnet7-7.0.113/src/source-build-externals/.git/modules/src/MSBuildLocator/shallow dotnet7-7.0.114/src/source-build-externals/.git/modules/src/MSBuildLocator/shallow --- dotnet7-7.0.113/src/source-build-externals/.git/modules/src/MSBuildLocator/shallow 2023-10-20 21:28:58.000000000 +0000 +++ dotnet7-7.0.114/src/source-build-externals/.git/modules/src/MSBuildLocator/shallow 2023-10-24 04:48:12.000000000 +0000 @@ -1,2 +1,2 @@ +1c7a1092bec4b57c37a2f54e8db091073724c342 47281c3de1c87a43ab946725d011b9dca4b6434a -65af3233f4517425fc759726b99ba963a38ebc4b Binary files /tmp/tmp6ypwwmzi/_rCMALy1fo/dotnet7-7.0.113/src/source-build-externals/.git/modules/src/application-insights/index and /tmp/tmp6ypwwmzi/0qgonBF_sg/dotnet7-7.0.114/src/source-build-externals/.git/modules/src/application-insights/index differ diff -Nru dotnet7-7.0.113/src/source-build-externals/.git/modules/src/application-insights/logs/HEAD dotnet7-7.0.114/src/source-build-externals/.git/modules/src/application-insights/logs/HEAD --- dotnet7-7.0.113/src/source-build-externals/.git/modules/src/application-insights/logs/HEAD 2023-10-20 21:28:59.000000000 +0000 +++ dotnet7-7.0.114/src/source-build-externals/.git/modules/src/application-insights/logs/HEAD 2023-10-24 04:48:13.000000000 +0000 @@ -1,2 +1,2 @@ -0000000000000000000000000000000000000000 de66d679ff32f5a74553edbf52b10b9dc57ded70 cloudtest_azpcontainer 1697837334 +0000 clone: from https://github.com/Microsoft/ApplicationInsights-dotnet -de66d679ff32f5a74553edbf52b10b9dc57ded70 51c3ed8aa3f32209edf01168f9136a3ac8486c5d cloudtest_azpcontainer 1697837339 +0000 checkout: moving from main to 51c3ed8aa3f32209edf01168f9136a3ac8486c5d +0000000000000000000000000000000000000000 de66d679ff32f5a74553edbf52b10b9dc57ded70 cloudtest_azpcontainer 1698122888 +0000 clone: from https://github.com/Microsoft/ApplicationInsights-dotnet +de66d679ff32f5a74553edbf52b10b9dc57ded70 51c3ed8aa3f32209edf01168f9136a3ac8486c5d cloudtest_azpcontainer 1698122893 +0000 checkout: moving from main to 51c3ed8aa3f32209edf01168f9136a3ac8486c5d diff -Nru dotnet7-7.0.113/src/source-build-externals/.git/modules/src/application-insights/logs/refs/heads/main dotnet7-7.0.114/src/source-build-externals/.git/modules/src/application-insights/logs/refs/heads/main --- dotnet7-7.0.113/src/source-build-externals/.git/modules/src/application-insights/logs/refs/heads/main 2023-10-20 21:28:54.000000000 +0000 +++ dotnet7-7.0.114/src/source-build-externals/.git/modules/src/application-insights/logs/refs/heads/main 2023-10-24 04:48:08.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 de66d679ff32f5a74553edbf52b10b9dc57ded70 cloudtest_azpcontainer 1697837334 +0000 clone: from https://github.com/Microsoft/ApplicationInsights-dotnet +0000000000000000000000000000000000000000 de66d679ff32f5a74553edbf52b10b9dc57ded70 cloudtest_azpcontainer 1698122888 +0000 clone: from https://github.com/Microsoft/ApplicationInsights-dotnet diff -Nru dotnet7-7.0.113/src/source-build-externals/.git/modules/src/application-insights/logs/refs/remotes/origin/HEAD dotnet7-7.0.114/src/source-build-externals/.git/modules/src/application-insights/logs/refs/remotes/origin/HEAD --- dotnet7-7.0.113/src/source-build-externals/.git/modules/src/application-insights/logs/refs/remotes/origin/HEAD 2023-10-20 21:28:54.000000000 +0000 +++ dotnet7-7.0.114/src/source-build-externals/.git/modules/src/application-insights/logs/refs/remotes/origin/HEAD 2023-10-24 04:48:08.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 de66d679ff32f5a74553edbf52b10b9dc57ded70 cloudtest_azpcontainer 1697837334 +0000 clone: from https://github.com/Microsoft/ApplicationInsights-dotnet +0000000000000000000000000000000000000000 de66d679ff32f5a74553edbf52b10b9dc57ded70 cloudtest_azpcontainer 1698122888 +0000 clone: from https://github.com/Microsoft/ApplicationInsights-dotnet Binary files /tmp/tmp6ypwwmzi/_rCMALy1fo/dotnet7-7.0.113/src/source-build-externals/.git/modules/src/azure-activedirectory-identitymodel-extensions-for-dotnet/index and /tmp/tmp6ypwwmzi/0qgonBF_sg/dotnet7-7.0.114/src/source-build-externals/.git/modules/src/azure-activedirectory-identitymodel-extensions-for-dotnet/index differ diff -Nru dotnet7-7.0.113/src/source-build-externals/.git/modules/src/azure-activedirectory-identitymodel-extensions-for-dotnet/logs/HEAD dotnet7-7.0.114/src/source-build-externals/.git/modules/src/azure-activedirectory-identitymodel-extensions-for-dotnet/logs/HEAD --- dotnet7-7.0.113/src/source-build-externals/.git/modules/src/azure-activedirectory-identitymodel-extensions-for-dotnet/logs/HEAD 2023-10-20 21:29:03.000000000 +0000 +++ dotnet7-7.0.114/src/source-build-externals/.git/modules/src/azure-activedirectory-identitymodel-extensions-for-dotnet/logs/HEAD 2023-10-24 04:48:16.000000000 +0000 @@ -1,2 +1,2 @@ -0000000000000000000000000000000000000000 3a7c8643f806c4d33ed9b52db48299045a3184ba cloudtest_azpcontainer 1697837335 +0000 clone: from https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet.git -3a7c8643f806c4d33ed9b52db48299045a3184ba a9de8ff14648770a3caa33a68d8061d0fa84d105 cloudtest_azpcontainer 1697837343 +0000 checkout: moving from dev to a9de8ff14648770a3caa33a68d8061d0fa84d105 +0000000000000000000000000000000000000000 3a7c8643f806c4d33ed9b52db48299045a3184ba cloudtest_azpcontainer 1698122889 +0000 clone: from https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet.git +3a7c8643f806c4d33ed9b52db48299045a3184ba a9de8ff14648770a3caa33a68d8061d0fa84d105 cloudtest_azpcontainer 1698122896 +0000 checkout: moving from dev to a9de8ff14648770a3caa33a68d8061d0fa84d105 diff -Nru dotnet7-7.0.113/src/source-build-externals/.git/modules/src/azure-activedirectory-identitymodel-extensions-for-dotnet/logs/refs/heads/dev dotnet7-7.0.114/src/source-build-externals/.git/modules/src/azure-activedirectory-identitymodel-extensions-for-dotnet/logs/refs/heads/dev --- dotnet7-7.0.113/src/source-build-externals/.git/modules/src/azure-activedirectory-identitymodel-extensions-for-dotnet/logs/refs/heads/dev 2023-10-20 21:28:55.000000000 +0000 +++ dotnet7-7.0.114/src/source-build-externals/.git/modules/src/azure-activedirectory-identitymodel-extensions-for-dotnet/logs/refs/heads/dev 2023-10-24 04:48:09.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 3a7c8643f806c4d33ed9b52db48299045a3184ba cloudtest_azpcontainer 1697837335 +0000 clone: from https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet.git +0000000000000000000000000000000000000000 3a7c8643f806c4d33ed9b52db48299045a3184ba cloudtest_azpcontainer 1698122889 +0000 clone: from https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet.git diff -Nru dotnet7-7.0.113/src/source-build-externals/.git/modules/src/azure-activedirectory-identitymodel-extensions-for-dotnet/logs/refs/remotes/origin/HEAD dotnet7-7.0.114/src/source-build-externals/.git/modules/src/azure-activedirectory-identitymodel-extensions-for-dotnet/logs/refs/remotes/origin/HEAD --- dotnet7-7.0.113/src/source-build-externals/.git/modules/src/azure-activedirectory-identitymodel-extensions-for-dotnet/logs/refs/remotes/origin/HEAD 2023-10-20 21:28:55.000000000 +0000 +++ dotnet7-7.0.114/src/source-build-externals/.git/modules/src/azure-activedirectory-identitymodel-extensions-for-dotnet/logs/refs/remotes/origin/HEAD 2023-10-24 04:48:09.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 3a7c8643f806c4d33ed9b52db48299045a3184ba cloudtest_azpcontainer 1697837335 +0000 clone: from https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet.git +0000000000000000000000000000000000000000 3a7c8643f806c4d33ed9b52db48299045a3184ba cloudtest_azpcontainer 1698122889 +0000 clone: from https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet.git Binary files /tmp/tmp6ypwwmzi/_rCMALy1fo/dotnet7-7.0.113/src/source-build-externals/.git/modules/src/cssparser/index and /tmp/tmp6ypwwmzi/0qgonBF_sg/dotnet7-7.0.114/src/source-build-externals/.git/modules/src/cssparser/index differ diff -Nru dotnet7-7.0.113/src/source-build-externals/.git/modules/src/cssparser/logs/HEAD dotnet7-7.0.114/src/source-build-externals/.git/modules/src/cssparser/logs/HEAD --- dotnet7-7.0.113/src/source-build-externals/.git/modules/src/cssparser/logs/HEAD 2023-10-20 21:29:04.000000000 +0000 +++ dotnet7-7.0.114/src/source-build-externals/.git/modules/src/cssparser/logs/HEAD 2023-10-24 04:48:18.000000000 +0000 @@ -1,2 +1,2 @@ -0000000000000000000000000000000000000000 0d59611784841735a7778a67aa6e9d8d000c861f cloudtest_azpcontainer 1697837335 +0000 clone: from https://github.com/dotnet/cssparser -0d59611784841735a7778a67aa6e9d8d000c861f d6d86bcd8c162b1ae22ef00955ff748d028dd0ee cloudtest_azpcontainer 1697837344 +0000 checkout: moving from main to d6d86bcd8c162b1ae22ef00955ff748d028dd0ee +0000000000000000000000000000000000000000 0d59611784841735a7778a67aa6e9d8d000c861f cloudtest_azpcontainer 1698122889 +0000 clone: from https://github.com/dotnet/cssparser +0d59611784841735a7778a67aa6e9d8d000c861f d6d86bcd8c162b1ae22ef00955ff748d028dd0ee cloudtest_azpcontainer 1698122898 +0000 checkout: moving from main to d6d86bcd8c162b1ae22ef00955ff748d028dd0ee diff -Nru dotnet7-7.0.113/src/source-build-externals/.git/modules/src/cssparser/logs/refs/heads/main dotnet7-7.0.114/src/source-build-externals/.git/modules/src/cssparser/logs/refs/heads/main --- dotnet7-7.0.113/src/source-build-externals/.git/modules/src/cssparser/logs/refs/heads/main 2023-10-20 21:28:55.000000000 +0000 +++ dotnet7-7.0.114/src/source-build-externals/.git/modules/src/cssparser/logs/refs/heads/main 2023-10-24 04:48:09.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 0d59611784841735a7778a67aa6e9d8d000c861f cloudtest_azpcontainer 1697837335 +0000 clone: from https://github.com/dotnet/cssparser +0000000000000000000000000000000000000000 0d59611784841735a7778a67aa6e9d8d000c861f cloudtest_azpcontainer 1698122889 +0000 clone: from https://github.com/dotnet/cssparser diff -Nru dotnet7-7.0.113/src/source-build-externals/.git/modules/src/cssparser/logs/refs/remotes/origin/HEAD dotnet7-7.0.114/src/source-build-externals/.git/modules/src/cssparser/logs/refs/remotes/origin/HEAD --- dotnet7-7.0.113/src/source-build-externals/.git/modules/src/cssparser/logs/refs/remotes/origin/HEAD 2023-10-20 21:28:55.000000000 +0000 +++ dotnet7-7.0.114/src/source-build-externals/.git/modules/src/cssparser/logs/refs/remotes/origin/HEAD 2023-10-24 04:48:09.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 0d59611784841735a7778a67aa6e9d8d000c861f cloudtest_azpcontainer 1697837335 +0000 clone: from https://github.com/dotnet/cssparser +0000000000000000000000000000000000000000 0d59611784841735a7778a67aa6e9d8d000c861f cloudtest_azpcontainer 1698122889 +0000 clone: from https://github.com/dotnet/cssparser Binary files /tmp/tmp6ypwwmzi/_rCMALy1fo/dotnet7-7.0.113/src/source-build-externals/.git/modules/src/humanizer/index and /tmp/tmp6ypwwmzi/0qgonBF_sg/dotnet7-7.0.114/src/source-build-externals/.git/modules/src/humanizer/index differ diff -Nru dotnet7-7.0.113/src/source-build-externals/.git/modules/src/humanizer/logs/HEAD dotnet7-7.0.114/src/source-build-externals/.git/modules/src/humanizer/logs/HEAD --- dotnet7-7.0.113/src/source-build-externals/.git/modules/src/humanizer/logs/HEAD 2023-10-20 21:29:05.000000000 +0000 +++ dotnet7-7.0.114/src/source-build-externals/.git/modules/src/humanizer/logs/HEAD 2023-10-24 04:48:19.000000000 +0000 @@ -1,2 +1,2 @@ -0000000000000000000000000000000000000000 5dfb5ae8b8f90d3f769a7ce389eb5f756305f746 cloudtest_azpcontainer 1697837336 +0000 clone: from https://github.com/Humanizr/Humanizer -5dfb5ae8b8f90d3f769a7ce389eb5f756305f746 3ebc38de585fc641a04b0e78ed69468453b0f8a1 cloudtest_azpcontainer 1697837345 +0000 checkout: moving from main to 3ebc38de585fc641a04b0e78ed69468453b0f8a1 +0000000000000000000000000000000000000000 5dfb5ae8b8f90d3f769a7ce389eb5f756305f746 cloudtest_azpcontainer 1698122890 +0000 clone: from https://github.com/Humanizr/Humanizer +5dfb5ae8b8f90d3f769a7ce389eb5f756305f746 3ebc38de585fc641a04b0e78ed69468453b0f8a1 cloudtest_azpcontainer 1698122899 +0000 checkout: moving from main to 3ebc38de585fc641a04b0e78ed69468453b0f8a1 diff -Nru dotnet7-7.0.113/src/source-build-externals/.git/modules/src/humanizer/logs/refs/heads/main dotnet7-7.0.114/src/source-build-externals/.git/modules/src/humanizer/logs/refs/heads/main --- dotnet7-7.0.113/src/source-build-externals/.git/modules/src/humanizer/logs/refs/heads/main 2023-10-20 21:28:56.000000000 +0000 +++ dotnet7-7.0.114/src/source-build-externals/.git/modules/src/humanizer/logs/refs/heads/main 2023-10-24 04:48:10.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 5dfb5ae8b8f90d3f769a7ce389eb5f756305f746 cloudtest_azpcontainer 1697837336 +0000 clone: from https://github.com/Humanizr/Humanizer +0000000000000000000000000000000000000000 5dfb5ae8b8f90d3f769a7ce389eb5f756305f746 cloudtest_azpcontainer 1698122890 +0000 clone: from https://github.com/Humanizr/Humanizer diff -Nru dotnet7-7.0.113/src/source-build-externals/.git/modules/src/humanizer/logs/refs/remotes/origin/HEAD dotnet7-7.0.114/src/source-build-externals/.git/modules/src/humanizer/logs/refs/remotes/origin/HEAD --- dotnet7-7.0.113/src/source-build-externals/.git/modules/src/humanizer/logs/refs/remotes/origin/HEAD 2023-10-20 21:28:56.000000000 +0000 +++ dotnet7-7.0.114/src/source-build-externals/.git/modules/src/humanizer/logs/refs/remotes/origin/HEAD 2023-10-24 04:48:10.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 5dfb5ae8b8f90d3f769a7ce389eb5f756305f746 cloudtest_azpcontainer 1697837336 +0000 clone: from https://github.com/Humanizr/Humanizer +0000000000000000000000000000000000000000 5dfb5ae8b8f90d3f769a7ce389eb5f756305f746 cloudtest_azpcontainer 1698122890 +0000 clone: from https://github.com/Humanizr/Humanizer Binary files /tmp/tmp6ypwwmzi/_rCMALy1fo/dotnet7-7.0.113/src/source-build-externals/.git/modules/src/newtonsoft-json/index and /tmp/tmp6ypwwmzi/0qgonBF_sg/dotnet7-7.0.114/src/source-build-externals/.git/modules/src/newtonsoft-json/index differ diff -Nru dotnet7-7.0.113/src/source-build-externals/.git/modules/src/newtonsoft-json/logs/HEAD dotnet7-7.0.114/src/source-build-externals/.git/modules/src/newtonsoft-json/logs/HEAD --- dotnet7-7.0.113/src/source-build-externals/.git/modules/src/newtonsoft-json/logs/HEAD 2023-10-20 21:29:06.000000000 +0000 +++ dotnet7-7.0.114/src/source-build-externals/.git/modules/src/newtonsoft-json/logs/HEAD 2023-10-24 04:48:20.000000000 +0000 @@ -1,2 +1,2 @@ -0000000000000000000000000000000000000000 01e1759cac40d8154e47ed0e11c12a9d42d2d0ff cloudtest_azpcontainer 1697837337 +0000 clone: from https://github.com/JamesNK/Newtonsoft.Json.git -01e1759cac40d8154e47ed0e11c12a9d42d2d0ff ae9fe44e1323e91bcbd185ca1a14099fba7c021f cloudtest_azpcontainer 1697837346 +0000 checkout: moving from master to ae9fe44e1323e91bcbd185ca1a14099fba7c021f +0000000000000000000000000000000000000000 01e1759cac40d8154e47ed0e11c12a9d42d2d0ff cloudtest_azpcontainer 1698122891 +0000 clone: from https://github.com/JamesNK/Newtonsoft.Json.git +01e1759cac40d8154e47ed0e11c12a9d42d2d0ff ae9fe44e1323e91bcbd185ca1a14099fba7c021f cloudtest_azpcontainer 1698122900 +0000 checkout: moving from master to ae9fe44e1323e91bcbd185ca1a14099fba7c021f diff -Nru dotnet7-7.0.113/src/source-build-externals/.git/modules/src/newtonsoft-json/logs/refs/heads/master dotnet7-7.0.114/src/source-build-externals/.git/modules/src/newtonsoft-json/logs/refs/heads/master --- dotnet7-7.0.113/src/source-build-externals/.git/modules/src/newtonsoft-json/logs/refs/heads/master 2023-10-20 21:28:57.000000000 +0000 +++ dotnet7-7.0.114/src/source-build-externals/.git/modules/src/newtonsoft-json/logs/refs/heads/master 2023-10-24 04:48:11.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 01e1759cac40d8154e47ed0e11c12a9d42d2d0ff cloudtest_azpcontainer 1697837337 +0000 clone: from https://github.com/JamesNK/Newtonsoft.Json.git +0000000000000000000000000000000000000000 01e1759cac40d8154e47ed0e11c12a9d42d2d0ff cloudtest_azpcontainer 1698122891 +0000 clone: from https://github.com/JamesNK/Newtonsoft.Json.git diff -Nru dotnet7-7.0.113/src/source-build-externals/.git/modules/src/newtonsoft-json/logs/refs/remotes/origin/HEAD dotnet7-7.0.114/src/source-build-externals/.git/modules/src/newtonsoft-json/logs/refs/remotes/origin/HEAD --- dotnet7-7.0.113/src/source-build-externals/.git/modules/src/newtonsoft-json/logs/refs/remotes/origin/HEAD 2023-10-20 21:28:57.000000000 +0000 +++ dotnet7-7.0.114/src/source-build-externals/.git/modules/src/newtonsoft-json/logs/refs/remotes/origin/HEAD 2023-10-24 04:48:11.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 01e1759cac40d8154e47ed0e11c12a9d42d2d0ff cloudtest_azpcontainer 1697837337 +0000 clone: from https://github.com/JamesNK/Newtonsoft.Json.git +0000000000000000000000000000000000000000 01e1759cac40d8154e47ed0e11c12a9d42d2d0ff cloudtest_azpcontainer 1698122891 +0000 clone: from https://github.com/JamesNK/Newtonsoft.Json.git Binary files /tmp/tmp6ypwwmzi/_rCMALy1fo/dotnet7-7.0.113/src/source-build-reference-packages/.git/index and /tmp/tmp6ypwwmzi/0qgonBF_sg/dotnet7-7.0.114/src/source-build-reference-packages/.git/index differ diff -Nru dotnet7-7.0.113/src/source-build-reference-packages/.git/logs/HEAD dotnet7-7.0.114/src/source-build-reference-packages/.git/logs/HEAD --- dotnet7-7.0.113/src/source-build-reference-packages/.git/logs/HEAD 2023-10-20 21:29:49.000000000 +0000 +++ dotnet7-7.0.114/src/source-build-reference-packages/.git/logs/HEAD 2023-10-24 04:49:03.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 525b6c35cc5c5c9b80b47044be2e4e77858d505a cloudtest_azpcontainer 1697837389 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 525b6c35cc5c5c9b80b47044be2e4e77858d505a cloudtest_azpcontainer 1698122943 +0000 reset: moving to FETCH_HEAD diff -Nru dotnet7-7.0.113/src/source-build-reference-packages/.git/logs/refs/heads/master dotnet7-7.0.114/src/source-build-reference-packages/.git/logs/refs/heads/master --- dotnet7-7.0.113/src/source-build-reference-packages/.git/logs/refs/heads/master 2023-10-20 21:29:49.000000000 +0000 +++ dotnet7-7.0.114/src/source-build-reference-packages/.git/logs/refs/heads/master 2023-10-24 04:49:03.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 525b6c35cc5c5c9b80b47044be2e4e77858d505a cloudtest_azpcontainer 1697837389 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 525b6c35cc5c5c9b80b47044be2e4e77858d505a cloudtest_azpcontainer 1698122943 +0000 reset: moving to FETCH_HEAD Binary files /tmp/tmp6ypwwmzi/_rCMALy1fo/dotnet7-7.0.113/src/sourcelink/.git/index and /tmp/tmp6ypwwmzi/0qgonBF_sg/dotnet7-7.0.114/src/sourcelink/.git/index differ diff -Nru dotnet7-7.0.113/src/sourcelink/.git/logs/HEAD dotnet7-7.0.114/src/sourcelink/.git/logs/HEAD --- dotnet7-7.0.113/src/sourcelink/.git/logs/HEAD 2023-10-20 21:29:50.000000000 +0000 +++ dotnet7-7.0.114/src/sourcelink/.git/logs/HEAD 2023-10-24 04:49:04.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 e57efa1ed395dd6975b33052719facb24f03ee0b cloudtest_azpcontainer 1697837390 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 e57efa1ed395dd6975b33052719facb24f03ee0b cloudtest_azpcontainer 1698122944 +0000 reset: moving to FETCH_HEAD diff -Nru dotnet7-7.0.113/src/sourcelink/.git/logs/refs/heads/master dotnet7-7.0.114/src/sourcelink/.git/logs/refs/heads/master --- dotnet7-7.0.113/src/sourcelink/.git/logs/refs/heads/master 2023-10-20 21:29:50.000000000 +0000 +++ dotnet7-7.0.114/src/sourcelink/.git/logs/refs/heads/master 2023-10-24 04:49:04.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 e57efa1ed395dd6975b33052719facb24f03ee0b cloudtest_azpcontainer 1697837390 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 e57efa1ed395dd6975b33052719facb24f03ee0b cloudtest_azpcontainer 1698122944 +0000 reset: moving to FETCH_HEAD Binary files /tmp/tmp6ypwwmzi/_rCMALy1fo/dotnet7-7.0.113/src/symreader/.git/index and /tmp/tmp6ypwwmzi/0qgonBF_sg/dotnet7-7.0.114/src/symreader/.git/index differ diff -Nru dotnet7-7.0.113/src/symreader/.git/logs/HEAD dotnet7-7.0.114/src/symreader/.git/logs/HEAD --- dotnet7-7.0.113/src/symreader/.git/logs/HEAD 2023-10-20 21:29:07.000000000 +0000 +++ dotnet7-7.0.114/src/symreader/.git/logs/HEAD 2023-10-24 04:48:21.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 7b9791daa3a3477eb22ec805946c9fff8b42d8ca cloudtest_azpcontainer 1697837347 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 7b9791daa3a3477eb22ec805946c9fff8b42d8ca cloudtest_azpcontainer 1698122901 +0000 reset: moving to FETCH_HEAD diff -Nru dotnet7-7.0.113/src/symreader/.git/logs/refs/heads/master dotnet7-7.0.114/src/symreader/.git/logs/refs/heads/master --- dotnet7-7.0.113/src/symreader/.git/logs/refs/heads/master 2023-10-20 21:29:07.000000000 +0000 +++ dotnet7-7.0.114/src/symreader/.git/logs/refs/heads/master 2023-10-24 04:48:21.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 7b9791daa3a3477eb22ec805946c9fff8b42d8ca cloudtest_azpcontainer 1697837347 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 7b9791daa3a3477eb22ec805946c9fff8b42d8ca cloudtest_azpcontainer 1698122901 +0000 reset: moving to FETCH_HEAD diff -Nru dotnet7-7.0.113/src/templating/.git/FETCH_HEAD dotnet7-7.0.114/src/templating/.git/FETCH_HEAD --- dotnet7-7.0.113/src/templating/.git/FETCH_HEAD 2023-10-20 21:27:59.000000000 +0000 +++ dotnet7-7.0.114/src/templating/.git/FETCH_HEAD 2023-10-24 04:47:21.000000000 +0000 @@ -1 +1 @@ -0fc1c18622a562d02b4768511981644c55b5d5a1 '0fc1c18622a562d02b4768511981644c55b5d5a1' of https://dev.azure.com/dnceng/internal/_git/dotnet-templating +ce7e640c9736f1319d04c516b3a872ec4bb02d02 'ce7e640c9736f1319d04c516b3a872ec4bb02d02' of https://dev.azure.com/dnceng/internal/_git/dotnet-templating Binary files /tmp/tmp6ypwwmzi/_rCMALy1fo/dotnet7-7.0.113/src/templating/.git/index and /tmp/tmp6ypwwmzi/0qgonBF_sg/dotnet7-7.0.114/src/templating/.git/index differ diff -Nru dotnet7-7.0.113/src/templating/.git/logs/HEAD dotnet7-7.0.114/src/templating/.git/logs/HEAD --- dotnet7-7.0.113/src/templating/.git/logs/HEAD 2023-10-20 21:27:59.000000000 +0000 +++ dotnet7-7.0.114/src/templating/.git/logs/HEAD 2023-10-24 04:47:21.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 0fc1c18622a562d02b4768511981644c55b5d5a1 cloudtest_azpcontainer 1697837279 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 ce7e640c9736f1319d04c516b3a872ec4bb02d02 cloudtest_azpcontainer 1698122841 +0000 reset: moving to FETCH_HEAD diff -Nru dotnet7-7.0.113/src/templating/.git/logs/refs/heads/master dotnet7-7.0.114/src/templating/.git/logs/refs/heads/master --- dotnet7-7.0.113/src/templating/.git/logs/refs/heads/master 2023-10-20 21:27:59.000000000 +0000 +++ dotnet7-7.0.114/src/templating/.git/logs/refs/heads/master 2023-10-24 04:47:21.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 0fc1c18622a562d02b4768511981644c55b5d5a1 cloudtest_azpcontainer 1697837279 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 ce7e640c9736f1319d04c516b3a872ec4bb02d02 cloudtest_azpcontainer 1698122841 +0000 reset: moving to FETCH_HEAD diff -Nru dotnet7-7.0.113/src/templating/.git/refs/heads/master dotnet7-7.0.114/src/templating/.git/refs/heads/master --- dotnet7-7.0.113/src/templating/.git/refs/heads/master 2023-10-20 21:27:59.000000000 +0000 +++ dotnet7-7.0.114/src/templating/.git/refs/heads/master 2023-10-24 04:47:21.000000000 +0000 @@ -1 +1 @@ -0fc1c18622a562d02b4768511981644c55b5d5a1 +ce7e640c9736f1319d04c516b3a872ec4bb02d02 diff -Nru dotnet7-7.0.113/src/templating/.git/shallow dotnet7-7.0.114/src/templating/.git/shallow --- dotnet7-7.0.113/src/templating/.git/shallow 2023-10-20 21:27:59.000000000 +0000 +++ dotnet7-7.0.114/src/templating/.git/shallow 2023-10-24 04:47:20.000000000 +0000 @@ -1 +1 @@ -0fc1c18622a562d02b4768511981644c55b5d5a1 +ce7e640c9736f1319d04c516b3a872ec4bb02d02 diff -Nru dotnet7-7.0.113/src/templating/NuGet.config dotnet7-7.0.114/src/templating/NuGet.config --- dotnet7-7.0.113/src/templating/NuGet.config 2023-10-20 21:27:59.000000000 +0000 +++ dotnet7-7.0.114/src/templating/NuGet.config 2023-10-24 04:47:21.000000000 +0000 @@ -4,7 +4,7 @@ - + @@ -19,7 +19,7 @@ - + diff -Nru dotnet7-7.0.113/src/templating/eng/Version.Details.xml dotnet7-7.0.114/src/templating/eng/Version.Details.xml --- dotnet7-7.0.113/src/templating/eng/Version.Details.xml 2023-10-20 21:27:59.000000000 +0000 +++ dotnet7-7.0.114/src/templating/eng/Version.Details.xml 2023-10-24 04:47:21.000000000 +0000 @@ -11,17 +11,17 @@ ddc5b4880b0bf18783fc6808c4d407214f7bdae1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3f73a2f186e08c905aba441ea5545295ca261730 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3f73a2f186e08c905aba441ea5545295ca261730 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3f73a2f186e08c905aba441ea5545295ca261730 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 https://github.com/dotnet/command-line-api @@ -33,9 +33,9 @@ - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + cb3ccc523ed844c82a63898ed3fa269680396f26 diff -Nru dotnet7-7.0.113/src/templating/eng/Versions.props dotnet7-7.0.114/src/templating/eng/Versions.props --- dotnet7-7.0.113/src/templating/eng/Versions.props 2023-10-20 21:27:59.000000000 +0000 +++ dotnet7-7.0.114/src/templating/eng/Versions.props 2023-10-24 04:47:21.000000000 +0000 @@ -7,7 +7,7 @@ 4.4.0-3.22452.8 true true - 7.0.113 + 7.0.114 servicing @@ -24,9 +24,9 @@ 2.0.0-beta4.22402.1 - 7.0.13 - 7.0.13 - 7.0.13-servicing.23518.16 + 7.0.14 + 7.0.14 + 7.0.14-servicing.23519.10 7.0.0-preview1.22559.1 diff -Nru dotnet7-7.0.113/src/templating/global.json dotnet7-7.0.114/src/templating/global.json --- dotnet7-7.0.113/src/templating/global.json 2023-10-20 21:27:59.000000000 +0000 +++ dotnet7-7.0.114/src/templating/global.json 2023-10-24 04:47:21.000000000 +0000 @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.110", + "dotnet": "7.0.112", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23408.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23517.4" } } Binary files /tmp/tmp6ypwwmzi/_rCMALy1fo/dotnet7-7.0.113/src/test-templates/.git/index and /tmp/tmp6ypwwmzi/0qgonBF_sg/dotnet7-7.0.114/src/test-templates/.git/index differ diff -Nru dotnet7-7.0.113/src/test-templates/.git/logs/HEAD dotnet7-7.0.114/src/test-templates/.git/logs/HEAD --- dotnet7-7.0.113/src/test-templates/.git/logs/HEAD 2023-10-20 21:27:56.000000000 +0000 +++ dotnet7-7.0.114/src/test-templates/.git/logs/HEAD 2023-10-24 04:47:18.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 aaaa0c1826f97a9dfcc67e94136bf01010b55f23 cloudtest_azpcontainer 1697837276 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 aaaa0c1826f97a9dfcc67e94136bf01010b55f23 cloudtest_azpcontainer 1698122838 +0000 reset: moving to FETCH_HEAD diff -Nru dotnet7-7.0.113/src/test-templates/.git/logs/refs/heads/master dotnet7-7.0.114/src/test-templates/.git/logs/refs/heads/master --- dotnet7-7.0.113/src/test-templates/.git/logs/refs/heads/master 2023-10-20 21:27:56.000000000 +0000 +++ dotnet7-7.0.114/src/test-templates/.git/logs/refs/heads/master 2023-10-24 04:47:18.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 aaaa0c1826f97a9dfcc67e94136bf01010b55f23 cloudtest_azpcontainer 1697837276 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 aaaa0c1826f97a9dfcc67e94136bf01010b55f23 cloudtest_azpcontainer 1698122838 +0000 reset: moving to FETCH_HEAD Binary files /tmp/tmp6ypwwmzi/_rCMALy1fo/dotnet7-7.0.113/src/vstest/.git/index and /tmp/tmp6ypwwmzi/0qgonBF_sg/dotnet7-7.0.114/src/vstest/.git/index differ diff -Nru dotnet7-7.0.113/src/vstest/.git/logs/HEAD dotnet7-7.0.114/src/vstest/.git/logs/HEAD --- dotnet7-7.0.113/src/vstest/.git/logs/HEAD 2023-10-20 21:28:10.000000000 +0000 +++ dotnet7-7.0.114/src/vstest/.git/logs/HEAD 2023-10-24 04:47:31.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 79d56b02b69a582cd90428878a5e9411ab7538f5 cloudtest_azpcontainer 1697837290 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 79d56b02b69a582cd90428878a5e9411ab7538f5 cloudtest_azpcontainer 1698122851 +0000 reset: moving to FETCH_HEAD diff -Nru dotnet7-7.0.113/src/vstest/.git/logs/refs/heads/master dotnet7-7.0.114/src/vstest/.git/logs/refs/heads/master --- dotnet7-7.0.113/src/vstest/.git/logs/refs/heads/master 2023-10-20 21:28:10.000000000 +0000 +++ dotnet7-7.0.114/src/vstest/.git/logs/refs/heads/master 2023-10-24 04:47:31.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 79d56b02b69a582cd90428878a5e9411ab7538f5 cloudtest_azpcontainer 1697837290 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 79d56b02b69a582cd90428878a5e9411ab7538f5 cloudtest_azpcontainer 1698122851 +0000 reset: moving to FETCH_HEAD Binary files /tmp/tmp6ypwwmzi/_rCMALy1fo/dotnet7-7.0.113/src/xdt/.git/index and /tmp/tmp6ypwwmzi/0qgonBF_sg/dotnet7-7.0.114/src/xdt/.git/index differ diff -Nru dotnet7-7.0.113/src/xdt/.git/logs/HEAD dotnet7-7.0.114/src/xdt/.git/logs/HEAD --- dotnet7-7.0.113/src/xdt/.git/logs/HEAD 2023-10-20 21:27:55.000000000 +0000 +++ dotnet7-7.0.114/src/xdt/.git/logs/HEAD 2023-10-24 04:47:17.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 9a1c3e1b7f0c8763d4c96e593961a61a72679a7b cloudtest_azpcontainer 1697837275 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 9a1c3e1b7f0c8763d4c96e593961a61a72679a7b cloudtest_azpcontainer 1698122837 +0000 reset: moving to FETCH_HEAD diff -Nru dotnet7-7.0.113/src/xdt/.git/logs/refs/heads/master dotnet7-7.0.114/src/xdt/.git/logs/refs/heads/master --- dotnet7-7.0.113/src/xdt/.git/logs/refs/heads/master 2023-10-20 21:27:55.000000000 +0000 +++ dotnet7-7.0.114/src/xdt/.git/logs/refs/heads/master 2023-10-24 04:47:17.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 9a1c3e1b7f0c8763d4c96e593961a61a72679a7b cloudtest_azpcontainer 1697837275 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 9a1c3e1b7f0c8763d4c96e593961a61a72679a7b cloudtest_azpcontainer 1698122837 +0000 reset: moving to FETCH_HEAD Binary files /tmp/tmp6ypwwmzi/_rCMALy1fo/dotnet7-7.0.113/src/xliff-tasks/.git/index and /tmp/tmp6ypwwmzi/0qgonBF_sg/dotnet7-7.0.114/src/xliff-tasks/.git/index differ diff -Nru dotnet7-7.0.113/src/xliff-tasks/.git/logs/HEAD dotnet7-7.0.114/src/xliff-tasks/.git/logs/HEAD --- dotnet7-7.0.113/src/xliff-tasks/.git/logs/HEAD 2023-10-20 21:29:51.000000000 +0000 +++ dotnet7-7.0.114/src/xliff-tasks/.git/logs/HEAD 2023-10-24 04:49:05.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 740189d758fb3bbdc118c5b6171ef1a7351a8c44 cloudtest_azpcontainer 1697837391 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 740189d758fb3bbdc118c5b6171ef1a7351a8c44 cloudtest_azpcontainer 1698122945 +0000 reset: moving to FETCH_HEAD diff -Nru dotnet7-7.0.113/src/xliff-tasks/.git/logs/refs/heads/master dotnet7-7.0.114/src/xliff-tasks/.git/logs/refs/heads/master --- dotnet7-7.0.113/src/xliff-tasks/.git/logs/refs/heads/master 2023-10-20 21:29:51.000000000 +0000 +++ dotnet7-7.0.114/src/xliff-tasks/.git/logs/refs/heads/master 2023-10-24 04:49:05.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 740189d758fb3bbdc118c5b6171ef1a7351a8c44 cloudtest_azpcontainer 1697837391 +0000 reset: moving to FETCH_HEAD +0000000000000000000000000000000000000000 740189d758fb3bbdc118c5b6171ef1a7351a8c44 cloudtest_azpcontainer 1698122945 +0000 reset: moving to FETCH_HEAD