Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
907e352
wp
ysolomchenko Nov 7, 2024
4bd262d
wp
ysolomchenko Nov 19, 2024
23f3070
Merge branch 'main' into mongo-db-bytecode
ysolomchenko Nov 19, 2024
b21ff46
bytecode instrumentation mongoDB v1
ysolomchenko Nov 21, 2024
392ddd0
merge to .net 9
ysolomchenko Nov 28, 2024
f8c8b9d
bytecode .net9
ysolomchenko Nov 28, 2024
1335176
update MongoDB Test app
ysolomchenko Nov 29, 2024
c816588
wp
ysolomchenko Dec 2, 2024
744e1fa
mongo db-bytecode
ysolomchenko Dec 2, 2024
9131161
minimum version to 2.7.0
ysolomchenko Dec 2, 2024
31976a2
Merge branch 'main' into mongo-db-bytecode
ysolomchenko Dec 2, 2024
413e842
cleanup
ysolomchenko Dec 3, 2024
a5f3941
Merge branch 'mongo-db-bytecode' of https://github.com/ysolomchenko/o…
ysolomchenko Dec 3, 2024
8244b01
CommonExcludedAssets.props remove required by MongoDB.DiagnosticSources
ysolomchenko Dec 3, 2024
e32860a
fix GenerateNetFxTransientDependencies & override net462 for MongoDB …
ysolomchenko Dec 3, 2024
7d9b4a8
update CHANGELOG
ysolomchenko Dec 3, 2024
2d6b081
BuildTests.DistributionStructure verified fix
ysolomchenko Dec 5, 2024
a804618
Merge branch 'main' into mongo-db-bytecode
Kielek Dec 5, 2024
94f638d
add upper boundaries to the documentation
Kielek Dec 5, 2024
716231b
changelog update
Kielek Dec 5, 2024
7baac59
document vulnerabilities in generator
Kielek Dec 5, 2024
0212ab2
partial revert launchSettings.json
Kielek Dec 5, 2024
18e4fb7
partial revert config.md
Kielek Dec 5, 2024
7f2972a
Fix version in nuget instruction
Kielek Dec 5, 2024
6d94e46
Bump System.Runtime.InteropServices.RuntimeInformation to 4.3.0 in tr…
Kielek Dec 5, 2024
7119946
Merge branch 'main' into mongo-db-bytecode
Kielek Dec 6, 2024
2fd20b1
Fix build for .NET Framework
Kielek Dec 6, 2024
e2f50e5
Merge branch 'main' into mongo-db-bytecode
Kielek Dec 6, 2024
bdcbb69
Merge branch 'main' into mongo-db-bytecode
Kielek Dec 10, 2024
c60f412
Merge branch 'main' into mongo-db-bytecode
Kielek Dec 10, 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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h
- Changed minimal supported version of `Microsoft.Extensions.Logging`
for `ILOGGER` instrumentation from `8.0.0` to `9.0.0`.
- Glibc native libraries are compiled on Ubuntu v16.04.
- Changed `MongoDB` traces instrumentation to the bytecode version. It supports
`MongoDB.Driver.Core` from `2.7.0` and `MongoDB.Driver` from `3.0.0`.

#### Dependency updates

Expand Down Expand Up @@ -76,6 +78,7 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h
- Support for .NET 6 and .NET 7. Both framework reached end of support.
- Support for macOS Monterey 12 x64.
macOs libraries are built and tested against [macOS Ventura 13 x64](https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md).
- `MongoDB.Driver.Core.Extensions.DiagnosticSources` dependency is removed.

### Fixed

