dependabot-nuget 0.296.2 → 0.296.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/DependencyDiscovery.props +1 -1
- data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/MSBuildHelper.cs +8 -2
- data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/DiscoveryWorkerTestBase.cs +2 -1
- data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/DiscoveryWorkerTests.cs +47 -0
- data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/UpdateWorkerTestBase.cs +6 -2
- metadata +5 -5
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7c1046fbb15a8f2d47ae5e607be17ea2b8e17d56c453e3ea7f76d2383a308865
|
4
|
+
data.tar.gz: ca504c5949c316c79835a634e33ec5faaa4008633786b05b0f7d136d0c89f38c
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 053d4f211ffc8e963c02f0db8b6768f03c1c6edf563fd4e5daa5de895667ef6e14700e6919ebade796f69af32da9845a8abbd8825438f0b67ded0e9fd9660115
|
7
|
+
data.tar.gz: 83c1dcef8239b85f3e5f4bc1e1722cacb1426dd3cf916e4adcac0a9770332379e2cc523bc9a04be3ce4db857f9b4fe34c1b848448ef92bf1765b4780168c6b3e
|
@@ -2,7 +2,7 @@
|
|
2
2
|
<!-- The following properties enable target framework and dependency discovery when OS-specific workloads are required -->
|
3
3
|
<PropertyGroup>
|
4
4
|
<DesignTimeBuild>true</DesignTimeBuild>
|
5
|
-
<EnableWindowsTargeting>true</EnableWindowsTargeting>
|
5
|
+
<EnableWindowsTargeting Condition="$(TargetFramework.Contains('-windows'))">true</EnableWindowsTargeting>
|
6
6
|
<TargetPlatformVersion Condition="$(TargetPlatformVersion) == '' AND $(TargetFramework.Contains('-'))">1.0</TargetPlatformVersion>
|
7
7
|
</PropertyGroup>
|
8
8
|
</Project>
|
@@ -784,11 +784,11 @@ internal static partial class MSBuildHelper
|
|
784
784
|
var targetsHelperPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!, "TargetFrameworkReporter.targets");
|
785
785
|
var (exitCode, stdOut, stdErr) = await ProcessEx.RunDotnetWithoutMSBuildEnvironmentVariablesAsync(
|
786
786
|
[
|
787
|
-
"
|
787
|
+
"msbuild",
|
788
788
|
projectPath,
|
789
789
|
"/t:ReportTargetFramework",
|
790
790
|
$"/p:CustomAfterMicrosoftCommonCrossTargetingTargets={targetsHelperPath}",
|
791
|
-
$"/p:CustomAfterMicrosoftCommonTargets={targetsHelperPath}"
|
791
|
+
$"/p:CustomAfterMicrosoftCommonTargets={targetsHelperPath}",
|
792
792
|
],
|
793
793
|
projectDirectory,
|
794
794
|
experimentsManager
|
@@ -833,6 +833,12 @@ internal static partial class MSBuildHelper
|
|
833
833
|
var framework = string.IsNullOrWhiteSpace(tfpm.Item2)
|
834
834
|
? NuGetFramework.Parse(tfpm.Item1)
|
835
835
|
: NuGetFramework.ParseComponents(tfpm.Item1, tfpm.Item2);
|
836
|
+
if (framework.Framework == "_")
|
837
|
+
{
|
838
|
+
// error/default value
|
839
|
+
return null;
|
840
|
+
}
|
841
|
+
|
836
842
|
return framework;
|
837
843
|
}
|
838
844
|
catch
|
@@ -23,12 +23,13 @@ public class DiscoveryWorkerTestBase : TestBase
|
|
23
23
|
TestFile[] files,
|
24
24
|
ExpectedWorkspaceDiscoveryResult expectedResult,
|
25
25
|
MockNuGetPackage[]? packages = null,
|
26
|
+
bool includeCommonPackages = true,
|
26
27
|
ExperimentsManager? experimentsManager = null)
|
27
28
|
{
|
28
29
|
experimentsManager ??= new ExperimentsManager();
|
29
30
|
var actualResult = await RunDiscoveryAsync(files, async directoryPath =>
|
30
31
|
{
|
31
|
-
await UpdateWorkerTestBase.MockNuGetPackagesInDirectory(packages, directoryPath);
|
32
|
+
await UpdateWorkerTestBase.MockNuGetPackagesInDirectory(packages, directoryPath, includeCommonPackages: includeCommonPackages);
|
32
33
|
|
33
34
|
var worker = new DiscoveryWorker("TEST-JOB-ID", experimentsManager, new TestLogger());
|
34
35
|
var result = await worker.RunWithErrorHandlingAsync(directoryPath, workspacePath);
|
@@ -1247,4 +1247,51 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
|
|
1247
1247
|
}
|
1248
1248
|
);
|
1249
1249
|
}
|
1250
|
+
|
1251
|
+
[LinuxOnlyFact]
|
1252
|
+
public async Task DiscoverySucceedsWhenNoWindowsAppRefPackageCanBeFound()
|
1253
|
+
{
|
1254
|
+
// this test mimics a package feed that doesn't have the common Microsoft.Windows.App.Ref package; common in Azure DevOps
|
1255
|
+
// Windows machines always have the package, so this test only makes sense on Linux
|
1256
|
+
await TestDiscoveryAsync(
|
1257
|
+
experimentsManager: new ExperimentsManager() { InstallDotnetSdks = true, UseDirectDiscovery = true },
|
1258
|
+
includeCommonPackages: false,
|
1259
|
+
packages: [
|
1260
|
+
MockNuGetPackage.CreateSimplePackage("Some.Package", "1.2.3", "net8.0"),
|
1261
|
+
],
|
1262
|
+
workspacePath: "",
|
1263
|
+
files: [
|
1264
|
+
("project.csproj", """
|
1265
|
+
<Project Sdk="Microsoft.NET.Sdk">
|
1266
|
+
<PropertyGroup>
|
1267
|
+
<TargetFramework>net8.0</TargetFramework>
|
1268
|
+
</PropertyGroup>
|
1269
|
+
<ItemGroup>
|
1270
|
+
<PackageReference Include="Some.Package" Version="1.2.3" />
|
1271
|
+
</ItemGroup>
|
1272
|
+
</Project>
|
1273
|
+
""")
|
1274
|
+
],
|
1275
|
+
expectedResult: new()
|
1276
|
+
{
|
1277
|
+
Path = "",
|
1278
|
+
Projects = [
|
1279
|
+
new()
|
1280
|
+
{
|
1281
|
+
FilePath = "project.csproj",
|
1282
|
+
TargetFrameworks = ["net8.0"],
|
1283
|
+
Dependencies = [
|
1284
|
+
new("Some.Package", "1.2.3", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true)
|
1285
|
+
],
|
1286
|
+
Properties = [
|
1287
|
+
new("TargetFramework", "net8.0", "project.csproj"),
|
1288
|
+
],
|
1289
|
+
ReferencedProjectPaths = [],
|
1290
|
+
ImportedFiles = [],
|
1291
|
+
AdditionalFiles = [],
|
1292
|
+
}
|
1293
|
+
]
|
1294
|
+
}
|
1295
|
+
);
|
1296
|
+
}
|
1250
1297
|
}
|
@@ -298,13 +298,17 @@ public abstract class UpdateWorkerTestBase : TestBase
|
|
298
298
|
await File.WriteAllTextAsync(Path.Join(temporaryDirectory, "job.json"), JsonSerializer.Serialize(jobFile, RunWorker.SerializerOptions));
|
299
299
|
}
|
300
300
|
|
301
|
-
public static async Task MockNuGetPackagesInDirectory(MockNuGetPackage[]? packages, string temporaryDirectory)
|
301
|
+
public static async Task MockNuGetPackagesInDirectory(MockNuGetPackage[]? packages, string temporaryDirectory, bool includeCommonPackages = true)
|
302
302
|
{
|
303
303
|
if (packages is not null)
|
304
304
|
{
|
305
305
|
string localFeedPath = Path.Join(temporaryDirectory, "local-feed");
|
306
306
|
Directory.CreateDirectory(localFeedPath);
|
307
|
-
|
307
|
+
var allPackages = packages;
|
308
|
+
if (includeCommonPackages)
|
309
|
+
{
|
310
|
+
allPackages = allPackages.Concat(MockNuGetPackage.CommonPackages).ToArray();
|
311
|
+
}
|
308
312
|
|
309
313
|
// write all packages to disk
|
310
314
|
foreach (MockNuGetPackage package in allPackages)
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: dependabot-nuget
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.296.
|
4
|
+
version: 0.296.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Dependabot
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2025-02-
|
11
|
+
date: 2025-02-12 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: dependabot-common
|
@@ -16,14 +16,14 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - '='
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 0.296.
|
19
|
+
version: 0.296.3
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - '='
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: 0.296.
|
26
|
+
version: 0.296.3
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: rubyzip
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
@@ -533,7 +533,7 @@ licenses:
|
|
533
533
|
- MIT
|
534
534
|
metadata:
|
535
535
|
bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
|
536
|
-
changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.296.
|
536
|
+
changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.296.3
|
537
537
|
post_install_message:
|
538
538
|
rdoc_options: []
|
539
539
|
require_paths:
|