From 8afff317a0654813faccdc7fba19cdf838ef4200 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 19:28:49 +0000 Subject: [PATCH 1/5] Bump Nuke.Common from 8.1.4 to 9.0.1 Bumps [Nuke.Common](https://github.com/nuke-build/nuke) from 8.1.4 to 9.0.1. - [Release notes](https://github.com/nuke-build/nuke/releases) - [Changelog](https://github.com/nuke-build/nuke/blob/develop/CHANGELOG.md) - [Commits](https://github.com/nuke-build/nuke/compare/8.1.4...9.0.1) --- updated-dependencies: - dependency-name: Nuke.Common dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- build/Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Directory.Packages.props b/build/Directory.Packages.props index 7557b84b29..1ddf1b893b 100644 --- a/build/Directory.Packages.props +++ b/build/Directory.Packages.props @@ -3,7 +3,7 @@ - + From 2d743c8125bf962cf94379c0bc0ff325da3515ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= Date: Fri, 22 Nov 2024 10:46:58 +0100 Subject: [PATCH 2/5] drop unneeded dependency --- build/Directory.Packages.props | 1 - 1 file changed, 1 deletion(-) diff --git a/build/Directory.Packages.props b/build/Directory.Packages.props index 1ddf1b893b..092733c4f7 100644 --- a/build/Directory.Packages.props +++ b/build/Directory.Packages.props @@ -5,6 +5,5 @@ - From 6216d8e7c655525d4ef5457b829815997e87ef29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= Date: Fri, 22 Nov 2024 10:47:20 +0100 Subject: [PATCH 3/5] build fixes --- build/Build.Steps.cs | 18 +++++++++--------- build/_build.csproj | 1 - 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/build/Build.Steps.cs b/build/Build.Steps.cs index e891b882b1..19c3bb11e9 100644 --- a/build/Build.Steps.cs +++ b/build/Build.Steps.cs @@ -79,7 +79,7 @@ DotNetRestoreSettings Restore(DotNetRestoreSettings s) => .SetVerbosity(DotNetVerbosity.normal) .SetProperty("configuration", BuildConfiguration.ToString()) .SetPlatform(Platform) - .When(!string.IsNullOrEmpty(NuGetPackagesDirectory), o => o.SetPackageDirectory(NuGetPackagesDirectory)); + .When(_ => !string.IsNullOrEmpty(NuGetPackagesDirectory), o => o.SetPackageDirectory(NuGetPackagesDirectory)); if (LibraryVersion.TryGetVersions(project.Name, Platform, out var libraryVersions)) { @@ -162,7 +162,7 @@ DotNetRestoreSettings Restore(DotNetRestoreSettings s) => .SetNoRestore(true) // project w/ packages.config can't do the restore via dotnet CLI .SetPlatform(Platform) .SetConfiguration(BuildConfiguration) - .When(TestTargetFramework != TargetFramework.NOT_SPECIFIED, + .When(_ => TestTargetFramework != TargetFramework.NOT_SPECIFIED, x => x.SetFramework(TestTargetFramework))); continue; @@ -192,7 +192,7 @@ DotNetBuildSettings BuildTestApplication(DotNetBuildSettings x) => .SetConfiguration(BuildConfiguration) .SetPlatform(Platform) .SetNoRestore(NoRestore) - .When(TestTargetFramework != TargetFramework.NOT_SPECIFIED, + .When(_ =>TestTargetFramework != TargetFramework.NOT_SPECIFIED, s => s.SetFramework(actualTestTfm)); if (LibraryVersion.Versions.TryGetValue(app.Name, out var libraryVersions)) @@ -221,7 +221,7 @@ DotNetBuildSettings BuildTestApplication(DotNetBuildSettings x) => .SetProjectFile(project) .SetConfiguration(BuildConfiguration) .SetNoRestore(NoRestore) - .When(TestTargetFramework != TargetFramework.NOT_SPECIFIED, + .When(_ => TestTargetFramework != TargetFramework.NOT_SPECIFIED, s => s.SetFramework(TestTargetFramework))); } }); @@ -455,7 +455,7 @@ void RemoveFilesInNetFolderAvailableInAdditionalStore() .SetProjectFile(Solution.GetProjectByName(Projects.Mocks.AutoInstrumentationMock)) .SetConfiguration(BuildConfiguration) .SetNoRestore(NoRestore) - .When(TestTargetFramework != TargetFramework.NOT_SPECIFIED, + .When(_ => TestTargetFramework != TargetFramework.NOT_SPECIFIED, s => s.SetFramework(TestTargetFramework)) ); }); @@ -502,7 +502,7 @@ void RemoveFilesInNetFolderAvailableInAdditionalStore() .SetNoRestore(NoRestore) .SetProcessEnvironmentVariable("OTEL_DOTNET_AUTO_LOG_DIRECTORY", ProfilerTestLogs) .EnableNoBuild() - .When(TestTargetFramework != TargetFramework.NOT_SPECIFIED, + .When(_ => TestTargetFramework != TargetFramework.NOT_SPECIFIED, x => x.SetFramework(TestTargetFramework)) .CombineWith(unitTestProjects, (s, project) => s .EnableTrxLogOutput(GetResultsDirectory(project)) @@ -531,7 +531,7 @@ void RemoveFilesInNetFolderAvailableInAdditionalStore() .EnableTrxLogOutput(GetResultsDirectory(project)) .SetTargetPath(project) .SetRestore(!NoRestore) - .When(TestTargetFramework != TargetFramework.NOT_SPECIFIED, + .When(_ => TestTargetFramework != TargetFramework.NOT_SPECIFIED, s => s.SetProperty("TargetFramework", TestTargetFramework.ToString())) .RunTests() ); @@ -713,7 +713,7 @@ private void RunBootstrappingTests() .EnableTrxLogOutput(GetResultsDirectory(project)) .SetProjectFile(project) .SetFilter(AndFilter(TestNameFilter(), testName)) - .When(TestTargetFramework != TargetFramework.NOT_SPECIFIED, s => s.SetFramework(TestTargetFramework)) + .When(_ => TestTargetFramework != TargetFramework.NOT_SPECIFIED, s => s.SetFramework(TestTargetFramework)) .SetProcessEnvironmentVariable("OTEL_DOTNET_AUTO_LOG_DIRECTORY", ProfilerTestLogs) .SetProcessEnvironmentVariable("BOOSTRAPPING_TESTS", "true")); } @@ -734,7 +734,7 @@ private void RestoreLegacyNuGetPackagesConfig(IEnumerable legacyRestore .SetTargetPath(project) .SetSolutionDirectory(Solution.Directory) .SetVerbosity(NuGetVerbosity.Normal) - .When(!string.IsNullOrEmpty(NuGetPackagesDirectory), o => + .When(_ => !string.IsNullOrEmpty(NuGetPackagesDirectory), o => o.SetPackagesDirectory(NuGetPackagesDirectory))); } } diff --git a/build/_build.csproj b/build/_build.csproj index 164391e725..4556dd88d8 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -16,7 +16,6 @@ - From 21042b6f887b4eea96807e8afaa07fbab9e580d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 19:28:43 +0000 Subject: [PATCH 4/5] Bump nuke.globaltool from 8.1.4 to 9.0.1 Bumps [nuke.globaltool](https://github.com/nuke-build/nuke) from 8.1.4 to 9.0.1. - [Release notes](https://github.com/nuke-build/nuke/releases) - [Changelog](https://github.com/nuke-build/nuke/blob/develop/CHANGELOG.md) - [Commits](https://github.com/nuke-build/nuke/compare/8.1.4...9.0.1) --- updated-dependencies: - dependency-name: nuke.globaltool dependency-type: direct:production update-type: version-update:semver-major ... 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 83fc41ce19..e383e75d13 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "nuke.globaltool": { - "version": "8.1.4", + "version": "9.0.1", "commands": [ "nuke" ] From 3ec02882dc64c18c62ac7847706569d35b2b524f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= Date: Fri, 22 Nov 2024 11:09:02 +0100 Subject: [PATCH 5/5] Fix passing arguments by SetApplicationArguments on DotNetSettings --- build/Build.Steps.Windows.cs | 2 +- build/Build.Steps.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/Build.Steps.Windows.cs b/build/Build.Steps.Windows.cs index 27dda070a3..e30832be7b 100644 --- a/build/Build.Steps.Windows.cs +++ b/build/Build.Steps.Windows.cs @@ -291,7 +291,7 @@ private void RunNetFxGacOperation(string operation) DotNetRun(s => s .SetProjectFile(installTool) .SetConfiguration(BuildConfiguration) - .SetApplicationArguments($"{operation} {netFxAssembliesFolder}")); + .SetApplicationArguments(operation, netFxAssembliesFolder)); static bool IsWindowsAdministrator() { diff --git a/build/Build.Steps.cs b/build/Build.Steps.cs index 19c3bb11e9..ff4a92ef87 100644 --- a/build/Build.Steps.cs +++ b/build/Build.Steps.cs @@ -365,7 +365,7 @@ void RemoveFilesInNetFolderAvailableInAdditionalStore() DotNetRun(s => s .SetProjectFile(verifier) - .SetApplicationArguments($"--verify {RootDirectory}")); + .SetApplicationArguments("--verify", RootDirectory)); }); Target GenerateLibraryVersionFiles => _ => _