Expand Down
5 changes: 0 additions & 5 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -292,11 +292,6 @@ are under the following copyright:
Copyright (c) .NET Foundation and Contributors under the MIT License (MIT)
(<https://github.com/dotnet/wcf/blob/main/LICENSE.TXT>).

Library MongoDB.Driver.Core.Extensions.DiagnosticSources is under the following copyright:
Copyright MongoDB.Driver.Core.Extensions.DiagnosticSources Authors under Apache
License Version 2.0
(<https://github.com/jbogard/MongoDB.Driver.Core.Extensions.DiagnosticSources/blob/master/LICENSE>).

Component Serilog compiled into OpenTelemetry.AutoInstrumentation, OpenTelemetry.AutoInstrumentation.Loader, OpenTelemetry.AutoInstrumentation.StartupHook
is under the following copyright:
Copyright 2013-2017 Serilog Contributors under Apache License Version 2.0
Expand Down
8 changes: 1 addition & 7 deletions build/Build.Steps.Windows.cs
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,6 @@ void BuildDockerImage(Project project)

var project = targetProject.GetMSBuildProject();
var packages = Solution.Directory / "src" / "Directory.Packages.props";
var commonExcludedAssets = Solution.Directory / "src" / "CommonExcludedAssets.props";

const string label = $"Transient dependencies auto-generated by {nameof(GenerateNetFxTransientDependencies)}";

Expand All @@ -224,12 +223,7 @@ void BuildDockerImage(Project project)
versionGroup.Label = label;
}

var commonExcludedAssetsProject = ProjectModelTasks.ParseProject(commonExcludedAssets);
var excludedProjectsGroup = commonExcludedAssetsProject.Xml.ItemGroups.First(x => x.Condition == string.Empty);

var excludedDependencies = excludedProjectsGroup.Items.Select(x => x.Include).ToImmutableList();

var deps = Generator.EnumerateDependencies(project.FullPath, excludedDependencies);
var deps = Generator.EnumerateDependencies(project.FullPath);
foreach (var item in deps)
{
if (!packagesGroup.Items.Any(x => x.Include == item.Name))
Expand Down
18 changes: 11 additions & 7 deletions build/Build.Steps.cs
Original file line number Diff line number Diff line change
Expand Up @@ -187,23 +187,27 @@ DotNetRestoreSettings Restore(DotNetRestoreSettings s) =>
}
}

DotNetBuildSettings BuildTestApplication(DotNetBuildSettings x) =>
DotNetBuildSettings BuildTestApplication(DotNetBuildSettings x, string targetFramework) =>
x.SetProjectFile(app)
.SetConfiguration(BuildConfiguration)
.SetPlatform(Platform)
.SetNoRestore(NoRestore)
.When(_ =>TestTargetFramework != TargetFramework.NOT_SPECIFIED,
s => s.SetFramework(actualTestTfm));
.When(_ => TestTargetFramework != TargetFramework.NOT_SPECIFIED,
s => s.SetFramework(targetFramework));

if (LibraryVersion.Versions.TryGetValue(app.Name, out var libraryVersions))
{
DotNetBuild(x =>
BuildTestApplication(x)
.CombineWithBuildInfos(libraryVersions, TestTargetFramework));
foreach (var packageBuildInfo in libraryVersions)
{
var targetFramework = packageBuildInfo.SupportedFrameworks.Length == 0 || packageBuildInfo.SupportedFrameworks.Contains(actualTestTfm) ? actualTestTfm : TestTargetFramework;
DotNetBuild(x =>
BuildTestApplication(x, targetFramework)
.CombineWithBuildInfos([packageBuildInfo], TestTargetFramework));
}
}
else
{
DotNetBuild(BuildTestApplication);
DotNetBuild(x => BuildTestApplication(x, actualTestTfm));
}
}

Expand Down
5 changes: 3 additions & 2 deletions build/LibraryVersions.g.cs
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,9 @@ public static partial class LibraryVersion
"TestApplication.MongoDB",
new List<PackageBuildInfo>
{
new("2.28.0"),
new("2.30.0"),
new("2.19.0", supportedFrameworks: new string[] {"net9.0","net8.0","net462"}),
new("2.30.0", supportedFrameworks: new string[] {"net9.0","net8.0","net462"}),
new("3.0.0", supportedFrameworks: new string[] {"net9.0","net8.0","net472"}),
}
},
{
Expand Down
Loading
Loading