Bump Nuke.Common from 6.3.0 to 7.0.0 (#2523)
* Bump Nuke.Common from 6.3.0 to 7.0.0 Bumps [Nuke.Common](https://github.com/nuke-build/nuke) from 6.3.0 to 7.0.0. - [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/6.3.0...7.0.0) --- updated-dependencies: - dependency-name: Nuke.Common dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * Bump nuke.globaltool from 6.3.0 to 7.0.0 Bumps [nuke.globaltool](https://github.com/nuke-build/nuke) from 6.3.0 to 7.0.0. - [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/6.3.0...7.0.0) --- updated-dependencies: - dependency-name: nuke.globaltool dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * Change the way to reference local tools * Fix arguments https://github.com/nuke-build/nuke/issues/1163#issuecomment-1538223635 * Stop using deprecated methods * Fix deprecated methods --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Piotr Kiełkowicz <pkiekowicz@splunk.com>
This commit is contained in:
dependabot[bot]
GitHub
parent
6f4e6a6799
commit
74987db9ec
|
|
@ -3,7 +3,7 @@
|
|||
"isRoot": true,
|
||||
"tools": {
|
||||
"nuke.globaltool": {
|
||||
"version": "6.3.0",
|
||||
"version": "7.0.0",
|
||||
"commands": [
|
||||
"nuke"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -44,8 +44,8 @@ partial class Build
|
|||
.Description("Setup the \"runtimes/{platform}-{architecture}/native\" folders under \"nuget/OpenTelemetry.AutoInstrumentation.Runtime.Native\".")
|
||||
.Executes(() =>
|
||||
{
|
||||
const string ciArtifactsDirectory = "bin/ci-artifacts";
|
||||
const string baseRuntimeNativePath = "./nuget/OpenTelemetry.AutoInstrumentation.Runtime.Native/";
|
||||
var ciArtifactsDirectory = RootDirectory / "bin" / "ci-artifacts";
|
||||
var baseRuntimeNativePath = RootDirectory / "nuget" / "OpenTelemetry.AutoInstrumentation.Runtime.Native/";
|
||||
|
||||
var requiredArtifacts = new string[]
|
||||
{
|
||||
|
|
@ -58,12 +58,11 @@ partial class Build
|
|||
|
||||
foreach (var artifactFolder in requiredArtifacts)
|
||||
{
|
||||
var sourcePath = Path.Combine(ciArtifactsDirectory, artifactFolder);
|
||||
var sourcePath = ciArtifactsDirectory / artifactFolder;
|
||||
|
||||
var platformAndArchitecture = Path.GetFileName(artifactFolder);
|
||||
var destinationPath =
|
||||
Path.Combine(baseRuntimeNativePath, "runtimes", platformAndArchitecture, "native");
|
||||
DeleteDirectory(destinationPath);
|
||||
var destinationPath = baseRuntimeNativePath / "runtimes" / platformAndArchitecture / "native";
|
||||
destinationPath.DeleteDirectory();
|
||||
|
||||
CopyDirectoryRecursively(sourcePath, destinationPath);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
using Nuke.Common;
|
||||
using Nuke.Common.IO;
|
||||
using Nuke.Common.Tooling;
|
||||
using Serilog;
|
||||
using static Nuke.Common.EnvironmentInfo;
|
||||
using static Nuke.Common.IO.FileSystemTasks;
|
||||
|
|
@ -13,12 +14,14 @@ partial class Build
|
|||
.Executes(() =>
|
||||
{
|
||||
var buildDirectory = NativeProfilerProject.Directory / "build";
|
||||
EnsureExistingDirectory(buildDirectory);
|
||||
buildDirectory.CreateDirectory();
|
||||
|
||||
CMake.Value(
|
||||
arguments: "../ -DCMAKE_BUILD_TYPE=Release",
|
||||
arguments: $"../ -DCMAKE_BUILD_TYPE=Release",
|
||||
workingDirectory: buildDirectory);
|
||||
Make.Value(
|
||||
arguments: $"",
|
||||
workingDirectory: buildDirectory);
|
||||
Make.Value(workingDirectory: buildDirectory);
|
||||
});
|
||||
|
||||
Target CompileNativeTestsLinux => _ => _
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@ partial class Build
|
|||
.Executes(() =>
|
||||
{
|
||||
var nativeProjectDirectory = NativeProfilerProject.Directory;
|
||||
CMake.Value(arguments: ".", workingDirectory: nativeProjectDirectory);
|
||||
Make.Value(workingDirectory: nativeProjectDirectory);
|
||||
CMake.Value(arguments: $".", workingDirectory: nativeProjectDirectory);
|
||||
Make.Value(arguments: $"", workingDirectory: nativeProjectDirectory);
|
||||
});
|
||||
|
||||
Target PublishNativeProfilerMacOs => _ => _
|
||||
|
|
|
|||
|
|
@ -93,9 +93,9 @@ partial class Build
|
|||
var project = Solution.GetProject(Projects.Tests.AutoInstrumentationNativeTests);
|
||||
var workingDirectory = project.Directory / "bin" / BuildConfiguration.ToString() / Platform.ToString();
|
||||
var exePath = workingDirectory / $"{project.Name}.exe";
|
||||
var testExe = ToolResolver.GetLocalTool(exePath);
|
||||
var testExe = ToolResolver.GetTool(exePath);
|
||||
|
||||
testExe("--gtest_output=xml", workingDirectory: workingDirectory);
|
||||
testExe($"--gtest_output=xml", workingDirectory: workingDirectory);
|
||||
});
|
||||
|
||||
Target PublishIisTestApplications => _ => _
|
||||
|
|
|
|||
|
|
@ -55,10 +55,10 @@ partial class Build
|
|||
.Unlisted()
|
||||
.Executes(() =>
|
||||
{
|
||||
EnsureExistingDirectory(TracerHomeDirectory);
|
||||
EnsureExistingDirectory(NuGetArtifactsDirectory);
|
||||
EnsureExistingDirectory(BuildDataDirectory);
|
||||
EnsureExistingDirectory(ProfilerTestLogs);
|
||||
TracerHomeDirectory.CreateDirectory();
|
||||
NuGetArtifactsDirectory.CreateDirectory();
|
||||
BuildDataDirectory.CreateDirectory();
|
||||
ProfilerTestLogs.CreateDirectory();
|
||||
});
|
||||
|
||||
Target Restore => _ => _
|
||||
|
|
@ -248,11 +248,11 @@ partial class Build
|
|||
.SetOutput(TracerHomeDirectory / MapToFolderOutput(TargetFramework.NET6_0)));
|
||||
|
||||
// Remove non-library files
|
||||
TracerHomeDirectory.GlobFiles("**/*.xml").ForEach(DeleteFile);
|
||||
(TracerHomeDirectory / "net").GlobFiles("*.json").ForEach(DeleteFile);
|
||||
TracerHomeDirectory.GlobFiles("**/*.xml").ForEach(file => file.DeleteFile());
|
||||
(TracerHomeDirectory / "net").GlobFiles("*.json").ForEach(file => file.DeleteFile());
|
||||
if (IsWin)
|
||||
{
|
||||
(TracerHomeDirectory / "netfx").GlobFiles("*.json").ForEach(DeleteFile);
|
||||
(TracerHomeDirectory / "netfx").GlobFiles("*.json").ForEach(file => file.DeleteFile());
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -444,10 +444,10 @@ partial class Build
|
|||
var depsJson = JsonNode.Parse(rawJson).AsObject();
|
||||
|
||||
var folderRuntimeName = depsJson.GetFolderRuntimeName();
|
||||
var architectureStores = new List<string>
|
||||
var architectureStores = new List<AbsolutePath>
|
||||
{
|
||||
Path.Combine(StoreDirectory, "x64", folderRuntimeName),
|
||||
Path.Combine(StoreDirectory, "x86", folderRuntimeName),
|
||||
StoreDirectory / "x64" / folderRuntimeName,
|
||||
StoreDirectory / "x86" / folderRuntimeName,
|
||||
}.AsReadOnly();
|
||||
|
||||
depsJson.CopyNativeDependenciesToStore(file, architectureStores);
|
||||
|
|
@ -469,8 +469,8 @@ partial class Build
|
|||
});
|
||||
|
||||
// Cleanup Additional Deps Directory
|
||||
AdditionalDepsDirectory.GlobFiles("**/*.dll", "**/*.pdb", "**/*.xml", "**/*.dylib", "**/*.so").ForEach(DeleteFile);
|
||||
AdditionalDepsDirectory.GlobDirectories("**/runtimes").ForEach(DeleteDirectory);
|
||||
AdditionalDepsDirectory.GlobFiles("**/*.dll", "**/*.pdb", "**/*.xml", "**/*.dylib", "**/*.so").ForEach(file => file.DeleteFile());
|
||||
AdditionalDepsDirectory.GlobDirectories("**/runtimes").ForEach(directory => directory.DeleteDirectory());
|
||||
});
|
||||
|
||||
Target PublishRuleEngineJson => _ => _
|
||||
|
|
|
|||
|
|
@ -61,14 +61,14 @@ partial class Build : NukeBuild
|
|||
DeleteReparsePoints(SourceDirectory);
|
||||
DeleteReparsePoints(TestsDirectory);
|
||||
}
|
||||
SourceDirectory.GlobDirectories("**/bin", "**/obj").ForEach(x => DeleteDirectory(x));
|
||||
TestsDirectory.GlobDirectories("**/bin", "**/obj").ForEach(x => DeleteDirectory(x));
|
||||
EnsureCleanDirectory(OutputDirectory);
|
||||
EnsureCleanDirectory(TracerHomeDirectory);
|
||||
EnsureCleanDirectory(NuGetArtifactsDirectory);
|
||||
EnsureCleanDirectory(NativeProfilerProject.Directory / "build");
|
||||
EnsureCleanDirectory(NativeProfilerProject.Directory / "deps");
|
||||
EnsureCleanDirectory(BuildDataDirectory);
|
||||
SourceDirectory.GlobDirectories("**/bin", "**/obj").ForEach(x => x.DeleteDirectory());
|
||||
TestsDirectory.GlobDirectories("**/bin", "**/obj").ForEach(x => x.DeleteDirectory());
|
||||
OutputDirectory.CreateOrCleanDirectory();
|
||||
TracerHomeDirectory.CreateOrCleanDirectory();
|
||||
NuGetArtifactsDirectory.CreateOrCleanDirectory();
|
||||
(NativeProfilerProject.Directory / "build").CreateOrCleanDirectory();
|
||||
(NativeProfilerProject.Directory / "deps").CreateOrCleanDirectory();
|
||||
BuildDataDirectory.CreateOrCleanDirectory();
|
||||
|
||||
void DeleteReparsePoints(string path)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageVersion Include="Mono.Cecil" Version="0.11.5" />
|
||||
<PackageVersion Include="Nuke.Common" Version="6.3.0" />
|
||||
<PackageVersion Include="Nuke.Common" Version="7.0.0" />
|
||||
<PackageVersion Include="Nuget.CommandLine" Version="6.5.0" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ internal static class DepsJsonExtensions
|
|||
return folderRuntimeName;
|
||||
}
|
||||
|
||||
public static void CopyNativeDependenciesToStore(this JsonObject depsJson, AbsolutePath file, IReadOnlyList<string> architectureStores)
|
||||
public static void CopyNativeDependenciesToStore(this JsonObject depsJson, AbsolutePath file, IReadOnlyList<AbsolutePath> architectureStores)
|
||||
{
|
||||
var depsDirectory = file.Parent;
|
||||
|
||||
|
|
@ -68,7 +68,7 @@ internal static class DepsJsonExtensions
|
|||
}
|
||||
}
|
||||
|
||||
public static void RollFrameworkForward(this JsonObject depsJson, string runtime, string rollForwardRuntime, IReadOnlyList<string> architectureStores)
|
||||
public static void RollFrameworkForward(this JsonObject depsJson, string runtime, string rollForwardRuntime, IReadOnlyList<AbsolutePath> architectureStores)
|
||||
{
|
||||
// Update the contents of the json file.
|
||||
foreach (var dep in depsJson.GetDependencies())
|
||||
|
|
@ -96,26 +96,26 @@ internal static class DepsJsonExtensions
|
|||
// Roll forward each architecture by renaming the tfm folder holding the assemblies.
|
||||
foreach (var architectureStore in architectureStores)
|
||||
{
|
||||
var assemblyDirectories = Directory.GetDirectories(architectureStore);
|
||||
var assemblyDirectories = architectureStore.GetDirectories();
|
||||
foreach (var assemblyDirectory in assemblyDirectories)
|
||||
{
|
||||
var assemblyVersionDirectories = Directory.GetDirectories(assemblyDirectory);
|
||||
if (assemblyVersionDirectories.Length != 1)
|
||||
var assemblyVersionDirectories = assemblyDirectory.GetDirectories().ToList();
|
||||
if (assemblyVersionDirectories.Count != 1)
|
||||
{
|
||||
throw new InvalidOperationException(
|
||||
$"Expected exactly one directory under {assemblyDirectory} but found {assemblyVersionDirectories.Length} instead.");
|
||||
$"Expected exactly one directory under {assemblyDirectory} but found {assemblyVersionDirectories.Count} instead.");
|
||||
}
|
||||
|
||||
var assemblyVersionDirectory = assemblyVersionDirectories[0];
|
||||
var sourceDir = Path.Combine(assemblyVersionDirectory, "lib", runtime);
|
||||
if (Directory.Exists(sourceDir))
|
||||
var sourceDir = assemblyVersionDirectory / "lib" / runtime;
|
||||
if (sourceDir.Exists())
|
||||
{
|
||||
var destDir = Path.Combine(assemblyVersionDirectory, "lib", rollForwardRuntime);
|
||||
var destDir = assemblyVersionDirectory / "lib" / rollForwardRuntime;
|
||||
|
||||
CopyDirectoryRecursively(sourceDir, destDir);
|
||||
|
||||
// Since the json was also rolled forward the original tfm folder can be deleted.
|
||||
DeleteDirectory(sourceDir);
|
||||
sourceDir.DeleteDirectory();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue