From 49de44343db266ac4c24d3861fe31dd87c23c583 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Wed, 20 Sep 2023 19:44:22 -0700 Subject: [PATCH 01/44] Adjusted the workload list, update, and install commands when specifying JSON only output to only output JSON. This removed the starting/ending tags and any potential output of called functionality. It pipes a NullReporter into the necessary components. --- .../commands/InstallingWorkloadCommand.cs | 18 +++++----- .../dotnet-workload/WorkloadCommandBase.cs | 1 + .../dotnet-workload/install/NullReporter.cs | 2 ++ .../install/WorkloadInstallCommand.cs | 29 +++++++++------ .../list/WorkloadListCommand.cs | 15 ++++---- .../update/WorkloadUpdateCommand.cs | 35 ++++++++++++------- 6 files changed, 60 insertions(+), 40 deletions(-) diff --git a/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs b/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs index 3e44077fd323..9be84a34d717 100644 --- a/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs +++ b/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs @@ -82,12 +82,14 @@ public InstallingWorkloadCommand( _workloadManifestUpdaterFromConstructor = workloadManifestUpdater; } - protected async Task> GetDownloads(IEnumerable workloadIds, bool skipManifestUpdate, bool includePreview, string downloadFolder = null) + protected async Task> GetDownloads(IEnumerable workloadIds, bool skipManifestUpdate, bool includePreview, string downloadFolder = null, + IReporter reporter = null, INuGetPackageDownloader packageDownloader = null) { - List ret = new(); + reporter ??= Reporter; + packageDownloader ??= PackageDownloader; + List ret = new(); DirectoryPath? tempPath = null; - try { if (!skipManifestUpdate) @@ -109,7 +111,7 @@ protected async Task> GetDownloads(IEnumerable> GetDownloads(IEnumerable> GetDownloads(IEnumerable WriteLine(string.Format(format, args)); + + public static NullReporter Instance { get; } = new NullReporter(); } } diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs index d56bdd65351a..66cd6e88ebc5 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs @@ -9,6 +9,7 @@ using Microsoft.DotNet.ToolPackage; using Microsoft.Extensions.EnvironmentAbstractions; using Microsoft.NET.Sdk.WorkloadManifestReader; +using NuGet.Common; using NuGet.Versioning; using static Microsoft.NET.Sdk.WorkloadManifestReader.WorkloadResolver; @@ -38,13 +39,14 @@ public WorkloadInstallCommand( { _skipManifestUpdate = parseResult.GetValue(WorkloadInstallCommandParser.SkipManifestUpdateOption); _workloadIds = workloadIds ?? parseResult.GetValue(WorkloadInstallCommandParser.WorkloadIdArgument).ToList().AsReadOnly(); + var resolvedReporter = _printDownloadLinkOnly ? NullReporter.Instance : Reporter; _workloadInstaller = _workloadInstallerFromConstructor ?? - WorkloadInstallerFactory.GetWorkloadInstaller(Reporter, _sdkFeatureBand, + WorkloadInstallerFactory.GetWorkloadInstaller(resolvedReporter, _sdkFeatureBand, workloadResolver ?? _workloadResolver, Verbosity, _userProfileDir, VerifySignatures, PackageDownloader, _dotnetPath, TempDirectoryPath, _packageSourceLocation, RestoreActionConfiguration, elevationRequired: !_printDownloadLinkOnly && string.IsNullOrWhiteSpace(_downloadToCacheOption)); - _workloadManifestUpdater = _workloadManifestUpdaterFromConstructor ?? new WorkloadManifestUpdater(Reporter, workloadResolver ?? _workloadResolver, PackageDownloader, _userProfileDir, TempDirectoryPath, + _workloadManifestUpdater = _workloadManifestUpdaterFromConstructor ?? new WorkloadManifestUpdater(resolvedReporter, workloadResolver ?? _workloadResolver, PackageDownloader, _userProfileDir, TempDirectoryPath, _workloadInstaller.GetWorkloadInstallationRecordRepository(), _workloadInstaller, _packageSourceLocation, displayManifestUpdates: Verbosity.IsDetailedOrDiagnostic()); ValidateWorkloadIdsInput(); @@ -70,7 +72,14 @@ public override int Execute() bool usedRollback = !string.IsNullOrWhiteSpace(_fromRollbackDefinition); if (_printDownloadLinkOnly) { - Reporter.WriteLine(string.Format(LocalizableStrings.ResolvingPackageUrls, string.Join(", ", _workloadIds))); + var packageDownloader = new NuGetPackageDownloader( + TempPackagesDirectory, + filePermissionSetter: null, + new FirstPartyNuGetPackageSigningVerifier(), + new NullLogger(), + NullReporter.Instance, + restoreActionConfig: RestoreActionConfiguration, + verifySignatures: VerifySignatures); // Take the union of the currently installed workloads and the ones that are being requested. This is so that if there are updates to the manifests // which require new packs for currently installed workloads, those packs will be downloaded. @@ -78,11 +87,9 @@ public override int Execute() var existingWorkloads = GetInstalledWorkloads(false); var workloadsToDownload = existingWorkloads.Union(_workloadIds.Select(id => new WorkloadId(id))).ToList(); - var packageUrls = GetPackageDownloadUrlsAsync(workloadsToDownload, _skipManifestUpdate, _includePreviews).GetAwaiter().GetResult(); + var packageUrls = GetPackageDownloadUrlsAsync(workloadsToDownload, _skipManifestUpdate, _includePreviews, NullReporter.Instance, packageDownloader).GetAwaiter().GetResult(); - Reporter.WriteLine("==allPackageLinksJsonOutputStart=="); Reporter.WriteLine(JsonSerializer.Serialize(packageUrls, new JsonSerializerOptions() { WriteIndented = true })); - Reporter.WriteLine("==allPackageLinksJsonOutputEnd=="); } else if (!string.IsNullOrWhiteSpace(_downloadToCacheOption)) { @@ -226,17 +233,19 @@ private void InstallWorkloadsWithInstallRecord( .DeleteWorkloadInstallationRecord(workloadId, sdkFeatureBand); } }); - } - private async Task> GetPackageDownloadUrlsAsync(IEnumerable workloadIds, bool skipManifestUpdate, bool includePreview) + private async Task> GetPackageDownloadUrlsAsync(IEnumerable workloadIds, bool skipManifestUpdate, bool includePreview, + IReporter reporter = null, INuGetPackageDownloader packageDownloader = null) { - var downloads = await GetDownloads(workloadIds, skipManifestUpdate, includePreview); + reporter ??= Reporter; + packageDownloader ??= PackageDownloader; + var downloads = await GetDownloads(workloadIds, skipManifestUpdate, includePreview, reporter: reporter, packageDownloader: packageDownloader); var urls = new List(); foreach (var download in downloads) { - urls.Add(await PackageDownloader.GetPackageUrl(new PackageId(download.NuGetPackageId), new NuGetVersion(download.NuGetPackageVersion), _packageSourceLocation)); + urls.Add(await packageDownloader.GetPackageUrl(new PackageId(download.NuGetPackageId), new NuGetVersion(download.NuGetPackageVersion), _packageSourceLocation)); } return urls; diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/WorkloadListCommand.cs b/src/Cli/dotnet/commands/dotnet-workload/list/WorkloadListCommand.cs index 42fb65445dd7..13f96f6a9880 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/list/WorkloadListCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/list/WorkloadListCommand.cs @@ -35,12 +35,15 @@ public WorkloadListCommand( IWorkloadResolver workloadResolver = null ) : base(parseResult, CommonOptions.HiddenVerbosityOption, reporter, tempDirPath, nugetPackageDownloader) { + _machineReadableOption = parseResult.GetValue(WorkloadListCommandParser.MachineReadableOption); + + var resolvedReporter = _machineReadableOption ? NullReporter.Instance : Reporter; _workloadListHelper = new WorkloadInfoHelper( parseResult.HasOption(SharedOptions.InteractiveOption), Verbosity, parseResult?.GetValue(WorkloadListCommandParser.VersionOption) ?? null, VerifySignatures, - Reporter, + resolvedReporter, workloadRecordRepo, currentSdkVersion, dotnetDir, @@ -48,12 +51,10 @@ public WorkloadListCommand( workloadResolver ); - _machineReadableOption = parseResult.GetValue(WorkloadListCommandParser.MachineReadableOption); - _includePreviews = parseResult.GetValue(WorkloadListCommandParser.IncludePreviewsOption); string userProfileDir1 = userProfileDir ?? CliFolderPathCalculator.DotnetUserProfileFolderPath; - _workloadManifestUpdater = workloadManifestUpdater ?? new WorkloadManifestUpdater(Reporter, + _workloadManifestUpdater = workloadManifestUpdater ?? new WorkloadManifestUpdater(resolvedReporter, _workloadListHelper.WorkloadResolver, PackageDownloader, userProfileDir1, TempDirectoryPath, _workloadListHelper.WorkloadRecordRepo, _workloadListHelper.Installer); } @@ -69,11 +70,7 @@ public override int Execute() ListOutput listOutput = new(installedList.Select(id => id.ToString()).ToArray(), updateAvailable); - Reporter.WriteLine("==workloadListJsonOutputStart=="); - Reporter.WriteLine( - JsonSerializer.Serialize(listOutput, - new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase })); - Reporter.WriteLine("==workloadListJsonOutputEnd=="); + Reporter.WriteLine(JsonSerializer.Serialize(listOutput, new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase })); } else { diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs b/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs index 48881631ecd8..d6a1c82fe1fe 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs @@ -10,6 +10,7 @@ using Microsoft.DotNet.Workloads.Workload.Install; using Microsoft.Extensions.EnvironmentAbstractions; using Microsoft.NET.Sdk.WorkloadManifestReader; +using NuGet.Common; using NuGet.Versioning; namespace Microsoft.DotNet.Workloads.Workload.Update @@ -40,13 +41,14 @@ public WorkloadUpdateCommand( _fromPreviousSdk = parseResult.GetValue(WorkloadUpdateCommandParser.FromPreviousSdkOption); _adManifestOnlyOption = parseResult.GetValue(WorkloadUpdateCommandParser.AdManifestOnlyOption); _printRollbackDefinitionOnly = parseResult.GetValue(WorkloadUpdateCommandParser.PrintRollbackOption); + var resolvedReporter = _printDownloadLinkOnly || _printRollbackDefinitionOnly ? NullReporter.Instance : Reporter; - _workloadInstaller = _workloadInstallerFromConstructor ?? WorkloadInstallerFactory.GetWorkloadInstaller(Reporter, + _workloadInstaller = _workloadInstallerFromConstructor ?? WorkloadInstallerFactory.GetWorkloadInstaller(resolvedReporter, _sdkFeatureBand, workloadResolver ?? _workloadResolver, Verbosity, _userProfileDir, VerifySignatures, PackageDownloader, _dotnetPath, TempDirectoryPath, packageSourceLocation: _packageSourceLocation, RestoreActionConfiguration, elevationRequired: !_printDownloadLinkOnly && !_printRollbackDefinitionOnly && string.IsNullOrWhiteSpace(_downloadToCacheOption)); - _workloadManifestUpdater = _workloadManifestUpdaterFromConstructor ?? new WorkloadManifestUpdater(Reporter, workloadResolver ?? _workloadResolver, PackageDownloader, _userProfileDir, TempDirectoryPath, + _workloadManifestUpdater = _workloadManifestUpdaterFromConstructor ?? new WorkloadManifestUpdater(resolvedReporter, workloadResolver ?? _workloadResolver, PackageDownloader, _userProfileDir, TempDirectoryPath, _workloadInstaller.GetWorkloadInstallationRecordRepository(), _workloadInstaller, _packageSourceLocation, sdkFeatureBand: _sdkFeatureBand); } @@ -65,10 +67,17 @@ public override int Execute() } else if (_printDownloadLinkOnly) { - var packageUrls = GetUpdatablePackageUrlsAsync(_includePreviews).GetAwaiter().GetResult(); - Reporter.WriteLine("==allPackageLinksJsonOutputStart=="); + var packageDownloader = new NuGetPackageDownloader( + TempPackagesDirectory, + filePermissionSetter: null, + new FirstPartyNuGetPackageSigningVerifier(), + new NullLogger(), + NullReporter.Instance, + restoreActionConfig: RestoreActionConfiguration, + verifySignatures: VerifySignatures); + + var packageUrls = GetUpdatablePackageUrlsAsync(_includePreviews, NullReporter.Instance, packageDownloader).GetAwaiter().GetResult(); Reporter.WriteLine(JsonSerializer.Serialize(packageUrls, new JsonSerializerOptions() { WriteIndented = true })); - Reporter.WriteLine("==allPackageLinksJsonOutputEnd=="); } else if (_adManifestOnlyOption) { @@ -79,10 +88,7 @@ public override int Execute() else if (_printRollbackDefinitionOnly) { var workloadSet = WorkloadSet.FromManifests(_workloadResolver.GetInstalledManifests()); - - Reporter.WriteLine("==workloadRollbackDefinitionJsonOutputStart=="); Reporter.WriteLine(workloadSet.ToJson()); - Reporter.WriteLine("==workloadRollbackDefinitionJsonOutputEnd=="); } else { @@ -169,26 +175,29 @@ private async Task DownloadToOfflineCacheAsync(DirectoryPath offlineCache, bool await GetDownloads(GetUpdatableWorkloads(), skipManifestUpdate: false, includePreviews, offlineCache.Value); } - private async Task> GetUpdatablePackageUrlsAsync(bool includePreview) + private async Task> GetUpdatablePackageUrlsAsync(bool includePreview, IReporter reporter = null, INuGetPackageDownloader packageDownloader = null) { - var downloads = await GetDownloads(GetUpdatableWorkloads(), skipManifestUpdate: false, includePreview); + reporter ??= Reporter; + packageDownloader ??= PackageDownloader; + var downloads = await GetDownloads(GetUpdatableWorkloads(reporter), skipManifestUpdate: false, includePreview, reporter: reporter, packageDownloader: packageDownloader); var urls = new List(); foreach (var download in downloads) { - urls.Add(await PackageDownloader.GetPackageUrl(new PackageId(download.NuGetPackageId), new NuGetVersion(download.NuGetPackageVersion), _packageSourceLocation)); + urls.Add(await packageDownloader.GetPackageUrl(new PackageId(download.NuGetPackageId), new NuGetVersion(download.NuGetPackageVersion), _packageSourceLocation)); } return urls; } - private IEnumerable GetUpdatableWorkloads() + private IEnumerable GetUpdatableWorkloads(IReporter reporter = null) { + reporter ??= Reporter; var workloads = GetInstalledWorkloads(_fromPreviousSdk); if (workloads == null || !workloads.Any()) { - Reporter.WriteLine(LocalizableStrings.NoWorkloadsToUpdate); + reporter.WriteLine(LocalizableStrings.NoWorkloadsToUpdate); } return workloads; From 307c11aabb9455511a1520282ca6e3b4f1589905 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Thu, 21 Sep 2023 17:16:15 -0700 Subject: [PATCH 02/44] Added a protected property to indicate when a PackageDownloader is being passed through the constructor chain, which is needed for unit testing. Adjusted failing unit tests based on changes. --- .../dotnet/commands/dotnet-workload/WorkloadCommandBase.cs | 5 ++++- .../dotnet-workload/install/WorkloadInstallCommand.cs | 2 +- .../commands/dotnet-workload/update/WorkloadUpdateCommand.cs | 2 +- .../GivenDotnetWorkloadInstall.cs | 1 - .../GivenDotnetWorkloadUpdate.cs | 3 +-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-workload/WorkloadCommandBase.cs b/src/Cli/dotnet/commands/dotnet-workload/WorkloadCommandBase.cs index 92ea41351b17..d1e46e09bc91 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/WorkloadCommandBase.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/WorkloadCommandBase.cs @@ -71,6 +71,8 @@ protected bool VerifySignatures get; } + protected bool IsPackageDownloaderProvided { get; } + /// /// Initializes a new instance. /// @@ -107,7 +109,8 @@ public WorkloadCommandBase( TempPackagesDirectory = new DirectoryPath(Path.Combine(TempDirectoryPath, "dotnet-sdk-advertising-temp")); - PackageDownloader = nugetPackageDownloader ?? new NuGetPackageDownloader(TempPackagesDirectory, + IsPackageDownloaderProvided = nugetPackageDownloader != null; + PackageDownloader = IsPackageDownloaderProvided ? nugetPackageDownloader : new NuGetPackageDownloader(TempPackagesDirectory, filePermissionSetter: null, new FirstPartyNuGetPackageSigningVerifier(), nugetLogger, diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs index 66cd6e88ebc5..7b31859cb7cc 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs @@ -72,7 +72,7 @@ public override int Execute() bool usedRollback = !string.IsNullOrWhiteSpace(_fromRollbackDefinition); if (_printDownloadLinkOnly) { - var packageDownloader = new NuGetPackageDownloader( + var packageDownloader = IsPackageDownloaderProvided ? PackageDownloader : new NuGetPackageDownloader( TempPackagesDirectory, filePermissionSetter: null, new FirstPartyNuGetPackageSigningVerifier(), diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs b/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs index d6a1c82fe1fe..44b8542ed968 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs @@ -67,7 +67,7 @@ public override int Execute() } else if (_printDownloadLinkOnly) { - var packageDownloader = new NuGetPackageDownloader( + var packageDownloader = IsPackageDownloaderProvided ? PackageDownloader : new NuGetPackageDownloader( TempPackagesDirectory, filePermissionSetter: null, new FirstPartyNuGetPackageSigningVerifier(), diff --git a/src/Tests/dotnet-workload-install.Tests/GivenDotnetWorkloadInstall.cs b/src/Tests/dotnet-workload-install.Tests/GivenDotnetWorkloadInstall.cs index e70abd5297c9..e14d01dbe57e 100644 --- a/src/Tests/dotnet-workload-install.Tests/GivenDotnetWorkloadInstall.cs +++ b/src/Tests/dotnet-workload-install.Tests/GivenDotnetWorkloadInstall.cs @@ -308,7 +308,6 @@ public void GivenWorkloadInstallItPrintsDownloadUrls(bool userLocal, string sdkV installManager.Execute(); - _reporter.Lines.Should().Contain("==allPackageLinksJsonOutputStart=="); string.Join(" ", _reporter.Lines).Should().Contain("http://mock-url/xamarin.android.sdk.8.4.7.nupkg"); string.Join(" ", _reporter.Lines).Should().Contain("http://mock-url/mock-manifest-package.1.0.5.nupkg"); } diff --git a/src/Tests/dotnet-workload-update.Tests/GivenDotnetWorkloadUpdate.cs b/src/Tests/dotnet-workload-update.Tests/GivenDotnetWorkloadUpdate.cs index 7fd04aec0e12..08b8c09c20a5 100644 --- a/src/Tests/dotnet-workload-update.Tests/GivenDotnetWorkloadUpdate.cs +++ b/src/Tests/dotnet-workload-update.Tests/GivenDotnetWorkloadUpdate.cs @@ -250,7 +250,6 @@ public void GivenWorkloadUpdateItPrintsDownloadUrls() command.Execute(); - _reporter.Lines.Should().Contain("==allPackageLinksJsonOutputStart=="); string.Join(" ", _reporter.Lines).Should().Contain("http://mock-url/xamarin.android.templates.1.0.3.nupkg", "New pack urls should be included in output"); string.Join(" ", _reporter.Lines).Should().Contain("http://mock-url/xamarin.android.framework.8.4.0.nupkg", "Urls for packs with updated versions should be included in output"); string.Join(" ", _reporter.Lines).Should().NotContain("xamarin.android.sdk", "Urls for packs with the same version should not be included in output"); @@ -327,7 +326,7 @@ public void GivenPrintRollbackDefinitionItIncludesAllInstalledManifests() updateCommand.Execute(); - _reporter.Lines.Count().Should().Be(3); + _reporter.Lines.Count().Should().Be(1); string.Join("", _reporter.Lines).Should().Contain("samplemanifest"); } From 9e3a0d23a5401fb7c846aab5a8d4b893616f591a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Sep 2023 12:13:15 +0000 Subject: [PATCH 03/44] Update dependencies from https://github.com/dotnet/source-build-externals build 20230921.3 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 9.0.0-alpha.1.23468.2 -> To Version 9.0.0-alpha.1.23471.3 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fc407ff5d794..b1d938d32cbd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -334,9 +334,9 @@ 02fe27cd6a9b001c8feb7938e6ef4b3799745759 - + https://github.com/dotnet/source-build-externals - 57102f65c7bfffc8ce50818cb7066942edfcaefd + fb896b0f1c716ae84e4e4787d0a02a0002988508 From ae5638d021e143bccf8a24df46a0b4493877f831 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Sep 2023 22:13:53 +0000 Subject: [PATCH 04/44] Update dependencies from https://github.com/dotnet/razor build 20230922.2 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23472.1 -> To Version 7.0.0-preview.23472.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 016f46a04332..91af19087f76 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -278,18 +278,18 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/razor - 79fc2ed7f974c9d93b09a9f5de9dac0569838c8d + 309b8bcc9a5e33c9e0753fd5deb057383282520a - + https://github.com/dotnet/razor - 79fc2ed7f974c9d93b09a9f5de9dac0569838c8d + 309b8bcc9a5e33c9e0753fd5deb057383282520a - + https://github.com/dotnet/razor - 79fc2ed7f974c9d93b09a9f5de9dac0569838c8d + 309b8bcc9a5e33c9e0753fd5deb057383282520a https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index a39206c13673..f55e0d85ee69 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -157,9 +157,9 @@ - 7.0.0-preview.23472.1 - 7.0.0-preview.23472.1 - 7.0.0-preview.23472.1 + 7.0.0-preview.23472.2 + 7.0.0-preview.23472.2 + 7.0.0-preview.23472.2 From 7089d7ec80ce480c7039bb890f1969b720328c27 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Sep 2023 22:38:36 +0000 Subject: [PATCH 05/44] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20230922.2 Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.NetAnalyzers , Microsoft.CodeAnalysis.PublicApiAnalyzers From Version 3.11.0-beta1.23471.1 -> To Version 3.11.0-beta1.23472.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 016f46a04332..5bac140c16b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -312,17 +312,17 @@ 9a1c3e1b7f0c8763d4c96e593961a61a72679a7b - + https://github.com/dotnet/roslyn-analyzers - 4aefee9f788e07c480a69518f38901bf7b19d9be + 39ccb5b7570c179a82aa604ab7c3712af94ef119 - + https://github.com/dotnet/roslyn-analyzers - 4aefee9f788e07c480a69518f38901bf7b19d9be + 39ccb5b7570c179a82aa604ab7c3712af94ef119 - + https://github.com/dotnet/roslyn-analyzers - 4aefee9f788e07c480a69518f38901bf7b19d9be + 39ccb5b7570c179a82aa604ab7c3712af94ef119 diff --git a/eng/Versions.props b/eng/Versions.props index a39206c13673..0e8329bfdb04 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,8 +97,8 @@ - 9.0.0-preview.23471.1 - 3.11.0-beta1.23471.1 + 9.0.0-preview.23472.2 + 3.11.0-beta1.23472.2 From 299de035b26bd545870df6bd0eace254dafe3366 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Fri, 22 Sep 2023 16:39:14 -0700 Subject: [PATCH 06/44] Applied cleanup for IDE0017 to the solution. --- .../FileWatcher/PollingFileWatcher.cs | 8 ++- .../SlnFile.cs | 21 ++++--- .../ProcessStartInfoExtensions.cs | 5 +- .../Commands/create/TemplateCommand.cs | 4 +- .../Commands/create/TemplateResult.cs | 10 ++-- src/Cli/dotnet/Telemetry/Telemetry.cs | 6 +- .../dotnet/ToolManifest/ToolManifestEditor.cs | 6 +- .../dotnet-nuget/NuGetCommandParser.cs | 15 +++-- .../ProjectLaunchSettingsProvider.cs | 6 +- .../commands/dotnet-test/TestCommandParser.cs | 6 +- .../dotnet-vstest/VSTestCommandParser.cs | 7 ++- .../install/WorkloadResolverFactory.cs | 7 ++- .../update/WorkloadUpdateCommand.cs | 19 +++--- .../LocalDaemons/DockerCli.cs | 10 ++-- .../Tasks/ReferencedProjectConfiguration.cs | 23 +++---- .../Tasks/StaticWebAssetsDiscoveryPattern.cs | 15 ++--- .../GetPublishItemsOutputGroupOutputsTests.cs | 9 +-- .../GivenADependencyContextBuilder.cs | 6 +- .../GivenAProduceContentsAssetsTask.cs | 30 ++++++---- .../GivenAResolveTargetingPackAssetsTask.cs | 11 ++-- ...olvedSDKProjectItemsAndImplicitPackages.cs | 12 ++-- .../ProcessFrameworkReferencesTests.cs | 53 ++++++++-------- .../GenerateRuntimeConfigurationFiles.cs | 38 +++++++----- .../PrepareForReadyToRunCompilation.cs | 36 +++++++---- .../RuntimePackAssetInfo.cs | 8 ++- .../BlockingMemoryStreamTests.cs | 7 ++- .../ArtifactsOutputPathTests.cs | 5 +- .../DesignTimeBuildTests.cs | 28 +++++---- .../GivenFrameworkReferences.cs | 6 +- .../GivenThatWeManifestSupportedFrameworks.cs | 7 ++- ...nThatWeWantToBuildACrossTargetedLibrary.cs | 6 +- .../GivenThatWeWantToBuildALibrary.cs | 9 +-- ...ivenThatWeWantToBuildALibraryWithFSharp.cs | 9 +-- ...ntToBuildALibraryWithOSSupportedVersion.cs | 60 ++++++++++++------- .../GivenThatWeWantToBuildALibraryWithVB.cs | 9 +-- ...GivenThatWeWantToBuildASelfContainedApp.cs | 10 ++-- ...ThatWeWantToBuildAWindowsDesktopProject.cs | 8 ++- .../GivenThatWeWantToReferenceAProject.cs | 6 +- .../GivenThatWeWantToResolveConflicts.cs | 12 ++-- .../GivenThatWeWantToUseAnalyzers.cs | 7 ++- ...ransitiveFrameworkReferencesAreDisabled.cs | 7 +-- .../WorkloadTests.cs | 22 ++++--- ...atWeWantToStoreAProjectWithDependencies.cs | 6 +- .../RestoreWithOlderNuGet.cs | 6 +- .../ApplyCssScopesTest.cs | 35 +++++------ .../GenerateStaticWebAssetsManifestTest.cs | 22 +++---- .../WorkloadPackGroupTests.cs | 9 +-- .../Commands/SdkCommandSpec.cs | 10 ++-- .../TestCommandLine.cs | 13 ++-- .../TestDirectory.cs | 6 +- .../ToolsetInfo.cs | 14 +++-- .../GivenWorkloadManifestUpdater.cs | 6 +- .../Publish/Tasks/MsDeploy/CommonUtility.cs | 6 +- .../Tasks/Tasks/GenerateEFSQLScripts.cs | 8 ++- .../Publish/Tasks/Tasks/Kudu/KuduDeploy.cs | 12 ++-- .../Publish/Tasks/Tasks/Xdt/TransformXml.cs | 7 ++- 56 files changed, 445 insertions(+), 304 deletions(-) diff --git a/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/PollingFileWatcher.cs b/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/PollingFileWatcher.cs index 97973a8a8fb8..286089a4fbd3 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/PollingFileWatcher.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/PollingFileWatcher.cs @@ -31,9 +31,11 @@ public PollingFileWatcher(string watchedDirectory) _watchedDirectory = new DirectoryInfo(watchedDirectory); BasePath = _watchedDirectory.FullName; - _pollingThread = new Thread(new ThreadStart(PollingLoop)); - _pollingThread.IsBackground = true; - _pollingThread.Name = nameof(PollingFileWatcher); + _pollingThread = new Thread(new ThreadStart(PollingLoop)) + { + IsBackground = true, + Name = nameof(PollingFileWatcher) + }; CreateKnownFilesSnapshot(); diff --git a/src/Cli/Microsoft.DotNet.Cli.Sln.Internal/SlnFile.cs b/src/Cli/Microsoft.DotNet.Cli.Sln.Internal/SlnFile.cs index a227d43e4543..db0a71c26b30 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Sln.Internal/SlnFile.cs +++ b/src/Cli/Microsoft.DotNet.Cli.Sln.Internal/SlnFile.cs @@ -105,9 +105,11 @@ public SlnFile() public static SlnFile Read(string file) { - SlnFile slnFile = new SlnFile(); - slnFile.FullPath = Path.GetFullPath(file); - slnFile._format = FileUtil.GetTextFormatInfo(file); + SlnFile slnFile = new SlnFile + { + FullPath = Path.GetFullPath(file), + _format = FileUtil.GetTextFormatInfo(file) + }; using (var sr = new StreamReader(new FileStream(file, FileMode.Open, FileAccess.Read))) { @@ -429,8 +431,10 @@ public SlnPropertySet Properties { if (_properties == null) { - _properties = new SlnPropertySet(); - _properties.ParentSection = this; + _properties = new SlnPropertySet + { + ParentSection = this + }; if (_sectionLines != null) { foreach (var line in _sectionLines) @@ -1066,8 +1070,11 @@ public SlnSection GetOrCreateSection(string id, SlnSectionType sectionType) var sec = this.FirstOrDefault(s => s.Id == id); if (sec == null) { - sec = new SlnSection { Id = id }; - sec.SectionType = sectionType; + sec = new SlnSection + { + Id = id, + SectionType = sectionType + }; Add(sec); } return sec; diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/ProcessStartInfoExtensions.cs b/src/Cli/Microsoft.DotNet.Cli.Utils/ProcessStartInfoExtensions.cs index 226d1f616895..4ba88507b531 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/ProcessStartInfoExtensions.cs +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/ProcessStartInfoExtensions.cs @@ -39,11 +39,10 @@ public static int ExecuteAndCaptureOutput(this ProcessStartInfo startInfo, out s var process = new Process { - StartInfo = startInfo + StartInfo = startInfo, + EnableRaisingEvents = true }; - process.EnableRaisingEvents = true; - using (var reaper = new ProcessReaper(process)) { process.Start(); diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/TemplateCommand.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/TemplateCommand.cs index 99f5edae588f..085f800392e4 100644 --- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/TemplateCommand.cs +++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/TemplateCommand.cs @@ -103,9 +103,9 @@ public TemplateCommand( AllowScriptsOption = new CliOption("--allow-scripts") { Description = SymbolStrings.TemplateCommand_Option_AllowScripts, - Arity = new ArgumentArity(1, 1) + Arity = new ArgumentArity(1, 1), + DefaultValueFactory = (_) => AllowRunScripts.Prompt }; - AllowScriptsOption.DefaultValueFactory = (_) => AllowRunScripts.Prompt; Options.Add(AllowScriptsOption); } diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/TemplateResult.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/TemplateResult.cs index a09a848b64c0..dced444e6b69 100644 --- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/TemplateResult.cs +++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/TemplateResult.cs @@ -39,10 +39,12 @@ private TemplateResult(TemplateCommand templateCommand, ParseResult parseResult) internal static TemplateResult FromParseResult(TemplateCommand templateCommand, ParseResult parseResult) { - TemplateResult result = new TemplateResult(templateCommand, parseResult); - result.IsLanguageMatch = templateCommand.LanguageOption == null || !parseResult.HasErrorFor(templateCommand.LanguageOption, out _); - result.IsTypeMatch = templateCommand.TypeOption == null || !parseResult.HasErrorFor(templateCommand.TypeOption, out _); - result.IsBaselineMatch = templateCommand.BaselineOption == null || !parseResult.HasErrorFor(templateCommand.BaselineOption, out _); + TemplateResult result = new TemplateResult(templateCommand, parseResult) + { + IsLanguageMatch = templateCommand.LanguageOption == null || !parseResult.HasErrorFor(templateCommand.LanguageOption, out _), + IsTypeMatch = templateCommand.TypeOption == null || !parseResult.HasErrorFor(templateCommand.TypeOption, out _), + IsBaselineMatch = templateCommand.BaselineOption == null || !parseResult.HasErrorFor(templateCommand.BaselineOption, out _) + }; if (templateCommand.LanguageOption != null && result.IsTemplateMatch) { diff --git a/src/Cli/dotnet/Telemetry/Telemetry.cs b/src/Cli/dotnet/Telemetry/Telemetry.cs index 962beb53e4dc..cc3bea3c2d7a 100644 --- a/src/Cli/dotnet/Telemetry/Telemetry.cs +++ b/src/Cli/dotnet/Telemetry/Telemetry.cs @@ -136,8 +136,10 @@ private void InitializeTelemetry() { try { - var persistenceChannel = new PersistenceChannel.PersistenceChannel(sendersCount: _senderCount); - persistenceChannel.SendingInterval = TimeSpan.FromMilliseconds(1); + var persistenceChannel = new PersistenceChannel.PersistenceChannel(sendersCount: _senderCount) + { + SendingInterval = TimeSpan.FromMilliseconds(1) + }; var config = TelemetryConfiguration.CreateDefault(); config.TelemetryChannel = persistenceChannel; diff --git a/src/Cli/dotnet/ToolManifest/ToolManifestEditor.cs b/src/Cli/dotnet/ToolManifest/ToolManifestEditor.cs index 8bc7eecc5324..a601df222c18 100644 --- a/src/Cli/dotnet/ToolManifest/ToolManifestEditor.cs +++ b/src/Cli/dotnet/ToolManifest/ToolManifestEditor.cs @@ -165,8 +165,10 @@ private SerializableLocalToolsManifest DeserializeLocalToolsManifest(FilePath po foreach (var toolJson in tools.EnumerateObject()) { - var serializableLocalToolSinglePackage = new SerializableLocalToolSinglePackage(); - serializableLocalToolSinglePackage.PackageId = toolJson.Name; + var serializableLocalToolSinglePackage = new SerializableLocalToolSinglePackage + { + PackageId = toolJson.Name + }; if (toolJson.Value.TryGetStringValue(JsonPropertyVersion, out var versionJson)) { serializableLocalToolSinglePackage.Version = versionJson; diff --git a/src/Cli/dotnet/commands/dotnet-nuget/NuGetCommandParser.cs b/src/Cli/dotnet/commands/dotnet-nuget/NuGetCommandParser.cs index 8fe864d8ce0f..06fa3b710b85 100644 --- a/src/Cli/dotnet/commands/dotnet-nuget/NuGetCommandParser.cs +++ b/src/Cli/dotnet/commands/dotnet-nuget/NuGetCommandParser.cs @@ -21,10 +21,11 @@ public static CliCommand GetCommand() private static CliCommand ConstructCommand() { - var command = new DocumentedCommand("nuget", DocsLink); - - // some subcommands are not defined here and just forwarded to NuGet app - command.TreatUnmatchedTokensAsErrors = false; + var command = new DocumentedCommand("nuget", DocsLink) + { + // some subcommands are not defined here and just forwarded to NuGet app + TreatUnmatchedTokensAsErrors = false + }; command.Options.Add(new CliOption("--version")); command.Options.Add(new CliOption("--verbosity", "-v")); @@ -167,8 +168,10 @@ private static CliCommand GetTrustCommand() }; CliCommand CertificateCommand() { - CliOption algorithm = new("--algorithm"); - algorithm.DefaultValueFactory = (_argResult) => "SHA256"; + CliOption algorithm = new("--algorithm") + { + DefaultValueFactory = (_argResult) => "SHA256" + }; algorithm.AcceptOnlyFromAmong("SHA256", "SHA384", "SHA512"); return new CliCommand("certificate") { diff --git a/src/Cli/dotnet/commands/dotnet-run/LaunchSettings/ProjectLaunchSettingsProvider.cs b/src/Cli/dotnet/commands/dotnet-run/LaunchSettings/ProjectLaunchSettingsProvider.cs index 4f35b2e504c9..80c2035cc056 100644 --- a/src/Cli/dotnet/commands/dotnet-run/LaunchSettings/ProjectLaunchSettingsProvider.cs +++ b/src/Cli/dotnet/commands/dotnet-run/LaunchSettings/ProjectLaunchSettingsProvider.cs @@ -15,8 +15,10 @@ internal class ProjectLaunchSettingsProvider : ILaunchSettingsProvider public LaunchSettingsApplyResult TryGetLaunchSettings(string? launchProfileName, JsonElement model) { - var config = new ProjectLaunchSettingsModel(); - config.LaunchProfileName = launchProfileName; + var config = new ProjectLaunchSettingsModel + { + LaunchProfileName = launchProfileName + }; foreach (var property in model.EnumerateObject()) { diff --git a/src/Cli/dotnet/commands/dotnet-test/TestCommandParser.cs b/src/Cli/dotnet/commands/dotnet-test/TestCommandParser.cs index 33d8e9437480..12a042e399d8 100644 --- a/src/Cli/dotnet/commands/dotnet-test/TestCommandParser.cs +++ b/src/Cli/dotnet/commands/dotnet-test/TestCommandParser.cs @@ -159,8 +159,10 @@ public static CliCommand GetCommand() private static CliCommand ConstructCommand() { - DocumentedCommand command = new("test", DocsLink, LocalizableStrings.AppFullName); - command.TreatUnmatchedTokensAsErrors = false; + DocumentedCommand command = new("test", DocsLink, LocalizableStrings.AppFullName) + { + TreatUnmatchedTokensAsErrors = false + }; // We are on purpose not capturing the solution, project or directory here. We want to pass it to the // MSBuild command so we are letting it flow. diff --git a/src/Cli/dotnet/commands/dotnet-vstest/VSTestCommandParser.cs b/src/Cli/dotnet/commands/dotnet-vstest/VSTestCommandParser.cs index 36f41bd6026e..3309cdc8385e 100644 --- a/src/Cli/dotnet/commands/dotnet-vstest/VSTestCommandParser.cs +++ b/src/Cli/dotnet/commands/dotnet-vstest/VSTestCommandParser.cs @@ -19,9 +19,10 @@ public static CliCommand GetCommand() private static CliCommand ConstructCommand() { - DocumentedCommand command = new("vstest", DocsLink); - - command.TreatUnmatchedTokensAsErrors = false; + DocumentedCommand command = new("vstest", DocsLink) + { + TreatUnmatchedTokensAsErrors = false + }; command.Options.Add(CommonOptions.TestPlatformOption); command.Options.Add(CommonOptions.TestFrameworkOption); diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadResolverFactory.cs b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadResolverFactory.cs index 19c9415eab89..f67b419aae87 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadResolverFactory.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadResolverFactory.cs @@ -35,9 +35,10 @@ public class CreationResult public static CreationResult Create(CreationParameters parameters) { - var result = new CreationResult(); - - result.InstalledSdkVersion = new ReleaseVersion(parameters.VersionForTesting ?? Product.Version); + var result = new CreationResult + { + InstalledSdkVersion = new ReleaseVersion(parameters.VersionForTesting ?? Product.Version) + }; bool manifestsNeedValidation; if (string.IsNullOrEmpty(parameters.SdkVersionFromOption)) diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs b/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs index 48881631ecd8..87226c33f772 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs @@ -130,16 +130,17 @@ private void UpdateWorkloadsWithInstallRecord( DirectoryPath? offlineCache = null) { - var transaction = new CliTransaction(); - - transaction.RollbackStarted = () => - { - Reporter.WriteLine(LocalizableStrings.RollingBackInstall); - }; - // Don't hide the original error if roll back fails, but do log the rollback failure - transaction.RollbackFailed = ex => + var transaction = new CliTransaction { - Reporter.WriteLine(string.Format(LocalizableStrings.RollBackFailedMessage, ex.Message)); + RollbackStarted = () => + { + Reporter.WriteLine(LocalizableStrings.RollingBackInstall); + }, + // Don't hide the original error if roll back fails, but do log the rollback failure + RollbackFailed = ex => + { + Reporter.WriteLine(string.Format(LocalizableStrings.RollBackFailedMessage, ex.Message)); + } }; transaction.Run( diff --git a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs index 36cc5e7c2dc2..60fb3f12a302 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs @@ -78,10 +78,12 @@ public async Task LoadAsync(BuiltImage image, SourceImageReference sourceReferen string commandPath = await FindFullCommandPath(cancellationToken); // call `docker load` and get it ready to receive input - ProcessStartInfo loadInfo = new(commandPath, $"load"); - loadInfo.RedirectStandardInput = true; - loadInfo.RedirectStandardOutput = true; - loadInfo.RedirectStandardError = true; + ProcessStartInfo loadInfo = new(commandPath, $"load") + { + RedirectStandardInput = true, + RedirectStandardOutput = true, + RedirectStandardError = true + }; using Process? loadProcess = Process.Start(loadInfo); diff --git a/src/StaticWebAssetsSdk/Tasks/ReferencedProjectConfiguration.cs b/src/StaticWebAssetsSdk/Tasks/ReferencedProjectConfiguration.cs index d7119eff24ca..93093fbdd926 100644 --- a/src/StaticWebAssetsSdk/Tasks/ReferencedProjectConfiguration.cs +++ b/src/StaticWebAssetsSdk/Tasks/ReferencedProjectConfiguration.cs @@ -97,17 +97,18 @@ public ITaskItem ToTaskItem() internal static ReferencedProjectConfiguration FromTaskItem(ITaskItem arg) { - var result = new ReferencedProjectConfiguration(); - - result.Identity = arg.GetMetadata("FullPath"); - result.Version = int.Parse(arg.GetMetadata(nameof(Version)), CultureInfo.InvariantCulture); - result.Source = arg.GetMetadata(nameof(Source)); - result.GetBuildAssetsTargets = arg.GetMetadata(nameof(GetBuildAssetsTargets)); - result.AdditionalBuildProperties = arg.GetMetadata(nameof(AdditionalBuildProperties)); - result.AdditionalBuildPropertiesToRemove = arg.GetMetadata(nameof(AdditionalBuildPropertiesToRemove)); - result.GetPublishAssetsTargets = arg.GetMetadata(nameof(GetPublishAssetsTargets)); - result.AdditionalPublishProperties = arg.GetMetadata(nameof(AdditionalPublishProperties)); - result.AdditionalPublishPropertiesToRemove = arg.GetMetadata(nameof(AdditionalPublishPropertiesToRemove)); + var result = new ReferencedProjectConfiguration + { + Identity = arg.GetMetadata("FullPath"), + Version = int.Parse(arg.GetMetadata(nameof(Version)), CultureInfo.InvariantCulture), + Source = arg.GetMetadata(nameof(Source)), + GetBuildAssetsTargets = arg.GetMetadata(nameof(GetBuildAssetsTargets)), + AdditionalBuildProperties = arg.GetMetadata(nameof(AdditionalBuildProperties)), + AdditionalBuildPropertiesToRemove = arg.GetMetadata(nameof(AdditionalBuildPropertiesToRemove)), + GetPublishAssetsTargets = arg.GetMetadata(nameof(GetPublishAssetsTargets)), + AdditionalPublishProperties = arg.GetMetadata(nameof(AdditionalPublishProperties)), + AdditionalPublishPropertiesToRemove = arg.GetMetadata(nameof(AdditionalPublishPropertiesToRemove)) + }; return result; } diff --git a/src/StaticWebAssetsSdk/Tasks/StaticWebAssetsDiscoveryPattern.cs b/src/StaticWebAssetsSdk/Tasks/StaticWebAssetsDiscoveryPattern.cs index e0c85a6943d0..900af7b0d65c 100644 --- a/src/StaticWebAssetsSdk/Tasks/StaticWebAssetsDiscoveryPattern.cs +++ b/src/StaticWebAssetsSdk/Tasks/StaticWebAssetsDiscoveryPattern.cs @@ -65,13 +65,14 @@ internal static bool HasSourceId(string candidate, string source) => internal static StaticWebAssetsDiscoveryPattern FromTaskItem(ITaskItem pattern) { - var result = new StaticWebAssetsDiscoveryPattern(); - - result.Name = pattern.ItemSpec; - result.Source = pattern.GetMetadata(nameof(Source)); - result.BasePath = pattern.GetMetadata(nameof(BasePath)); - result.ContentRoot = pattern.GetMetadata(nameof(ContentRoot)); - result.Pattern = pattern.GetMetadata(nameof(Pattern)); + var result = new StaticWebAssetsDiscoveryPattern + { + Name = pattern.ItemSpec, + Source = pattern.GetMetadata(nameof(Source)), + BasePath = pattern.GetMetadata(nameof(BasePath)), + ContentRoot = pattern.GetMetadata(nameof(ContentRoot)), + Pattern = pattern.GetMetadata(nameof(Pattern)) + }; return result; } diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GetPublishItemsOutputGroupOutputsTests.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GetPublishItemsOutputGroupOutputsTests.cs index 447e65d380ac..856abf9b876c 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GetPublishItemsOutputGroupOutputsTests.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GetPublishItemsOutputGroupOutputsTests.cs @@ -31,12 +31,13 @@ private readonly MockTaskItem _apphost [WindowsOnlyFact] public void It_can_expand_OutputPath() { - var task = new GetPublishItemsOutputGroupOutputs(); - - task.PublishDir = @"bin\Debug\net5.0\publish\"; - task.ResolvedFileToPublish = new[] + var task = new GetPublishItemsOutputGroupOutputs + { + PublishDir = @"bin\Debug\net5.0\publish\", + ResolvedFileToPublish = new[] { _apphost, _dll, _dll + } }; task.Execute().Should().BeTrue(); diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenADependencyContextBuilder.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenADependencyContextBuilder.cs index 33cbc5e693f6..34b80edbadcc 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenADependencyContextBuilder.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenADependencyContextBuilder.cs @@ -85,8 +85,10 @@ public void ItBuildsDependencyContextsFromProjectLockFiles( using (JsonTextWriter writer = new JsonTextWriter(File.CreateText($"result-{baselineFileName}.deps.json"))) { - JsonSerializer serializer = new JsonSerializer(); - serializer.Formatting = Formatting.Indented; + JsonSerializer serializer = new JsonSerializer + { + Formatting = Formatting.Indented + }; serializer.Serialize(writer, result); } diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAProduceContentsAssetsTask.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAProduceContentsAssetsTask.cs index ce099c87bd87..a2278e226565 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAProduceContentsAssetsTask.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAProduceContentsAssetsTask.cs @@ -24,8 +24,10 @@ public void ItProcessesContentFiles() }; // mock preprocessor - var assetPreprocessor = new MockContentAssetPreprocessor((s) => false); - assetPreprocessor.MockReadContent = inputText; + var assetPreprocessor = new MockContentAssetPreprocessor((s) => false) + { + MockReadContent = inputText + }; // input items var contentPreprocessorValues = GetPreprocessorValueItems(preprocessorValues); @@ -73,8 +75,10 @@ public void ItOutputsFileWritesForProcessedContent() }; // mock preprocessor - var assetPreprocessor = new MockContentAssetPreprocessor((s) => false); - assetPreprocessor.MockReadContent = inputText; + var assetPreprocessor = new MockContentAssetPreprocessor((s) => false) + { + MockReadContent = inputText + }; // input items var contentPreprocessorValues = GetPreprocessorValueItems(preprocessorValues); @@ -127,8 +131,10 @@ public void ItOutputsCopyLocalItems() }; // mock preprocessor - var assetPreprocessor = new MockContentAssetPreprocessor((s) => false); - assetPreprocessor.MockReadContent = inputText; + var assetPreprocessor = new MockContentAssetPreprocessor((s) => false) + { + MockReadContent = inputText + }; // input items var contentPreprocessorValues = GetPreprocessorValueItems(preprocessorValues); @@ -204,8 +210,10 @@ public void ItOutputsContentItemsWithActiveBuildAction() }; // mock preprocessor - var assetPreprocessor = new MockContentAssetPreprocessor((s) => false); - assetPreprocessor.MockReadContent = inputText; + var assetPreprocessor = new MockContentAssetPreprocessor((s) => false) + { + MockReadContent = inputText + }; // input items var contentPreprocessorValues = GetPreprocessorValueItems(preprocessorValues); @@ -280,8 +288,10 @@ public void ItCanOutputOnlyPreprocessedItems() }; // mock preprocessor - var assetPreprocessor = new MockContentAssetPreprocessor((s) => false); - assetPreprocessor.MockReadContent = inputText; + var assetPreprocessor = new MockContentAssetPreprocessor((s) => false) + { + MockReadContent = inputText + }; // input items var contentPreprocessorValues = GetPreprocessorValueItems(preprocessorValues); diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolveTargetingPackAssetsTask.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolveTargetingPackAssetsTask.cs index 866100c7be31..c16b14f68377 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolveTargetingPackAssetsTask.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolveTargetingPackAssetsTask.cs @@ -140,16 +140,15 @@ private ResolveTargetingPackAssets InitializeMockTargetingPackAssetsDirectory(ou private ResolveTargetingPackAssets InitializeTask(string mockPackageDirectory, IBuildEngine buildEngine) { - var task = new ResolveTargetingPackAssets() + var task = new ResolveTargetingPackAssets { BuildEngine = buildEngine, - }; - - task.FrameworkReferences = DefaultFrameworkReferences(); + FrameworkReferences = DefaultFrameworkReferences(), - task.ResolvedTargetingPacks = DefaultTargetingPacks(mockPackageDirectory); + ResolvedTargetingPacks = DefaultTargetingPacks(mockPackageDirectory), - task.ProjectLanguage = "C#"; + ProjectLanguage = "C#" + }; return task; } diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenUnresolvedSDKProjectItemsAndImplicitPackages.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenUnresolvedSDKProjectItemsAndImplicitPackages.cs index 805d9dc69dfb..d9be8349ddff 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenUnresolvedSDKProjectItemsAndImplicitPackages.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenUnresolvedSDKProjectItemsAndImplicitPackages.cs @@ -60,18 +60,20 @@ public void ItShouldCombineSdkReferencesWithImplicitPackageReferences() { MetadataKeys.Version, "1.2.3" } }); - var task = new CollectSDKReferencesDesignTime(); - task.SdkReferences = new[] { + var task = new CollectSDKReferencesDesignTime + { + SdkReferences = new[] { sdkReference1, sdkReference2 - }; - task.PackageReferences = new ITaskItem[] { + }, + PackageReferences = new ITaskItem[] { packageReference1, packageReference2, packageReference3, defaultImplicitPackage1 + }, + DefaultImplicitPackages = "DefaultImplicitPackage1;SomeOtherImplicitPackage" }; - task.DefaultImplicitPackages = "DefaultImplicitPackage1;SomeOtherImplicitPackage"; // Act var result = task.Execute(); diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/ProcessFrameworkReferencesTests.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/ProcessFrameworkReferencesTests.cs index d8a29f3eda14..fbb5078396bf 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/ProcessFrameworkReferencesTests.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/ProcessFrameworkReferencesTests.cs @@ -43,17 +43,17 @@ private MockTaskItem _validWindowsSDKKnownFrameworkReference [Fact] public void It_resolves_FrameworkReferences() { - var task = new ProcessFrameworkReferences(); - - task.EnableTargetingPackDownload = true; - task.TargetFrameworkIdentifier = ".NETCoreApp"; - task.TargetFrameworkVersion = ToolsetInfo.CurrentTargetFrameworkVersion; - task.FrameworkReferences = new[] + var task = new ProcessFrameworkReferences + { + EnableTargetingPackDownload = true, + TargetFrameworkIdentifier = ".NETCoreApp", + TargetFrameworkVersion = ToolsetInfo.CurrentTargetFrameworkVersion, + FrameworkReferences = new[] { new MockTaskItem("Microsoft.AspNetCore.App", new Dictionary()) - }; + }, - task.KnownFrameworkReferences = new[] + KnownFrameworkReferences = new[] { new MockTaskItem("Microsoft.AspNetCore.App", new Dictionary() @@ -65,6 +65,7 @@ public void It_resolves_FrameworkReferences() {"TargetingPackName", "Microsoft.AspNetCore.App"}, {"TargetingPackVersion", "1.9.0"} }) + } }; task.Execute().Should().BeTrue(); @@ -79,19 +80,19 @@ public void It_resolves_FrameworkReferences() [Fact] public void Given_targetPlatform_and_targetPlatform_version_It_resolves_FrameworkReferences_() { - var task = new ProcessFrameworkReferences(); - - task.EnableTargetingPackDownload = true; - task.TargetFrameworkIdentifier = ".NETCoreApp"; - task.TargetFrameworkVersion = ToolsetInfo.CurrentTargetFrameworkVersion; - task.TargetPlatformIdentifier = "Windows"; - task.TargetPlatformVersion = "10.0.18362"; - task.FrameworkReferences = new[] + var task = new ProcessFrameworkReferences + { + EnableTargetingPackDownload = true, + TargetFrameworkIdentifier = ".NETCoreApp", + TargetFrameworkVersion = ToolsetInfo.CurrentTargetFrameworkVersion, + TargetPlatformIdentifier = "Windows", + TargetPlatformVersion = "10.0.18362", + FrameworkReferences = new[] { new MockTaskItem("Microsoft.AspNetCore.App", new Dictionary()) - }; + }, - task.KnownFrameworkReferences = new[] + KnownFrameworkReferences = new[] { new MockTaskItem("Microsoft.AspNetCore.App", new Dictionary() @@ -103,6 +104,7 @@ public void Given_targetPlatform_and_targetPlatform_version_It_resolves_Framewor {"TargetingPackName", "Microsoft.AspNetCore.App"}, {"TargetingPackVersion", "1.9.0"} }) + } }; task.Execute().Should().BeTrue(); @@ -117,16 +119,16 @@ public void Given_targetPlatform_and_targetPlatform_version_It_resolves_Framewor [Fact] public void It_does_not_resolve_FrameworkReferences_if_targetframework_doesnt_match() { - var task = new ProcessFrameworkReferences(); - - task.TargetFrameworkIdentifier = ".NETCoreApp"; - task.TargetFrameworkVersion = "2.0"; - task.FrameworkReferences = new[] + var task = new ProcessFrameworkReferences + { + TargetFrameworkIdentifier = ".NETCoreApp", + TargetFrameworkVersion = "2.0", + FrameworkReferences = new[] { new MockTaskItem("Microsoft.AspNetCore.App", new Dictionary()) - }; + }, - task.KnownFrameworkReferences = new[] + KnownFrameworkReferences = new[] { new MockTaskItem("Microsoft.AspNetCore.App", new Dictionary() @@ -138,6 +140,7 @@ public void It_does_not_resolve_FrameworkReferences_if_targetframework_doesnt_ma {"TargetingPackName", "Microsoft.AspNetCore.App"}, {"TargetingPackVersion", "1.9.0"} }) + } }; task.Execute().Should().BeTrue(); diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/GenerateRuntimeConfigurationFiles.cs b/src/Tasks/Microsoft.NET.Build.Tasks/GenerateRuntimeConfigurationFiles.cs index c76b4d55c474..b7b91089a6b1 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/GenerateRuntimeConfigurationFiles.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/GenerateRuntimeConfigurationFiles.cs @@ -152,8 +152,10 @@ private void WriteRuntimeConfig( bool isFrameworkDependent, IList packageFolders) { - RuntimeConfig config = new RuntimeConfig(); - config.RuntimeOptions = new RuntimeOptions(); + RuntimeConfig config = new RuntimeConfig + { + RuntimeOptions = new RuntimeOptions() + }; AddFrameworks( config.RuntimeOptions, @@ -192,9 +194,11 @@ private void AddFrameworks(RuntimeOptions runtimeOptions, // If there are no RuntimeFrameworks (which would be set in the ProcessFrameworkReferences task based // on FrameworkReference items), then use package resolved from MicrosoftNETPlatformLibrary for // the runtimeconfig - RuntimeConfigFramework framework = new RuntimeConfigFramework(); - framework.Name = lockFilePlatformLibrary.Name; - framework.Version = lockFilePlatformLibrary.Version.ToNormalizedString(); + RuntimeConfigFramework framework = new RuntimeConfigFramework + { + Name = lockFilePlatformLibrary.Name, + Version = lockFilePlatformLibrary.Version.ToNormalizedString() + }; frameworks.Add(framework); } @@ -224,9 +228,11 @@ private void AddFrameworks(RuntimeOptions runtimeOptions, continue; } - RuntimeConfigFramework framework = new RuntimeConfigFramework(); - framework.Name = platformLibrary.Name; - framework.Version = platformLibrary.Version; + RuntimeConfigFramework framework = new RuntimeConfigFramework + { + Name = platformLibrary.Name, + Version = platformLibrary.Version + }; frameworks.Add(framework); } @@ -325,8 +331,10 @@ private static JToken GetConfigPropertyValue(ITaskItem hostConfigurationOption) private void WriteDevRuntimeConfig(IList packageFolders) { - RuntimeConfig devConfig = new RuntimeConfig(); - devConfig.RuntimeOptions = new RuntimeOptions(); + RuntimeConfig devConfig = new RuntimeConfig + { + RuntimeOptions = new RuntimeOptions() + }; AddAdditionalProbingPaths(devConfig.RuntimeOptions, packageFolders); @@ -373,10 +381,12 @@ private static string EnsureNoTrailingDirectorySeparator(string path) private static void WriteToJsonFile(string fileName, object value) { - JsonSerializer serializer = new JsonSerializer(); - serializer.ContractResolver = new CamelCasePropertyNamesContractResolver(); - serializer.Formatting = Formatting.Indented; - serializer.DefaultValueHandling = DefaultValueHandling.Ignore; + JsonSerializer serializer = new JsonSerializer + { + ContractResolver = new CamelCasePropertyNamesContractResolver(), + Formatting = Formatting.Indented, + DefaultValueHandling = DefaultValueHandling.Ignore + }; using (JsonTextWriter writer = new JsonTextWriter(new StreamWriter(File.Create(fileName)))) { diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/PrepareForReadyToRunCompilation.cs b/src/Tasks/Microsoft.NET.Build.Tasks/PrepareForReadyToRunCompilation.cs index 7b452d5e33c4..fa87be8ee23b 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/PrepareForReadyToRunCompilation.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/PrepareForReadyToRunCompilation.cs @@ -212,8 +212,10 @@ private void ProcessInputFileList( // This TaskItem corresponds to the output R2R image. It is equivalent to the input TaskItem, only the ItemSpec for it points to the new path // for the newly created R2R image - TaskItem r2rFileToPublish = new TaskItem(file); - r2rFileToPublish.ItemSpec = outputR2RImage; + TaskItem r2rFileToPublish = new TaskItem(file) + { + ItemSpec = outputR2RImage + }; r2rFileToPublish.RemoveMetadata(MetadataKeys.OriginalItemSpec); r2rFilesPublishList.Add(r2rFileToPublish); @@ -227,8 +229,10 @@ private void ProcessInputFileList( { // This TaskItem is the R2R->R2RPDB entry, for a R2R image that was just created, and for which we need to create native PDBs. This will be used as // an input to the ReadyToRunCompiler task - TaskItem pdbCompilationEntry = new TaskItem(file); - pdbCompilationEntry.ItemSpec = outputR2RImage; + TaskItem pdbCompilationEntry = new TaskItem(file) + { + ItemSpec = outputR2RImage + }; pdbCompilationEntry.SetMetadata(MetadataKeys.OutputPDBImage, outputPDBImage); pdbCompilationEntry.SetMetadata(MetadataKeys.CreatePDBCommand, crossgen1CreatePDBCommand); symbolsCompilationList.Add(pdbCompilationEntry); @@ -236,8 +240,10 @@ private void ProcessInputFileList( // This TaskItem corresponds to the output PDB image. It is equivalent to the input TaskItem, only the ItemSpec for it points to the new path // for the newly created PDB image. - TaskItem r2rSymbolsFileToPublish = new TaskItem(file); - r2rSymbolsFileToPublish.ItemSpec = outputPDBImage; + TaskItem r2rSymbolsFileToPublish = new TaskItem(file) + { + ItemSpec = outputPDBImage + }; r2rSymbolsFileToPublish.SetMetadata(MetadataKeys.RelativePath, outputPDBImageRelativePath); r2rSymbolsFileToPublish.RemoveMetadata(MetadataKeys.OriginalItemSpec); if (!IncludeSymbolsInSingleFile) @@ -257,8 +263,10 @@ private void ProcessInputFileList( compositeR2RImageRelativePath = Path.ChangeExtension(compositeR2RImageRelativePath, "r2r" + Path.GetExtension(compositeR2RImageRelativePath)); var compositeR2RImage = Path.Combine(OutputPath, compositeR2RImageRelativePath); - TaskItem r2rCompilationEntry = new TaskItem(MainAssembly); - r2rCompilationEntry.ItemSpec = r2rCompositeInputList[0].ItemSpec; + TaskItem r2rCompilationEntry = new TaskItem(MainAssembly) + { + ItemSpec = r2rCompositeInputList[0].ItemSpec + }; r2rCompilationEntry.SetMetadata(MetadataKeys.OutputR2RImage, compositeR2RImage); r2rCompilationEntry.SetMetadata(MetadataKeys.CreateCompositeImage, "true"); r2rCompilationEntry.RemoveMetadata(MetadataKeys.OriginalItemSpec); @@ -288,8 +296,10 @@ private void ProcessInputFileList( r2rCompilationEntry.SetMetadata(MetadataKeys.OutputPDBImage, compositePDBImage); // Publish composite PDB file - TaskItem r2rSymbolsFileToPublish = new TaskItem(MainAssembly); - r2rSymbolsFileToPublish.ItemSpec = compositePDBImage; + TaskItem r2rSymbolsFileToPublish = new TaskItem(MainAssembly) + { + ItemSpec = compositePDBImage + }; r2rSymbolsFileToPublish.SetMetadata(MetadataKeys.RelativePath, compositePDBRelativePath); r2rSymbolsFileToPublish.RemoveMetadata(MetadataKeys.OriginalItemSpec); if (!IncludeSymbolsInSingleFile) @@ -304,8 +314,10 @@ private void ProcessInputFileList( imageCompilationList.Add(r2rCompilationEntry); // Publish it - TaskItem compositeR2RFileToPublish = new TaskItem(MainAssembly); - compositeR2RFileToPublish.ItemSpec = compositeR2RImage; + TaskItem compositeR2RFileToPublish = new TaskItem(MainAssembly) + { + ItemSpec = compositeR2RImage + }; compositeR2RFileToPublish.RemoveMetadata(MetadataKeys.OriginalItemSpec); compositeR2RFileToPublish.SetMetadata(MetadataKeys.RelativePath, compositeR2RImageRelativePath); r2rFilesPublishList.Add(compositeR2RFileToPublish); diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/RuntimePackAssetInfo.cs b/src/Tasks/Microsoft.NET.Build.Tasks/RuntimePackAssetInfo.cs index 66e1ea3aa5cf..cefc0a2d5be2 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/RuntimePackAssetInfo.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/RuntimePackAssetInfo.cs @@ -21,9 +21,11 @@ internal class RuntimePackAssetInfo public static RuntimePackAssetInfo FromItem(ITaskItem item) { - var assetInfo = new RuntimePackAssetInfo(); - assetInfo.SourcePath = item.ItemSpec; - assetInfo.DestinationSubPath = item.GetMetadata(MetadataKeys.DestinationSubPath); + var assetInfo = new RuntimePackAssetInfo + { + SourcePath = item.ItemSpec, + DestinationSubPath = item.GetMetadata(MetadataKeys.DestinationSubPath) + }; string assetTypeString = item.GetMetadata(MetadataKeys.AssetType); if (assetTypeString.Equals("runtime", StringComparison.OrdinalIgnoreCase)) diff --git a/src/Tests/Microsoft.DotNet.Cli.Utils.Tests/BlockingMemoryStreamTests.cs b/src/Tests/Microsoft.DotNet.Cli.Utils.Tests/BlockingMemoryStreamTests.cs index 7db1f542240a..2b8d11909ce1 100644 --- a/src/Tests/Microsoft.DotNet.Cli.Utils.Tests/BlockingMemoryStreamTests.cs +++ b/src/Tests/Microsoft.DotNet.Cli.Utils.Tests/BlockingMemoryStreamTests.cs @@ -83,9 +83,10 @@ public void TestReadBlocksUntilWrite() Assert.Equal(3, buffer[2]); readerThreadSuccessful = true; - }); - - readerThread.IsBackground = true; + }) + { + IsBackground = true + }; readerThread.Start(); // ensure the thread is executing diff --git a/src/Tests/Microsoft.NET.Build.Tests/ArtifactsOutputPathTests.cs b/src/Tests/Microsoft.NET.Build.Tests/ArtifactsOutputPathTests.cs index 85a313508463..b1040d3c4bfe 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/ArtifactsOutputPathTests.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/ArtifactsOutputPathTests.cs @@ -308,11 +308,10 @@ TestAsset CreateCustomizedTestProject(string propertyName, string propertyValue, { var testProject = new TestProject("App") { - IsExe = true + IsExe = true, + UseArtifactsOutput = true }; - testProject.UseArtifactsOutput = true; - var testAsset = _testAssetsManager.CreateTestProjects(new[] { testProject }, callingMethod: callingMethod); File.WriteAllText(Path.Combine(testAsset.Path, "Directory.Build.props"), diff --git a/src/Tests/Microsoft.NET.Build.Tests/DesignTimeBuildTests.cs b/src/Tests/Microsoft.NET.Build.Tests/DesignTimeBuildTests.cs index b209328166c9..9cbe12adb976 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/DesignTimeBuildTests.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/DesignTimeBuildTests.cs @@ -41,8 +41,10 @@ public void The_design_time_build_succeeds_before_nuget_restore(string relativeP var projectDirectory = Path.Combine(testAsset.TestRoot, relativeProjectPath); - var command = new MSBuildCommand(Log, "ResolveAssemblyReferencesDesignTime", projectDirectory); - command.WorkingDirectory = projectDirectory; + var command = new MSBuildCommand(Log, "ResolveAssemblyReferencesDesignTime", projectDirectory) + { + WorkingDirectory = projectDirectory + }; var result = command.Execute(args); result.Should().Pass(); @@ -109,8 +111,10 @@ public void DesignTimePackageDependenciesAreResolved(string targetFramework) var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework); - var getValuesCommand = new GetValuesCommand(testAsset, "_PackageDependenciesDesignTime", GetValuesCommand.ValueType.Item); - getValuesCommand.DependsOnTargets = "ResolvePackageDependenciesDesignTime"; + var getValuesCommand = new GetValuesCommand(testAsset, "_PackageDependenciesDesignTime", GetValuesCommand.ValueType.Item) + { + DependsOnTargets = "ResolvePackageDependenciesDesignTime" + }; getValuesCommand.Execute() .Should() @@ -154,10 +158,12 @@ public void PackageErrorsAreSet(string targetFramework) .Should() .Fail(); - var getValuesCommand = new GetValuesCommand(testAsset, "_PackageDependenciesDesignTime", GetValuesCommand.ValueType.Item); - getValuesCommand.ShouldRestore = false; - getValuesCommand.DependsOnTargets = "ResolvePackageDependenciesDesignTime"; - getValuesCommand.MetadataNames = new List() { "DiagnosticLevel" }; + var getValuesCommand = new GetValuesCommand(testAsset, "_PackageDependenciesDesignTime", GetValuesCommand.ValueType.Item) + { + ShouldRestore = false, + DependsOnTargets = "ResolvePackageDependenciesDesignTime", + MetadataNames = new List() { "DiagnosticLevel" } + }; getValuesCommand .WithWorkingDirectory(testAsset.TestRoot) @@ -206,8 +212,10 @@ private void TestDesignTimeBuildAfterChange(Action projectChange, [Ca string projectFolder = Path.Combine(testAsset.TestRoot, testProject.Name); - var buildCommand = new MSBuildCommand(Log, null, projectFolder); - buildCommand.WorkingDirectory = projectFolder; + var buildCommand = new MSBuildCommand(Log, null, projectFolder) + { + WorkingDirectory = projectFolder + }; buildCommand .Execute() diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenFrameworkReferences.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenFrameworkReferences.cs index 57f6bdea0e31..a9144a87a2d0 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenFrameworkReferences.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenFrameworkReferences.cs @@ -842,8 +842,10 @@ public void ResolvedFrameworkReferences_are_generated() }; var getValuesCommand = new GetValuesCommand(Log, projectFolder, testProject.TargetFrameworks, - "ResolvedFrameworkReference", GetValuesCommand.ValueType.Item); - getValuesCommand.DependsOnTargets = "ResolveFrameworkReferences"; + "ResolvedFrameworkReference", GetValuesCommand.ValueType.Item) + { + DependsOnTargets = "ResolveFrameworkReferences" + }; getValuesCommand.MetadataNames.AddRange(expectedMetadata); getValuesCommand.Execute().Should().Pass(); diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeManifestSupportedFrameworks.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeManifestSupportedFrameworks.cs index d02660379606..be9ba6ab5988 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeManifestSupportedFrameworks.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeManifestSupportedFrameworks.cs @@ -107,9 +107,10 @@ private List GetItems(string testDirectory, string tfm, string itemName) testDirectory, tfm, itemName, - GetValuesCommand.ValueType.Item); - - command.DependsOnTargets = ""; + GetValuesCommand.ValueType.Item) + { + DependsOnTargets = "" + }; command.Execute().Should().Pass(); return command.GetValues(); diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildACrossTargetedLibrary.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildACrossTargetedLibrary.cs index 8b49b2debd89..f84909d4f14d 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildACrossTargetedLibrary.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildACrossTargetedLibrary.cs @@ -103,8 +103,10 @@ public void It_combines_inner_rids_for_restore( new XElement(ns + "RuntimeIdentifiers", secondFrameworkRids))); }); - var command = new GetValuesCommand(Log, testAsset.TestRoot, "", valueName: "RuntimeIdentifiers"); - command.DependsOnTargets = "GetAllRuntimeIdentifiers"; + var command = new GetValuesCommand(Log, testAsset.TestRoot, "", valueName: "RuntimeIdentifiers") + { + DependsOnTargets = "GetAllRuntimeIdentifiers" + }; command.ExecuteWithoutRestore().Should().Pass(); command.GetValues().Should().BeEquivalentTo(expectedCombination.Split(';')); } diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs index 1f02829c0509..13186bc18b56 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs @@ -283,10 +283,11 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st var libraryProjectDirectory = Path.Combine(testAsset.TestRoot, "TestLibrary"); var getValuesCommand = new GetValuesCommand(Log, libraryProjectDirectory, - "netstandard1.5", "DefineConstants"); - - getValuesCommand.ShouldCompile = true; - getValuesCommand.Configuration = configuration; + "netstandard1.5", "DefineConstants") + { + ShouldCompile = true, + Configuration = configuration + }; getValuesCommand .Execute("/p:Configuration=" + configuration) diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithFSharp.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithFSharp.cs index 3a8a8ddb1681..97db7747bff4 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithFSharp.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithFSharp.cs @@ -146,10 +146,11 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st var libraryProjectDirectory = Path.Combine(testAsset.TestRoot, "TestLibrary"); var getValuesCommand = new GetValuesCommand(Log, libraryProjectDirectory, - "netstandard1.6", "DefineConstants"); - - getValuesCommand.ShouldCompile = true; - getValuesCommand.Configuration = configuration; + "netstandard1.6", "DefineConstants") + { + ShouldCompile = true, + Configuration = configuration + }; getValuesCommand .Execute("/p:Configuration=" + configuration) diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithOSSupportedVersion.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithOSSupportedVersion.cs index 445885937c0a..80ba89e53eda 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithOSSupportedVersion.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithOSSupportedVersion.cs @@ -15,8 +15,10 @@ public void WhenPropertiesAreNotSetItShouldNotGenerateSupportedOSPlatformAttribu TestProject testProject = SetUpProject(); var testAsset = _testAssetsManager.CreateTestProject(testProject); - var runCommand = new DotnetCommand(Log, "run"); - runCommand.WorkingDirectory = Path.Combine(testAsset.TestRoot, testProject.Name); + var runCommand = new DotnetCommand(Log, "run") + { + WorkingDirectory = Path.Combine(testAsset.TestRoot, testProject.Name) + }; runCommand.Execute() .Should() .Pass() @@ -38,8 +40,10 @@ public void WhenPropertiesAreSetItCanGenerateSupportedOSPlatformAttribute() var testAsset = _testAssetsManager.CreateTestProject(testProject); - var runCommand = new DotnetCommand(Log, "run"); - runCommand.WorkingDirectory = Path.Combine(testAsset.TestRoot, testProject.Name); + var runCommand = new DotnetCommand(Log, "run") + { + WorkingDirectory = Path.Combine(testAsset.TestRoot, testProject.Name) + }; runCommand.Execute() .Should() .Pass() @@ -60,8 +64,10 @@ public void WhenSupportedOSPlatformVersionIsNotSetTargetPlatformVersionIsSetItCa var testAsset = _testAssetsManager.CreateTestProject(testProject); - var runCommand = new DotnetCommand(Log, "run"); - runCommand.WorkingDirectory = Path.Combine(testAsset.TestRoot, testProject.Name); + var runCommand = new DotnetCommand(Log, "run") + { + WorkingDirectory = Path.Combine(testAsset.TestRoot, testProject.Name) + }; runCommand.Execute() .Should() .Pass() @@ -77,8 +83,10 @@ public void WhenUsingDefaultTargetPlatformVersionItCanGenerateSupportedOSPlatfor var testAsset = _testAssetsManager.CreateTestProject(testProject); - var runCommand = new DotnetCommand(Log, "run"); - runCommand.WorkingDirectory = Path.Combine(testAsset.TestRoot, testProject.Name); + var runCommand = new DotnetCommand(Log, "run") + { + WorkingDirectory = Path.Combine(testAsset.TestRoot, testProject.Name) + }; runCommand.Execute() .Should() .Pass() @@ -95,8 +103,10 @@ public void WhenUsingTargetPlatformInTargetFrameworkItCanGenerateSupportedOSPlat var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework); - var runCommand = new DotnetCommand(Log, "run"); - runCommand.WorkingDirectory = Path.Combine(testAsset.TestRoot, testProject.Name); + var runCommand = new DotnetCommand(Log, "run") + { + WorkingDirectory = Path.Combine(testAsset.TestRoot, testProject.Name) + }; runCommand.Execute() .Should() .Pass() @@ -112,8 +122,10 @@ public void WhenUsingZeroedSupportedOSPlatformVersionItCanGenerateSupportedOSPla var testAsset = _testAssetsManager.CreateTestProject(testProject); - var runCommand = new DotnetCommand(Log, "run"); - runCommand.WorkingDirectory = Path.Combine(testAsset.TestRoot, testProject.Name); + var runCommand = new DotnetCommand(Log, "run") + { + WorkingDirectory = Path.Combine(testAsset.TestRoot, testProject.Name) + }; runCommand.Execute() .Should() .Pass() @@ -149,8 +161,10 @@ public void WhenTargetPlatformMinVersionIsSetForWindowsItIsUsedForTheSupportedOS var testAsset = _testAssetsManager.CreateTestProject(testProject); - var runCommand = new DotnetCommand(Log, "run"); - runCommand.WorkingDirectory = Path.Combine(testAsset.TestRoot, testProject.Name); + var runCommand = new DotnetCommand(Log, "run") + { + WorkingDirectory = Path.Combine(testAsset.TestRoot, testProject.Name) + }; runCommand.Execute() .Should() .Pass() @@ -166,8 +180,10 @@ public void WhenTargetingWindowsSupportedOSVersionPropertySetsTargetPlatformMinV var testAsset = _testAssetsManager.CreateTestProject(testProject); - var runCommand = new DotnetCommand(Log, "run"); - runCommand.WorkingDirectory = Path.Combine(testAsset.TestRoot, testProject.Name); + var runCommand = new DotnetCommand(Log, "run") + { + WorkingDirectory = Path.Combine(testAsset.TestRoot, testProject.Name) + }; runCommand.Execute() .Should() .Pass() @@ -193,8 +209,10 @@ public void WhenTargetingWindowsSupportedOSPlatformVersionPropertyIsPreferredOve var testAsset = _testAssetsManager.CreateTestProject(testProject); - var runCommand = new DotnetCommand(Log, "run"); - runCommand.WorkingDirectory = Path.Combine(testAsset.TestRoot, testProject.Name); + var runCommand = new DotnetCommand(Log, "run") + { + WorkingDirectory = Path.Combine(testAsset.TestRoot, testProject.Name) + }; runCommand.Execute() .Should() .Pass() @@ -240,8 +258,10 @@ public void WhenNotTargetingWindowsTargetPlatformMinVersionPropertyIsIgnored() var testAsset = _testAssetsManager.CreateTestProject(testProject); - var runCommand = new DotnetCommand(Log, "run"); - runCommand.WorkingDirectory = Path.Combine(testAsset.TestRoot, testProject.Name); + var runCommand = new DotnetCommand(Log, "run") + { + WorkingDirectory = Path.Combine(testAsset.TestRoot, testProject.Name) + }; runCommand.Execute() .Should() .Pass() diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithVB.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithVB.cs index cc6e90a7ed50..0ae219de93fb 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithVB.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithVB.cs @@ -157,10 +157,11 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st var libraryProjectDirectory = Path.Combine(testAsset.TestRoot, "TestLibrary"); var getValuesCommand = new GetValuesCommand(Log, libraryProjectDirectory, - "netstandard1.5", "FinalDefineConstants"); - - getValuesCommand.ShouldCompile = true; - getValuesCommand.Configuration = configuration; + "netstandard1.5", "FinalDefineConstants") + { + ShouldCompile = true, + Configuration = configuration + }; getValuesCommand .Execute("/p:Configuration=" + configuration) diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildASelfContainedApp.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildASelfContainedApp.cs index 2c719b558dc7..42594ccfe4a6 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildASelfContainedApp.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildASelfContainedApp.cs @@ -160,10 +160,12 @@ public void It_resolves_runtimepack_from_packs_folder() var testAsset = _testAssetsManager.CreateTestProject(testProject); - var getValuesCommand = new GetValuesCommand(testAsset, "RuntimePack", GetValuesCommand.ValueType.Item); - getValuesCommand.MetadataNames = new List() { "NuGetPackageId", "NuGetPackageVersion" }; - getValuesCommand.DependsOnTargets = "ProcessFrameworkReferences"; - getValuesCommand.ShouldRestore = false; + var getValuesCommand = new GetValuesCommand(testAsset, "RuntimePack", GetValuesCommand.ValueType.Item) + { + MetadataNames = new List() { "NuGetPackageId", "NuGetPackageVersion" }, + DependsOnTargets = "ProcessFrameworkReferences", + ShouldRestore = false + }; getValuesCommand.Execute() .Should() diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs index 3a62d619da30..dcc9d2af0cbd 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs @@ -455,9 +455,11 @@ public void ItUsesTheHighestMatchingWindowsSdkPackageVersion(string targetFramew private string GetReferencedWindowsSdkVersion(TestAsset testAsset) { - var getValueCommand = new GetValuesCommand(testAsset, "PackageDownload", GetValuesCommand.ValueType.Item); - getValueCommand.ShouldRestore = false; - getValueCommand.DependsOnTargets = "_CheckForInvalidConfigurationAndPlatform;CollectPackageDownloads"; + var getValueCommand = new GetValuesCommand(testAsset, "PackageDownload", GetValuesCommand.ValueType.Item) + { + ShouldRestore = false, + DependsOnTargets = "_CheckForInvalidConfigurationAndPlatform;CollectPackageDownloads" + }; getValueCommand.MetadataNames.Add("Version"); getValueCommand.Execute() .Should() diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToReferenceAProject.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToReferenceAProject.cs index eff6fe98e746..dae1d9c408c1 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToReferenceAProject.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToReferenceAProject.cs @@ -182,8 +182,10 @@ public void It_disables_copying_conflicting_transitive_content(bool copyConflict var buildCommand = new BuildCommand(parentAsset); buildCommand.Execute().Should().Pass(); - var getValuesCommand = new GetValuesCommand(Log, Path.Combine(parentAsset.Path, parentProject.Name), tfm, "ResultOutput"); - getValuesCommand.DependsOnTargets = "Build"; + var getValuesCommand = new GetValuesCommand(Log, Path.Combine(parentAsset.Path, parentProject.Name), tfm, "ResultOutput") + { + DependsOnTargets = "Build" + }; getValuesCommand.Execute().Should().Pass(); var valuesResult = getValuesCommand.GetValuesWithMetadata().Select(pair => Path.GetFullPath(pair.value)); diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToResolveConflicts.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToResolveConflicts.cs index 4b221458362c..2d241f22e8e2 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToResolveConflicts.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToResolveConflicts.cs @@ -67,8 +67,10 @@ private void GetReferences(TestProject testProject, bool expectConflicts, out Li projectFolder, targetFramework, "Reference", - GetValuesCommand.ValueType.Item); - getReferenceCommand.DependsOnTargets = "Build"; + GetValuesCommand.ValueType.Item) + { + DependsOnTargets = "Build" + }; var result = getReferenceCommand.Execute("/v:detailed").Should().Pass(); if (expectConflicts) { @@ -86,8 +88,10 @@ private void GetReferences(TestProject testProject, bool expectConflicts, out Li projectFolder, targetFramework, "ReferenceCopyLocalPaths", - GetValuesCommand.ValueType.Item); - getReferenceCopyLocalPathsCommand.DependsOnTargets = "Build"; + GetValuesCommand.ValueType.Item) + { + DependsOnTargets = "Build" + }; getReferenceCopyLocalPathsCommand.Execute().Should().Pass(); referenceCopyLocalPaths = getReferenceCopyLocalPathsCommand.GetValues(); diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToUseAnalyzers.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToUseAnalyzers.cs index 99b304d030ad..4c31d15ecdee 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToUseAnalyzers.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToUseAnalyzers.cs @@ -239,9 +239,10 @@ public void It_resolves_multitargeted_analyzers() var getValuesCommand = new GetValuesCommand(testAsset, valueName: "Analyzer", GetValuesCommand.ValueType.Item, - targetFramework); - - getValuesCommand.DependsOnTargets = "ResolveLockFileAnalyzers"; + targetFramework) + { + DependsOnTargets = "ResolveLockFileAnalyzers" + }; getValuesCommand.Execute("-p:TargetFramework=" + targetFramework).Should().Pass(); diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenTransitiveFrameworkReferencesAreDisabled.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenTransitiveFrameworkReferencesAreDisabled.cs index 62619a18073b..e37427a2cb92 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenTransitiveFrameworkReferencesAreDisabled.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenTransitiveFrameworkReferencesAreDisabled.cs @@ -150,14 +150,13 @@ public void TransitiveFrameworkReferenceGeneratesRuntimePackError() referencedProject.FrameworkReferences.Add("Microsoft.AspNetCore.App"); - var testProject = new TestProject() + var testProject = new TestProject { TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true, - SelfContained = "true" + SelfContained = "true", + RuntimeIdentifier = EnvironmentInfo.GetCompatibleRid() }; - - testProject.RuntimeIdentifier = EnvironmentInfo.GetCompatibleRid(); testProject.AdditionalProperties["DisableTransitiveFrameworkReferenceDownloads"] = "True"; testProject.AdditionalProperties["RestorePackagesPath"] = nugetPackagesFolder; diff --git a/src/Tests/Microsoft.NET.Build.Tests/WorkloadTests.cs b/src/Tests/Microsoft.NET.Build.Tests/WorkloadTests.cs index aa93bbfd6667..880b3b224a16 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/WorkloadTests.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/WorkloadTests.cs @@ -61,8 +61,10 @@ public void It_should_create_suggested_workload_items() var testAsset = _testAssetsManager .CreateTestProject(testProject); - var getValuesCommand = new GetValuesCommand(testAsset, "SuggestedWorkload", GetValuesCommand.ValueType.Item); - getValuesCommand.DependsOnTargets = "GetSuggestedWorkloads"; + var getValuesCommand = new GetValuesCommand(testAsset, "SuggestedWorkload", GetValuesCommand.ValueType.Item) + { + DependsOnTargets = "GetSuggestedWorkloads" + }; getValuesCommand.MetadataNames.Add("VisualStudioComponentId"); getValuesCommand.MetadataNames.Add("VisualStudioComponentIds"); getValuesCommand.ShouldRestore = false; @@ -242,9 +244,11 @@ public void It_should_get_suggested_workload_by_GetRequiredWorkloads_target() .CreateTestProject(mainProject); var getValuesCommand = - new GetValuesCommand(testAsset, "_ResolvedSuggestedWorkload", GetValuesCommand.ValueType.Item); - getValuesCommand.DependsOnTargets = "_GetRequiredWorkloads"; - getValuesCommand.ShouldRestore = false; + new GetValuesCommand(testAsset, "_ResolvedSuggestedWorkload", GetValuesCommand.ValueType.Item) + { + DependsOnTargets = "_GetRequiredWorkloads", + ShouldRestore = false + }; getValuesCommand.Execute("/p:SkipResolvePackageAssets=true") .Should() @@ -290,9 +294,11 @@ public void Given_multi_target_It_should_get_suggested_workload_by_GetRequiredWo .CreateTestProject(mainProject, identifier: mainTfm + "_" + referencingTfm); var getValuesCommand = - new GetValuesCommand(testAsset, "_ResolvedSuggestedWorkload", GetValuesCommand.ValueType.Item); - getValuesCommand.DependsOnTargets = "_GetRequiredWorkloads"; - getValuesCommand.ShouldRestore = false; + new GetValuesCommand(testAsset, "_ResolvedSuggestedWorkload", GetValuesCommand.ValueType.Item) + { + DependsOnTargets = "_GetRequiredWorkloads", + ShouldRestore = false + }; getValuesCommand.Execute("/p:SkipResolvePackageAssets=true") .Should() diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs index b8b880bc0399..cd075206dd51 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs @@ -156,8 +156,10 @@ public void compose_multifile() .CopyTestAsset("TargetManifests", "multifile") .WithSource(); - var storeCommand = new ComposeStoreCommand(Log, simpleDependenciesAsset.TestRoot, "NewtonsoftFilterProfile.xml"); - storeCommand.WorkingDirectory = simpleDependenciesAsset.Path; + var storeCommand = new ComposeStoreCommand(Log, simpleDependenciesAsset.TestRoot, "NewtonsoftFilterProfile.xml") + { + WorkingDirectory = simpleDependenciesAsset.Path + }; var OutputFolder = Path.Combine(simpleDependenciesAsset.TestRoot, "o"); var WorkingDir = Path.Combine(simpleDependenciesAsset.TestRoot, "w"); diff --git a/src/Tests/Microsoft.NET.Restore.Tests/RestoreWithOlderNuGet.cs b/src/Tests/Microsoft.NET.Restore.Tests/RestoreWithOlderNuGet.cs index db45ecf0d89e..bd44491e3848 100644 --- a/src/Tests/Microsoft.NET.Restore.Tests/RestoreWithOlderNuGet.cs +++ b/src/Tests/Microsoft.NET.Restore.Tests/RestoreWithOlderNuGet.cs @@ -21,8 +21,10 @@ public void ItCanBuildProjectRestoredWithNuGet5_7() var testAsset = _testAssetsManager.CreateTestProject(testProject); - var restoreCommand = new NuGetExeRestoreCommand(Log, testAsset.Path, testProject.Name); - restoreCommand.NuGetExeVersion = "5.7.0"; + var restoreCommand = new NuGetExeRestoreCommand(Log, testAsset.Path, testProject.Name) + { + NuGetExeVersion = "5.7.0" + }; restoreCommand // Workaround for CI machines where MSBuild workload resolver isn't enabled by default .WithEnvironmentVariable("MSBuildEnableWorkloadResolver", "false") diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ApplyCssScopesTest.cs b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ApplyCssScopesTest.cs index 8ce75bfa6d3e..fbbbc61f9777 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ApplyCssScopesTest.cs +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ApplyCssScopesTest.cs @@ -130,7 +130,7 @@ public void DoesNotApplyCssScopes_ToRazorViewsWithoutAssociatedFiles() public void ApplyAllCssScopes_FailsWhenTheScopedCss_DoesNotMatchTheRazorComponent() { // Arrange - var taskInstance = new ApplyCssScopes() + var taskInstance = new ApplyCssScopes { RazorComponents = new[] { @@ -143,11 +143,10 @@ public void ApplyAllCssScopes_FailsWhenTheScopedCss_DoesNotMatchTheRazorComponen new TaskItem("TestFiles/Pages/Index.razor.css", new Dictionary { ["CssScope"] = "index-scope" }), new TaskItem("TestFiles/Pages/Counter.razor.css", new Dictionary { ["CssScope"] = "counter-scope" }), new TaskItem("TestFiles/Pages/Profile.razor.css", new Dictionary { ["CssScope"] = "profile-scope" }), - } + }, + BuildEngine = Mock.Of() }; - taskInstance.BuildEngine = Mock.Of(); - // Act var result = taskInstance.Execute(); @@ -159,7 +158,7 @@ public void ApplyAllCssScopes_FailsWhenTheScopedCss_DoesNotMatchTheRazorComponen public void ApplyAllCssScopes_FailsWhenTheScopedCss_DoesNotMatchTheRazorView() { // Arrange - var taskInstance = new ApplyCssScopes() + var taskInstance = new ApplyCssScopes { RazorGenerate = new[] { @@ -172,11 +171,10 @@ public void ApplyAllCssScopes_FailsWhenTheScopedCss_DoesNotMatchTheRazorView() new TaskItem("TestFiles/Pages/Index.cshtml.css", new Dictionary { ["CssScope"] = "index-scope" }), new TaskItem("TestFiles/Pages/Counter.cshtml.css", new Dictionary { ["CssScope"] = "counter-scope" }), new TaskItem("TestFiles/Pages/Profile.cshtml.css", new Dictionary { ["CssScope"] = "profile-scope" }), - } + }, + BuildEngine = Mock.Of() }; - taskInstance.BuildEngine = Mock.Of(); - // Act var result = taskInstance.Execute(); @@ -246,7 +244,7 @@ public void ScopedCssCanDefineAssociatedRazorGenerateFile() public void ApplyAllCssScopes_FailsWhenMultipleScopedCssFiles_MatchTheSameRazorComponent() { // Arrange - var taskInstance = new ApplyCssScopes() + var taskInstance = new ApplyCssScopes { RazorComponents = new[] { @@ -263,11 +261,10 @@ public void ApplyAllCssScopes_FailsWhenMultipleScopedCssFiles_MatchTheSameRazorC ["CssScope"] = "conflict-scope", ["RazorComponent"] = "TestFiles/Pages/Index.razor" }), - } + }, + BuildEngine = Mock.Of() }; - taskInstance.BuildEngine = Mock.Of(); - // Act var result = taskInstance.Execute(); @@ -279,7 +276,7 @@ public void ApplyAllCssScopes_FailsWhenMultipleScopedCssFiles_MatchTheSameRazorC public void ApplyAllCssScopes_FailsWhenMultipleScopedCssFiles_MatchTheSameRazorView() { // Arrange - var taskInstance = new ApplyCssScopes() + var taskInstance = new ApplyCssScopes { RazorGenerate = new[] { @@ -296,11 +293,10 @@ public void ApplyAllCssScopes_FailsWhenMultipleScopedCssFiles_MatchTheSameRazorV ["CssScope"] = "conflict-scope", ["View"] = "TestFiles/Pages/Index.cshtml" }), - } + }, + BuildEngine = Mock.Of() }; - taskInstance.BuildEngine = Mock.Of(); - // Act var result = taskInstance.Execute(); @@ -351,7 +347,7 @@ public void ApplyAllCssScopes_AppliesScopesToRazorComponentAndViewFiles() public void ApplyAllCssScopes_ScopedCssComponentsDontMatchWithScopedCssViewStylesAndViceversa() { // Arrange - var taskInstance = new ApplyCssScopes() + var taskInstance = new ApplyCssScopes { RazorComponents = new[] { @@ -369,11 +365,10 @@ public void ApplyAllCssScopes_ScopedCssComponentsDontMatchWithScopedCssViewStyle new TaskItem("TestFiles/Pages/_Host.razor.css", new Dictionary { ["CssScope"] = "_host-scope" }), new TaskItem("TestFiles/Pages/Index.cshtml.css", new Dictionary { ["CssScope"] = "index-scope" }), new TaskItem("TestFiles/Pages/Counter.cshtml.css", new Dictionary { ["CssScope"] = "counter-scope" }), - } + }, + BuildEngine = Mock.Of() }; - taskInstance.BuildEngine = Mock.Of(); - // Act var result = taskInstance.Execute(); diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/GenerateStaticWebAssetsManifestTest.cs b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/GenerateStaticWebAssetsManifestTest.cs index f5955ab8e94b..5e2e07b2e6cf 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/GenerateStaticWebAssetsManifestTest.cs +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/GenerateStaticWebAssetsManifestTest.cs @@ -315,16 +315,18 @@ private StaticWebAssetsManifest.ReferencedProjectConfiguration CreateProjectRefe string additionalBuildProperties = ";", string additionalBuildPropertiesToRemove = ";WebPublishProfileFile") { - var result = new StaticWebAssetsManifest.ReferencedProjectConfiguration(); - result.Identity = Path.GetFullPath(Path.Combine(Directory.GetCurrentDirectory(), $"{source}.csproj")); - result.Version = version; - result.Source = source; - result.GetPublishAssetsTargets = publishTargets; - result.AdditionalPublishProperties = additionalPublishProperties; - result.AdditionalPublishPropertiesToRemove = additionalPublishPropertiesToRemove; - result.GetBuildAssetsTargets = buildTargets; - result.AdditionalBuildProperties = additionalBuildProperties; - result.AdditionalBuildPropertiesToRemove = additionalBuildPropertiesToRemove; + var result = new StaticWebAssetsManifest.ReferencedProjectConfiguration + { + Identity = Path.GetFullPath(Path.Combine(Directory.GetCurrentDirectory(), $"{source}.csproj")), + Version = version, + Source = source, + GetPublishAssetsTargets = publishTargets, + AdditionalPublishProperties = additionalPublishProperties, + AdditionalPublishPropertiesToRemove = additionalPublishPropertiesToRemove, + GetBuildAssetsTargets = buildTargets, + AdditionalBuildProperties = additionalBuildProperties, + AdditionalBuildPropertiesToRemove = additionalBuildPropertiesToRemove + }; return result; } diff --git a/src/Tests/Microsoft.NET.Sdk.WorkloadManifestReader.Tests/WorkloadPackGroupTests.cs b/src/Tests/Microsoft.NET.Sdk.WorkloadManifestReader.Tests/WorkloadPackGroupTests.cs index 99fb540b03f8..b7b02aee34fb 100644 --- a/src/Tests/Microsoft.NET.Sdk.WorkloadManifestReader.Tests/WorkloadPackGroupTests.cs +++ b/src/Tests/Microsoft.NET.Sdk.WorkloadManifestReader.Tests/WorkloadPackGroupTests.cs @@ -184,10 +184,11 @@ List GetPackGroups() WorkloadPackGroupJson ConvertGroupToJson(WorkloadPackGroup group) { - var groupJson = new WorkloadPackGroupJson(); - - groupJson.GroupPackageId = group.Workload.Id + ".Packs"; - groupJson.GroupPackageVersion = group.WorkloadManifestVersion; + var groupJson = new WorkloadPackGroupJson + { + GroupPackageId = group.Workload.Id + ".Packs", + GroupPackageVersion = group.WorkloadManifestVersion + }; foreach (var pack in group.Packs) { diff --git a/src/Tests/Microsoft.NET.TestFramework/Commands/SdkCommandSpec.cs b/src/Tests/Microsoft.NET.TestFramework/Commands/SdkCommandSpec.cs index d4f0f747bfab..ee8c0055b82e 100644 --- a/src/Tests/Microsoft.NET.TestFramework/Commands/SdkCommandSpec.cs +++ b/src/Tests/Microsoft.NET.TestFramework/Commands/SdkCommandSpec.cs @@ -36,10 +36,12 @@ public Command ToCommand(bool doNotEscapeArguments = false) public ProcessStartInfo ToProcessStartInfo(bool doNotEscapeArguments = false) { - var ret = new ProcessStartInfo(); - ret.FileName = FileName; - ret.Arguments = doNotEscapeArguments ? string.Join(" ", Arguments) : EscapeArgs(); - ret.UseShellExecute = false; + var ret = new ProcessStartInfo + { + FileName = FileName, + Arguments = doNotEscapeArguments ? string.Join(" ", Arguments) : EscapeArgs(), + UseShellExecute = false + }; foreach (var kvp in Environment) { ret.Environment[kvp.Key] = kvp.Value; diff --git a/src/Tests/Microsoft.NET.TestFramework/TestCommandLine.cs b/src/Tests/Microsoft.NET.TestFramework/TestCommandLine.cs index 1addcbdcc6c0..e23906e240ec 100644 --- a/src/Tests/Microsoft.NET.TestFramework/TestCommandLine.cs +++ b/src/Tests/Microsoft.NET.TestFramework/TestCommandLine.cs @@ -37,8 +37,10 @@ public class TestCommandLine public static TestCommandLine Parse(string[] args) { - TestCommandLine ret = new TestCommandLine(); - ret.RemainingArgs = new List(); + TestCommandLine ret = new TestCommandLine + { + RemainingArgs = new List() + }; Stack argStack = new Stack(args.Reverse()); while (argStack.Any()) @@ -210,9 +212,10 @@ private class TestList public static TestList Parse(XElement element) { - TestList group = new TestList(); - - group.Name = element.Attribute("Name")?.Value; + TestList group = new TestList + { + Name = element.Attribute("Name")?.Value + }; foreach (var item in element.Elements()) { diff --git a/src/Tests/Microsoft.NET.TestFramework/TestDirectory.cs b/src/Tests/Microsoft.NET.TestFramework/TestDirectory.cs index 28fabfd71e70..543e415c84eb 100644 --- a/src/Tests/Microsoft.NET.TestFramework/TestDirectory.cs +++ b/src/Tests/Microsoft.NET.TestFramework/TestDirectory.cs @@ -31,8 +31,10 @@ private static void EnsureExistsAndEmpty(string path, string sdkVersion) try { // Clear read-only flags on anything in the directory - var dirInfo = new DirectoryInfo(path); - dirInfo.Attributes = FileAttributes.Normal; + var dirInfo = new DirectoryInfo(path) + { + Attributes = FileAttributes.Normal + }; foreach (var info in dirInfo.GetFileSystemInfos("*", SearchOption.AllDirectories)) { info.Attributes = FileAttributes.Normal; diff --git a/src/Tests/Microsoft.NET.TestFramework/ToolsetInfo.cs b/src/Tests/Microsoft.NET.TestFramework/ToolsetInfo.cs index 5d8428d8ff9f..4a50b8b13b51 100644 --- a/src/Tests/Microsoft.NET.TestFramework/ToolsetInfo.cs +++ b/src/Tests/Microsoft.NET.TestFramework/ToolsetInfo.cs @@ -88,9 +88,10 @@ private void InitSdkVersion() { FullFrameworkMSBuildPath = null; var logger = new StringTestLogger(); - var command = new DotnetCommand(logger, "--version"); - - command.WorkingDirectory = TestContext.Current.TestExecutionDirectory; + var command = new DotnetCommand(logger, "--version") + { + WorkingDirectory = TestContext.Current.TestExecutionDirectory + }; var result = command.Execute(); @@ -110,9 +111,10 @@ private void InitSdkVersion() private void InitMSBuildVersion() { var logger = new StringTestLogger(); - var command = new MSBuildVersionCommand(logger); - - command.WorkingDirectory = TestContext.Current.TestExecutionDirectory; + var command = new MSBuildVersionCommand(logger) + { + WorkingDirectory = TestContext.Current.TestExecutionDirectory + }; var result = command.Execute(); diff --git a/src/Tests/dotnet-workload-install.Tests/GivenWorkloadManifestUpdater.cs b/src/Tests/dotnet-workload-install.Tests/GivenWorkloadManifestUpdater.cs index aec297b76db5..74b5a8c45e34 100644 --- a/src/Tests/dotnet-workload-install.Tests/GivenWorkloadManifestUpdater.cs +++ b/src/Tests/dotnet-workload-install.Tests/GivenWorkloadManifestUpdater.cs @@ -186,8 +186,10 @@ public void GivenAdvertisedManifestsItCalculatesCorrectUpdates() manifestId => (manifestId.ToString(), Path.Combine(testDir, "dotnet", "sdk-manifests", currentFeatureBand, manifestId.ToString(), "WorkloadManifest.json"), currentFeatureBand))) .ToArray(); - var workloadManifestProvider = new MockManifestProvider(manifestInfo); - workloadManifestProvider.SdkFeatureBand = new SdkFeatureBand(currentFeatureBand); + var workloadManifestProvider = new MockManifestProvider(manifestInfo) + { + SdkFeatureBand = new SdkFeatureBand(currentFeatureBand) + }; var nugetDownloader = new MockNuGetPackageDownloader(dotnetRoot); var workloadResolver = WorkloadResolver.CreateForTests(workloadManifestProvider, dotnetRoot); var installationRepo = new MockInstallationRecordRepository(); diff --git a/src/WebSdk/Publish/Tasks/MsDeploy/CommonUtility.cs b/src/WebSdk/Publish/Tasks/MsDeploy/CommonUtility.cs index c655c6921721..d831b5946e42 100644 --- a/src/WebSdk/Publish/Tasks/MsDeploy/CommonUtility.cs +++ b/src/WebSdk/Publish/Tasks/MsDeploy/CommonUtility.cs @@ -462,8 +462,10 @@ public static bool CheckMSDeploymentVersion(Utilities.TaskLoggingHelper log, out public static void SaveDocument(Xml.XmlDocument document, string outputFileName, System.Text.Encoding encode) { #if NET472 - Xml.XmlTextWriter textWriter = new Xml.XmlTextWriter(outputFileName, encode); - textWriter.Formatting = System.Xml.Formatting.Indented; + Xml.XmlTextWriter textWriter = new Xml.XmlTextWriter(outputFileName, encode) + { + Formatting = System.Xml.Formatting.Indented + }; document.Save(textWriter); textWriter.Close(); #else diff --git a/src/WebSdk/Publish/Tasks/Tasks/GenerateEFSQLScripts.cs b/src/WebSdk/Publish/Tasks/Tasks/GenerateEFSQLScripts.cs index dab4278cb508..222f58f0b825 100644 --- a/src/WebSdk/Publish/Tasks/Tasks/GenerateEFSQLScripts.cs +++ b/src/WebSdk/Publish/Tasks/Tasks/GenerateEFSQLScripts.cs @@ -99,9 +99,11 @@ private bool GenerateSQLScript(string sqlFileFullPath, string dbContextName, boo Log.LogMessage(MessageImportance.High, string.Format("Executing command: {0} {1}", psi.FileName, psi.Arguments)); } - proc = new Process(); - proc.StartInfo = psi; - proc.EnableRaisingEvents = true; + proc = new Process + { + StartInfo = psi, + EnableRaisingEvents = true + }; proc.OutputDataReceived += Proc_OutputDataReceived; proc.ErrorDataReceived += Proc_ErrorDataReceived; proc.Exited += Proc_Exited; diff --git a/src/WebSdk/Publish/Tasks/Tasks/Kudu/KuduDeploy.cs b/src/WebSdk/Publish/Tasks/Tasks/Kudu/KuduDeploy.cs index 9ddaa9c05c40..7d11e59d700d 100644 --- a/src/WebSdk/Publish/Tasks/Tasks/Kudu/KuduDeploy.cs +++ b/src/WebSdk/Publish/Tasks/Tasks/Kudu/KuduDeploy.cs @@ -61,12 +61,14 @@ public bool DeployIndividualFiles internal KuduConnectionInfo GetConnectionInfo() { - KuduConnectionInfo connectionInfo = new KuduConnectionInfo(); - connectionInfo.DestinationUrl = PublishUrl; + KuduConnectionInfo connectionInfo = new KuduConnectionInfo + { + DestinationUrl = PublishUrl, - connectionInfo.UserName = UserName; - connectionInfo.Password = Password; - connectionInfo.SiteName = PublishSiteName; + UserName = UserName, + Password = Password, + SiteName = PublishSiteName + }; return connectionInfo; } diff --git a/src/WebSdk/Publish/Tasks/Tasks/Xdt/TransformXml.cs b/src/WebSdk/Publish/Tasks/Tasks/Xdt/TransformXml.cs index 4fe3c7ea659c..a2b368aaac64 100644 --- a/src/WebSdk/Publish/Tasks/Tasks/Xdt/TransformXml.cs +++ b/src/WebSdk/Publish/Tasks/Tasks/Xdt/TransformXml.cs @@ -202,9 +202,10 @@ private XmlTransformableDocument OpenSourceFile(string sourceFile) { try { - XmlTransformableDocument document = new XmlTransformableDocument(); - - document.PreserveWhitespace = true; + XmlTransformableDocument document = new XmlTransformableDocument + { + PreserveWhitespace = true + }; document.Load(sourceFile); return document; From a75cc347a98d382afa2ea915b1a3c08ac511154b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Sep 2023 23:46:35 +0000 Subject: [PATCH 07/44] Update dependencies from https://github.com/dotnet/razor build 20230922.3 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23472.1 -> To Version 7.0.0-preview.23472.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 91af19087f76..03ec62a4f7ad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -278,18 +278,18 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/razor - 309b8bcc9a5e33c9e0753fd5deb057383282520a + 9ff3387560e846ac1b1cd979d38336ab3121eef2 - + https://github.com/dotnet/razor - 309b8bcc9a5e33c9e0753fd5deb057383282520a + 9ff3387560e846ac1b1cd979d38336ab3121eef2 - + https://github.com/dotnet/razor - 309b8bcc9a5e33c9e0753fd5deb057383282520a + 9ff3387560e846ac1b1cd979d38336ab3121eef2 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index f55e0d85ee69..beb309d6cc0c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -157,9 +157,9 @@ - 7.0.0-preview.23472.2 - 7.0.0-preview.23472.2 - 7.0.0-preview.23472.2 + 7.0.0-preview.23472.3 + 7.0.0-preview.23472.3 + 7.0.0-preview.23472.3 From a87a2f64c3a73b9fb2ca398658381deab53feabd Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Fri, 22 Sep 2023 16:53:29 -0700 Subject: [PATCH 08/44] Fixing some misalignment and extra whitespace caused by the code formatter. --- .../GetPublishItemsOutputGroupOutputsTests.cs | 6 +- .../GivenAResolveTargetingPackAssetsTask.cs | 2 - ...olvedSDKProjectItemsAndImplicitPackages.cs | 22 +++-- .../ProcessFrameworkReferencesTests.cs | 93 +++++++++---------- .../Publish/Tasks/Tasks/Kudu/KuduDeploy.cs | 1 - 5 files changed, 60 insertions(+), 64 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GetPublishItemsOutputGroupOutputsTests.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GetPublishItemsOutputGroupOutputsTests.cs index 856abf9b876c..5dd3c7904268 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GetPublishItemsOutputGroupOutputsTests.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GetPublishItemsOutputGroupOutputsTests.cs @@ -35,9 +35,9 @@ public void It_can_expand_OutputPath() { PublishDir = @"bin\Debug\net5.0\publish\", ResolvedFileToPublish = new[] - { - _apphost, _dll, _dll - } + { + _apphost, _dll, _dll + } }; task.Execute().Should().BeTrue(); diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolveTargetingPackAssetsTask.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolveTargetingPackAssetsTask.cs index c16b14f68377..3570f7b98f6c 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolveTargetingPackAssetsTask.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolveTargetingPackAssetsTask.cs @@ -144,9 +144,7 @@ private ResolveTargetingPackAssets InitializeTask(string mockPackageDirectory, I { BuildEngine = buildEngine, FrameworkReferences = DefaultFrameworkReferences(), - ResolvedTargetingPacks = DefaultTargetingPacks(mockPackageDirectory), - ProjectLanguage = "C#" }; diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenUnresolvedSDKProjectItemsAndImplicitPackages.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenUnresolvedSDKProjectItemsAndImplicitPackages.cs index d9be8349ddff..fa54dd0fc1d2 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenUnresolvedSDKProjectItemsAndImplicitPackages.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenUnresolvedSDKProjectItemsAndImplicitPackages.cs @@ -62,16 +62,18 @@ public void ItShouldCombineSdkReferencesWithImplicitPackageReferences() var task = new CollectSDKReferencesDesignTime { - SdkReferences = new[] { - sdkReference1, - sdkReference2 - }, - PackageReferences = new ITaskItem[] { - packageReference1, - packageReference2, - packageReference3, - defaultImplicitPackage1 - }, + SdkReferences = new[] + { + sdkReference1, + sdkReference2 + }, + PackageReferences = new ITaskItem[] + { + packageReference1, + packageReference2, + packageReference3, + defaultImplicitPackage1 + }, DefaultImplicitPackages = "DefaultImplicitPackage1;SomeOtherImplicitPackage" }; diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/ProcessFrameworkReferencesTests.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/ProcessFrameworkReferencesTests.cs index fbb5078396bf..070cc0d839ee 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/ProcessFrameworkReferencesTests.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/ProcessFrameworkReferencesTests.cs @@ -49,23 +49,22 @@ public void It_resolves_FrameworkReferences() TargetFrameworkIdentifier = ".NETCoreApp", TargetFrameworkVersion = ToolsetInfo.CurrentTargetFrameworkVersion, FrameworkReferences = new[] - { - new MockTaskItem("Microsoft.AspNetCore.App", new Dictionary()) - }, - + { + new MockTaskItem("Microsoft.AspNetCore.App", new Dictionary()) + }, KnownFrameworkReferences = new[] - { - new MockTaskItem("Microsoft.AspNetCore.App", - new Dictionary() - { - {"TargetFramework", ToolsetInfo.CurrentTargetFramework}, - {"RuntimeFrameworkName", "Microsoft.AspNetCore.App"}, - {"DefaultRuntimeFrameworkVersion", "1.9.5"}, - {"LatestRuntimeFrameworkVersion", "1.9.6"}, - {"TargetingPackName", "Microsoft.AspNetCore.App"}, - {"TargetingPackVersion", "1.9.0"} - }) - } + { + new MockTaskItem("Microsoft.AspNetCore.App", + new Dictionary() + { + {"TargetFramework", ToolsetInfo.CurrentTargetFramework}, + {"RuntimeFrameworkName", "Microsoft.AspNetCore.App"}, + {"DefaultRuntimeFrameworkVersion", "1.9.5"}, + {"LatestRuntimeFrameworkVersion", "1.9.6"}, + {"TargetingPackName", "Microsoft.AspNetCore.App"}, + {"TargetingPackVersion", "1.9.0"} + }) + } }; task.Execute().Should().BeTrue(); @@ -88,23 +87,22 @@ public void Given_targetPlatform_and_targetPlatform_version_It_resolves_Framewor TargetPlatformIdentifier = "Windows", TargetPlatformVersion = "10.0.18362", FrameworkReferences = new[] - { - new MockTaskItem("Microsoft.AspNetCore.App", new Dictionary()) - }, - + { + new MockTaskItem("Microsoft.AspNetCore.App", new Dictionary()) + }, KnownFrameworkReferences = new[] - { - new MockTaskItem("Microsoft.AspNetCore.App", - new Dictionary() - { - {"TargetFramework", ToolsetInfo.CurrentTargetFramework}, - {"RuntimeFrameworkName", "Microsoft.AspNetCore.App"}, - {"DefaultRuntimeFrameworkVersion", "1.9.5"}, - {"LatestRuntimeFrameworkVersion", "1.9.6"}, - {"TargetingPackName", "Microsoft.AspNetCore.App"}, - {"TargetingPackVersion", "1.9.0"} - }) - } + { + new MockTaskItem("Microsoft.AspNetCore.App", + new Dictionary() + { + {"TargetFramework", ToolsetInfo.CurrentTargetFramework}, + {"RuntimeFrameworkName", "Microsoft.AspNetCore.App"}, + {"DefaultRuntimeFrameworkVersion", "1.9.5"}, + {"LatestRuntimeFrameworkVersion", "1.9.6"}, + {"TargetingPackName", "Microsoft.AspNetCore.App"}, + {"TargetingPackVersion", "1.9.0"} + }) + } }; task.Execute().Should().BeTrue(); @@ -124,23 +122,22 @@ public void It_does_not_resolve_FrameworkReferences_if_targetframework_doesnt_ma TargetFrameworkIdentifier = ".NETCoreApp", TargetFrameworkVersion = "2.0", FrameworkReferences = new[] - { - new MockTaskItem("Microsoft.AspNetCore.App", new Dictionary()) - }, - + { + new MockTaskItem("Microsoft.AspNetCore.App", new Dictionary()) + }, KnownFrameworkReferences = new[] - { - new MockTaskItem("Microsoft.AspNetCore.App", - new Dictionary() - { - {"TargetFramework", "netcoreapp3.0"}, - {"RuntimeFrameworkName", "Microsoft.AspNetCore.App"}, - {"DefaultRuntimeFrameworkVersion", "1.9.5"}, - {"LatestRuntimeFrameworkVersion", "1.9.6"}, - {"TargetingPackName", "Microsoft.AspNetCore.App"}, - {"TargetingPackVersion", "1.9.0"} - }) - } + { + new MockTaskItem("Microsoft.AspNetCore.App", + new Dictionary() + { + {"TargetFramework", "netcoreapp3.0"}, + {"RuntimeFrameworkName", "Microsoft.AspNetCore.App"}, + {"DefaultRuntimeFrameworkVersion", "1.9.5"}, + {"LatestRuntimeFrameworkVersion", "1.9.6"}, + {"TargetingPackName", "Microsoft.AspNetCore.App"}, + {"TargetingPackVersion", "1.9.0"} + }) + } }; task.Execute().Should().BeTrue(); diff --git a/src/WebSdk/Publish/Tasks/Tasks/Kudu/KuduDeploy.cs b/src/WebSdk/Publish/Tasks/Tasks/Kudu/KuduDeploy.cs index 7d11e59d700d..daf6e5227a28 100644 --- a/src/WebSdk/Publish/Tasks/Tasks/Kudu/KuduDeploy.cs +++ b/src/WebSdk/Publish/Tasks/Tasks/Kudu/KuduDeploy.cs @@ -64,7 +64,6 @@ internal KuduConnectionInfo GetConnectionInfo() KuduConnectionInfo connectionInfo = new KuduConnectionInfo { DestinationUrl = PublishUrl, - UserName = UserName, Password = Password, SiteName = PublishSiteName From 13f25fcdc80328a3b89928dcedcc15906cd9da91 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Fri, 22 Sep 2023 17:01:32 -0700 Subject: [PATCH 09/44] Applied cleanup for IDE0049 to the solution. --- .../dotnet-watch/Internal/ProcessRunner.cs | 2 +- .../SlnFile.cs | 2 +- .../NativeMethods.cs | 24 ++++++------ .../RuntimeEnvironment.cs | 2 +- .../UILanguageOverride.cs | 2 +- .../Windows/InstallClientElevationContext.cs | 2 +- .../dotnet/ReleasePropertyProjectLocator.cs | 6 +-- src/Cli/dotnet/SlnFileExtensions.cs | 2 +- .../LaunchSettings/LaunchSettingsManager.cs | 2 +- .../dotnet/commands/dotnet-run/RunCommand.cs | 2 +- .../dotnet/commands/dotnet-test/Program.cs | 2 +- ...lUninstallCommandLowLevelErrorConverter.cs | 2 +- .../install/NetSdkMsiInstallerClient.cs | 14 +++---- .../install/NetSdkMsiInstallerServer.cs | 2 +- .../install/WorkloadManifestUpdater.cs | 2 +- .../BaseImageNotFoundException.cs | 2 +- .../ContainerHelpers.cs | 2 +- .../Tasks/CreateNewImage.cs | 2 +- .../Tasks/ParseContainerProperties.cs | 10 ++--- .../Tool/ServerProtocol/NativeMethods.cs | 24 ++++++------ .../NETCoreSdkResolver.cs | 2 +- .../WorkloadSet.cs | 2 +- .../Common/ConflictResolution/ConflictItem.cs | 10 ++--- .../ConflictResolution/ConflictResolver.cs | 2 +- src/Tasks/Common/ItemUtilities.cs | 8 ++-- src/Tasks/Common/MSBuildUtilities.cs | 26 ++++++------- .../GetDependsOnNETStandard.net46.cs | 38 +++++++++---------- .../GivenAnAssetsFileResolver.cs | 2 +- .../AllowEmptyTelemetry.cs | 4 +- .../CollectSDKReferencesDesignTime.cs | 2 +- .../ProjectContext.cs | 2 +- .../ResolvePackageAssets.cs | 2 +- ...omCreateXUnitWorkItemsWithTestExclusion.cs | 4 +- .../TarGzFileCreateFromDirectory.cs | 2 +- .../EndToEndTests.cs | 2 +- .../TargetsTests.cs | 16 ++++---- ...atWeWantToBuildAnAppWithLibrariesAndRid.cs | 2 +- ...venThatWeWantToPublishASelfContainedApp.cs | 2 +- ...SolutionWithPublishReleaseOrPackRelease.cs | 6 +-- .../PublishDepsFilePathTests.cs | 2 +- .../WasmBuildIntegrationTest.cs | 2 +- .../Assertions/StringAssertionsExtensions.cs | 2 +- .../ProjectConstruction/TestProject.cs | 4 +- .../TestAssetsManager.cs | 2 +- .../TestPackageReference.cs | 2 +- .../Program.cs | 6 +-- .../GivenDotnetRunRunsVbProj.cs | 4 +- ...enDotnetTestBuildsAndRunsTestfromCsproj.cs | 2 +- .../GivenDotnetWorkloadInstall.cs | 8 ++-- .../GivenWorkloadManifestUpdater.cs | 6 +-- src/WebSdk/Publish/Tasks/Kudu/KuduConnect.cs | 2 +- .../Publish/Tasks/Kudu/KuduVfsDeploy.cs | 8 ++-- .../Publish/Tasks/Kudu/KuduZipDeploy.cs | 8 ++-- .../Publish/Tasks/Tasks/Kudu/KuduDeploy.cs | 18 ++++----- .../Tasks/Tasks/MsDeploy/GetPassword.cs | 4 +- .../Tasks/Tasks/MsDeploy/VsMsdeploy.cs | 2 +- .../Publish/Tasks/Tasks/ValidateParameter.cs | 4 +- .../Tasks/Xdt/TaskTransformationLogger.cs | 6 +-- .../Publish/Tasks/Tasks/Xdt/TransformXml.cs | 6 +-- .../Publish/Tasks/WebConfigTransform.cs | 2 +- 60 files changed, 171 insertions(+), 171 deletions(-) diff --git a/src/BuiltInTools/dotnet-watch/Internal/ProcessRunner.cs b/src/BuiltInTools/dotnet-watch/Internal/ProcessRunner.cs index cd52ea0b7880..655f74e2fde8 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/ProcessRunner.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/ProcessRunner.cs @@ -182,7 +182,7 @@ public ProcessState(Process process, IReporter reporter) // events. // // See the remarks here: https://docs.microsoft.com/en-us/dotnet/api/system.diagnostics.process.waitforexit#System_Diagnostics_Process_WaitForExit_System_Int32_ - if (!_process.WaitForExit(Int32.MaxValue)) + if (!_process.WaitForExit(int.MaxValue)) { throw new TimeoutException(); } diff --git a/src/Cli/Microsoft.DotNet.Cli.Sln.Internal/SlnFile.cs b/src/Cli/Microsoft.DotNet.Cli.Sln.Internal/SlnFile.cs index a227d43e4543..173ccaa96a4a 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Sln.Internal/SlnFile.cs +++ b/src/Cli/Microsoft.DotNet.Cli.Sln.Internal/SlnFile.cs @@ -504,7 +504,7 @@ private SlnSectionType ToSectionType(int curLineNum, string s) } throw new InvalidSolutionFormatException( curLineNum, - String.Format(LocalizableStrings.InvalidSectionTypeError, s)); + string.Format(LocalizableStrings.InvalidSectionTypeError, s)); } private string FromSectionType(bool isProjectSection, SlnSectionType type) diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/NativeMethods.cs b/src/Cli/Microsoft.DotNet.Cli.Utils/NativeMethods.cs index e63518ab4d6d..2467eb6166ea 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/NativeMethods.cs +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/NativeMethods.cs @@ -23,26 +23,26 @@ internal enum JobObjectLimitFlags : uint [StructLayout(LayoutKind.Sequential)] internal struct JobObjectBasicLimitInformation { - public Int64 PerProcessUserTimeLimit; - public Int64 PerJobUserTimeLimit; + public long PerProcessUserTimeLimit; + public long PerJobUserTimeLimit; public JobObjectLimitFlags LimitFlags; public UIntPtr MinimumWorkingSetSize; public UIntPtr MaximumWorkingSetSize; - public UInt32 ActiveProcessLimit; + public uint ActiveProcessLimit; public UIntPtr Affinity; - public UInt32 PriorityClass; - public UInt32 SchedulingClass; + public uint PriorityClass; + public uint SchedulingClass; } [StructLayout(LayoutKind.Sequential)] internal struct IoCounters { - public UInt64 ReadOperationCount; - public UInt64 WriteOperationCount; - public UInt64 OtherOperationCount; - public UInt64 ReadTransferCount; - public UInt64 WriteTransferCount; - public UInt64 OtherTransferCount; + public ulong ReadOperationCount; + public ulong WriteOperationCount; + public ulong OtherOperationCount; + public ulong ReadTransferCount; + public ulong WriteTransferCount; + public ulong OtherTransferCount; } [StructLayout(LayoutKind.Sequential)] @@ -73,7 +73,7 @@ internal struct PROCESS_BASIC_INFORMATION internal static extern SafeWaitHandle CreateJobObjectW(IntPtr lpJobAttributes, string lpName); [DllImport("kernel32.dll", SetLastError = true)] - internal static extern bool SetInformationJobObject(IntPtr hJob, JobObjectInfoClass jobObjectInformationClass, IntPtr lpJobObjectInformation, UInt32 cbJobObjectInformationLength); + internal static extern bool SetInformationJobObject(IntPtr hJob, JobObjectInfoClass jobObjectInformationClass, IntPtr lpJobObjectInformation, uint cbJobObjectInformationLength); [DllImport("kernel32.dll", SetLastError = true)] internal static extern bool AssignProcessToJobObject(IntPtr hJob, IntPtr hProcess); diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/RuntimeEnvironment.cs b/src/Cli/Microsoft.DotNet.Cli.Utils/RuntimeEnvironment.cs index 46d6dd2186d7..18a3f54474b7 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/RuntimeEnvironment.cs +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/RuntimeEnvironment.cs @@ -82,7 +82,7 @@ private static string GetFreeBSDVersion() // This is same as sysctl kern.version // FreeBSD 11.0-RELEASE-p1 FreeBSD 11.0-RELEASE-p1 #0 r306420: Thu Sep 29 01:43:23 UTC 2016 root@releng2.nyi.freebsd.org:/usr/obj/usr/src/sys/GENERIC // What we want is major release as minor releases should be compatible. - String version = RuntimeInformation.OSDescription; + string version = RuntimeInformation.OSDescription; try { // second token up to first dot diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/UILanguageOverride.cs b/src/Cli/Microsoft.DotNet.Cli.Utils/UILanguageOverride.cs index 9893d5545ad3..59e37dc038dd 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/UILanguageOverride.cs +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/UILanguageOverride.cs @@ -126,7 +126,7 @@ private static bool CurrentPlatformOfficiallySupportsUTF8Encoding() private static bool ForceUniversalEncodingOptInEnabled() { - return String.Equals(Environment.GetEnvironmentVariable("DOTNET_CLI_FORCE_UTF8_ENCODING"), "true", StringComparison.OrdinalIgnoreCase); + return string.Equals(Environment.GetEnvironmentVariable("DOTNET_CLI_FORCE_UTF8_ENCODING"), "true", StringComparison.OrdinalIgnoreCase); } } } diff --git a/src/Cli/dotnet/Installer/Windows/InstallClientElevationContext.cs b/src/Cli/dotnet/Installer/Windows/InstallClientElevationContext.cs index 65c24dfbe79c..d6002a9731e5 100644 --- a/src/Cli/dotnet/Installer/Windows/InstallClientElevationContext.cs +++ b/src/Cli/dotnet/Installer/Windows/InstallClientElevationContext.cs @@ -75,7 +75,7 @@ public override void Elevate() } } - private void ServerExited(Object sender, EventArgs e) + private void ServerExited(object sender, EventArgs e) { _log?.LogMessage($"Elevated command instance has exited."); } diff --git a/src/Cli/dotnet/ReleasePropertyProjectLocator.cs b/src/Cli/dotnet/ReleasePropertyProjectLocator.cs index a51f34ebe9f8..dc075b38b5cb 100644 --- a/src/Cli/dotnet/ReleasePropertyProjectLocator.cs +++ b/src/Cli/dotnet/ReleasePropertyProjectLocator.cs @@ -62,7 +62,7 @@ public IEnumerable GetCustomDefaultConfigurationValueIfSpecified() // Setup Debug.Assert(_propertyToCheck == MSBuildPropertyNames.PUBLISH_RELEASE || _propertyToCheck == MSBuildPropertyNames.PACK_RELEASE, "Only PackRelease or PublishRelease are currently expected."); var nothing = Enumerable.Empty(); - if (String.Equals(Environment.GetEnvironmentVariable(EnvironmentVariableNames.DISABLE_PUBLISH_AND_PACK_RELEASE), "true", StringComparison.OrdinalIgnoreCase)) + if (string.Equals(Environment.GetEnvironmentVariable(EnvironmentVariableNames.DISABLE_PUBLISH_AND_PACK_RELEASE), "true", StringComparison.OrdinalIgnoreCase)) { return nothing; } @@ -160,7 +160,7 @@ public IEnumerable GetCustomDefaultConfigurationValueIfSpecified() HashSet configValues = new HashSet(); object projectDataLock = new object(); - if (String.Equals(Environment.GetEnvironmentVariable(EnvironmentVariableNames.DOTNET_CLI_LAZY_PUBLISH_AND_PACK_RELEASE_FOR_SOLUTIONS), "true", StringComparison.OrdinalIgnoreCase)) + if (string.Equals(Environment.GetEnvironmentVariable(EnvironmentVariableNames.DOTNET_CLI_LAZY_PUBLISH_AND_PACK_RELEASE_FOR_SOLUTIONS), "true", StringComparison.OrdinalIgnoreCase)) { // Evaluate only one project for speed if this environment variable is used. Will break more customers if enabled (adding 8.0 project to SLN with other project TFMs with no Publish or PackRelease.) return GetSingleProjectFromSolution(sln, globalProps); @@ -197,7 +197,7 @@ public IEnumerable GetCustomDefaultConfigurationValueIfSpecified() // 1) This error should not be thrown in VS because it is part of the SDK CLI code // 2) If PublishRelease or PackRelease is disabled via opt out, or Configuration is specified, we won't get to this code, so we won't error // 3) This code only gets hit if we are in a solution publish setting, so we don't need to worry about it failing other publish scenarios - throw new GracefulException(Strings.SolutionProjectConfigurationsConflict, _propertyToCheck, String.Join("\n", (configuredProjects).Select(x => x.FullPath))); + throw new GracefulException(Strings.SolutionProjectConfigurationsConflict, _propertyToCheck, string.Join("\n", (configuredProjects).Select(x => x.FullPath))); } return configuredProjects.FirstOrDefault(); } diff --git a/src/Cli/dotnet/SlnFileExtensions.cs b/src/Cli/dotnet/SlnFileExtensions.cs index 598367215db1..3f601caee8c2 100644 --- a/src/Cli/dotnet/SlnFileExtensions.cs +++ b/src/Cli/dotnet/SlnFileExtensions.cs @@ -205,7 +205,7 @@ private static string GetMatchingProjectKey(IDictionary projectK return projectKey; } - var keyWithoutWhitespace = String.Concat(solutionKey.Where(c => !Char.IsWhiteSpace(c))); + var keyWithoutWhitespace = string.Concat(solutionKey.Where(c => !char.IsWhiteSpace(c))); if (projectKeys.TryGetValue(keyWithoutWhitespace, out projectKey)) { return projectKey; diff --git a/src/Cli/dotnet/commands/dotnet-run/LaunchSettings/LaunchSettingsManager.cs b/src/Cli/dotnet/commands/dotnet-run/LaunchSettings/LaunchSettingsManager.cs index 30bd40a2565b..9e4aa74970e1 100644 --- a/src/Cli/dotnet/commands/dotnet-run/LaunchSettings/LaunchSettingsManager.cs +++ b/src/Cli/dotnet/commands/dotnet-run/LaunchSettings/LaunchSettingsManager.cs @@ -61,7 +61,7 @@ public static LaunchSettingsApplyResult TryApplyLaunchSettings(string launchSett if (caseInsensitiveProfileMatches.Count() > 1) { throw new GracefulException(LocalizableStrings.DuplicateCaseInsensitiveLaunchProfileNames, - String.Join(",\n", caseInsensitiveProfileMatches.Select(p => $"\t{p.Name}").ToArray())); + string.Join(",\n", caseInsensitiveProfileMatches.Select(p => $"\t{p.Name}").ToArray())); } else if (!caseInsensitiveProfileMatches.Any()) { diff --git a/src/Cli/dotnet/commands/dotnet-run/RunCommand.cs b/src/Cli/dotnet/commands/dotnet-run/RunCommand.cs index 6c4e7ac53cf6..5079f7961a03 100644 --- a/src/Cli/dotnet/commands/dotnet-run/RunCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-run/RunCommand.cs @@ -69,7 +69,7 @@ public int Execute() //NOTE: MSBuild variables are not expanded like they are in VS targetCommand.EnvironmentVariable(entry.Key, value); } - if (String.IsNullOrEmpty(targetCommand.CommandArgs) && launchSettings.CommandLineArgs != null) + if (string.IsNullOrEmpty(targetCommand.CommandArgs) && launchSettings.CommandLineArgs != null) { targetCommand.SetCommandArgs(launchSettings.CommandLineArgs); } diff --git a/src/Cli/dotnet/commands/dotnet-test/Program.cs b/src/Cli/dotnet/commands/dotnet-test/Program.cs index f50519454c8f..8cfc5a3600fc 100644 --- a/src/Cli/dotnet/commands/dotnet-test/Program.cs +++ b/src/Cli/dotnet/commands/dotnet-test/Program.cs @@ -141,7 +141,7 @@ private static TestCommand FromParseResult(ParseResult result, string[] settings result.OptionValuesToBeForwarded(TestCommandParser.GetCommand()) // all msbuild-recognized tokens .Concat(unMatchedNonSettingsArgs); // all tokens that the test-parser doesn't explicitly track (minus the settings tokens) - VSTestTrace.SafeWriteTrace(() => $"MSBuild args from forwarded options: {String.Join(", ", parsedArgs)}"); + VSTestTrace.SafeWriteTrace(() => $"MSBuild args from forwarded options: {string.Join(", ", parsedArgs)}"); msbuildArgs.AddRange(parsedArgs); if (settings.Any()) diff --git a/src/Cli/dotnet/commands/dotnet-tool/uninstall/ToolUninstallCommandLowLevelErrorConverter.cs b/src/Cli/dotnet/commands/dotnet-tool/uninstall/ToolUninstallCommandLowLevelErrorConverter.cs index c7c0e16e3a11..634e20571dd8 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/uninstall/ToolUninstallCommandLowLevelErrorConverter.cs +++ b/src/Cli/dotnet/commands/dotnet-tool/uninstall/ToolUninstallCommandLowLevelErrorConverter.cs @@ -15,7 +15,7 @@ public static IEnumerable GetUserFacingMessages(Exception ex, PackageId { userFacingMessages = new[] { - String.Format( + string.Format( CommonLocalizableStrings.FailedToUninstallToolPackage, packageId, ex.Message), diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.cs b/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.cs index 4194ec25710f..377062f9d995 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.cs @@ -283,7 +283,7 @@ private void RemoveWorkloadPacks(List packsToRemove, Directo { Log?.LogMessage($"ProductCode mismatch! Cached package: {msi.ProductCode}, pack record: {record.ProductCode}."); string logFile = GetMsiLogName(record, InstallAction.Uninstall); - uint error = ExecuteWithProgress(String.Format(LocalizableStrings.MsiProgressUninstall, id), () => UninstallMsi(record.ProductCode, logFile)); + uint error = ExecuteWithProgress(string.Format(LocalizableStrings.MsiProgressUninstall, id), () => UninstallMsi(record.ProductCode, logFile)); ExitOnError(error, $"Failed to uninstall {msi.MsiPath}."); } else @@ -586,7 +586,7 @@ public async Task ExtractManifestAsync(string nupkgPath, string targetPath) string packageDataPath = Path.Combine(extractionPath, "data"); if (!Cache.TryGetMsiPathFromPackageData(packageDataPath, out string msiPath, out _)) { - throw new FileNotFoundException(String.Format(LocalizableStrings.ManifestMsiNotFoundInNuGetPackage, extractionPath)); + throw new FileNotFoundException(string.Format(LocalizableStrings.ManifestMsiNotFoundInNuGetPackage, extractionPath)); } string msiExtractionPath = Path.Combine(extractionPath, "msi"); @@ -604,7 +604,7 @@ public async Task ExtractManifestAsync(string nupkgPath, string targetPath) if (result != Error.SUCCESS) { Log?.LogMessage($"ExtractManifestAsync: Admin install failed: {result}"); - throw new GracefulException(String.Format(LocalizableStrings.FailedToExtractMsi, msiPath)); + throw new GracefulException(string.Format(LocalizableStrings.FailedToExtractMsi, msiPath)); } } @@ -619,7 +619,7 @@ public async Task ExtractManifestAsync(string nupkgPath, string targetPath) if (manifestFolder == null) { - throw new GracefulException(String.Format(LocalizableStrings.ExpectedSingleManifest, nupkgPath)); + throw new GracefulException(string.Format(LocalizableStrings.ExpectedSingleManifest, nupkgPath)); } FileAccessRetrier.RetryOnMoveAccessFailure(() => DirectoryPath.MoveDirectory(manifestFolder, targetPath)); @@ -930,17 +930,17 @@ private void ExecutePackage(MsiPayload msi, InstallAction action, string display case InstallAction.MinorUpdate: case InstallAction.Install: case InstallAction.MajorUpgrade: - error = ExecuteWithProgress(String.Format(LocalizableStrings.MsiProgressInstall, name), () => InstallMsi(msi.MsiPath, logFile)); + error = ExecuteWithProgress(string.Format(LocalizableStrings.MsiProgressInstall, name), () => InstallMsi(msi.MsiPath, logFile)); ExitOnError(error, $"Failed to install {msi.Payload}."); break; case InstallAction.Repair: - error = ExecuteWithProgress(String.Format(LocalizableStrings.MsiProgressRepair, name), () => RepairMsi(msi.ProductCode, logFile)); + error = ExecuteWithProgress(string.Format(LocalizableStrings.MsiProgressRepair, name), () => RepairMsi(msi.ProductCode, logFile)); ExitOnError(error, $"Failed to repair {msi.Payload}."); break; case InstallAction.Uninstall: - error = ExecuteWithProgress(String.Format(LocalizableStrings.MsiProgressUninstall, name), () => UninstallMsi(msi.ProductCode, logFile)); + error = ExecuteWithProgress(string.Format(LocalizableStrings.MsiProgressUninstall, name), () => UninstallMsi(msi.ProductCode, logFile)); ExitOnError(error, $"Failed to remove {msi.Payload}."); break; diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerServer.cs b/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerServer.cs index 06e55b87c783..804bf5fed107 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerServer.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerServer.cs @@ -133,7 +133,7 @@ public static NetSdkMsiInstallerServer Create(bool verifySignatures) if ((ParentProcess == null) || (ParentProcess.StartTime > CurrentProcess.StartTime) || !string.Equals(ParentProcess.MainModule.FileName, Environment.ProcessPath, StringComparison.OrdinalIgnoreCase)) { - throw new SecurityException(String.Format(LocalizableStrings.NoTrustWithParentPID, ParentProcess?.Id)); + throw new SecurityException(string.Format(LocalizableStrings.NoTrustWithParentPID, ParentProcess?.Id)); } // Configure pipe DACLs diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs index da18d53e4e6d..d1a0d7c60476 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs @@ -470,7 +470,7 @@ private bool BackgroundUpdatesAreDisabled() => private static string GetAdvertisingWorkloadsFilePath(string userProfileDir, SdkFeatureBand featureBand) => Path.Combine(userProfileDir, $".workloadAdvertisingUpdates{featureBand}"); - private async Task GetOnlinePackagePath(SdkFeatureBand sdkFeatureBand, ManifestId manifestId, bool includePreviews) + private async Task GetOnlinePackagePath(SdkFeatureBand sdkFeatureBand, ManifestId manifestId, bool includePreviews) { string packagePath = await _nugetPackageDownloader.DownloadPackageAsync( _workloadManifestInstaller.GetManifestPackageId(manifestId, sdkFeatureBand), diff --git a/src/Containers/Microsoft.NET.Build.Containers/BaseImageNotFoundException.cs b/src/Containers/Microsoft.NET.Build.Containers/BaseImageNotFoundException.cs index 0b721ba060ac..c54083890163 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/BaseImageNotFoundException.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/BaseImageNotFoundException.cs @@ -6,5 +6,5 @@ namespace Microsoft.NET.Build.Containers; public sealed class BaseImageNotFoundException : Exception { internal BaseImageNotFoundException(string specifiedRuntimeIdentifier, string repositoryName, string reference, IEnumerable supportedRuntimeIdentifiers) - : base($"The RuntimeIdentifier '{specifiedRuntimeIdentifier}' is not supported by {repositoryName}:{reference}. The supported RuntimeIdentifiers are {String.Join(",", supportedRuntimeIdentifiers)}") { } + : base($"The RuntimeIdentifier '{specifiedRuntimeIdentifier}' is not supported by {repositoryName}:{reference}. The supported RuntimeIdentifiers are {string.Join(",", supportedRuntimeIdentifiers)}") { } } diff --git a/src/Containers/Microsoft.NET.Build.Containers/ContainerHelpers.cs b/src/Containers/Microsoft.NET.Build.Containers/ContainerHelpers.cs index 5be30d53337b..38b555606a32 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/ContainerHelpers.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/ContainerHelpers.cs @@ -50,7 +50,7 @@ public static bool TryParsePort(string? portNumber, string? portType, [NotNullWh { var portNo = 0; error = null; - if (String.IsNullOrEmpty(portNumber)) + if (string.IsNullOrEmpty(portNumber)) { error = ParsePortError.MissingPortNumber; } diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs index 669edba9590e..ffe30386de2e 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs @@ -98,7 +98,7 @@ internal async Task ExecuteAsync(CancellationToken cancellationToken) return !Log.HasLoggedErrors; } - SafeLog(Strings.ContainerBuilder_StartBuildingImage, Repository, String.Join(",", ImageTags), sourceImageReference); + SafeLog(Strings.ContainerBuilder_StartBuildingImage, Repository, string.Join(",", ImageTags), sourceImageReference); Layer newLayer = Layer.FromDirectory(PublishDirectory, WorkingDirectory, imageBuilder.IsWindows); imageBuilder.AddLayer(newLayer); diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/ParseContainerProperties.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/ParseContainerProperties.cs index f7bc4c755ceb..926f63508865 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/ParseContainerProperties.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/ParseContainerProperties.cs @@ -82,13 +82,13 @@ public ParseContainerProperties() public override bool Execute() { string[] validTags; - if (!String.IsNullOrEmpty(ContainerImageTag) && ContainerImageTags.Length >= 1) + if (!string.IsNullOrEmpty(ContainerImageTag) && ContainerImageTags.Length >= 1) { Log.LogErrorWithCodeFromResources(nameof(Strings.AmbiguousTags), nameof(ContainerImageTag), nameof(ContainerImageTags)); return !Log.HasLoggedErrors; } - if (!String.IsNullOrEmpty(ContainerImageTag)) + if (!string.IsNullOrEmpty(ContainerImageTag)) { if (ContainerHelpers.IsValidImageTag(ContainerImageTag)) { @@ -105,7 +105,7 @@ public override bool Execute() validTags = valids; if (invalids.Any()) { - Log.LogErrorWithCodeFromResources(nameof(Strings.InvalidTags), nameof(ContainerImageTags), String.Join(",", invalids)); + Log.LogErrorWithCodeFromResources(nameof(Strings.InvalidTags), nameof(ContainerImageTags), string.Join(",", invalids)); return !Log.HasLoggedErrors; } } @@ -114,7 +114,7 @@ public override bool Execute() validTags = Array.Empty(); } - if (!String.IsNullOrEmpty(ContainerRegistry) && !ContainerHelpers.IsValidRegistry(ContainerRegistry)) + if (!string.IsNullOrEmpty(ContainerRegistry) && !ContainerHelpers.IsValidRegistry(ContainerRegistry)) { Log.LogErrorWithCodeFromResources(nameof(Strings.CouldntRecognizeRegistry), ContainerRegistry); return !Log.HasLoggedErrors; @@ -173,7 +173,7 @@ public override bool Execute() Log.LogMessage(MessageImportance.Low, "Image: {0}", ParsedContainerImage); Log.LogMessage(MessageImportance.Low, "Tag: {0}", ParsedContainerTag); Log.LogMessage(MessageImportance.Low, "Image Name: {0}", NewContainerRepository); - Log.LogMessage(MessageImportance.Low, "Image Tags: {0}", String.Join(", ", NewContainerTags)); + Log.LogMessage(MessageImportance.Low, "Image Tags: {0}", string.Join(", ", NewContainerTags)); } return !Log.HasLoggedErrors; diff --git a/src/RazorSdk/Tool/ServerProtocol/NativeMethods.cs b/src/RazorSdk/Tool/ServerProtocol/NativeMethods.cs index 7d833d022b28..2e2b849b0b9f 100644 --- a/src/RazorSdk/Tool/ServerProtocol/NativeMethods.cs +++ b/src/RazorSdk/Tool/ServerProtocol/NativeMethods.cs @@ -6,20 +6,20 @@ namespace Microsoft.NET.Sdk.Razor.Tool [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)] internal struct STARTUPINFO { - internal Int32 cb; + internal int cb; internal string lpReserved; internal string lpDesktop; internal string lpTitle; - internal Int32 dwX; - internal Int32 dwY; - internal Int32 dwXSize; - internal Int32 dwYSize; - internal Int32 dwXCountChars; - internal Int32 dwYCountChars; - internal Int32 dwFillAttribute; - internal Int32 dwFlags; - internal Int16 wShowWindow; - internal Int16 cbReserved2; + internal int dwX; + internal int dwY; + internal int dwXSize; + internal int dwYSize; + internal int dwXCountChars; + internal int dwYCountChars; + internal int dwFillAttribute; + internal int dwFlags; + internal short wShowWindow; + internal short cbReserved2; internal IntPtr lpReserved2; internal IntPtr hStdInput; internal IntPtr hStdOutput; @@ -47,7 +47,7 @@ internal static class NativeMethods internal const uint NORMAL_PRIORITY_CLASS = 0x0020; internal const uint CREATE_NO_WINDOW = 0x08000000; - internal const Int32 STARTF_USESTDHANDLES = 0x00000100; + internal const int STARTF_USESTDHANDLES = 0x00000100; internal const int ERROR_SUCCESS = 0; #endregion diff --git a/src/Resolvers/Microsoft.DotNet.SdkResolver/NETCoreSdkResolver.cs b/src/Resolvers/Microsoft.DotNet.SdkResolver/NETCoreSdkResolver.cs index d4e857472e76..0fb04b312a4a 100644 --- a/src/Resolvers/Microsoft.DotNet.SdkResolver/NETCoreSdkResolver.cs +++ b/src/Resolvers/Microsoft.DotNet.SdkResolver/NETCoreSdkResolver.cs @@ -112,7 +112,7 @@ private CompatibleSdkValue GetMostCompatibleSdks(string dotnetExeDirectory, Vers continue; } - if (minimumSdkMajorVersion != 0 && Int32.TryParse(netcoreSdkVersion.Split('.')[0], out int sdkMajorVersion) && sdkMajorVersion < minimumSdkMajorVersion) + if (minimumSdkMajorVersion != 0 && int.TryParse(netcoreSdkVersion.Split('.')[0], out int sdkMajorVersion) && sdkMajorVersion < minimumSdkMajorVersion) { continue; } diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadSet.cs b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadSet.cs index 897d6541b30c..355f5c2ecb67 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadSet.cs +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadSet.cs @@ -42,7 +42,7 @@ public static WorkloadSet FromDictionaryForJson(IDictionary dict string manifestVersionString = parts[0]; if (!FXVersion.TryParse(manifestVersionString, out FXVersion version)) { - throw new FormatException(String.Format(Strings.InvalidVersionForWorkload, manifest.Key, manifestVersionString)); + throw new FormatException(string.Format(Strings.InvalidVersionForWorkload, manifest.Key, manifestVersionString)); } manifestVersion = new ManifestVersion(parts[0]); diff --git a/src/Tasks/Common/ConflictResolution/ConflictItem.cs b/src/Tasks/Common/ConflictResolution/ConflictItem.cs index 0c909a45adf5..9c99187a85af 100644 --- a/src/Tasks/Common/ConflictResolution/ConflictItem.cs +++ b/src/Tasks/Common/ConflictResolution/ConflictItem.cs @@ -69,7 +69,7 @@ public Version AssemblyVersion { _assemblyVersion = null; - var assemblyVersionString = OriginalItem?.GetMetadata(nameof(AssemblyVersion)) ?? String.Empty; + var assemblyVersionString = OriginalItem?.GetMetadata(nameof(AssemblyVersion)) ?? string.Empty; if (assemblyVersionString.Length != 0) { @@ -116,7 +116,7 @@ public string FileName { if (_fileName == null) { - _fileName = OriginalItem == null ? String.Empty : Path.GetFileName(OriginalItem.ItemSpec); + _fileName = OriginalItem == null ? string.Empty : Path.GetFileName(OriginalItem.ItemSpec); } return _fileName; } @@ -133,7 +133,7 @@ public Version FileVersion { _fileVersion = null; - var fileVersionString = OriginalItem?.GetMetadata(nameof(FileVersion)) ?? String.Empty; + var fileVersionString = OriginalItem?.GetMetadata(nameof(FileVersion)) ?? string.Empty; if (fileVersionString.Length != 0) { @@ -190,7 +190,7 @@ public ConflictVersion PackageVersion { _packageVersion = null; - var packageVersionString = OriginalItem?.GetMetadata(nameof(MetadataNames.NuGetPackageVersion)) ?? String.Empty; + var packageVersionString = OriginalItem?.GetMetadata(nameof(MetadataNames.NuGetPackageVersion)) ?? string.Empty; if (packageVersionString.Length != 0) { @@ -212,7 +212,7 @@ public string SourcePath { if (_sourcePath == null) { - _sourcePath = ItemUtilities.GetSourcePath(OriginalItem) ?? String.Empty; + _sourcePath = ItemUtilities.GetSourcePath(OriginalItem) ?? string.Empty; } return _sourcePath.Length == 0 ? null : _sourcePath; diff --git a/src/Tasks/Common/ConflictResolution/ConflictResolver.cs b/src/Tasks/Common/ConflictResolution/ConflictResolver.cs index 50978c8c4777..6ca9aab3a368 100644 --- a/src/Tasks/Common/ConflictResolution/ConflictResolver.cs +++ b/src/Tasks/Common/ConflictResolution/ConflictResolver.cs @@ -44,7 +44,7 @@ public void ResolveConflicts(IEnumerable conflictItems, FuncBoolean true or false, corresponding to the string. internal static bool ConvertStringToBool(string parameterValue, bool defaultValue = false) { - if (String.IsNullOrEmpty(parameterValue)) + if (string.IsNullOrEmpty(parameterValue)) { return defaultValue; } @@ -48,12 +48,12 @@ internal static bool ConvertStringToBool(string parameterValue, bool defaultValu /// private static bool ValidBooleanTrue(string parameterValue) { - return ((String.Compare(parameterValue, "true", StringComparison.OrdinalIgnoreCase) == 0) || - (String.Compare(parameterValue, "on", StringComparison.OrdinalIgnoreCase) == 0) || - (String.Compare(parameterValue, "yes", StringComparison.OrdinalIgnoreCase) == 0) || - (String.Compare(parameterValue, "!false", StringComparison.OrdinalIgnoreCase) == 0) || - (String.Compare(parameterValue, "!off", StringComparison.OrdinalIgnoreCase) == 0) || - (String.Compare(parameterValue, "!no", StringComparison.OrdinalIgnoreCase) == 0)); + return ((string.Compare(parameterValue, "true", StringComparison.OrdinalIgnoreCase) == 0) || + (string.Compare(parameterValue, "on", StringComparison.OrdinalIgnoreCase) == 0) || + (string.Compare(parameterValue, "yes", StringComparison.OrdinalIgnoreCase) == 0) || + (string.Compare(parameterValue, "!false", StringComparison.OrdinalIgnoreCase) == 0) || + (string.Compare(parameterValue, "!off", StringComparison.OrdinalIgnoreCase) == 0) || + (string.Compare(parameterValue, "!no", StringComparison.OrdinalIgnoreCase) == 0)); } /// @@ -62,12 +62,12 @@ private static bool ValidBooleanTrue(string parameterValue) /// private static bool ValidBooleanFalse(string parameterValue) { - return ((String.Compare(parameterValue, "false", StringComparison.OrdinalIgnoreCase) == 0) || - (String.Compare(parameterValue, "off", StringComparison.OrdinalIgnoreCase) == 0) || - (String.Compare(parameterValue, "no", StringComparison.OrdinalIgnoreCase) == 0) || - (String.Compare(parameterValue, "!true", StringComparison.OrdinalIgnoreCase) == 0) || - (String.Compare(parameterValue, "!on", StringComparison.OrdinalIgnoreCase) == 0) || - (String.Compare(parameterValue, "!yes", StringComparison.OrdinalIgnoreCase) == 0)); + return ((string.Compare(parameterValue, "false", StringComparison.OrdinalIgnoreCase) == 0) || + (string.Compare(parameterValue, "off", StringComparison.OrdinalIgnoreCase) == 0) || + (string.Compare(parameterValue, "no", StringComparison.OrdinalIgnoreCase) == 0) || + (string.Compare(parameterValue, "!true", StringComparison.OrdinalIgnoreCase) == 0) || + (string.Compare(parameterValue, "!on", StringComparison.OrdinalIgnoreCase) == 0) || + (string.Compare(parameterValue, "!yes", StringComparison.OrdinalIgnoreCase) == 0)); } } } diff --git a/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/GetDependsOnNETStandard.net46.cs b/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/GetDependsOnNETStandard.net46.cs index 41cd962a778b..32b56bef82cb 100644 --- a/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/GetDependsOnNETStandard.net46.cs +++ b/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/GetDependsOnNETStandard.net46.cs @@ -48,8 +48,8 @@ internal static bool GetFileDependsOnNETStandard(string filePath) var assemblyImport = (IMetaDataAssemblyImport)metadataDispenser.OpenScope(filePathAbsolute, 0, s_importerGuid); var asmRefEnum = IntPtr.Zero; - var asmRefTokens = new UInt32[16]; - UInt32 fetched; + var asmRefTokens = new uint[16]; + uint fetched; var assemblyMD = new ASSEMBLYMETADATA() { @@ -77,7 +77,7 @@ internal static bool GetFileDependsOnNETStandard(string filePath) { // Determine the length of the string to contain the name first. IntPtr hashDataPtr, pubKeyPtr; - UInt32 hashDataLength, pubKeyBytes, asmNameLength, flags; + uint hashDataLength, pubKeyBytes, asmNameLength, flags; assemblyImport.GetAssemblyRefProps( asmRefTokens[i], out pubKeyPtr, @@ -163,13 +163,13 @@ internal class CorMetaDataDispenser internal interface IMetaDataDispenser { [return: MarshalAs(UnmanagedType.Interface)] - object DefineScope([In] ref Guid rclsid, [In] UInt32 dwCreateFlags, [In] ref Guid riid); + object DefineScope([In] ref Guid rclsid, [In] uint dwCreateFlags, [In] ref Guid riid); [return: MarshalAs(UnmanagedType.Interface)] - object OpenScope([In][MarshalAs(UnmanagedType.LPWStr)] string szScope, [In] UInt32 dwOpenFlags, [In] ref Guid riid); + object OpenScope([In][MarshalAs(UnmanagedType.LPWStr)] string szScope, [In] uint dwOpenFlags, [In] ref Guid riid); [return: MarshalAs(UnmanagedType.Interface)] - object OpenScopeOnMemory([In] IntPtr pData, [In] UInt32 cbData, [In] UInt32 dwOpenFlags, [In] ref Guid riid); + object OpenScopeOnMemory([In] IntPtr pData, [In] uint cbData, [In] uint dwOpenFlags, [In] ref Guid riid); } [ComImport] @@ -177,16 +177,16 @@ internal interface IMetaDataDispenser [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)] internal interface IMetaDataAssemblyImport { - void GetAssemblyProps(UInt32 mdAsm, out IntPtr pPublicKeyPtr, out UInt32 ucbPublicKeyPtr, out UInt32 uHashAlg, StringBuilder strName, UInt32 cchNameIn, out UInt32 cchNameRequired, IntPtr amdInfo, out UInt32 dwFlags); - void GetAssemblyRefProps(UInt32 mdAsmRef, out IntPtr ppbPublicKeyOrToken, out UInt32 pcbPublicKeyOrToken, StringBuilder strName, UInt32 cchNameIn, out UInt32 pchNameOut, ref ASSEMBLYMETADATA amdInfo, out IntPtr ppbHashValue, out UInt32 pcbHashValue, out UInt32 pdwAssemblyRefFlags); - void GetFileProps([In] UInt32 mdFile, StringBuilder strName, UInt32 cchName, out UInt32 cchNameRequired, out IntPtr bHashData, out UInt32 cchHashBytes, out UInt32 dwFileFlags); + void GetAssemblyProps(uint mdAsm, out IntPtr pPublicKeyPtr, out uint ucbPublicKeyPtr, out uint uHashAlg, StringBuilder strName, uint cchNameIn, out uint cchNameRequired, IntPtr amdInfo, out uint dwFlags); + void GetAssemblyRefProps(uint mdAsmRef, out IntPtr ppbPublicKeyOrToken, out uint pcbPublicKeyOrToken, StringBuilder strName, uint cchNameIn, out uint pchNameOut, ref ASSEMBLYMETADATA amdInfo, out IntPtr ppbHashValue, out uint pcbHashValue, out uint pdwAssemblyRefFlags); + void GetFileProps([In] uint mdFile, StringBuilder strName, uint cchName, out uint cchNameRequired, out IntPtr bHashData, out uint cchHashBytes, out uint dwFileFlags); void GetExportedTypeProps(); void GetManifestResourceProps(); - void EnumAssemblyRefs([In, Out] ref IntPtr phEnum, [MarshalAs(UnmanagedType.LPArray), Out] UInt32[] asmRefs, System.UInt32 asmRefCount, out System.UInt32 iFetched); - void EnumFiles([In, Out] ref IntPtr phEnum, [MarshalAs(UnmanagedType.LPArray), Out] UInt32[] fileRefs, System.UInt32 fileRefCount, out System.UInt32 iFetched); + void EnumAssemblyRefs([In, Out] ref IntPtr phEnum, [MarshalAs(UnmanagedType.LPArray), Out] uint[] asmRefs, uint asmRefCount, out uint iFetched); + void EnumFiles([In, Out] ref IntPtr phEnum, [MarshalAs(UnmanagedType.LPArray), Out] uint[] fileRefs, uint fileRefCount, out uint iFetched); void EnumExportedTypes(); void EnumManifestResources(); - void GetAssemblyFromScope(out UInt32 mdAsm); + void GetAssemblyFromScope(out uint mdAsm); void FindExportedTypeByName(); void FindManifestResourceByName(); // PreserveSig because this method is an exception that @@ -216,16 +216,16 @@ typedef struct [StructLayout(LayoutKind.Sequential)] internal struct ASSEMBLYMETADATA { - public UInt16 usMajorVersion; - public UInt16 usMinorVersion; - public UInt16 usBuildNumber; - public UInt16 usRevisionNumber; + public ushort usMajorVersion; + public ushort usMinorVersion; + public ushort usBuildNumber; + public ushort usRevisionNumber; public IntPtr rpLocale; - public UInt32 cchLocale; + public uint cchLocale; public IntPtr rpProcessors; - public UInt32 cProcessors; + public uint cProcessors; public IntPtr rOses; - public UInt32 cOses; + public uint cOses; } #endregion diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAnAssetsFileResolver.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAnAssetsFileResolver.cs index 5bc7c64a1aa8..4e85850ee060 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAnAssetsFileResolver.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAnAssetsFileResolver.cs @@ -189,7 +189,7 @@ private static ResolvedFile CreateResolvedFile( string sourcedir = Path.GetDirectoryName(sourcepath); string destinationSubDirPath = preserveStoreLayout ? sourcedir.Substring(packageRoot.Length) : destinationSubDirectory; - if (!String.IsNullOrEmpty(destinationSubDirPath) && !destinationSubDirPath.EndsWith(Path.DirectorySeparatorChar)) + if (!string.IsNullOrEmpty(destinationSubDirPath) && !destinationSubDirPath.EndsWith(Path.DirectorySeparatorChar)) { destinationSubDirPath += Path.DirectorySeparatorChar; } diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/AllowEmptyTelemetry.cs b/src/Tasks/Microsoft.NET.Build.Tasks/AllowEmptyTelemetry.cs index c282154bd8f5..cb4cc9b94f36 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/AllowEmptyTelemetry.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/AllowEmptyTelemetry.cs @@ -14,7 +14,7 @@ public sealed class AllowEmptyTelemetry : TaskBase public AllowEmptyTelemetry() { EventData = Array.Empty(); - EventName = String.Empty; + EventName = string.Empty; } /// @@ -46,7 +46,7 @@ protected override void ExecuteCore() { value = HashWithNormalizedCasing(value); } - if (String.IsNullOrEmpty(value)) + if (string.IsNullOrEmpty(value)) { properties[key] = "null"; } diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/CollectSDKReferencesDesignTime.cs b/src/Tasks/Microsoft.NET.Build.Tasks/CollectSDKReferencesDesignTime.cs index dc23d3dbd6c4..ef7d9fb87b8d 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/CollectSDKReferencesDesignTime.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/CollectSDKReferencesDesignTime.cs @@ -74,7 +74,7 @@ private IEnumerable GetImplicitPackageReferences() } else { - Boolean.TryParse(isImplicitlyDefinedString, out isImplicitlyDefined); + bool.TryParse(isImplicitlyDefinedString, out isImplicitlyDefined); } if (isImplicitlyDefined) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ProjectContext.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ProjectContext.cs index 7fdd7f0a10db..f4e78cfcef6d 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/ProjectContext.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/ProjectContext.cs @@ -99,7 +99,7 @@ public IEnumerable GetRuntimeLibraries(IEnumerable 0 && !String.Equals(PlatformLibrary.Name, NetCorePlatformLibrary, StringComparison.OrdinalIgnoreCase)) + if (PlatformLibrary.Name.Length > 0 && !string.Equals(PlatformLibrary.Name, NetCorePlatformLibrary, StringComparison.OrdinalIgnoreCase)) { var library = _lockFileTarget.GetLibrary(NetCorePlatformLibrary); if (library != null) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageAssets.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageAssets.cs index 9db25dcdaee2..c7693f28076a 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageAssets.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageAssets.cs @@ -1813,7 +1813,7 @@ private void ComputePackageExclusions() // If the platform library is not Microsoft.NETCore.App, treat it as an implicit dependency. // This makes it so Microsoft.AspNet.* 2.x platforms also exclude Microsoft.NETCore.App files. - if (!String.Equals(platformLibrary.Name, NetCorePlatformLibrary, StringComparison.OrdinalIgnoreCase)) + if (!string.Equals(platformLibrary.Name, NetCorePlatformLibrary, StringComparison.OrdinalIgnoreCase)) { var library = _runtimeTarget.GetLibrary(NetCorePlatformLibrary); if (library != null) diff --git a/src/Tests/HelixTasks/SDKCustomCreateXUnitWorkItemsWithTestExclusion.cs b/src/Tests/HelixTasks/SDKCustomCreateXUnitWorkItemsWithTestExclusion.cs index 737dceef4001..87f95c449cb7 100644 --- a/src/Tests/HelixTasks/SDKCustomCreateXUnitWorkItemsWithTestExclusion.cs +++ b/src/Tests/HelixTasks/SDKCustomCreateXUnitWorkItemsWithTestExclusion.cs @@ -136,7 +136,7 @@ private async Task> PrepareWorkItem(ITaskItem xunitProject) msbuildAdditionalSdkResolverFolder = ""; } - var scheduler = new AssemblyScheduler(methodLimit: !String.IsNullOrEmpty(Environment.GetEnvironmentVariable("TestFullMSBuild")) ? 32 : 16); + var scheduler = new AssemblyScheduler(methodLimit: !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("TestFullMSBuild")) ? 32 : 16); var assemblyPartitionInfos = scheduler.Schedule(targetPath, netFramework: netFramework); var partitionedWorkItem = new List(); @@ -145,7 +145,7 @@ private async Task> PrepareWorkItem(ITaskItem xunitProject) string command = $"{driver} exec {assemblyName} {testExecutionDirectory} {msbuildAdditionalSdkResolverFolder} {(XUnitArguments != null ? " " + XUnitArguments : "")} -xml testResults.xml {assemblyPartitionInfo.ClassListArgumentString} {arguments}"; if (netFramework) { - var testFilter = String.IsNullOrEmpty(assemblyPartitionInfo.ClassListArgumentString) ? "" : $"--filter \"{assemblyPartitionInfo.ClassListArgumentString}\""; + var testFilter = string.IsNullOrEmpty(assemblyPartitionInfo.ClassListArgumentString) ? "" : $"--filter \"{assemblyPartitionInfo.ClassListArgumentString}\""; command = $"{driver} test {assemblyName} {testExecutionDirectory} {msbuildAdditionalSdkResolverFolder} {(XUnitArguments != null ? " " + XUnitArguments : "")} --results-directory .\\ --logger trx {testFilter}"; } diff --git a/src/Tests/HelixTasks/TarGzFileCreateFromDirectory.cs b/src/Tests/HelixTasks/TarGzFileCreateFromDirectory.cs index c84656185c45..737a5a16fa0c 100644 --- a/src/Tests/HelixTasks/TarGzFileCreateFromDirectory.cs +++ b/src/Tests/HelixTasks/TarGzFileCreateFromDirectory.cs @@ -134,7 +134,7 @@ private string GetDestinationArchive() private string GetExcludes() { - var excludes = String.Empty; + var excludes = string.Empty; if (ExcludePatterns != null) { diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs index f387bfd049c5..767b254dce93 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs @@ -27,7 +27,7 @@ public static string NewImageName([CallerMemberName] string callerMemberName = " var (normalizedName, warning, error) = ContainerHelpers.NormalizeRepository(callerMemberName); if (error is (var format, var args)) { - throw new ArgumentException(String.Format(Strings.ResourceManager.GetString(format)!, args)); + throw new ArgumentException(string.Format(Strings.ResourceManager.GetString(format)!, args)); } return normalizedName!; // non-null if error is null diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/TargetsTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/TargetsTests.cs index 2f90edad0631..c5bbb2567e19 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/TargetsTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/TargetsTests.cs @@ -19,7 +19,7 @@ public void CanDeferEntrypoint(string selfContainedPropertyName, bool selfContai var (project, _, d) = ProjectInitializer.InitProject(new() { [selfContainedPropertyName] = selfContainedPropertyValue.ToString() - }, projectName: $"{nameof(CanDeferEntrypoint)}_{selfContainedPropertyName}_{selfContainedPropertyValue}_{String.Join("_", entrypointArgs)}"); + }, projectName: $"{nameof(CanDeferEntrypoint)}_{selfContainedPropertyName}_{selfContainedPropertyValue}_{string.Join("_", entrypointArgs)}"); using var _ = d; Assert.True(project.Build(ComputeContainerConfig)); var computedEntrypointArgs = project.GetItems(ContainerEntrypoint).Select(i => i.EvaluatedInclude).ToArray(); @@ -59,7 +59,7 @@ public void CanNormalizeInputContainerNames(string projectName, string expectedC }, projectName: $"{nameof(CanNormalizeInputContainerNames)}_{projectName}_{expectedContainerImageName}_{shouldPass}"); using var _ = d; var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None); - instance.Build(new[] { ComputeContainerConfig }, new[] { logger }, null, out var outputs).Should().Be(shouldPass, String.Join(Environment.NewLine, logger.AllMessages)); + instance.Build(new[] { ComputeContainerConfig }, new[] { logger }, null, out var outputs).Should().Be(shouldPass, string.Join(Environment.NewLine, logger.AllMessages)); Assert.Equal(expectedContainerImageName, instance.GetPropertyValue(ContainerRepository)); } @@ -80,7 +80,7 @@ public void CanWarnOnInvalidSDKVersions(string sdkVersion, bool isAllowed) using var _ = d; var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None); instance.Build(new[] { "_ContainerVerifySDKVersion" }, new[] { logger }, null, out var outputs).Should().Be(isAllowed); - var derivedIsAllowed = Boolean.Parse(project.GetProperty("_IsSDKContainerAllowedVersion").EvaluatedValue); + var derivedIsAllowed = bool.Parse(project.GetProperty("_IsSDKContainerAllowedVersion").EvaluatedValue); if (isAllowed) { logger.Errors.Should().HaveCount(0, "an error should not have been created"); @@ -133,7 +133,7 @@ public void ShouldNotIncludeSourceControlLabelsUnlessUserOptsIn(bool includeSour }, projectName: $"{nameof(ShouldNotIncludeSourceControlLabelsUnlessUserOptsIn)}_{includeSourceControl}"); using var _ = d; var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None); - instance.Build(new[] { ComputeContainerConfig }, new[] { logger }, null, out var outputs).Should().BeTrue("Build should have succeeded but failed due to {0}", String.Join("\n", logger.AllMessages)); + instance.Build(new[] { ComputeContainerConfig }, new[] { logger }, null, out var outputs).Should().BeTrue("Build should have succeeded but failed due to {0}", string.Join("\n", logger.AllMessages)); var labels = instance.GetItems(ContainerLabel); if (includeSourceControl) { @@ -179,7 +179,7 @@ public void CanComputeTagsForSupportedSDKVersions(string sdkVersion, string tfm, }, projectName: $"{nameof(CanComputeTagsForSupportedSDKVersions)}_{sdkVersion}_{tfm}_{expectedTag}"); using var _ = d; var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None); - instance.Build(new[] { "_ComputeContainerBaseImageTag" }, new[] { logger }, null, out var outputs).Should().BeTrue(String.Join(Environment.NewLine, logger.Errors)); + instance.Build(new[] { "_ComputeContainerBaseImageTag" }, new[] { logger }, null, out var outputs).Should().BeTrue(string.Join(Environment.NewLine, logger.Errors)); var computedTag = instance.GetProperty("_ContainerBaseImageTag").EvaluatedValue; computedTag.Should().Be(expectedTag); } @@ -202,7 +202,7 @@ public void CanComputeContainerUser(string tfm, string rid, string expectedUser) }, projectName: $"{nameof(CanComputeContainerUser)}_{tfm}_{rid}_{expectedUser}"); using var _ = d; var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None); - instance.Build(new[] { ComputeContainerConfig }, new[] { logger }, null, out var outputs).Should().BeTrue(String.Join(Environment.NewLine, logger.Errors)); + instance.Build(new[] { ComputeContainerConfig }, new[] { logger }, null, out var outputs).Should().BeTrue(string.Join(Environment.NewLine, logger.Errors)); var computedTag = instance.GetProperty("ContainerUser")?.EvaluatedValue; computedTag.Should().Be(expectedUser); } @@ -221,7 +221,7 @@ public void WindowsUsersGetLinuxContainers(string sdkPortableRid, string expecte }, projectName: $"{nameof(WindowsUsersGetLinuxContainers)}_{sdkPortableRid}_{expectedRid}"); using var _ = d; var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None); - instance.Build(new[] { ComputeContainerConfig }, null, null, out var outputs).Should().BeTrue(String.Join(Environment.NewLine, logger.Errors)); + instance.Build(new[] { ComputeContainerConfig }, null, null, out var outputs).Should().BeTrue(string.Join(Environment.NewLine, logger.Errors)); var computedRid = instance.GetProperty(KnownStrings.Properties.ContainerRuntimeIdentifier)?.EvaluatedValue; computedRid.Should().Be(expectedRid); } @@ -243,7 +243,7 @@ public void CanTakeContainerBaseFamilyIntoAccount(string sdkVersion, string tfmM }, projectName: $"{nameof(CanTakeContainerBaseFamilyIntoAccount)}_{sdkVersion}_{tfmMajMin}_{containerFamily}_{expectedTag}"); using var _ = d; var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None); - instance.Build(new[] { _ComputeContainerBaseImageTag }, null, null, out var outputs).Should().BeTrue(String.Join(Environment.NewLine, logger.Errors)); + instance.Build(new[] { _ComputeContainerBaseImageTag }, null, null, out var outputs).Should().BeTrue(string.Join(Environment.NewLine, logger.Errors)); var computedBaseImageTag = instance.GetProperty(KnownStrings.Properties._ContainerBaseImageTag)?.EvaluatedValue; computedBaseImageTag.Should().Be(expectedTag); } diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAnAppWithLibrariesAndRid.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAnAppWithLibrariesAndRid.cs index ae47d39b56d8..a05d354f3651 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAnAppWithLibrariesAndRid.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAnAppWithLibrariesAndRid.cs @@ -106,7 +106,7 @@ public void It_builds_a_framework_dependent_RID_specific_runnable_output() $"libuv{FileConstants.DynamicLibSuffix}" }; - outputDirectory.Should().OnlyHaveFiles(expectedFiles.Where(x => !String.IsNullOrEmpty(x)).ToList()); + outputDirectory.Should().OnlyHaveFiles(expectedFiles.Where(x => !string.IsNullOrEmpty(x)).ToList()); new DotnetCommand(Log, Path.Combine(outputDirectory.FullName, "App.dll")) .Execute() diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASelfContainedApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASelfContainedApp.cs index e259797d1dee..fc7e71781cee 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASelfContainedApp.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASelfContainedApp.cs @@ -94,7 +94,7 @@ public void It_can_make_a_Windows_GUI_exe() targetFramework: TargetFramework, runtimeIdentifier: runtimeIdentifier).FullName; byte[] fileContent = File.ReadAllBytes(Path.Combine(outputDirectory, TestProjectName + ".exe")); - UInt32 peHeaderOffset = BitConverter.ToUInt32(fileContent, PEHeaderPointerOffset); + uint peHeaderOffset = BitConverter.ToUInt32(fileContent, PEHeaderPointerOffset); BitConverter .ToUInt16(fileContent, (int)(peHeaderOffset + SubsystemOffset)) .Should() diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToTestAMultitargetedSolutionWithPublishReleaseOrPackRelease.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToTestAMultitargetedSolutionWithPublishReleaseOrPackRelease.cs index fbdeee9b0f51..5ec12445ce7e 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToTestAMultitargetedSolutionWithPublishReleaseOrPackRelease.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToTestAMultitargetedSolutionWithPublishReleaseOrPackRelease.cs @@ -41,7 +41,7 @@ public GivenThatWeWantToTestAMultitargetedSolutionWithPublishReleaseOrPackReleas List testProjects = new List(); var testProject = new TestProject("TestProject") { - TargetFrameworks = String.Join(";", exeProjTfms), + TargetFrameworks = string.Join(";", exeProjTfms), IsExe = true }; testProject.RecordProperties("Configuration", "Optimize", PReleaseProperty); @@ -52,7 +52,7 @@ public GivenThatWeWantToTestAMultitargetedSolutionWithPublishReleaseOrPackReleas var libraryProject = new TestProject("LibraryProject") { - TargetFrameworks = String.Join(";", libraryProjTfms), + TargetFrameworks = string.Join(";", libraryProjTfms), IsExe = false }; libraryProject.RecordProperties("Configuration", "Optimize", PReleaseProperty); @@ -271,7 +271,7 @@ public void ItFailsIfNet7DefinesPublishReleaseFalseButNet8PlusDefinesNone() .Should() .Fail() .And - .HaveStdErrContaining(String.Format(Strings.SolutionProjectConfigurationsConflict, PublishRelease, "")); ; + .HaveStdErrContaining(string.Format(Strings.SolutionProjectConfigurationsConflict, PublishRelease, "")); ; } [Fact] diff --git a/src/Tests/Microsoft.NET.Publish.Tests/PublishDepsFilePathTests.cs b/src/Tests/Microsoft.NET.Publish.Tests/PublishDepsFilePathTests.cs index d67653cef8c7..e55975a3132b 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/PublishDepsFilePathTests.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/PublishDepsFilePathTests.cs @@ -41,7 +41,7 @@ public void PublishDepsFilePathIsEmptyForSingleFileApps() var targetFramework = testProject.TargetFrameworks; var publishDepsFilePath = GetPropertyValue(projectPath, targetFramework, "PublishDepsFilePath"); - String.IsNullOrEmpty(publishDepsFilePath).Should().BeTrue(); + string.IsNullOrEmpty(publishDepsFilePath).Should().BeTrue(); } string GetPropertyValue(string projectPath, string targetFramework, string property) diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIntegrationTest.cs b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIntegrationTest.cs index dcdf8a758dfd..dc2dd85448a3 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIntegrationTest.cs +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIntegrationTest.cs @@ -739,7 +739,7 @@ public void Build_WithJiterpreter_Advanced() private void BuildWasmMinimalAndValidateBootConfig((string name, string value)[] properties, Action validateBootConfig) { var testAppName = "BlazorWasmMinimal"; - var testInstance = CreateAspNetSdkTestAsset(testAppName, identifier: String.Join("-", properties.Select(p => p.name + p.value ?? "null"))); + var testInstance = CreateAspNetSdkTestAsset(testAppName, identifier: string.Join("-", properties.Select(p => p.name + p.value ?? "null"))); foreach (var property in properties) { diff --git a/src/Tests/Microsoft.NET.TestFramework/Assertions/StringAssertionsExtensions.cs b/src/Tests/Microsoft.NET.TestFramework/Assertions/StringAssertionsExtensions.cs index 1f397b66e283..264dd4a1fdbc 100644 --- a/src/Tests/Microsoft.NET.TestFramework/Assertions/StringAssertionsExtensions.cs +++ b/src/Tests/Microsoft.NET.TestFramework/Assertions/StringAssertionsExtensions.cs @@ -17,7 +17,7 @@ private static string NormalizeLineEndings(string s) public static AndConstraint BeVisuallyEquivalentTo(this StringAssertions assertions, string expected, string because = "", params object[] becauseArgs) { Execute.Assertion - .ForCondition(String.Compare(NormalizeLineEndings(assertions.Subject), NormalizeLineEndings(expected), CultureInfo.CurrentCulture, CompareOptions.IgnoreSymbols) == 0) + .ForCondition(string.Compare(NormalizeLineEndings(assertions.Subject), NormalizeLineEndings(expected), CultureInfo.CurrentCulture, CompareOptions.IgnoreSymbols) == 0) .BecauseOf(because, becauseArgs) .FailWith($"String \"{assertions.Subject}\" is not visually equivalent to expected string \"{expected}\"."); diff --git a/src/Tests/Microsoft.NET.TestFramework/ProjectConstruction/TestProject.cs b/src/Tests/Microsoft.NET.TestFramework/ProjectConstruction/TestProject.cs index 6e28bec5f1aa..d3fbb0dfa379 100644 --- a/src/Tests/Microsoft.NET.TestFramework/ProjectConstruction/TestProject.cs +++ b/src/Tests/Microsoft.NET.TestFramework/ProjectConstruction/TestProject.cs @@ -278,7 +278,7 @@ internal void Create(TestAsset targetTestAsset, string testProjectsSourceFolder, if (SelfContained != "") { - propertyGroup.Add(new XElement(ns + "SelfContained", String.Equals(SelfContained, "true", StringComparison.OrdinalIgnoreCase) ? "true" : "false")); + propertyGroup.Add(new XElement(ns + "SelfContained", string.Equals(SelfContained, "true", StringComparison.OrdinalIgnoreCase) ? "true" : "false")); } if (ReferencedProjects.Any()) @@ -497,7 +497,7 @@ public Dictionary GetPropertyValues(string testRoot, string targ if (colonIndex > 0) { string propertyName = line.Substring(0, colonIndex); - string propertyValue = line.Length == colonIndex + 1 ? String.Empty : line.Substring(colonIndex + 2); + string propertyValue = line.Length == colonIndex + 1 ? string.Empty : line.Substring(colonIndex + 2); propertyValues[propertyName] = propertyValue; } } diff --git a/src/Tests/Microsoft.NET.TestFramework/TestAssetsManager.cs b/src/Tests/Microsoft.NET.TestFramework/TestAssetsManager.cs index 1c747316663f..f77da496f781 100644 --- a/src/Tests/Microsoft.NET.TestFramework/TestAssetsManager.cs +++ b/src/Tests/Microsoft.NET.TestFramework/TestAssetsManager.cs @@ -10,7 +10,7 @@ public class TestAssetsManager { public string TestAssetsRoot { get; private set; } - private List TestDestinationDirectories { get; } = new List(); + private List TestDestinationDirectories { get; } = new List(); protected ITestOutputHelper Log { get; } diff --git a/src/Tests/Microsoft.NET.TestFramework/TestPackageReference.cs b/src/Tests/Microsoft.NET.TestFramework/TestPackageReference.cs index e44a279ae3d3..f58a57ba3991 100644 --- a/src/Tests/Microsoft.NET.TestFramework/TestPackageReference.cs +++ b/src/Tests/Microsoft.NET.TestFramework/TestPackageReference.cs @@ -25,7 +25,7 @@ public TestPackageReference(string id, string version = null, string nupkgPath = public bool UpdatePackageReference { get; private set; } public bool NuGetPackageExists() { - return File.Exists(Path.Combine(NupkgPath, String.Concat(ID + "." + Version + ".nupkg"))); + return File.Exists(Path.Combine(NupkgPath, string.Concat(ID + "." + Version + ".nupkg"))); } } } diff --git a/src/Tests/Microsoft.Win32.Msi.Manual.Tests/Program.cs b/src/Tests/Microsoft.Win32.Msi.Manual.Tests/Program.cs index 690dc0f5910a..b140a87655df 100644 --- a/src/Tests/Microsoft.Win32.Msi.Manual.Tests/Program.cs +++ b/src/Tests/Microsoft.Win32.Msi.Manual.Tests/Program.cs @@ -104,7 +104,7 @@ void ClearLine() Console.SetCursorPosition(0, top); } - void OnActionData(Object sender, ActionDataEventArgs e) + void OnActionData(object sender, ActionDataEventArgs e) { if (ActionDataEnabled) { @@ -115,7 +115,7 @@ void OnActionData(Object sender, ActionDataEventArgs e) e.Result = DialogResult.IDOK; } - void OnActionStart(Object send, ActionStartEventArgs e) + void OnActionStart(object send, ActionStartEventArgs e) { if (ActionDataEnabled) { @@ -134,7 +134,7 @@ void OnActionStart(Object send, ActionStartEventArgs e) e.Result = DialogResult.IDOK; } - void OnProgress(Object send, ProgressEventArgs e) + void OnProgress(object send, ProgressEventArgs e) { e.Result = DialogResult.IDOK; diff --git a/src/Tests/dotnet-run.Tests/GivenDotnetRunRunsVbProj.cs b/src/Tests/dotnet-run.Tests/GivenDotnetRunRunsVbProj.cs index da047095d427..cd39acaa7629 100644 --- a/src/Tests/dotnet-run.Tests/GivenDotnetRunRunsVbProj.cs +++ b/src/Tests/dotnet-run.Tests/GivenDotnetRunRunsVbProj.cs @@ -46,7 +46,7 @@ public void ItFailsWhenTryingToUseLaunchProfileSharingTheSameNameWithAnotherProf .WithWorkingDirectory(testInstance.Path) .Execute("--launch-profile", "first"); - string expectedError = String.Format(LocalizableStrings.DuplicateCaseInsensitiveLaunchProfileNames, "\tfirst," + (OperatingSystem.IsWindows() ? "\r" : "") + "\n\tFIRST"); + string expectedError = string.Format(LocalizableStrings.DuplicateCaseInsensitiveLaunchProfileNames, "\tfirst," + (OperatingSystem.IsWindows() ? "\r" : "") + "\n\tFIRST"); runResult .Should() .Fail() @@ -69,7 +69,7 @@ public void ItFailsWithSpecificErrorMessageIfLaunchProfileDoesntExist() .Should() .Pass() .And - .HaveStdErrContaining(String.Format(LocalizableStrings.LaunchProfileDoesNotExist, invalidLaunchProfileName)); + .HaveStdErrContaining(string.Format(LocalizableStrings.LaunchProfileDoesNotExist, invalidLaunchProfileName)); } [Theory] diff --git a/src/Tests/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs b/src/Tests/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs index 1ee0cc229fa4..c0dd197651fc 100644 --- a/src/Tests/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs +++ b/src/Tests/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs @@ -241,7 +241,7 @@ public void TestWillCreateTrxLoggerInTheSpecifiedResultsDirectoryBySwitch() .Execute("--logger", "trx", "--results-directory", trxLoggerDirectory); // Verify - String[] trxFiles = Directory.GetFiles(trxLoggerDirectory, "*.trx"); + string[] trxFiles = Directory.GetFiles(trxLoggerDirectory, "*.trx"); Assert.Single(trxFiles); result.StdOut.Should().Contain(trxFiles[0]); diff --git a/src/Tests/dotnet-workload-install.Tests/GivenDotnetWorkloadInstall.cs b/src/Tests/dotnet-workload-install.Tests/GivenDotnetWorkloadInstall.cs index e70abd5297c9..3038ffcd8095 100644 --- a/src/Tests/dotnet-workload-install.Tests/GivenDotnetWorkloadInstall.cs +++ b/src/Tests/dotnet-workload-install.Tests/GivenDotnetWorkloadInstall.cs @@ -37,7 +37,7 @@ public void GivenWorkloadInstallItErrorsOnFakeWorkloadName() .Should() .Fail() .And - .HaveStdErrContaining(String.Format(Workloads.Workload.Install.LocalizableStrings.WorkloadNotRecognized, "fake")); + .HaveStdErrContaining(string.Format(Workloads.Workload.Install.LocalizableStrings.WorkloadNotRecognized, "fake")); } [Fact(Skip = "https://github.com/dotnet/sdk/issues/26624")] @@ -51,7 +51,7 @@ public void ItErrorUsingSkipManifestAndRollback() .Should() .Fail() .And - .HaveStdErrContaining(String.Format(Workloads.Workload.Install.LocalizableStrings.CannotCombineSkipManifestAndRollback, "skip-manifest-update", "from-rollback-file", "skip-manifest-update", "from-rollback-file")); + .HaveStdErrContaining(string.Format(Workloads.Workload.Install.LocalizableStrings.CannotCombineSkipManifestAndRollback, "skip-manifest-update", "from-rollback-file", "skip-manifest-update", "from-rollback-file")); } @@ -328,7 +328,7 @@ public void GivenWorkloadInstallItErrorsOnUnsupportedPlatform() var exceptionThrown = Assert.Throws(() => new WorkloadInstallCommand(parseResult, reporter: _reporter, workloadResolver: workloadResolver, workloadInstaller: installer, nugetPackageDownloader: nugetDownloader, workloadManifestUpdater: manifestUpdater, userProfileDir: testDirectory, dotnetDir: dotnetRoot, version: "6.0.100", installedFeatureBand: "6.0.100")); - exceptionThrown.Message.Should().Be(String.Format(Workloads.Workload.Install.LocalizableStrings.WorkloadNotSupportedOnPlatform, mockWorkloadId)); + exceptionThrown.Message.Should().Be(string.Format(Workloads.Workload.Install.LocalizableStrings.WorkloadNotSupportedOnPlatform, mockWorkloadId)); } [Theory] @@ -583,7 +583,7 @@ public void ShowManifestUpdatesWhenVerbosityIsDetailedOrDiagnostic(string verbos installManager.InstallWorkloads(new List(), false); // Don't actually do any installs, just update manifests string.Join(" ", _reporter.Lines).Should().Contain(Workloads.Workload.Install.LocalizableStrings.CheckForUpdatedWorkloadManifests); - string.Join(" ", _reporter.Lines).Should().Contain(String.Format(Workloads.Workload.Install.LocalizableStrings.CheckForUpdatedWorkloadManifests, "mock-manifest")); + string.Join(" ", _reporter.Lines).Should().Contain(string.Format(Workloads.Workload.Install.LocalizableStrings.CheckForUpdatedWorkloadManifests, "mock-manifest")); } private string AppendForUserLocal(string identifier, bool userLocal) diff --git a/src/Tests/dotnet-workload-install.Tests/GivenWorkloadManifestUpdater.cs b/src/Tests/dotnet-workload-install.Tests/GivenWorkloadManifestUpdater.cs index aec297b76db5..df7863887220 100644 --- a/src/Tests/dotnet-workload-install.Tests/GivenWorkloadManifestUpdater.cs +++ b/src/Tests/dotnet-workload-install.Tests/GivenWorkloadManifestUpdater.cs @@ -271,7 +271,7 @@ public void ItCanFallbackAndAdvertiseCorrectUpdate(bool useOfflineCache) // check that update did not fail _reporter.Lines.Should().NotContain(l => l.ToLowerInvariant().Contains("fail")); - _reporter.Lines.Should().NotContain(String.Format(Workloads.Workload.Install.LocalizableStrings.AdManifestPackageDoesNotExist, testManifestName)); + _reporter.Lines.Should().NotContain(string.Format(Workloads.Workload.Install.LocalizableStrings.AdManifestPackageDoesNotExist, testManifestName)); } @@ -339,7 +339,7 @@ public void ItCanFallbackWithNoUpdates(bool useOfflineCache) // Assert _reporter.Lines.Should().NotContain(l => l.ToLowerInvariant().Contains("fail")); - _reporter.Lines.Should().Contain(String.Format(Workloads.Workload.Install.LocalizableStrings.AdManifestPackageDoesNotExist, testManifestName)); + _reporter.Lines.Should().Contain(string.Format(Workloads.Workload.Install.LocalizableStrings.AdManifestPackageDoesNotExist, testManifestName)); } [Theory] @@ -405,7 +405,7 @@ public void GivenNoUpdatesAreAvailableAndNoRollbackItGivesAppropriateMessage(boo Directory.GetFiles(adManifestDir).Should().BeEmpty(); _reporter.Lines.Should().NotContain(l => l.ToLowerInvariant().Contains("fail")); - _reporter.Lines.Should().Contain(String.Format(Workloads.Workload.Install.LocalizableStrings.AdManifestPackageDoesNotExist, testManifestName)); + _reporter.Lines.Should().Contain(string.Format(Workloads.Workload.Install.LocalizableStrings.AdManifestPackageDoesNotExist, testManifestName)); } [Fact] diff --git a/src/WebSdk/Publish/Tasks/Kudu/KuduConnect.cs b/src/WebSdk/Publish/Tasks/Kudu/KuduConnect.cs index 07cb33cfd89e..7505b53a53cc 100644 --- a/src/WebSdk/Publish/Tasks/Kudu/KuduConnect.cs +++ b/src/WebSdk/Publish/Tasks/Kudu/KuduConnect.cs @@ -33,7 +33,7 @@ protected string AuthorizationInfo { lock (_syncObject) { - string authInfo = String.Format("{0}:{1}", _connectionInfo.UserName, _connectionInfo.Password); + string authInfo = string.Format("{0}:{1}", _connectionInfo.UserName, _connectionInfo.Password); return Convert.ToBase64String(Encoding.UTF8.GetBytes(authInfo)); } } diff --git a/src/WebSdk/Publish/Tasks/Kudu/KuduVfsDeploy.cs b/src/WebSdk/Publish/Tasks/Kudu/KuduVfsDeploy.cs index b18edca37c03..fb73a958d274 100644 --- a/src/WebSdk/Publish/Tasks/Kudu/KuduVfsDeploy.cs +++ b/src/WebSdk/Publish/Tasks/Kudu/KuduVfsDeploy.cs @@ -24,7 +24,7 @@ public override string DestinationUrl { get { - return String.Format(ConnectionInfo.DestinationUrl, ConnectionInfo.SiteName, "vfs/site/wwwroot/"); + return string.Format(ConnectionInfo.DestinationUrl, ConnectionInfo.SiteName, "vfs/site/wwwroot/"); } } @@ -51,7 +51,7 @@ private System.Threading.Tasks.Task PostFilesAsync(string file, string sourcePat return System.Threading.Tasks.Task.Run( async () => { - string relPath = file.Replace(sourcePath, String.Empty); + string relPath = file.Replace(sourcePath, string.Empty); string relUrl = relPath.Replace(Path.DirectorySeparatorChar, '/'); string apiUrl = DestinationUrl + relUrl; @@ -74,14 +74,14 @@ private System.Threading.Tasks.Task PostFilesAsync(string file, string sourcePat { lock (_syncObject) { - _logger.LogMessage(Microsoft.Build.Framework.MessageImportance.High, String.Format(Resources.KUDUDEPLOY_AddingFileFailed, ConnectionInfo.SiteName + "/" + relUrl, response.ReasonPhrase)); + _logger.LogMessage(Microsoft.Build.Framework.MessageImportance.High, string.Format(Resources.KUDUDEPLOY_AddingFileFailed, ConnectionInfo.SiteName + "/" + relUrl, response.ReasonPhrase)); } } else { lock (_syncObject) { - _logger.LogMessage(Microsoft.Build.Framework.MessageImportance.High, String.Format(Resources.KUDUDEPLOY_AddingFile, ConnectionInfo.SiteName + "/" + relUrl)); + _logger.LogMessage(Microsoft.Build.Framework.MessageImportance.High, string.Format(Resources.KUDUDEPLOY_AddingFile, ConnectionInfo.SiteName + "/" + relUrl)); } } } diff --git a/src/WebSdk/Publish/Tasks/Kudu/KuduZipDeploy.cs b/src/WebSdk/Publish/Tasks/Kudu/KuduZipDeploy.cs index 4cd09a605529..c2420fab9bb9 100644 --- a/src/WebSdk/Publish/Tasks/Kudu/KuduZipDeploy.cs +++ b/src/WebSdk/Publish/Tasks/Kudu/KuduZipDeploy.cs @@ -21,7 +21,7 @@ public override string DestinationUrl { get { - return String.Format(ConnectionInfo.DestinationUrl, ConnectionInfo.SiteName, "zip/site/wwwroot/"); + return string.Format(ConnectionInfo.DestinationUrl, ConnectionInfo.SiteName, "zip/site/wwwroot/"); } } @@ -31,7 +31,7 @@ public async System.Threading.Tasks.Task DeployAsync(string zipFileFullPat if (!File.Exists(zipFileFullPath)) { // If the source file directory does not exist quit early. - _logger.LogError(String.Format(Resources.KUDUDEPLOY_AzurePublishErrorReason, Resources.KUDUDEPLOY_DeployOutputPathEmpty)); + _logger.LogError(string.Format(Resources.KUDUDEPLOY_AzurePublishErrorReason, Resources.KUDUDEPLOY_DeployOutputPathEmpty)); return false; } @@ -41,7 +41,7 @@ public async System.Threading.Tasks.Task DeployAsync(string zipFileFullPat private async System.Threading.Tasks.Task PostZipAsync(string zipFilePath) { - if (String.IsNullOrEmpty(zipFilePath)) + if (string.IsNullOrEmpty(zipFilePath)) { return false; } @@ -63,7 +63,7 @@ private async System.Threading.Tasks.Task PostZipAsync(string zipFilePath) { if (!response.IsSuccessStatusCode) { - _logger.LogError(String.Format(Resources.KUDUDEPLOY_PublishZipFailedReason, ConnectionInfo.SiteName, response.ReasonPhrase)); + _logger.LogError(string.Format(Resources.KUDUDEPLOY_PublishZipFailedReason, ConnectionInfo.SiteName, response.ReasonPhrase)); return false; } } diff --git a/src/WebSdk/Publish/Tasks/Tasks/Kudu/KuduDeploy.cs b/src/WebSdk/Publish/Tasks/Tasks/Kudu/KuduDeploy.cs index 9ddaa9c05c40..f8b2e8d26e9d 100644 --- a/src/WebSdk/Publish/Tasks/Tasks/Kudu/KuduDeploy.cs +++ b/src/WebSdk/Publish/Tasks/Tasks/Kudu/KuduDeploy.cs @@ -73,14 +73,14 @@ internal KuduConnectionInfo GetConnectionInfo() public override bool Execute() { - if (String.IsNullOrEmpty(PublishIntermediateOutputPath)) + if (string.IsNullOrEmpty(PublishIntermediateOutputPath)) { Log.LogError(Resources.KUDUDEPLOY_DeployOutputPathEmpty); return false; } KuduConnectionInfo connectionInfo = GetConnectionInfo(); - if (String.IsNullOrEmpty(connectionInfo.UserName) || String.IsNullOrEmpty(connectionInfo.Password) || String.IsNullOrEmpty(connectionInfo.DestinationUrl)) + if (string.IsNullOrEmpty(connectionInfo.UserName) || string.IsNullOrEmpty(connectionInfo.Password) || string.IsNullOrEmpty(connectionInfo.DestinationUrl)) { Log.LogError(Resources.KUDUDEPLOY_ConnectionInfoMissing); return false; @@ -118,12 +118,12 @@ internal bool DeployFiles(KuduConnectionInfo connectionInfo) success = deployTask.Wait(TimeoutMilliseconds); if (!success) { - Log.LogError(String.Format(Resources.KUDUDEPLOY_AzurePublishErrorReason, Resources.KUDUDEPLOY_OperationTimeout)); + Log.LogError(string.Format(Resources.KUDUDEPLOY_AzurePublishErrorReason, Resources.KUDUDEPLOY_OperationTimeout)); } } catch (AggregateException ae) { - Log.LogError(String.Format(Resources.KUDUDEPLOY_AzurePublishErrorReason, ae.Flatten().Message)); + Log.LogError(string.Format(Resources.KUDUDEPLOY_AzurePublishErrorReason, ae.Flatten().Message)); success = false; } @@ -144,12 +144,12 @@ internal bool DeployZipFile(KuduConnectionInfo connectionInfo) success = zipTask.Wait(TimeoutMilliseconds); if (!success) { - Log.LogError(String.Format(Resources.KUDUDEPLOY_AzurePublishErrorReason, Resources.KUDUDEPLOY_OperationTimeout)); + Log.LogError(string.Format(Resources.KUDUDEPLOY_AzurePublishErrorReason, Resources.KUDUDEPLOY_OperationTimeout)); } } catch (AggregateException ae) { - Log.LogError(String.Format(Resources.KUDUDEPLOY_AzurePublishErrorReason, ae.Flatten().Message)); + Log.LogError(string.Format(Resources.KUDUDEPLOY_AzurePublishErrorReason, ae.Flatten().Message)); success = false; } @@ -162,8 +162,8 @@ internal bool DeployZipFile(KuduConnectionInfo connectionInfo) internal string CreateZipFile(string sourcePath) { // Zip the files from PublishOutput path. - string zipFileFullPath = System.IO.Path.Combine(System.IO.Path.GetTempPath(), String.Format("Publish{0}.zip", new Random().Next(Int32.MaxValue))); - Log.LogMessage(Microsoft.Build.Framework.MessageImportance.High, String.Format(Resources.KUDUDEPLOY_CopyingToTempLocation, zipFileFullPath)); + string zipFileFullPath = System.IO.Path.Combine(System.IO.Path.GetTempPath(), string.Format("Publish{0}.zip", new Random().Next(int.MaxValue))); + Log.LogMessage(Microsoft.Build.Framework.MessageImportance.High, string.Format(Resources.KUDUDEPLOY_CopyingToTempLocation, zipFileFullPath)); try { @@ -171,7 +171,7 @@ internal string CreateZipFile(string sourcePath) } catch (Exception e) { - Log.LogError(String.Format(Resources.KUDUDEPLOY_AzurePublishErrorReason, e.Message)); + Log.LogError(string.Format(Resources.KUDUDEPLOY_AzurePublishErrorReason, e.Message)); // If we are unable to zip the file, then we fail. return null; } diff --git a/src/WebSdk/Publish/Tasks/Tasks/MsDeploy/GetPassword.cs b/src/WebSdk/Publish/Tasks/Tasks/MsDeploy/GetPassword.cs index 41fe0907f368..3d085cfd2505 100644 --- a/src/WebSdk/Publish/Tasks/Tasks/MsDeploy/GetPassword.cs +++ b/src/WebSdk/Publish/Tasks/Tasks/MsDeploy/GetPassword.cs @@ -33,7 +33,7 @@ public string GetClearTextPassword(string base64EncodedString) return GetClearTextPassword(encryptedData); } - public static string GetClearTextPassword(Byte[] encryptedData) + public static string GetClearTextPassword(byte[] encryptedData) { if (encryptedData == null) { @@ -44,7 +44,7 @@ public static string GetClearTextPassword(Byte[] encryptedData) try { #pragma warning disable CA1416 // This functionality is only expected to work in Windows. - Byte[] uncrypted = System.Security.Cryptography.ProtectedData.Unprotect(encryptedData, null, System.Security.Cryptography.DataProtectionScope.CurrentUser); + byte[] uncrypted = System.Security.Cryptography.ProtectedData.Unprotect(encryptedData, null, System.Security.Cryptography.DataProtectionScope.CurrentUser); #pragma warning restore CA1416 // This functionality is only expected to work in Windows. plainPWD = Encoding.Unicode.GetString(uncrypted); } diff --git a/src/WebSdk/Publish/Tasks/Tasks/MsDeploy/VsMsdeploy.cs b/src/WebSdk/Publish/Tasks/Tasks/MsDeploy/VsMsdeploy.cs index 45bed329f597..76abef1fa857 100644 --- a/src/WebSdk/Publish/Tasks/Tasks/MsDeploy/VsMsdeploy.cs +++ b/src/WebSdk/Publish/Tasks/Tasks/MsDeploy/VsMsdeploy.cs @@ -450,7 +450,7 @@ protected override void BeforeSync() // Utility function to log all public instance property to CustomerBuildEventArgs - private static void AddAllPropertiesToCustomBuildWithPropertyEventArgs(CustomBuildWithPropertiesEventArgs cbpEventArg, System.Object obj) + private static void AddAllPropertiesToCustomBuildWithPropertyEventArgs(CustomBuildWithPropertiesEventArgs cbpEventArg, object obj) { #if NET472 if (obj != null) diff --git a/src/WebSdk/Publish/Tasks/Tasks/ValidateParameter.cs b/src/WebSdk/Publish/Tasks/Tasks/ValidateParameter.cs index 3480155a1363..a6f21a24fbc0 100644 --- a/src/WebSdk/Publish/Tasks/Tasks/ValidateParameter.cs +++ b/src/WebSdk/Publish/Tasks/Tasks/ValidateParameter.cs @@ -16,9 +16,9 @@ public class ValidateParameter : Build.Utilities.Task public override bool Execute() { - if (String.IsNullOrEmpty(ParameterValue)) + if (string.IsNullOrEmpty(ParameterValue)) { - Log.LogError(String.Format(CultureInfo.CurrentCulture, Resources.ValidateParameter_ArgumentNullError, ParameterName)); + Log.LogError(string.Format(CultureInfo.CurrentCulture, Resources.ValidateParameter_ArgumentNullError, ParameterName)); return false; } diff --git a/src/WebSdk/Publish/Tasks/Tasks/Xdt/TaskTransformationLogger.cs b/src/WebSdk/Publish/Tasks/Tasks/Xdt/TaskTransformationLogger.cs index 32a631025d62..ddc5d8ba92d4 100644 --- a/src/WebSdk/Publish/Tasks/Tasks/Xdt/TaskTransformationLogger.cs +++ b/src/WebSdk/Publish/Tasks/Tasks/Xdt/TaskTransformationLogger.cs @@ -37,7 +37,7 @@ private string IndentString { if (indentString == null) { - indentString = String.Empty; + indentString = string.Empty; for (int i = 0; i < indentLevel; i++) { indentString += indentStringPiece; @@ -86,7 +86,7 @@ void IXmlTransformationLogger.LogMessage(MessageType type, string message, param break; } - loggingHelper.LogMessage(importance, String.Concat(IndentString, message), messageArgs); + loggingHelper.LogMessage(importance, string.Concat(IndentString, message), messageArgs); } void IXmlTransformationLogger.LogWarning(string message, params object[] messageArgs) @@ -161,7 +161,7 @@ void IXmlTransformationLogger.LogErrorFromException(Exception ex, string file, i { sb.AppendFormat("{0} : {1}", exIterator.GetType().Name, exIterator.Message); sb.AppendLine(); - if (!String.IsNullOrEmpty(exIterator.StackTrace)) + if (!string.IsNullOrEmpty(exIterator.StackTrace)) { sb.Append(exIterator.StackTrace); } diff --git a/src/WebSdk/Publish/Tasks/Tasks/Xdt/TransformXml.cs b/src/WebSdk/Publish/Tasks/Tasks/Xdt/TransformXml.cs index 4fe3c7ea659c..69ab1dcdeb81 100644 --- a/src/WebSdk/Publish/Tasks/Tasks/Xdt/TransformXml.cs +++ b/src/WebSdk/Publish/Tasks/Tasks/Xdt/TransformXml.cs @@ -19,7 +19,7 @@ public class TransformXml : Task private bool stackTrace = false; [Required] - public String Source + public string Source { get { @@ -42,7 +42,7 @@ public bool IgnoreError [Required] - public String Transform + public string Transform { get { @@ -72,7 +72,7 @@ public string TransformRootPath [Required] - public String Destination + public string Destination { get { diff --git a/src/WebSdk/Publish/Tasks/WebConfigTransform.cs b/src/WebSdk/Publish/Tasks/WebConfigTransform.cs index d5a583d59226..d23a99fd9234 100644 --- a/src/WebSdk/Publish/Tasks/WebConfigTransform.cs +++ b/src/WebSdk/Publish/Tasks/WebConfigTransform.cs @@ -117,7 +117,7 @@ private static void TransformAspNetCore(XElement aspNetCoreElement, string appNa // if the app path is already there in the web.config, don't do anything. if (string.Equals(appPath, (string)argumentsAttribute, StringComparison.OrdinalIgnoreCase)) { - appPath = String.Empty; + appPath = string.Empty; } attributes.Insert(processPathIndex + 1, new XAttribute("arguments", (appPath + " " + (string)argumentsAttribute).Trim())); From 443c2736f31eed42888a44b89b908e805f8b8e50 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 23 Sep 2023 04:19:15 +0000 Subject: [PATCH 10/44] Update dependencies from https://github.com/nuget/nuget.client build 6.8.0.117 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.8.0-rc.112 -> To Version 6.8.0-rc.117 --- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5bac140c16b7..a30abc451bd5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -116,69 +116,69 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/nuget/nuget.client - f47eb5771ee3f9a100d0b31d82ccb5ee600a56ed + 7fb5ed887352d2892797a365cfdd7bb8df029941 - + https://github.com/nuget/nuget.client - f47eb5771ee3f9a100d0b31d82ccb5ee600a56ed + 7fb5ed887352d2892797a365cfdd7bb8df029941 - + https://github.com/nuget/nuget.client - f47eb5771ee3f9a100d0b31d82ccb5ee600a56ed + 7fb5ed887352d2892797a365cfdd7bb8df029941 - + https://github.com/nuget/nuget.client - f47eb5771ee3f9a100d0b31d82ccb5ee600a56ed + 7fb5ed887352d2892797a365cfdd7bb8df029941 - + https://github.com/nuget/nuget.client - f47eb5771ee3f9a100d0b31d82ccb5ee600a56ed + 7fb5ed887352d2892797a365cfdd7bb8df029941 - + https://github.com/nuget/nuget.client - f47eb5771ee3f9a100d0b31d82ccb5ee600a56ed + 7fb5ed887352d2892797a365cfdd7bb8df029941 - + https://github.com/nuget/nuget.client - f47eb5771ee3f9a100d0b31d82ccb5ee600a56ed + 7fb5ed887352d2892797a365cfdd7bb8df029941 - + https://github.com/nuget/nuget.client - f47eb5771ee3f9a100d0b31d82ccb5ee600a56ed + 7fb5ed887352d2892797a365cfdd7bb8df029941 - + https://github.com/nuget/nuget.client - f47eb5771ee3f9a100d0b31d82ccb5ee600a56ed + 7fb5ed887352d2892797a365cfdd7bb8df029941 - + https://github.com/nuget/nuget.client - f47eb5771ee3f9a100d0b31d82ccb5ee600a56ed + 7fb5ed887352d2892797a365cfdd7bb8df029941 - + https://github.com/nuget/nuget.client - f47eb5771ee3f9a100d0b31d82ccb5ee600a56ed + 7fb5ed887352d2892797a365cfdd7bb8df029941 - + https://github.com/nuget/nuget.client - f47eb5771ee3f9a100d0b31d82ccb5ee600a56ed + 7fb5ed887352d2892797a365cfdd7bb8df029941 - + https://github.com/nuget/nuget.client - f47eb5771ee3f9a100d0b31d82ccb5ee600a56ed + 7fb5ed887352d2892797a365cfdd7bb8df029941 - + https://github.com/nuget/nuget.client - f47eb5771ee3f9a100d0b31d82ccb5ee600a56ed + 7fb5ed887352d2892797a365cfdd7bb8df029941 - + https://github.com/nuget/nuget.client - f47eb5771ee3f9a100d0b31d82ccb5ee600a56ed + 7fb5ed887352d2892797a365cfdd7bb8df029941 - + https://github.com/nuget/nuget.client - f47eb5771ee3f9a100d0b31d82ccb5ee600a56ed + 7fb5ed887352d2892797a365cfdd7bb8df029941 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 0e8329bfdb04..a7ebdae1786c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,18 +64,18 @@ - 6.8.0-rc.112 - 6.8.0-rc.112 + 6.8.0-rc.117 + 6.8.0-rc.117 6.0.0-rc.278 - 6.8.0-rc.112 - 6.8.0-rc.112 - 6.8.0-rc.112 - 6.8.0-rc.112 - 6.8.0-rc.112 - 6.8.0-rc.112 - 6.8.0-rc.112 - 6.8.0-rc.112 - 6.8.0-rc.112 + 6.8.0-rc.117 + 6.8.0-rc.117 + 6.8.0-rc.117 + 6.8.0-rc.117 + 6.8.0-rc.117 + 6.8.0-rc.117 + 6.8.0-rc.117 + 6.8.0-rc.117 + 6.8.0-rc.117 $(NuGetPackagingPackageVersion) $(NuGetProjectModelPackageVersion) From 1a70ca3af74f884b80e711e4ed0468857795d647 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 23 Sep 2023 12:11:16 +0000 Subject: [PATCH 11/44] Update dependencies from https://github.com/dotnet/source-build-externals build 20230922.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 9.0.0-alpha.1.23468.2 -> To Version 9.0.0-alpha.1.23472.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b1d938d32cbd..20e53f36351a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -334,9 +334,9 @@ 02fe27cd6a9b001c8feb7938e6ef4b3799745759 - + https://github.com/dotnet/source-build-externals - fb896b0f1c716ae84e4e4787d0a02a0002988508 + 778b0a5de9ec91af8fbbf99b907a56986a90ca6f From d9df79d5a3ed94417ec260e78bcf71dcb21a1bfa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 23 Sep 2023 12:12:19 +0000 Subject: [PATCH 12/44] Update dependencies from https://github.com/dotnet/msbuild build 20230922.4 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.8.0-preview-23471-08 -> To Version 17.8.0-preview-23472-04 --- NuGet.config | 1 + eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 52f8c9735c20..de13d2146ccf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5bac140c16b7..1aa24ad26ddd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,18 +52,18 @@ bebe955e9f7d392fbca594b1c76c54ba2e27027e - + https://github.com/dotnet/msbuild - 3847162365a20626dbef16f2b1153dada9c26965 + 6cdef424154c976f04802b101e6be6292f8a8897 - + https://github.com/dotnet/msbuild - 3847162365a20626dbef16f2b1153dada9c26965 + 6cdef424154c976f04802b101e6be6292f8a8897 - + https://github.com/dotnet/msbuild - 3847162365a20626dbef16f2b1153dada9c26965 + 6cdef424154c976f04802b101e6be6292f8a8897 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 0e8329bfdb04..14fe58fc18a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -102,7 +102,7 @@ - 17.8.0-preview-23471-08 + 17.8.0 $(MicrosoftBuildPackageVersion) - 12.8.0-beta.23472.1 + 12.8.0-beta.23472.4 From abb08b5b2c65eec7581cb1205a03d7a821387ca1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 23 Sep 2023 19:39:16 +0000 Subject: [PATCH 15/44] Update dependencies from https://github.com/dotnet/razor build 20230923.1 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23472.1 -> To Version 7.0.0-preview.23473.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 03ec62a4f7ad..8e30472ed9d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -278,18 +278,18 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/razor - 9ff3387560e846ac1b1cd979d38336ab3121eef2 + 2daeaaaed440a9c59b063b1578616850a0ccddd1 - + https://github.com/dotnet/razor - 9ff3387560e846ac1b1cd979d38336ab3121eef2 + 2daeaaaed440a9c59b063b1578616850a0ccddd1 - + https://github.com/dotnet/razor - 9ff3387560e846ac1b1cd979d38336ab3121eef2 + 2daeaaaed440a9c59b063b1578616850a0ccddd1 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index beb309d6cc0c..6a24a04787d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -157,9 +157,9 @@ - 7.0.0-preview.23472.3 - 7.0.0-preview.23472.3 - 7.0.0-preview.23472.3 + 7.0.0-preview.23473.1 + 7.0.0-preview.23473.1 + 7.0.0-preview.23473.1 From ef6bf2ff6d2168e488fc77a359decfee5f4dd894 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 24 Sep 2023 12:09:52 +0000 Subject: [PATCH 16/44] Update dependencies from https://github.com/dotnet/source-build-externals build 20230922.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 9.0.0-alpha.1.23468.2 -> To Version 9.0.0-alpha.1.23472.1 From de1447c4023f6b5c5f05cdf5d1fe880a9de0be6b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 24 Sep 2023 12:11:03 +0000 Subject: [PATCH 17/44] Update dependencies from https://github.com/dotnet/msbuild build 20230922.4 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.8.0-preview-23471-08 -> To Version 17.8.0-preview-23472-04 From 2c00c937537ee4d657460c6608cb766872249afd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 24 Sep 2023 12:11:38 +0000 Subject: [PATCH 18/44] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230922.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.23468.3 -> To Version 9.0.0-alpha.1.23472.1 From 971aff88ed4240d636520460ad546b2e061062e2 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Sun, 24 Sep 2023 20:16:14 -0700 Subject: [PATCH 19/44] Upgrade MSBuildLocator --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 16b661d400a5..8052c87ddfb9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -167,7 +167,7 @@ - 1.6.1 + 1.6.10 4.0.1 From ed8367a58fb11693dc4c3f7db5de08be985836e5 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Sun, 24 Sep 2023 23:27:10 -0700 Subject: [PATCH 20/44] Update Version.Details.xml --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 358ca2f4a7a5..74e86d474326 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,7 +55,6 @@ https://github.com/dotnet/msbuild 6cdef424154c976f04802b101e6be6292f8a8897 - https://github.com/dotnet/msbuild @@ -64,6 +63,7 @@ https://github.com/dotnet/msbuild 6cdef424154c976f04802b101e6be6292f8a8897 + https://github.com/dotnet/fsharp From 9c07daaa547bd1864a16d7a726e7eff15b51f5be Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 25 Sep 2023 09:34:38 -0500 Subject: [PATCH 21/44] [main] Update dependencies from dotnet/fsharp (#35700) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f4ef77587c25..c99de0b5e19b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,13 +65,13 @@ https://github.com/dotnet/msbuild 3847162365a20626dbef16f2b1153dada9c26965 - + https://github.com/dotnet/fsharp - 803f0e7b7af405084429d981cfe1f799a5f6d40c + 5527f0ae794c46cf81ff69e5e315d611dfb9a029 - + https://github.com/dotnet/fsharp - 803f0e7b7af405084429d981cfe1f799a5f6d40c + 5527f0ae794c46cf81ff69e5e315d611dfb9a029 diff --git a/eng/Versions.props b/eng/Versions.props index 8052c87ddfb9..7c4817cf501b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -132,7 +132,7 @@ - 12.8.0-beta.23472.4 + 12.8.0-beta.23475.1 From e8bc4b83ab1ef561307ea2e6afca14602006d04f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Sep 2023 21:53:15 +0000 Subject: [PATCH 22/44] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20230925.1 Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.NetAnalyzers , Microsoft.CodeAnalysis.PublicApiAnalyzers From Version 3.11.0-beta1.23472.2 -> To Version 3.11.0-beta1.23475.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f74a90677897..269281b980c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -312,17 +312,17 @@ 9a1c3e1b7f0c8763d4c96e593961a61a72679a7b - + https://github.com/dotnet/roslyn-analyzers - 39ccb5b7570c179a82aa604ab7c3712af94ef119 + b39866e7ea93f62605584bd4d4b8d73cd50131be - + https://github.com/dotnet/roslyn-analyzers - 39ccb5b7570c179a82aa604ab7c3712af94ef119 + b39866e7ea93f62605584bd4d4b8d73cd50131be - + https://github.com/dotnet/roslyn-analyzers - 39ccb5b7570c179a82aa604ab7c3712af94ef119 + b39866e7ea93f62605584bd4d4b8d73cd50131be diff --git a/eng/Versions.props b/eng/Versions.props index f9c0273eabd4..1b91247dff87 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,8 +97,8 @@ - 9.0.0-preview.23472.2 - 3.11.0-beta1.23472.2 + 9.0.0-preview.23475.1 + 3.11.0-beta1.23475.1 From ce6b547bc5eb8875d83f58a19db975f163470231 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Sep 2023 23:29:56 +0000 Subject: [PATCH 23/44] Update dependencies from https://github.com/dotnet/razor build 20230925.2 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23473.1 -> To Version 7.0.0-preview.23475.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 269281b980c7..fff139230bec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -278,18 +278,18 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/razor - 2daeaaaed440a9c59b063b1578616850a0ccddd1 + 4b812a0afca7394b75a33be3223335e2957a76c3 - + https://github.com/dotnet/razor - 2daeaaaed440a9c59b063b1578616850a0ccddd1 + 4b812a0afca7394b75a33be3223335e2957a76c3 - + https://github.com/dotnet/razor - 2daeaaaed440a9c59b063b1578616850a0ccddd1 + 4b812a0afca7394b75a33be3223335e2957a76c3 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 1b91247dff87..b10623ef4764 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -157,9 +157,9 @@ - 7.0.0-preview.23473.1 - 7.0.0-preview.23473.1 - 7.0.0-preview.23473.1 + 7.0.0-preview.23475.2 + 7.0.0-preview.23475.2 + 7.0.0-preview.23475.2 From 22f0a82a64937dd4ed96a39c4fc9d30130c65acd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 26 Sep 2023 01:36:36 +0000 Subject: [PATCH 24/44] [main] Update dependencies from dotnet/roslyn (#35659) [main] Update dependencies from dotnet/roslyn - Update razor to latest - Update razor to latest - Merge branch 'main' into darc-main-a25139e9-e595-4dd6-a32a-552d707e9419 --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 20 ++++++++++---------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 269281b980c7..1f21d82c2765 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,34 +79,34 @@ 6a6de7dccf80a4a7247f0d67aa5df0062d460edb - + https://github.com/dotnet/roslyn - bdd9c5ba66b00beebdc3516acc5e29b83efd89af + 3888717166f55fa18143fa117c14ceebb421dac0 - + https://github.com/dotnet/roslyn - bdd9c5ba66b00beebdc3516acc5e29b83efd89af + 3888717166f55fa18143fa117c14ceebb421dac0 - + https://github.com/dotnet/roslyn - bdd9c5ba66b00beebdc3516acc5e29b83efd89af + 3888717166f55fa18143fa117c14ceebb421dac0 - + https://github.com/dotnet/roslyn - bdd9c5ba66b00beebdc3516acc5e29b83efd89af + 3888717166f55fa18143fa117c14ceebb421dac0 - + https://github.com/dotnet/roslyn - bdd9c5ba66b00beebdc3516acc5e29b83efd89af + 3888717166f55fa18143fa117c14ceebb421dac0 - + https://github.com/dotnet/roslyn - bdd9c5ba66b00beebdc3516acc5e29b83efd89af + 3888717166f55fa18143fa117c14ceebb421dac0 - + https://github.com/dotnet/roslyn - bdd9c5ba66b00beebdc3516acc5e29b83efd89af + 3888717166f55fa18143fa117c14ceebb421dac0 https://github.com/dotnet/aspnetcore @@ -278,18 +278,18 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/razor - 2daeaaaed440a9c59b063b1578616850a0ccddd1 + 4b812a0afca7394b75a33be3223335e2957a76c3 - + https://github.com/dotnet/razor - 2daeaaaed440a9c59b063b1578616850a0ccddd1 + 4b812a0afca7394b75a33be3223335e2957a76c3 - + https://github.com/dotnet/razor - 2daeaaaed440a9c59b063b1578616850a0ccddd1 + 4b812a0afca7394b75a33be3223335e2957a76c3 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 1b91247dff87..cfe35c0de9f3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -136,13 +136,13 @@ - 4.8.0-3.23471.11 - 4.8.0-3.23471.11 - 4.8.0-3.23471.11 - 4.8.0-3.23471.11 - 4.8.0-3.23471.11 - 4.8.0-3.23471.11 - 4.8.0-3.23471.11 + 4.8.0-3.23475.6 + 4.8.0-3.23475.6 + 4.8.0-3.23475.6 + 4.8.0-3.23475.6 + 4.8.0-3.23475.6 + 4.8.0-3.23475.6 + 4.8.0-3.23475.6 $(MicrosoftNetCompilersToolsetPackageVersion) @@ -157,9 +157,9 @@ - 7.0.0-preview.23473.1 - 7.0.0-preview.23473.1 - 7.0.0-preview.23473.1 + 7.0.0-preview.23475.2 + 7.0.0-preview.23475.2 + 7.0.0-preview.23475.2 From bc4faf3452961fe420ed89d029a13838c183218f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Sep 2023 01:38:34 +0000 Subject: [PATCH 25/44] Update dependencies from https://github.com/dotnet/razor build 20230925.3 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23475.2 -> To Version 7.0.0-preview.23475.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fff139230bec..244363fda3c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -278,18 +278,18 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/razor - 4b812a0afca7394b75a33be3223335e2957a76c3 + e524e8bd33573dc8db19fd077894e777940d79d7 - + https://github.com/dotnet/razor - 4b812a0afca7394b75a33be3223335e2957a76c3 + e524e8bd33573dc8db19fd077894e777940d79d7 - + https://github.com/dotnet/razor - 4b812a0afca7394b75a33be3223335e2957a76c3 + e524e8bd33573dc8db19fd077894e777940d79d7 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index b10623ef4764..56eacfe9be36 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -157,9 +157,9 @@ - 7.0.0-preview.23475.2 - 7.0.0-preview.23475.2 - 7.0.0-preview.23475.2 + 7.0.0-preview.23475.3 + 7.0.0-preview.23475.3 + 7.0.0-preview.23475.3 From 6ab8a4e4a9901f60d791abd23a5c8dc68a002a89 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Sep 2023 01:38:49 +0000 Subject: [PATCH 26/44] Update dependencies from https://github.com/dotnet/roslyn build 20230925.8 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.8.0-3.23475.6 -> To Version 4.8.0-3.23475.8 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1f21d82c2765..a0a4f60c4b0c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,34 +79,34 @@ 6a6de7dccf80a4a7247f0d67aa5df0062d460edb - + https://github.com/dotnet/roslyn - 3888717166f55fa18143fa117c14ceebb421dac0 + b975fb1b8812d895aac5cf8a5cc084647d1b37f2 - + https://github.com/dotnet/roslyn - 3888717166f55fa18143fa117c14ceebb421dac0 + b975fb1b8812d895aac5cf8a5cc084647d1b37f2 - + https://github.com/dotnet/roslyn - 3888717166f55fa18143fa117c14ceebb421dac0 + b975fb1b8812d895aac5cf8a5cc084647d1b37f2 - + https://github.com/dotnet/roslyn - 3888717166f55fa18143fa117c14ceebb421dac0 + b975fb1b8812d895aac5cf8a5cc084647d1b37f2 - + https://github.com/dotnet/roslyn - 3888717166f55fa18143fa117c14ceebb421dac0 + b975fb1b8812d895aac5cf8a5cc084647d1b37f2 - + https://github.com/dotnet/roslyn - 3888717166f55fa18143fa117c14ceebb421dac0 + b975fb1b8812d895aac5cf8a5cc084647d1b37f2 - + https://github.com/dotnet/roslyn - 3888717166f55fa18143fa117c14ceebb421dac0 + b975fb1b8812d895aac5cf8a5cc084647d1b37f2 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index cfe35c0de9f3..2b24d6004e51 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -136,13 +136,13 @@ - 4.8.0-3.23475.6 - 4.8.0-3.23475.6 - 4.8.0-3.23475.6 - 4.8.0-3.23475.6 - 4.8.0-3.23475.6 - 4.8.0-3.23475.6 - 4.8.0-3.23475.6 + 4.8.0-3.23475.8 + 4.8.0-3.23475.8 + 4.8.0-3.23475.8 + 4.8.0-3.23475.8 + 4.8.0-3.23475.8 + 4.8.0-3.23475.8 + 4.8.0-3.23475.8 $(MicrosoftNetCompilersToolsetPackageVersion) From cca5abc091e413afccd1691b687c3aded680a305 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Sep 2023 01:42:23 +0000 Subject: [PATCH 27/44] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20230925.2 Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.NetAnalyzers , Microsoft.CodeAnalysis.PublicApiAnalyzers From Version 3.11.0-beta1.23475.1 -> To Version 3.11.0-beta1.23475.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1f21d82c2765..7c57a1d642b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -312,17 +312,17 @@ 9a1c3e1b7f0c8763d4c96e593961a61a72679a7b - + https://github.com/dotnet/roslyn-analyzers - b39866e7ea93f62605584bd4d4b8d73cd50131be + 2dbc0e4795ffd194777b3dc4efdf7c9b26002b04 - + https://github.com/dotnet/roslyn-analyzers - b39866e7ea93f62605584bd4d4b8d73cd50131be + 2dbc0e4795ffd194777b3dc4efdf7c9b26002b04 - + https://github.com/dotnet/roslyn-analyzers - b39866e7ea93f62605584bd4d4b8d73cd50131be + 2dbc0e4795ffd194777b3dc4efdf7c9b26002b04 diff --git a/eng/Versions.props b/eng/Versions.props index cfe35c0de9f3..58daa4475c7c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,8 +97,8 @@ - 9.0.0-preview.23475.1 - 3.11.0-beta1.23475.1 + 9.0.0-preview.23475.2 + 3.11.0-beta1.23475.2 From a3d90aaca1006dc1be564c467e7034938c1f5557 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Sep 2023 02:37:31 +0000 Subject: [PATCH 28/44] Update dependencies from https://github.com/dotnet/razor build 20230925.4 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23475.2 -> To Version 7.0.0-preview.23475.4 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 244363fda3c9..2d7e46286b50 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -278,18 +278,18 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/razor - e524e8bd33573dc8db19fd077894e777940d79d7 + ba1a3d2c132e1e4ae321e151a7dd8e7d814745ec - + https://github.com/dotnet/razor - e524e8bd33573dc8db19fd077894e777940d79d7 + ba1a3d2c132e1e4ae321e151a7dd8e7d814745ec - + https://github.com/dotnet/razor - e524e8bd33573dc8db19fd077894e777940d79d7 + ba1a3d2c132e1e4ae321e151a7dd8e7d814745ec https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 56eacfe9be36..aa94a2fc9387 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -157,9 +157,9 @@ - 7.0.0-preview.23475.3 - 7.0.0-preview.23475.3 - 7.0.0-preview.23475.3 + 7.0.0-preview.23475.4 + 7.0.0-preview.23475.4 + 7.0.0-preview.23475.4 From 206474cd1b508efc7e7ca2150cecfba03b371957 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Sep 2023 02:52:45 +0000 Subject: [PATCH 29/44] Update dependencies from https://github.com/dotnet/roslyn build 20230925.7 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.8.0-3.23475.6 -> To Version 4.8.0-3.23475.7 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a0a4f60c4b0c..e825154cfad2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,34 +79,34 @@ 6a6de7dccf80a4a7247f0d67aa5df0062d460edb - + https://github.com/dotnet/roslyn - b975fb1b8812d895aac5cf8a5cc084647d1b37f2 + 32ddfd49681dbfdc661ccf63505326bcda574f9d - + https://github.com/dotnet/roslyn - b975fb1b8812d895aac5cf8a5cc084647d1b37f2 + 32ddfd49681dbfdc661ccf63505326bcda574f9d - + https://github.com/dotnet/roslyn - b975fb1b8812d895aac5cf8a5cc084647d1b37f2 + 32ddfd49681dbfdc661ccf63505326bcda574f9d - + https://github.com/dotnet/roslyn - b975fb1b8812d895aac5cf8a5cc084647d1b37f2 + 32ddfd49681dbfdc661ccf63505326bcda574f9d - + https://github.com/dotnet/roslyn - b975fb1b8812d895aac5cf8a5cc084647d1b37f2 + 32ddfd49681dbfdc661ccf63505326bcda574f9d - + https://github.com/dotnet/roslyn - b975fb1b8812d895aac5cf8a5cc084647d1b37f2 + 32ddfd49681dbfdc661ccf63505326bcda574f9d - + https://github.com/dotnet/roslyn - b975fb1b8812d895aac5cf8a5cc084647d1b37f2 + 32ddfd49681dbfdc661ccf63505326bcda574f9d https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 2b24d6004e51..2914f307f00d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -136,13 +136,13 @@ - 4.8.0-3.23475.8 - 4.8.0-3.23475.8 - 4.8.0-3.23475.8 - 4.8.0-3.23475.8 - 4.8.0-3.23475.8 - 4.8.0-3.23475.8 - 4.8.0-3.23475.8 + 4.8.0-3.23475.7 + 4.8.0-3.23475.7 + 4.8.0-3.23475.7 + 4.8.0-3.23475.7 + 4.8.0-3.23475.7 + 4.8.0-3.23475.7 + 4.8.0-3.23475.7 $(MicrosoftNetCompilersToolsetPackageVersion) From ab611fa570c1a7fd3515ffdc9e3207338fe003f1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Sep 2023 04:01:17 +0000 Subject: [PATCH 30/44] Update dependencies from https://github.com/dotnet/razor build 20230925.6 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23475.2 -> To Version 7.0.0-preview.23475.6 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2d7e46286b50..54606a9f8152 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -278,18 +278,18 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/razor - ba1a3d2c132e1e4ae321e151a7dd8e7d814745ec + f994b959a0e062c32f0f836dc66539dfb7f91d73 - + https://github.com/dotnet/razor - ba1a3d2c132e1e4ae321e151a7dd8e7d814745ec + f994b959a0e062c32f0f836dc66539dfb7f91d73 - + https://github.com/dotnet/razor - ba1a3d2c132e1e4ae321e151a7dd8e7d814745ec + f994b959a0e062c32f0f836dc66539dfb7f91d73 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index aa94a2fc9387..3d47642cd8eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -157,9 +157,9 @@ - 7.0.0-preview.23475.4 - 7.0.0-preview.23475.4 - 7.0.0-preview.23475.4 + 7.0.0-preview.23475.6 + 7.0.0-preview.23475.6 + 7.0.0-preview.23475.6 From 0249ef464652de0c9c802359795df95a517e2b03 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Sep 2023 04:17:35 +0000 Subject: [PATCH 31/44] Update dependencies from https://github.com/dotnet/roslyn build 20230925.10 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.8.0-3.23475.6 -> To Version 4.8.0-3.23475.10 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e825154cfad2..3ceb85b07368 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,34 +79,34 @@ 6a6de7dccf80a4a7247f0d67aa5df0062d460edb - + https://github.com/dotnet/roslyn - 32ddfd49681dbfdc661ccf63505326bcda574f9d + 23bb1060f4e735c35a9bab935eddf28e50fe77ca - + https://github.com/dotnet/roslyn - 32ddfd49681dbfdc661ccf63505326bcda574f9d + 23bb1060f4e735c35a9bab935eddf28e50fe77ca - + https://github.com/dotnet/roslyn - 32ddfd49681dbfdc661ccf63505326bcda574f9d + 23bb1060f4e735c35a9bab935eddf28e50fe77ca - + https://github.com/dotnet/roslyn - 32ddfd49681dbfdc661ccf63505326bcda574f9d + 23bb1060f4e735c35a9bab935eddf28e50fe77ca - + https://github.com/dotnet/roslyn - 32ddfd49681dbfdc661ccf63505326bcda574f9d + 23bb1060f4e735c35a9bab935eddf28e50fe77ca - + https://github.com/dotnet/roslyn - 32ddfd49681dbfdc661ccf63505326bcda574f9d + 23bb1060f4e735c35a9bab935eddf28e50fe77ca - + https://github.com/dotnet/roslyn - 32ddfd49681dbfdc661ccf63505326bcda574f9d + 23bb1060f4e735c35a9bab935eddf28e50fe77ca https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 2914f307f00d..be2018c7d75b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -136,13 +136,13 @@ - 4.8.0-3.23475.7 - 4.8.0-3.23475.7 - 4.8.0-3.23475.7 - 4.8.0-3.23475.7 - 4.8.0-3.23475.7 - 4.8.0-3.23475.7 - 4.8.0-3.23475.7 + 4.8.0-3.23475.10 + 4.8.0-3.23475.10 + 4.8.0-3.23475.10 + 4.8.0-3.23475.10 + 4.8.0-3.23475.10 + 4.8.0-3.23475.10 + 4.8.0-3.23475.10 $(MicrosoftNetCompilersToolsetPackageVersion) From 37b10463887fd13208d1c325c551806d1e82e516 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Sep 2023 12:13:41 +0000 Subject: [PATCH 32/44] Update dependencies from https://github.com/dotnet/source-build-externals build 20230925.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 9.0.0-alpha.1.23472.1 -> To Version 9.0.0-alpha.1.23475.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 55d5fe59eec6..74301a800cf0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -334,9 +334,9 @@ 02fe27cd6a9b001c8feb7938e6ef4b3799745759 - + https://github.com/dotnet/source-build-externals - 778b0a5de9ec91af8fbbf99b907a56986a90ca6f + e45d334fa3fd29018b70c598eced1938c054884d From 3e958ea75bce4ec1c768d41853223f4c6b6bd7a4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Sep 2023 12:21:59 +0000 Subject: [PATCH 33/44] Update dependencies from https://github.com/dotnet/fsharp build 20230925.2 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 8.0.100-beta.23475.1 -> To Version 8.0.100-beta.23475.2 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 55d5fe59eec6..1a8d0e255b4d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,13 +65,13 @@ 6cdef424154c976f04802b101e6be6292f8a8897 - + https://github.com/dotnet/fsharp - 5527f0ae794c46cf81ff69e5e315d611dfb9a029 + 10f956e631a1efc0f7f5e49c626c494cd32b1f50 - + https://github.com/dotnet/fsharp - 5527f0ae794c46cf81ff69e5e315d611dfb9a029 + 10f956e631a1efc0f7f5e49c626c494cd32b1f50 diff --git a/eng/Versions.props b/eng/Versions.props index ce0bdd002e29..e33a11cb563d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -132,7 +132,7 @@ - 12.8.0-beta.23475.1 + 12.8.0-beta.23475.2 From 3d326851382c8dda0f6d1a627f72183a56fc54d9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 26 Sep 2023 15:59:04 +0000 Subject: [PATCH 34/44] [main] Update dependencies from dotnet/source-build-reference-packages (#35721) [main] Update dependencies from dotnet/source-build-reference-packages --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 55d5fe59eec6..c2473069b8d9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -339,9 +339,9 @@ 778b0a5de9ec91af8fbbf99b907a56986a90ca6f - + https://github.com/dotnet/source-build-reference-packages - 3af65e74c8be435668f328c2bf134270b33d4e3a + 0650b50b2a5263c735d12b5c36c5deb34e7e6b60 From 111afea6ce7d6078ee64901c7691deb277d394cc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Sep 2023 18:23:06 +0000 Subject: [PATCH 35/44] Update dependencies from https://github.com/dotnet/razor build 20230926.1 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23475.6 -> To Version 7.0.0-preview.23476.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0bf06390d10a..0f9fcde4a474 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -278,18 +278,18 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/dotnet/razor - f994b959a0e062c32f0f836dc66539dfb7f91d73 + 098adbd749333545ee11dfb7798526bddc736451 - + https://github.com/dotnet/razor - f994b959a0e062c32f0f836dc66539dfb7f91d73 + 098adbd749333545ee11dfb7798526bddc736451 - + https://github.com/dotnet/razor - f994b959a0e062c32f0f836dc66539dfb7f91d73 + 098adbd749333545ee11dfb7798526bddc736451 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index ce0bdd002e29..4b272af7d5e4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -157,9 +157,9 @@ - 7.0.0-preview.23475.6 - 7.0.0-preview.23475.6 - 7.0.0-preview.23475.6 + 7.0.0-preview.23476.1 + 7.0.0-preview.23476.1 + 7.0.0-preview.23476.1 From ee97e422b3b329f814fcbc6fe456b2765af7a563 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Sep 2023 18:37:56 +0000 Subject: [PATCH 36/44] Update dependencies from https://github.com/dotnet/roslyn build 20230926.3 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.8.0-3.23475.10 -> To Version 4.8.0-3.23476.3 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0bf06390d10a..f2ac032cac7b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,34 +79,34 @@ 6a6de7dccf80a4a7247f0d67aa5df0062d460edb - + https://github.com/dotnet/roslyn - 23bb1060f4e735c35a9bab935eddf28e50fe77ca + a8700449c87c2a7a8e822429e50cd493fb854d0b - + https://github.com/dotnet/roslyn - 23bb1060f4e735c35a9bab935eddf28e50fe77ca + a8700449c87c2a7a8e822429e50cd493fb854d0b - + https://github.com/dotnet/roslyn - 23bb1060f4e735c35a9bab935eddf28e50fe77ca + a8700449c87c2a7a8e822429e50cd493fb854d0b - + https://github.com/dotnet/roslyn - 23bb1060f4e735c35a9bab935eddf28e50fe77ca + a8700449c87c2a7a8e822429e50cd493fb854d0b - + https://github.com/dotnet/roslyn - 23bb1060f4e735c35a9bab935eddf28e50fe77ca + a8700449c87c2a7a8e822429e50cd493fb854d0b - + https://github.com/dotnet/roslyn - 23bb1060f4e735c35a9bab935eddf28e50fe77ca + a8700449c87c2a7a8e822429e50cd493fb854d0b - + https://github.com/dotnet/roslyn - 23bb1060f4e735c35a9bab935eddf28e50fe77ca + a8700449c87c2a7a8e822429e50cd493fb854d0b https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index ce0bdd002e29..e6099b03cfa5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -136,13 +136,13 @@ - 4.8.0-3.23475.10 - 4.8.0-3.23475.10 - 4.8.0-3.23475.10 - 4.8.0-3.23475.10 - 4.8.0-3.23475.10 - 4.8.0-3.23475.10 - 4.8.0-3.23475.10 + 4.8.0-3.23476.3 + 4.8.0-3.23476.3 + 4.8.0-3.23476.3 + 4.8.0-3.23476.3 + 4.8.0-3.23476.3 + 4.8.0-3.23476.3 + 4.8.0-3.23476.3 $(MicrosoftNetCompilersToolsetPackageVersion) From c04748e14d6a5aa8a5d2dc7cb9cdca340423ad37 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Sep 2023 19:15:35 +0000 Subject: [PATCH 37/44] Update dependencies from https://github.com/nuget/nuget.client build 6.8.0.120 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.8.0-rc.117 -> To Version 6.8.0-rc.120 --- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0bf06390d10a..077ac616d986 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -116,69 +116,69 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/nuget/nuget.client - 7fb5ed887352d2892797a365cfdd7bb8df029941 + fed7892af6c079015431389d7cf7a7f630e22bbd - + https://github.com/nuget/nuget.client - 7fb5ed887352d2892797a365cfdd7bb8df029941 + fed7892af6c079015431389d7cf7a7f630e22bbd - + https://github.com/nuget/nuget.client - 7fb5ed887352d2892797a365cfdd7bb8df029941 + fed7892af6c079015431389d7cf7a7f630e22bbd - + https://github.com/nuget/nuget.client - 7fb5ed887352d2892797a365cfdd7bb8df029941 + fed7892af6c079015431389d7cf7a7f630e22bbd - + https://github.com/nuget/nuget.client - 7fb5ed887352d2892797a365cfdd7bb8df029941 + fed7892af6c079015431389d7cf7a7f630e22bbd - + https://github.com/nuget/nuget.client - 7fb5ed887352d2892797a365cfdd7bb8df029941 + fed7892af6c079015431389d7cf7a7f630e22bbd - + https://github.com/nuget/nuget.client - 7fb5ed887352d2892797a365cfdd7bb8df029941 + fed7892af6c079015431389d7cf7a7f630e22bbd - + https://github.com/nuget/nuget.client - 7fb5ed887352d2892797a365cfdd7bb8df029941 + fed7892af6c079015431389d7cf7a7f630e22bbd - + https://github.com/nuget/nuget.client - 7fb5ed887352d2892797a365cfdd7bb8df029941 + fed7892af6c079015431389d7cf7a7f630e22bbd - + https://github.com/nuget/nuget.client - 7fb5ed887352d2892797a365cfdd7bb8df029941 + fed7892af6c079015431389d7cf7a7f630e22bbd - + https://github.com/nuget/nuget.client - 7fb5ed887352d2892797a365cfdd7bb8df029941 + fed7892af6c079015431389d7cf7a7f630e22bbd - + https://github.com/nuget/nuget.client - 7fb5ed887352d2892797a365cfdd7bb8df029941 + fed7892af6c079015431389d7cf7a7f630e22bbd - + https://github.com/nuget/nuget.client - 7fb5ed887352d2892797a365cfdd7bb8df029941 + fed7892af6c079015431389d7cf7a7f630e22bbd - + https://github.com/nuget/nuget.client - 7fb5ed887352d2892797a365cfdd7bb8df029941 + fed7892af6c079015431389d7cf7a7f630e22bbd - + https://github.com/nuget/nuget.client - 7fb5ed887352d2892797a365cfdd7bb8df029941 + fed7892af6c079015431389d7cf7a7f630e22bbd - + https://github.com/nuget/nuget.client - 7fb5ed887352d2892797a365cfdd7bb8df029941 + fed7892af6c079015431389d7cf7a7f630e22bbd https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index ce0bdd002e29..2ed7b4e1747d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,18 +64,18 @@ - 6.8.0-rc.117 - 6.8.0-rc.117 + 6.8.0-rc.120 + 6.8.0-rc.120 6.0.0-rc.278 - 6.8.0-rc.117 - 6.8.0-rc.117 - 6.8.0-rc.117 - 6.8.0-rc.117 - 6.8.0-rc.117 - 6.8.0-rc.117 - 6.8.0-rc.117 - 6.8.0-rc.117 - 6.8.0-rc.117 + 6.8.0-rc.120 + 6.8.0-rc.120 + 6.8.0-rc.120 + 6.8.0-rc.120 + 6.8.0-rc.120 + 6.8.0-rc.120 + 6.8.0-rc.120 + 6.8.0-rc.120 + 6.8.0-rc.120 $(NuGetPackagingPackageVersion) $(NuGetProjectModelPackageVersion) From 9374d7c25834160f7f8f8727c554a79f26f45cbc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Sep 2023 22:18:53 +0000 Subject: [PATCH 38/44] Update dependencies from https://github.com/dotnet/roslyn build 20230926.6 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.8.0-3.23475.10 -> To Version 4.8.0-3.23476.6 --- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f2ac032cac7b..2dcc47b0ebb5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,32 +79,32 @@ 6a6de7dccf80a4a7247f0d67aa5df0062d460edb - + https://github.com/dotnet/roslyn a8700449c87c2a7a8e822429e50cd493fb854d0b - + https://github.com/dotnet/roslyn a8700449c87c2a7a8e822429e50cd493fb854d0b - + https://github.com/dotnet/roslyn a8700449c87c2a7a8e822429e50cd493fb854d0b - + https://github.com/dotnet/roslyn a8700449c87c2a7a8e822429e50cd493fb854d0b - + https://github.com/dotnet/roslyn a8700449c87c2a7a8e822429e50cd493fb854d0b - + https://github.com/dotnet/roslyn a8700449c87c2a7a8e822429e50cd493fb854d0b - + https://github.com/dotnet/roslyn a8700449c87c2a7a8e822429e50cd493fb854d0b diff --git a/eng/Versions.props b/eng/Versions.props index e6099b03cfa5..efb211aeca4e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -136,13 +136,13 @@ - 4.8.0-3.23476.3 - 4.8.0-3.23476.3 - 4.8.0-3.23476.3 - 4.8.0-3.23476.3 - 4.8.0-3.23476.3 - 4.8.0-3.23476.3 - 4.8.0-3.23476.3 + 4.8.0-3.23476.6 + 4.8.0-3.23476.6 + 4.8.0-3.23476.6 + 4.8.0-3.23476.6 + 4.8.0-3.23476.6 + 4.8.0-3.23476.6 + 4.8.0-3.23476.6 $(MicrosoftNetCompilersToolsetPackageVersion) From 49dcc6fdd591ed466feb8393a2a86b0d0aff61d7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Sep 2023 01:00:39 +0000 Subject: [PATCH 39/44] Update dependencies from https://github.com/nuget/nuget.client build 6.8.0.121 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.8.0-rc.117 -> To Version 6.8.0-rc.121 --- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 077ac616d986..81dec43f6891 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -116,69 +116,69 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/nuget/nuget.client - fed7892af6c079015431389d7cf7a7f630e22bbd + eb04000f97ade4add28a9e7447baaadee22ee863 - + https://github.com/nuget/nuget.client - fed7892af6c079015431389d7cf7a7f630e22bbd + eb04000f97ade4add28a9e7447baaadee22ee863 - + https://github.com/nuget/nuget.client - fed7892af6c079015431389d7cf7a7f630e22bbd + eb04000f97ade4add28a9e7447baaadee22ee863 - + https://github.com/nuget/nuget.client - fed7892af6c079015431389d7cf7a7f630e22bbd + eb04000f97ade4add28a9e7447baaadee22ee863 - + https://github.com/nuget/nuget.client - fed7892af6c079015431389d7cf7a7f630e22bbd + eb04000f97ade4add28a9e7447baaadee22ee863 - + https://github.com/nuget/nuget.client - fed7892af6c079015431389d7cf7a7f630e22bbd + eb04000f97ade4add28a9e7447baaadee22ee863 - + https://github.com/nuget/nuget.client - fed7892af6c079015431389d7cf7a7f630e22bbd + eb04000f97ade4add28a9e7447baaadee22ee863 - + https://github.com/nuget/nuget.client - fed7892af6c079015431389d7cf7a7f630e22bbd + eb04000f97ade4add28a9e7447baaadee22ee863 - + https://github.com/nuget/nuget.client - fed7892af6c079015431389d7cf7a7f630e22bbd + eb04000f97ade4add28a9e7447baaadee22ee863 - + https://github.com/nuget/nuget.client - fed7892af6c079015431389d7cf7a7f630e22bbd + eb04000f97ade4add28a9e7447baaadee22ee863 - + https://github.com/nuget/nuget.client - fed7892af6c079015431389d7cf7a7f630e22bbd + eb04000f97ade4add28a9e7447baaadee22ee863 - + https://github.com/nuget/nuget.client - fed7892af6c079015431389d7cf7a7f630e22bbd + eb04000f97ade4add28a9e7447baaadee22ee863 - + https://github.com/nuget/nuget.client - fed7892af6c079015431389d7cf7a7f630e22bbd + eb04000f97ade4add28a9e7447baaadee22ee863 - + https://github.com/nuget/nuget.client - fed7892af6c079015431389d7cf7a7f630e22bbd + eb04000f97ade4add28a9e7447baaadee22ee863 - + https://github.com/nuget/nuget.client - fed7892af6c079015431389d7cf7a7f630e22bbd + eb04000f97ade4add28a9e7447baaadee22ee863 - + https://github.com/nuget/nuget.client - fed7892af6c079015431389d7cf7a7f630e22bbd + eb04000f97ade4add28a9e7447baaadee22ee863 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 2ed7b4e1747d..f1cc2b071ed7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,18 +64,18 @@ - 6.8.0-rc.120 - 6.8.0-rc.120 + 6.8.0-rc.121 + 6.8.0-rc.121 6.0.0-rc.278 - 6.8.0-rc.120 - 6.8.0-rc.120 - 6.8.0-rc.120 - 6.8.0-rc.120 - 6.8.0-rc.120 - 6.8.0-rc.120 - 6.8.0-rc.120 - 6.8.0-rc.120 - 6.8.0-rc.120 + 6.8.0-rc.121 + 6.8.0-rc.121 + 6.8.0-rc.121 + 6.8.0-rc.121 + 6.8.0-rc.121 + 6.8.0-rc.121 + 6.8.0-rc.121 + 6.8.0-rc.121 + 6.8.0-rc.121 $(NuGetPackagingPackageVersion) $(NuGetProjectModelPackageVersion) From 0ff860dd8fe02cad0160a473ce34849d807deba3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Sep 2023 02:01:23 +0000 Subject: [PATCH 40/44] Update dependencies from https://github.com/dotnet/roslyn build 20230926.13 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.8.0-3.23475.10 -> To Version 4.8.0-3.23476.13 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2dcc47b0ebb5..2d9f4ddfdb8c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,34 +79,34 @@ 6a6de7dccf80a4a7247f0d67aa5df0062d460edb - + https://github.com/dotnet/roslyn - a8700449c87c2a7a8e822429e50cd493fb854d0b + db312bacc4b009b0847b016f1fa3c3307a8883b2 - + https://github.com/dotnet/roslyn - a8700449c87c2a7a8e822429e50cd493fb854d0b + db312bacc4b009b0847b016f1fa3c3307a8883b2 - + https://github.com/dotnet/roslyn - a8700449c87c2a7a8e822429e50cd493fb854d0b + db312bacc4b009b0847b016f1fa3c3307a8883b2 - + https://github.com/dotnet/roslyn - a8700449c87c2a7a8e822429e50cd493fb854d0b + db312bacc4b009b0847b016f1fa3c3307a8883b2 - + https://github.com/dotnet/roslyn - a8700449c87c2a7a8e822429e50cd493fb854d0b + db312bacc4b009b0847b016f1fa3c3307a8883b2 - + https://github.com/dotnet/roslyn - a8700449c87c2a7a8e822429e50cd493fb854d0b + db312bacc4b009b0847b016f1fa3c3307a8883b2 - + https://github.com/dotnet/roslyn - a8700449c87c2a7a8e822429e50cd493fb854d0b + db312bacc4b009b0847b016f1fa3c3307a8883b2 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index efb211aeca4e..26beab26c70c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -136,13 +136,13 @@ - 4.8.0-3.23476.6 - 4.8.0-3.23476.6 - 4.8.0-3.23476.6 - 4.8.0-3.23476.6 - 4.8.0-3.23476.6 - 4.8.0-3.23476.6 - 4.8.0-3.23476.6 + 4.8.0-3.23476.13 + 4.8.0-3.23476.13 + 4.8.0-3.23476.13 + 4.8.0-3.23476.13 + 4.8.0-3.23476.13 + 4.8.0-3.23476.13 + 4.8.0-3.23476.13 $(MicrosoftNetCompilersToolsetPackageVersion) From 2ed119d7708541837cd643b4b4effabbdd2024a4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Sep 2023 03:17:30 +0000 Subject: [PATCH 41/44] Update dependencies from https://github.com/dotnet/roslyn build 20230926.14 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.8.0-3.23475.10 -> To Version 4.8.0-3.23476.14 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2d9f4ddfdb8c..c5b0819340f3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,34 +79,34 @@ 6a6de7dccf80a4a7247f0d67aa5df0062d460edb - + https://github.com/dotnet/roslyn - db312bacc4b009b0847b016f1fa3c3307a8883b2 + b925063036ce015a2d62d409f890860a3cd59c37 - + https://github.com/dotnet/roslyn - db312bacc4b009b0847b016f1fa3c3307a8883b2 + b925063036ce015a2d62d409f890860a3cd59c37 - + https://github.com/dotnet/roslyn - db312bacc4b009b0847b016f1fa3c3307a8883b2 + b925063036ce015a2d62d409f890860a3cd59c37 - + https://github.com/dotnet/roslyn - db312bacc4b009b0847b016f1fa3c3307a8883b2 + b925063036ce015a2d62d409f890860a3cd59c37 - + https://github.com/dotnet/roslyn - db312bacc4b009b0847b016f1fa3c3307a8883b2 + b925063036ce015a2d62d409f890860a3cd59c37 - + https://github.com/dotnet/roslyn - db312bacc4b009b0847b016f1fa3c3307a8883b2 + b925063036ce015a2d62d409f890860a3cd59c37 - + https://github.com/dotnet/roslyn - db312bacc4b009b0847b016f1fa3c3307a8883b2 + b925063036ce015a2d62d409f890860a3cd59c37 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 26beab26c70c..4fa2d255096f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -136,13 +136,13 @@ - 4.8.0-3.23476.13 - 4.8.0-3.23476.13 - 4.8.0-3.23476.13 - 4.8.0-3.23476.13 - 4.8.0-3.23476.13 - 4.8.0-3.23476.13 - 4.8.0-3.23476.13 + 4.8.0-3.23476.14 + 4.8.0-3.23476.14 + 4.8.0-3.23476.14 + 4.8.0-3.23476.14 + 4.8.0-3.23476.14 + 4.8.0-3.23476.14 + 4.8.0-3.23476.14 $(MicrosoftNetCompilersToolsetPackageVersion) From 5a351405812b7374f5c708970bc67ec340be21b3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Sep 2023 04:39:17 +0000 Subject: [PATCH 42/44] Update dependencies from https://github.com/dotnet/roslyn build 20230926.15 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.8.0-3.23475.10 -> To Version 4.8.0-3.23476.15 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c5b0819340f3..bf18ca43a02f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,34 +79,34 @@ 6a6de7dccf80a4a7247f0d67aa5df0062d460edb - + https://github.com/dotnet/roslyn - b925063036ce015a2d62d409f890860a3cd59c37 + 668de5b297f946c11c9a637ab80fae47ba46fdb9 - + https://github.com/dotnet/roslyn - b925063036ce015a2d62d409f890860a3cd59c37 + 668de5b297f946c11c9a637ab80fae47ba46fdb9 - + https://github.com/dotnet/roslyn - b925063036ce015a2d62d409f890860a3cd59c37 + 668de5b297f946c11c9a637ab80fae47ba46fdb9 - + https://github.com/dotnet/roslyn - b925063036ce015a2d62d409f890860a3cd59c37 + 668de5b297f946c11c9a637ab80fae47ba46fdb9 - + https://github.com/dotnet/roslyn - b925063036ce015a2d62d409f890860a3cd59c37 + 668de5b297f946c11c9a637ab80fae47ba46fdb9 - + https://github.com/dotnet/roslyn - b925063036ce015a2d62d409f890860a3cd59c37 + 668de5b297f946c11c9a637ab80fae47ba46fdb9 - + https://github.com/dotnet/roslyn - b925063036ce015a2d62d409f890860a3cd59c37 + 668de5b297f946c11c9a637ab80fae47ba46fdb9 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 4fa2d255096f..645084369444 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -136,13 +136,13 @@ - 4.8.0-3.23476.14 - 4.8.0-3.23476.14 - 4.8.0-3.23476.14 - 4.8.0-3.23476.14 - 4.8.0-3.23476.14 - 4.8.0-3.23476.14 - 4.8.0-3.23476.14 + 4.8.0-3.23476.15 + 4.8.0-3.23476.15 + 4.8.0-3.23476.15 + 4.8.0-3.23476.15 + 4.8.0-3.23476.15 + 4.8.0-3.23476.15 + 4.8.0-3.23476.15 $(MicrosoftNetCompilersToolsetPackageVersion) From c54cc3c8af8d8a7fb182efc080c00baf2765fc8d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 27 Sep 2023 14:15:02 +0000 Subject: [PATCH 43/44] [main] Update dependencies from dotnet/roslyn (#35747) [main] Update dependencies from dotnet/roslyn --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b8afe70f4f2d..0e47e08a5d96 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,34 +79,34 @@ 6a6de7dccf80a4a7247f0d67aa5df0062d460edb - + https://github.com/dotnet/roslyn - 668de5b297f946c11c9a637ab80fae47ba46fdb9 + a0f635227f57c805c30ebb06a5afecacc77035f5 - + https://github.com/dotnet/roslyn - 668de5b297f946c11c9a637ab80fae47ba46fdb9 + a0f635227f57c805c30ebb06a5afecacc77035f5 - + https://github.com/dotnet/roslyn - 668de5b297f946c11c9a637ab80fae47ba46fdb9 + a0f635227f57c805c30ebb06a5afecacc77035f5 - + https://github.com/dotnet/roslyn - 668de5b297f946c11c9a637ab80fae47ba46fdb9 + a0f635227f57c805c30ebb06a5afecacc77035f5 - + https://github.com/dotnet/roslyn - 668de5b297f946c11c9a637ab80fae47ba46fdb9 + a0f635227f57c805c30ebb06a5afecacc77035f5 - + https://github.com/dotnet/roslyn - 668de5b297f946c11c9a637ab80fae47ba46fdb9 + a0f635227f57c805c30ebb06a5afecacc77035f5 - + https://github.com/dotnet/roslyn - 668de5b297f946c11c9a637ab80fae47ba46fdb9 + a0f635227f57c805c30ebb06a5afecacc77035f5 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 951a816216f2..220e0ee6de36 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -136,13 +136,13 @@ - 4.8.0-3.23476.15 - 4.8.0-3.23476.15 - 4.8.0-3.23476.15 - 4.8.0-3.23476.15 - 4.8.0-3.23476.15 - 4.8.0-3.23476.15 - 4.8.0-3.23476.15 + 4.8.0-3.23477.1 + 4.8.0-3.23477.1 + 4.8.0-3.23477.1 + 4.8.0-3.23477.1 + 4.8.0-3.23477.1 + 4.8.0-3.23477.1 + 4.8.0-3.23477.1 $(MicrosoftNetCompilersToolsetPackageVersion) From 95a0d64550eb107c6b19d8d13efa1f76a59b964b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Sep 2023 14:21:10 +0000 Subject: [PATCH 44/44] Update dependencies from https://github.com/nuget/nuget.client build 6.8.0.122 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.8.0-rc.121 -> To Version 6.8.0-rc.122 --- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e47e08a5d96..2a1991ff48eb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -116,69 +116,69 @@ https://github.com/dotnet/aspnetcore fa54329186df2e11b40bdfec4ae08f16fdbe9d99 - + https://github.com/nuget/nuget.client - eb04000f97ade4add28a9e7447baaadee22ee863 + 0dd5a1ea536201af94725353e4bc711d7560b246 - + https://github.com/nuget/nuget.client - eb04000f97ade4add28a9e7447baaadee22ee863 + 0dd5a1ea536201af94725353e4bc711d7560b246 - + https://github.com/nuget/nuget.client - eb04000f97ade4add28a9e7447baaadee22ee863 + 0dd5a1ea536201af94725353e4bc711d7560b246 - + https://github.com/nuget/nuget.client - eb04000f97ade4add28a9e7447baaadee22ee863 + 0dd5a1ea536201af94725353e4bc711d7560b246 - + https://github.com/nuget/nuget.client - eb04000f97ade4add28a9e7447baaadee22ee863 + 0dd5a1ea536201af94725353e4bc711d7560b246 - + https://github.com/nuget/nuget.client - eb04000f97ade4add28a9e7447baaadee22ee863 + 0dd5a1ea536201af94725353e4bc711d7560b246 - + https://github.com/nuget/nuget.client - eb04000f97ade4add28a9e7447baaadee22ee863 + 0dd5a1ea536201af94725353e4bc711d7560b246 - + https://github.com/nuget/nuget.client - eb04000f97ade4add28a9e7447baaadee22ee863 + 0dd5a1ea536201af94725353e4bc711d7560b246 - + https://github.com/nuget/nuget.client - eb04000f97ade4add28a9e7447baaadee22ee863 + 0dd5a1ea536201af94725353e4bc711d7560b246 - + https://github.com/nuget/nuget.client - eb04000f97ade4add28a9e7447baaadee22ee863 + 0dd5a1ea536201af94725353e4bc711d7560b246 - + https://github.com/nuget/nuget.client - eb04000f97ade4add28a9e7447baaadee22ee863 + 0dd5a1ea536201af94725353e4bc711d7560b246 - + https://github.com/nuget/nuget.client - eb04000f97ade4add28a9e7447baaadee22ee863 + 0dd5a1ea536201af94725353e4bc711d7560b246 - + https://github.com/nuget/nuget.client - eb04000f97ade4add28a9e7447baaadee22ee863 + 0dd5a1ea536201af94725353e4bc711d7560b246 - + https://github.com/nuget/nuget.client - eb04000f97ade4add28a9e7447baaadee22ee863 + 0dd5a1ea536201af94725353e4bc711d7560b246 - + https://github.com/nuget/nuget.client - eb04000f97ade4add28a9e7447baaadee22ee863 + 0dd5a1ea536201af94725353e4bc711d7560b246 - + https://github.com/nuget/nuget.client - eb04000f97ade4add28a9e7447baaadee22ee863 + 0dd5a1ea536201af94725353e4bc711d7560b246 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 220e0ee6de36..531fce791e76 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,18 +64,18 @@ - 6.8.0-rc.121 - 6.8.0-rc.121 + 6.8.0-rc.122 + 6.8.0-rc.122 6.0.0-rc.278 - 6.8.0-rc.121 - 6.8.0-rc.121 - 6.8.0-rc.121 - 6.8.0-rc.121 - 6.8.0-rc.121 - 6.8.0-rc.121 - 6.8.0-rc.121 - 6.8.0-rc.121 - 6.8.0-rc.121 + 6.8.0-rc.122 + 6.8.0-rc.122 + 6.8.0-rc.122 + 6.8.0-rc.122 + 6.8.0-rc.122 + 6.8.0-rc.122 + 6.8.0-rc.122 + 6.8.0-rc.122 + 6.8.0-rc.122 $(NuGetPackagingPackageVersion) $(NuGetProjectModelPackageVersion)