Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix GeneratePackageVersions #6094

Merged
merged 2 commits into from
Sep 27, 2024
Merged

Fix GeneratePackageVersions #6094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ef2801
Add *Retries IntegrationName
bouwkast Sep 27, 2024
4045c88
Bump the reset of the verions
bouwkast Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tracer/build/PackageVersionsGeneratorDefinitions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@
]
},
{
"IntegrationName": "XUnit",
"IntegrationName": "XUnitRetries",
"SampleProjectName": "Samples.XUnitTestsRetries",
"NugetPackageSearchName": "xunit",
"MinVersion": "2.2.0",
Expand Down Expand Up @@ -415,7 +415,7 @@
]
},
{
"IntegrationName": "NUnit",
"IntegrationName": "NUnitRetries",
"SampleProjectName": "Samples.NUnitTestsRetries",
"NugetPackageSearchName": "NUnit",
"MinVersion": "3.6.0",
Expand Down Expand Up @@ -458,7 +458,7 @@
]
},
{
"IntegrationName": "MSTest2",
"IntegrationName": "MSTest2Retries",
"SampleProjectName": "Samples.MSTestTestsRetries",
"NugetPackageSearchName": "MSTest.TestFramework",
"MinVersion": "2.0.0",
Expand Down
64 changes: 32 additions & 32 deletions tracer/build/PackageVersionsLatestMajors.g.props
View file
Open in desktop

Large diffs are not rendered by default.

158 changes: 151 additions & 7 deletions tracer/build/PackageVersionsLatestMinors.g.props
View file
Open in desktop

Large diffs are not rendered by default.

64 changes: 32 additions & 32 deletions tracer/build/PackageVersionsLatestSpecific.g.props
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions tracer/build/supported_versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,7 @@
"minVersionAvailableInclusive": "1.1.11",
"minVersionSupportedInclusive": "1.1.11",
"minVersionTestedInclusive": null,
"maxVersionSupportedInclusive": "3.5.2",
"maxVersionSupportedInclusive": "3.6.0",
"maxVersionAvailableInclusive": "3.6.0",
"maxVersionTestedInclusive": null
}
Expand Down Expand Up @@ -1268,9 +1268,9 @@
"minVersionAvailableInclusive": "1.7.0.1540",
"minVersionSupportedInclusive": "2.2.0",
"minVersionTestedInclusive": "2.2.0",
"maxVersionSupportedInclusive": "2.9.1",
"maxVersionAvailableInclusive": "2.9.1",
"maxVersionTestedInclusive": "2.9.1"
"maxVersionSupportedInclusive": "2.9.2",
"maxVersionAvailableInclusive": "2.9.2",
"maxVersionTestedInclusive": "2.9.2"
}
]
},
Expand All @@ -1285,10 +1285,10 @@
"minVersionAvailableInclusive": "2.0.0",
"minVersionSupportedInclusive": "2.2.0",
"minVersionTestedInclusive": null,
"maxVersionSupportedInclusive": "2.9.1",
"maxVersionAvailableInclusive": "2.9.1",
"maxVersionSupportedInclusive": "2.9.2",
"maxVersionAvailableInclusive": "2.9.2",
"maxVersionTestedInclusive": null
}
]
}
]
]
10 changes: 5 additions & 5 deletions tracer/dependabot/Datadog.Dependabot.Integrations.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@
<!-- Integration: Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter -->
<!-- Assembly: Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter -->
<!-- Latest package https://www.nuget.org/packages/MSTest.TestAdapter/3.6.0 -->
<PackageReference Include="MSTest.TestAdapter" Version="3.5.2" />
<PackageReference Include="MSTest.TestAdapter" Version="3.6.0" />

<!-- Integration: MySql.Data -->
<!-- Assembly: MySql.Data -->
Expand Down Expand Up @@ -322,13 +322,13 @@

<!-- Integration: xunit.execution.desktop -->
<!-- Assembly: xunit.execution.desktop -->
<!-- Latest package https://www.nuget.org/packages/xunit/2.9.1 -->
<PackageReference Include="xunit" Version="2.9.1" />
<!-- Latest package https://www.nuget.org/packages/xunit/2.9.2 -->
<PackageReference Include="xunit" Version="2.9.2" />

<!-- Integration: xunit.execution.dotnet -->
<!-- Assembly: xunit.execution.dotnet -->
<!-- Latest package https://www.nuget.org/packages/xunit.extensibility.execution/2.9.1 -->
<PackageReference Include="xunit.extensibility.execution" Version="2.9.1" />
<!-- Latest package https://www.nuget.org/packages/xunit.extensibility.execution/2.9.2 -->
<PackageReference Include="xunit.extensibility.execution" Version="2.9.2" />

<!-- Integration: Yarp.ReverseProxy -->
<!-- Assembly: Yarp.ReverseProxy -->
Expand Down
2 changes: 1 addition & 1 deletion tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/MsTestV2RetriesTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public MsTestV2RetriesTests(ITestOutputHelper output)
protected override string TrueAtThirdRetry => "Samples.MSTestTestsRetries.TestSuite.TrueAtThirdRetry";

[SkippableTheory]
[MemberData(nameof(PackageVersions.MSTest), MemberType = typeof(PackageVersions))]
[MemberData(nameof(PackageVersions.MSTest2Retries), MemberType = typeof(PackageVersions))]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tonyredondo Is this right? Wasn't sure as it was using MSTest (I think they map to the same versions though)

[Trait("Category", "EndToEnd")]
[Trait("Category", "TestIntegrations")]
[Trait("Category", "FlakyRetries")]
Expand Down
2 changes: 1 addition & 1 deletion tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/NUnitRetriesTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public NUnitRetriesTests(ITestOutputHelper output)
protected override string TrueAtThirdRetry => "Samples.NUnitTestsRetries.TestSuite.TrueAtThirdRetry";

[SkippableTheory]
[MemberData(nameof(PackageVersions.NUnit), MemberType = typeof(PackageVersions))]
[MemberData(nameof(PackageVersions.NUnitRetries), MemberType = typeof(PackageVersions))]
[Trait("Category", "EndToEnd")]
[Trait("Category", "TestIntegrations")]
[Trait("Category", "FlakyRetries")]
Expand Down
2 changes: 1 addition & 1 deletion tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/XUnitRetriesTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public XUnitRetriesTests(ITestOutputHelper output)
protected override string TrueAtThirdRetry => "Samples.XUnitTestsRetries.TestSuite.TrueAtThirdRetry";

[SkippableTheory]
[MemberData(nameof(PackageVersions.XUnit), MemberType = typeof(PackageVersions))]
[MemberData(nameof(PackageVersions.XUnitRetries), MemberType = typeof(PackageVersions))]
[Trait("Category", "EndToEnd")]
[Trait("Category", "TestIntegrations")]
[Trait("Category", "FlakyRetries")]
Expand Down
6 changes: 6 additions & 0 deletions tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersions.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,18 @@ public class PackageVersions

public static IEnumerable<object[]> XUnit => IsAllMinorPackageVersions ? PackageVersionsLatestMinors.XUnit : PackageVersionsLatestSpecific.XUnit;

public static IEnumerable<object[]> XUnitRetries => IsAllMinorPackageVersions ? PackageVersionsLatestMinors.XUnitRetries : PackageVersionsLatestSpecific.XUnitRetries;

public static IEnumerable<object[]> NUnit => IsAllMinorPackageVersions ? PackageVersionsLatestMinors.NUnit : PackageVersionsLatestSpecific.NUnit;

public static IEnumerable<object[]> NUnitRetries => IsAllMinorPackageVersions ? PackageVersionsLatestMinors.NUnitRetries : PackageVersionsLatestSpecific.NUnitRetries;

public static IEnumerable<object[]> MSTest => IsAllMinorPackageVersions ? PackageVersionsLatestMinors.MSTest : PackageVersionsLatestSpecific.MSTest;

public static IEnumerable<object[]> MSTest2 => IsAllMinorPackageVersions ? PackageVersionsLatestMinors.MSTest2 : PackageVersionsLatestSpecific.MSTest2;

public static IEnumerable<object[]> MSTest2Retries => IsAllMinorPackageVersions ? PackageVersionsLatestMinors.MSTest2Retries : PackageVersionsLatestSpecific.MSTest2Retries;

public static IEnumerable<object[]> Kafka => IsAllMinorPackageVersions ? PackageVersionsLatestMinors.Kafka : PackageVersionsLatestSpecific.Kafka;

