From d587fcefdd478ee699836fcd3a8817d340f1d2ed Mon Sep 17 00:00:00 2001 From: Christopher Mann Date: Fri, 31 Jan 2025 15:38:03 +0100 Subject: [PATCH 01/35] Fix tag normalization for Azure Pipelines --- .../Agents/AzurePipelinesTests.cs | 39 +++++++++++++++++++ .../Agents/AzurePipelines.cs | 20 +++++++++- 2 files changed, 57 insertions(+), 2 deletions(-) diff --git a/src/GitVersion.BuildAgents.Tests/Agents/AzurePipelinesTests.cs b/src/GitVersion.BuildAgents.Tests/Agents/AzurePipelinesTests.cs index e647086ad3..79c27fb26c 100644 --- a/src/GitVersion.BuildAgents.Tests/Agents/AzurePipelinesTests.cs +++ b/src/GitVersion.BuildAgents.Tests/Agents/AzurePipelinesTests.cs @@ -77,4 +77,43 @@ public void AzurePipelinesBuildNumberWithSemVer(string buildNumberFormat, string var logMessage = this.buildServer.SetBuildNumber(vars); logMessage.ShouldBe(logPrefix + expectedBuildNumber); } + + [Test] + public void GetCurrentBranchShouldHandleBranches() + { + // Arrange + this.environment.SetEnvironmentVariable("BUILD_SOURCEBRANCH", $"refs/heads/{MainBranch}"); + + // Act + var result = this.buildServer.GetCurrentBranch(false); + + // Assert + result.ShouldBe($"refs/heads/{MainBranch}"); + } + + [Test] + public void GetCurrentBranchShouldHandleTags() + { + // Arrange + this.environment.SetEnvironmentVariable("BUILD_SOURCEBRANCH", "refs/tags/1.0.0"); + + // Act + var result = this.buildServer.GetCurrentBranch(false); + + // Assert + result.ShouldBeNull(); + } + + [Test] + public void GetCurrentBranchShouldHandlePullRequests() + { + // Arrange + this.environment.SetEnvironmentVariable("BUILD_SOURCEBRANCH", "refs/pull/1/merge"); + + // Act + var result = this.buildServer.GetCurrentBranch(false); + + // Assert + result.ShouldBe("refs/pull/1/merge"); + } } diff --git a/src/GitVersion.BuildAgents/Agents/AzurePipelines.cs b/src/GitVersion.BuildAgents/Agents/AzurePipelines.cs index c8fef2b6e6..ef5763ede1 100644 --- a/src/GitVersion.BuildAgents/Agents/AzurePipelines.cs +++ b/src/GitVersion.BuildAgents/Agents/AzurePipelines.cs @@ -17,8 +17,24 @@ public override string[] SetOutputVariables(string name, string? value) => $"##vso[task.setvariable variable=GitVersion.{name};isOutput=true]{value}" ]; - public override string? GetCurrentBranch(bool usingDynamicRepos) => Environment.GetEnvironmentVariable("GIT_BRANCH") - ?? Environment.GetEnvironmentVariable("BUILD_SOURCEBRANCH"); + public override string? GetCurrentBranch(bool usingDynamicRepos) + { + var gitBranch = Environment.GetEnvironmentVariable("GIT_BRANCH"); + if (gitBranch is not null) + return gitBranch; + + var sourceBranch = Environment.GetEnvironmentVariable("BUILD_SOURCEBRANCH"); + + // https://learn.microsoft.com/en-us/azure/devops/pipelines/build/variables?view=azure-devops&tabs=yaml + // BUILD_SOURCEBRANCH must be used only for "real" branches, not for tags. + // Azure Pipelines sets BUILD_SOURCEBRANCH to refs/tags/ when the pipeline is triggered for a tag. + if (sourceBranch?.StartsWith("refs/tags", StringComparison.OrdinalIgnoreCase) == true) + { + return null; + } + + return sourceBranch; + } public override bool PreventFetch() => true; From cbcbbbdaed0667c38d4c6bf5b52f24af6e5f46e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Apr 2025 15:57:08 +0000 Subject: [PATCH 02/35] (deps): Bump NUnit.Analyzers Bumps the analyzers group with 1 update in the /src directory: [NUnit.Analyzers](https://github.com/nunit/nunit.analyzers). Updates `NUnit.Analyzers` from 4.6.0 to 4.7.0 - [Release notes](https://github.com/nunit/nunit.analyzers/releases) - [Changelog](https://github.com/nunit/nunit.analyzers/blob/master/CHANGES.md) - [Commits](https://github.com/nunit/nunit.analyzers/compare/4.6.0...4.7.0) --- updated-dependencies: - dependency-name: NUnit.Analyzers dependency-type: direct:production update-type: version-update:semver-minor dependency-group: analyzers ... Signed-off-by: dependabot[bot] --- src/Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 929249a14b..79d109825a 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -33,7 +33,7 @@ - + From 4f1f51f2faef3e2a38ab19b8ba977034432a8fcd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 3 Apr 2025 16:17:56 +0000 Subject: [PATCH 03/35] (deps): Bump gitreleasemanager.tool from 0.19.0 to 0.20.0 in /build Bumps [gitreleasemanager.tool](https://github.com/GitTools/GitReleaseManager) from 0.19.0 to 0.20.0. - [Release notes](https://github.com/GitTools/GitReleaseManager/releases) - [Changelog](https://github.com/GitTools/GitReleaseManager/blob/develop/GitReleaseManager.yaml) - [Commits](https://github.com/GitTools/GitReleaseManager/compare/0.19.0...0.20.0) --- updated-dependencies: - dependency-name: gitreleasemanager.tool dependency-version: 0.20.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .config/dotnet-tools.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index d9737dcf19..3ad6694334 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "gitreleasemanager.tool": { - "version": "0.19.0", + "version": "0.20.0", "commands": [ "dotnet-gitreleasemanager" ] From 9f44a44529d0518b042ce9216f1fc0ff9783d7bc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Apr 2025 15:34:56 +0000 Subject: [PATCH 04/35] (deps): Bump the microsoft group across 2 directories with 1 update Bumps the microsoft group with 1 update in the /new-cli directory: [System.IO.Abstractions](https://github.com/TestableIO/System.IO.Abstractions). Bumps the microsoft group with 1 update in the /src directory: [System.IO.Abstractions](https://github.com/TestableIO/System.IO.Abstractions). Updates `System.IO.Abstractions` from 22.0.12 to 22.0.13 - [Release notes](https://github.com/TestableIO/System.IO.Abstractions/releases) - [Commits](https://github.com/TestableIO/System.IO.Abstractions/compare/v22.0.12...v22.0.13) Updates `System.IO.Abstractions` from 22.0.12 to 22.0.13 - [Release notes](https://github.com/TestableIO/System.IO.Abstractions/releases) - [Commits](https://github.com/TestableIO/System.IO.Abstractions/compare/v22.0.12...v22.0.13) --- updated-dependencies: - dependency-name: System.IO.Abstractions dependency-version: 22.0.13 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: microsoft - dependency-name: System.IO.Abstractions dependency-version: 22.0.13 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: microsoft ... Signed-off-by: dependabot[bot] --- new-cli/Directory.Packages.props | 2 +- src/Directory.Packages.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/new-cli/Directory.Packages.props b/new-cli/Directory.Packages.props index e2bba2fc2e..04a79f1e43 100644 --- a/new-cli/Directory.Packages.props +++ b/new-cli/Directory.Packages.props @@ -21,7 +21,7 @@ - + \ No newline at end of file diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 79d109825a..93909ca702 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -38,7 +38,7 @@ - + From cb0743f986ccea9f8a55da6d7c202cac712db3b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C3=BC=C3=A7=C3=BCk?= Date: Wed, 2 Apr 2025 20:22:24 +0300 Subject: [PATCH 05/35] Make sure custom configuration file path is returned when custom configuration is set Introduce a new test method `ReturnConfigurationFilePathIfCustomConfigurationIsSet` in `ConfigurationFileLocatorTests.cs` to verify custom config file handling. Update `GitVersion.Configuration.Tests.csproj` to copy `Configuration/CustomConfig.yaml` to the output directory. Enhance `GetConfigurationFile` method in `ConfigurationFileLocator.cs` to return the custom config file path if set and exists. Add `CustomConfig.yaml` with various versioning settings. --- .../ConfigurationFileLocatorTests.cs | 34 ++++++++++--- .../ConfigurationFileLocator.cs | 50 ++++++++++++------- .../IConfigurationFileLocator.cs | 2 +- src/GitVersion.Core/PublicAPI.Shipped.txt | 2 +- 4 files changed, 62 insertions(+), 26 deletions(-) diff --git a/src/GitVersion.Configuration.Tests/Configuration/ConfigurationFileLocatorTests.cs b/src/GitVersion.Configuration.Tests/Configuration/ConfigurationFileLocatorTests.cs index 1074bc07d7..89393ec5cb 100644 --- a/src/GitVersion.Configuration.Tests/Configuration/ConfigurationFileLocatorTests.cs +++ b/src/GitVersion.Configuration.Tests/Configuration/ConfigurationFileLocatorTests.cs @@ -154,19 +154,39 @@ public void DoNotThrowWhenWorkingAndRepoPathsAreSame_WithDifferentCasing() } [Test] - public void DoNotThrowWhenFileNameAreSame_WithDifferentCasing() + public void ReturnConfigurationFilePathIfCustomConfigurationIsSet() { this.workingPath = this.repoPath; + string configurationFilePath = Path.Combine(this.workingPath, "Configuration", "CustomConfig.yaml"); - this.gitVersionOptions = new() { ConfigurationInfo = { ConfigurationFile = "MyConfig.yaml" } }; + this.gitVersionOptions = new() { ConfigurationInfo = { ConfigurationFile = configurationFilePath } }; + + var serviceProvider = GetServiceProvider(this.gitVersionOptions); + this.fileSystem = serviceProvider.GetRequiredService(); + + using var _ = this.fileSystem.SetupConfigFile( + path: Path.Combine(this.workingPath, "Configuration"), fileName: "CustomConfig.yaml" + ); + this.configFileLocator = serviceProvider.GetRequiredService(); + + var config = this.configFileLocator.GetConfigurationFile(this.workingPath); + config.ShouldBe(configurationFilePath); + } + + [TestCase(null)] + [TestCase("")] + [TestCase(" ")] + [TestCase("Configuration/CustomConfig2.yaml")] + public void ReturnConfigurationFilePathIfCustomConfigurationIsSet_InvalidConfigurationFilePaths(string? configFile) + { + this.workingPath = this.repoPath; + + this.gitVersionOptions = new() { ConfigurationInfo = { ConfigurationFile = configFile } }; var sp = GetServiceProvider(this.gitVersionOptions); this.configFileLocator = sp.GetRequiredService(); - this.fileSystem = sp.GetRequiredService(); - - using var _ = this.fileSystem.SetupConfigFile(path: this.workingPath, fileName: ConfigFile.ToLower()); - var config = Should.NotThrow(() => this.configFileLocator.GetConfigurationFile(this.workingPath)); - config.ShouldNotBe(null); + var config = this.configFileLocator.GetConfigurationFile(this.workingPath); + config.ShouldBe(null); } [Test] diff --git a/src/GitVersion.Configuration/ConfigurationFileLocator.cs b/src/GitVersion.Configuration/ConfigurationFileLocator.cs index c2a3ecbafa..1cdddbb560 100644 --- a/src/GitVersion.Configuration/ConfigurationFileLocator.cs +++ b/src/GitVersion.Configuration/ConfigurationFileLocator.cs @@ -38,32 +38,48 @@ public void Verify(string? workingDirectory, string? projectRootDirectory) WarnAboutAmbiguousConfigFileSelection(workingDirectory, projectRootDirectory); } - public string? GetConfigurationFile(string? directory) + public string? GetConfigurationFile(string? directoryPath) { - if (directory is null) return null; + string? customConfigurationFile = GetCustomConfigurationFilePathIfEligable(directoryPath); + if (!string.IsNullOrWhiteSpace(customConfigurationFile)) + { + return customConfigurationFile; + } - string[] candidates = !string.IsNullOrWhiteSpace(this.ConfigurationFile) - ? [this.ConfigurationFile, .. this.SupportedConfigFileNames] - : this.SupportedConfigFileNames; + if (string.IsNullOrWhiteSpace(directoryPath) || !fileSystem.Directory.Exists(directoryPath)) + { + return null; + } - foreach (var fileName in candidates) + string[] files = fileSystem.Directory.GetFiles(directoryPath); + foreach (var fileName in this.SupportedConfigFileNames) { - this.log.Debug($"Trying to find configuration file {fileName} at '{directory}'"); - if (directory != null && fileSystem.Directory.Exists(directory)) + this.log.Debug($"Trying to find configuration file {fileName} at '{directoryPath}'"); + string? matchingFile = files.FirstOrDefault(file => string.Equals(PathHelper.GetFileName(file), fileName, StringComparison.OrdinalIgnoreCase)); + if (matchingFile != null) { - var files = fileSystem.Directory.GetFiles(directory); + this.log.Info($"Found configuration file at '{matchingFile}'"); + return matchingFile; + } + } - var matchingFile = files.FirstOrDefault(file => - string.Equals(fileSystem.Path.GetFileName(file), fileName, StringComparison.OrdinalIgnoreCase)); + return null; + } - if (matchingFile != null) - { - this.log.Info($"Found configuration file at '{matchingFile}'"); - return matchingFile; - } + private string? GetCustomConfigurationFilePathIfEligable(string? directoryPath) + { + if (!string.IsNullOrWhiteSpace(this.ConfigurationFile)) + { + string configurationFilePath = this.ConfigurationFile; + if (!string.IsNullOrWhiteSpace(directoryPath)) + { + configurationFilePath = Path.Combine(directoryPath, this.ConfigurationFile); } - this.log.Debug($"Configuration file {fileName} not found at '{directory}'"); + if (fileSystem.File.Exists(configurationFilePath)) + { + return configurationFilePath; + } } return null; diff --git a/src/GitVersion.Core/Configuration/IConfigurationFileLocator.cs b/src/GitVersion.Core/Configuration/IConfigurationFileLocator.cs index 2ab64908cd..24ff54d935 100644 --- a/src/GitVersion.Core/Configuration/IConfigurationFileLocator.cs +++ b/src/GitVersion.Core/Configuration/IConfigurationFileLocator.cs @@ -3,5 +3,5 @@ namespace GitVersion.Configuration; public interface IConfigurationFileLocator { void Verify(string? workingDirectory, string? projectRootDirectory); - string? GetConfigurationFile(string? directory); + string? GetConfigurationFile(string? directoryPath); } diff --git a/src/GitVersion.Core/PublicAPI.Shipped.txt b/src/GitVersion.Core/PublicAPI.Shipped.txt index a2138c8c06..6b0a485718 100644 --- a/src/GitVersion.Core/PublicAPI.Shipped.txt +++ b/src/GitVersion.Core/PublicAPI.Shipped.txt @@ -113,7 +113,7 @@ GitVersion.Configuration.IConfigurationBuilder GitVersion.Configuration.IConfigurationBuilder.AddOverride(System.Collections.Generic.IReadOnlyDictionary! value) -> void GitVersion.Configuration.IConfigurationBuilder.Build() -> GitVersion.Configuration.IGitVersionConfiguration! GitVersion.Configuration.IConfigurationFileLocator -GitVersion.Configuration.IConfigurationFileLocator.GetConfigurationFile(string? directory) -> string? +GitVersion.Configuration.IConfigurationFileLocator.GetConfigurationFile(string? directoryPath) -> string? GitVersion.Configuration.IConfigurationFileLocator.Verify(string? workingDirectory, string? projectRootDirectory) -> void GitVersion.Configuration.IConfigurationProvider GitVersion.Configuration.IConfigurationProvider.Provide(System.Collections.Generic.IReadOnlyDictionary? overrideConfiguration = null) -> GitVersion.Configuration.IGitVersionConfiguration! From e40125e4f7dc632e1f5ed212b34d6c2255c33dce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Apr 2025 16:50:09 +0000 Subject: [PATCH 06/35] (deps): Bump Microsoft.CSharp and Scriban in /new-cli Bumps Microsoft.CSharp and [Scriban](https://github.com/scriban/scriban). These dependencies needed to be updated together. Updates `Microsoft.CSharp` from 4.7.0 to 4.5.0 Updates `Scriban` from 6.1.0 to 6.2.0 - [Release notes](https://github.com/scriban/scriban/releases) - [Changelog](https://github.com/scriban/scriban/blob/master/changelog.md) - [Commits](https://github.com/scriban/scriban/compare/6.1.0...6.2.0) --- updated-dependencies: - dependency-name: Microsoft.CSharp dependency-version: 4.5.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: Scriban dependency-version: 6.2.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- new-cli/Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/new-cli/Directory.Packages.props b/new-cli/Directory.Packages.props index 04a79f1e43..410604b47e 100644 --- a/new-cli/Directory.Packages.props +++ b/new-cli/Directory.Packages.props @@ -15,7 +15,7 @@ - + From 34967b3b45d1bd5b4cc7ad4a6e4d07f9850c3024 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 15:40:59 +0000 Subject: [PATCH 07/35] (deps): Bump dotnet-sdk from 9.0.202 to 9.0.203 Bumps [dotnet-sdk](https://github.com/dotnet/sdk) from 9.0.202 to 9.0.203. - [Release notes](https://github.com/dotnet/sdk/releases) - [Commits](https://github.com/dotnet/sdk/compare/v9.0.202...v9.0.203) --- updated-dependencies: - dependency-name: dotnet-sdk dependency-version: 9.0.203 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 983865216b..dfbf12676d 100644 --- a/global.json +++ b/global.json @@ -5,6 +5,6 @@ "src" ], "sdk": { - "version": "9.0.202" + "version": "9.0.203" } } From c7be882921c4cde14f8316f5499199cc98342323 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 16:52:55 +0000 Subject: [PATCH 08/35] (deps): Bump the microsoft group across 2 directories with 10 updates Bumps the microsoft group with 3 updates in the /new-cli directory: [System.Text.Json](https://github.com/dotnet/runtime), [Microsoft.Extensions.DependencyInjection.Abstractions](https://github.com/dotnet/runtime) and [System.CommandLine](https://github.com/dotnet/command-line-api). Bumps the microsoft group with 8 updates in the /src directory: | Package | From | To | | --- | --- | --- | | [Microsoft.Extensions.DependencyInjection.Abstractions](https://github.com/dotnet/runtime) | `9.0.3` | `9.0.4` | | [Microsoft.Extensions.Configuration.CommandLine](https://github.com/dotnet/runtime) | `9.0.3` | `9.0.4` | | [Microsoft.Extensions.DependencyInjection](https://github.com/dotnet/runtime) | `9.0.3` | `9.0.4` | | [Microsoft.Extensions.FileSystemGlobbing](https://github.com/dotnet/runtime) | `9.0.3` | `9.0.4` | | [Microsoft.Extensions.FileSystemGlobbing](https://github.com/dotnet/runtime) | `9.0.3` | `9.0.4` | | [Microsoft.Extensions.Hosting](https://github.com/dotnet/runtime) | `9.0.3` | `9.0.4` | | [Microsoft.Bcl.AsyncInterfaces](https://github.com/dotnet/runtime) | `9.0.3` | `9.0.4` | | [System.Drawing.Common](https://github.com/dotnet/winforms) | `9.0.3` | `9.0.4` | | [System.Security.Cryptography.Xml](https://github.com/dotnet/runtime) | `9.0.3` | `9.0.4` | Updates `System.Text.Json` from 9.0.3 to 9.0.4 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v9.0.3...v9.0.4) Updates `Microsoft.Extensions.DependencyInjection.Abstractions` from 9.0.3 to 9.0.4 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v9.0.3...v9.0.4) Updates `System.CommandLine` from 2.0.0-beta5.25174.1 to 2.0.0-beta5.25208.1 - [Release notes](https://github.com/dotnet/command-line-api/releases) - [Changelog](https://github.com/dotnet/command-line-api/blob/main/docs/History.md) - [Commits](https://github.com/dotnet/command-line-api/commits) Updates `Microsoft.Extensions.DependencyInjection.Abstractions` from 9.0.3 to 9.0.4 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v9.0.3...v9.0.4) Updates `Microsoft.Extensions.Configuration.CommandLine` from 9.0.3 to 9.0.4 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v9.0.3...v9.0.4) Updates `Microsoft.Extensions.DependencyInjection` from 9.0.3 to 9.0.4 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v9.0.3...v9.0.4) Updates `Microsoft.Extensions.FileSystemGlobbing` from 9.0.3 to 9.0.4 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v9.0.3...v9.0.4) Updates `Microsoft.Extensions.FileSystemGlobbing` from 9.0.3 to 9.0.4 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v9.0.3...v9.0.4) Updates `Microsoft.Extensions.Hosting` from 9.0.3 to 9.0.4 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v9.0.3...v9.0.4) Updates `Microsoft.Bcl.AsyncInterfaces` from 9.0.3 to 9.0.4 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v9.0.3...v9.0.4) Updates `System.Drawing.Common` from 9.0.3 to 9.0.4 - [Release notes](https://github.com/dotnet/winforms/releases) - [Changelog](https://github.com/dotnet/winforms/blob/main/docs/release-activity.md) - [Commits](https://github.com/dotnet/winforms/compare/v9.0.3...v9.0.4) Updates `System.Security.Cryptography.Xml` from 9.0.3 to 9.0.4 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v9.0.3...v9.0.4) --- updated-dependencies: - dependency-name: System.Text.Json dependency-version: 9.0.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: microsoft - dependency-name: Microsoft.Extensions.DependencyInjection.Abstractions dependency-version: 9.0.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: microsoft - dependency-name: System.CommandLine dependency-version: 2.0.0-beta5.25208.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: microsoft - dependency-name: Microsoft.Extensions.DependencyInjection.Abstractions dependency-version: 9.0.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: microsoft - dependency-name: Microsoft.Extensions.Configuration.CommandLine dependency-version: 9.0.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: microsoft - dependency-name: Microsoft.Extensions.DependencyInjection dependency-version: 9.0.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: microsoft - dependency-name: Microsoft.Extensions.FileSystemGlobbing dependency-version: 9.0.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: microsoft - dependency-name: Microsoft.Extensions.FileSystemGlobbing dependency-version: 9.0.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: microsoft - dependency-name: Microsoft.Extensions.Hosting dependency-version: 9.0.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: microsoft - dependency-name: Microsoft.Bcl.AsyncInterfaces dependency-version: 9.0.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: microsoft - dependency-name: System.Drawing.Common dependency-version: 9.0.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: microsoft - dependency-name: System.Security.Cryptography.Xml dependency-version: 9.0.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: microsoft ... Signed-off-by: dependabot[bot] --- new-cli/Directory.Packages.props | 6 +++--- src/Directory.Packages.props | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/new-cli/Directory.Packages.props b/new-cli/Directory.Packages.props index 410604b47e..872e70e7c0 100644 --- a/new-cli/Directory.Packages.props +++ b/new-cli/Directory.Packages.props @@ -10,7 +10,7 @@ - + @@ -20,8 +20,8 @@ - + - + \ No newline at end of file diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 93909ca702..15fa851a8d 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -11,8 +11,8 @@ - - + + @@ -22,13 +22,13 @@ - + - - - - + + + + @@ -37,11 +37,11 @@ - + - - + + From eaebe640d45a6fa07c05c673bdb8a7c23143b100 Mon Sep 17 00:00:00 2001 From: Artur Stolear Date: Thu, 10 Apr 2025 14:41:15 +0200 Subject: [PATCH 09/35] removes redundant charset definition removes the charset definition from the .editorconfig file, as it's no longer needed and can be inferred. --- .editorconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index 317101a73a..d1769eb231 100644 --- a/.editorconfig +++ b/.editorconfig @@ -2,7 +2,6 @@ # top-most EditorConfig file root = true -charset = utf-8 [*] indent_style = space From 49f7ff8b94bb9b9ef4828614ae31a6d3ce4085e1 Mon Sep 17 00:00:00 2001 From: Artur Stolear Date: Thu, 10 Apr 2025 15:11:20 +0200 Subject: [PATCH 10/35] Removes build server output type when running in diag mode. --- build/.run/Generate Schemas.run.xml | 1 + build/common/Addins/GitVersion/GitVersionOutput.cs | 4 +++- src/GitVersion.App/GitVersionExecutor.cs | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build/.run/Generate Schemas.run.xml b/build/.run/Generate Schemas.run.xml index e4dcf435a9..e009ddc54a 100644 --- a/build/.run/Generate Schemas.run.xml +++ b/build/.run/Generate Schemas.run.xml @@ -18,6 +18,7 @@