public static IEnumerable<object[]> CosmosDb => IsAllMinorPackageVersions ? PackageVersionsLatestMinors.CosmosDb : PackageVersionsLatestSpecific.CosmosDb;
Expand Down
126 changes: 120 additions & 6 deletions tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMajors.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -937,7 +937,7 @@ public class PackageVersionsLatestMajors
new object[] { string.Empty },
#else
#if NET462
new object[] { "2.9.1" },
new object[] { "2.9.2" },
#endif
#if NETCOREAPP2_1
new object[] { "2.4.2" },
Expand All @@ -952,13 +952,47 @@ public class PackageVersionsLatestMajors
new object[] { "2.4.2" },
#endif
#if NET6_0
new object[] { "2.9.1" },
new object[] { "2.9.2" },
#endif
#if NET7_0
new object[] { "2.9.1" },
new object[] { "2.9.2" },
#endif
#if NET8_0
new object[] { "2.9.1" },
new object[] { "2.9.2" },
#endif
#endif
};

public static IEnumerable<object[]> XUnitRetries =>

new List<object[]>
{
#if DEFAULT_SAMPLES
new object[] { string.Empty },
#else
#if NET462
new object[] { "2.9.2" },
#endif
#if NETCOREAPP2_1
new object[] { "2.4.2" },
#endif
#if NETCOREAPP3_0
new object[] { "2.4.2" },
#endif
#if NETCOREAPP3_1
new object[] { "2.4.2" },
#endif
#if NET5_0
new object[] { "2.4.2" },
#endif
#if NET6_0
new object[] { "2.9.2" },
#endif
#if NET7_0
new object[] { "2.9.2" },
#endif
#if NET8_0
new object[] { "2.9.2" },
#endif
#endif
};
Expand Down Expand Up @@ -998,6 +1032,44 @@ public class PackageVersionsLatestMajors
new object[] { "3.14.0" },
new object[] { "4.2.2" },
#endif
#endif
};

public static IEnumerable<object[]> NUnitRetries =>

new List<object[]>
{
#if DEFAULT_SAMPLES
new object[] { string.Empty },
#else
#if NET462
new object[] { "3.14.0" },
new object[] { "4.2.2" },
#endif
#if NETCOREAPP2_1
new object[] { "3.14.0" },
#endif
#if NETCOREAPP3_0
new object[] { "3.14.0" },
#endif
#if NETCOREAPP3_1
new object[] { "3.14.0" },
#endif
#if NET5_0
new object[] { "3.14.0" },
#endif
#if NET6_0
new object[] { "3.14.0" },
new object[] { "4.2.2" },
#endif
#if NET7_0
new object[] { "3.14.0" },
new object[] { "4.2.2" },
#endif
#if NET8_0
new object[] { "3.14.0" },
new object[] { "4.2.2" },
#endif
#endif
};

Expand All @@ -1010,11 +1082,11 @@ public class PackageVersionsLatestMajors
#else
#if NET462
new object[] { "2.2.10" },
new object[] { "3.5.2" },
new object[] { "3.6.0" },
#endif
#if NETCOREAPP2_1
new object[] { "2.2.10" },
new object[] { "3.5.2" },
new object[] { "3.6.0" },
#endif
#if NETCOREAPP3_0
new object[] { "2.2.10" },
Expand Down Expand Up @@ -1082,6 +1154,48 @@ public class PackageVersionsLatestMajors
new object[] { "2.2.10" },
new object[] { "3.6.0" },
#endif
#endif
};

public static IEnumerable<object[]> MSTest2Retries =>

new List<object[]>
{
#if DEFAULT_SAMPLES
new object[] { string.Empty },
#else
#if NET462
new object[] { "2.2.10" },
new object[] { "3.6.0" },
#endif
#if NETCOREAPP2_1
new object[] { "2.2.10" },
new object[] { "3.6.0" },
#endif
#if NETCOREAPP3_0
new object[] { "2.2.10" },
new object[] { "3.6.0" },
#endif
#if NETCOREAPP3_1
new object[] { "2.2.10" },
new object[] { "3.6.0" },
#endif
#if NET5_0
new object[] { "2.2.10" },
new object[] { "3.6.0" },
#endif
#if NET6_0
new object[] { "2.2.10" },
new object[] { "3.6.0" },
#endif
#if NET7_0
new object[] { "2.2.10" },
new object[] { "3.6.0" },
#endif
#if NET8_0
new object[] { "2.2.10" },
new object[] { "3.6.0" },
#endif
#endif
};

Expand Down
Loading
Loading