Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 2 deletions .github/scripts/run-simulator-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,10 @@ printf '{ "sdk": { "version": "%s", "rollForward": "latestFeature" } }\n' "${sdk
# NuGet caches by package id + version, so rebuilding a version that was already restored once
# silently reuses the stale copy. CI versions are unique, but locally you will re-pack the same
# version repeatedly and test yesterday's bits without this. All eleven are cleared, not just the
# three referenced directly, because the rest arrive as transitive dependencies.
for package in objc core internal logs rum sessionreplay trace webviewtracking crashreporting crashreporter opentelemetryapi; do
# ones referenced directly, because the rest arrive as transitive dependencies. crashreporter
# is gone from the list: dd-sdk-ios 3.0 replaced PLCrashReporter with KSCrash, which is linked
# into DatadogCrashReporting rather than shipped as a package of its own.
for package in objc core internal logs rum sessionreplay trace webviewtracking crashreporting flags profiling opentelemetryapi; do
rm -rf "${HOME}/.nuget/packages/datadognet.${package}.ios/${VERSION}"
done

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
{
echo "### Published \`${{ needs.version.outputs.version }}\` to nuget.org"
echo
for package in Objc Core Internal Logs RUM SessionReplay Trace WebViewTracking CrashReporting CrashReporter OpenTelemetryApi; do
for package in Core RUM Logs Trace SessionReplay WebViewTracking CrashReporting Flags Profiling Internal OpenTelemetryApi Objc; do
id="DatadogNet.${package}.iOS"
echo "- [${id}](https://www.nuget.org/packages/${id}/${{ needs.version.outputs.version }})"
done
Expand Down
14 changes: 8 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -152,21 +152,23 @@ jobs:
id="DatadogNet.${package}.iOS"
echo "| \`${id}\` | \`${framework}\` | [${VERSION}](https://www.nuget.org/packages/${id}/${VERSION}) |"
done <<'PACKAGES'
Objc:DatadogObjc
Core:DatadogCore
Internal:DatadogInternal
Logs:DatadogLogs
RUM:DatadogRUM
SessionReplay:DatadogSessionReplay
Logs:DatadogLogs
Trace:DatadogTrace
SessionReplay:DatadogSessionReplay
WebViewTracking:DatadogWebViewTracking
CrashReporting:DatadogCrashReporting
CrashReporter:CrashReporter
Flags:DatadogFlags
Profiling:DatadogProfiling
Internal:DatadogInternal
OpenTelemetryApi:OpenTelemetryApi
Objc:(compatibility meta-package)
PACKAGES
echo
echo "\`\`\`"
echo "dotnet add package DatadogNet.Objc.iOS --version ${VERSION}"
echo "dotnet add package DatadogNet.Core.iOS --version ${VERSION}"
echo "dotnet add package DatadogNet.RUM.iOS --version ${VERSION}"
echo "\`\`\`"
echo
echo "## Licensing"
Expand Down
45 changes: 30 additions & 15 deletions DatadogNet.sln
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DatadogNet.Core.iOS", "src\DatadogNet.Core.iOS\DatadogNet.Core.iOS.csproj", "{2AC96ED9-BE17-4201-A89F-8832C23C07E0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DatadogNet.CrashReporter.iOS", "src\DatadogNet.CrashReporter.iOS\DatadogNet.CrashReporter.iOS.csproj", "{0A67D329-FA08-4301-89CC-17AB1581D5A3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DatadogNet.CrashReporting.iOS", "src\DatadogNet.CrashReporting.iOS\DatadogNet.CrashReporting.iOS.csproj", "{F5AFA73D-050C-46CF-8345-537B15CA8022}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DatadogNet.Internal.iOS", "src\DatadogNet.Internal.iOS\DatadogNet.Internal.iOS.csproj", "{CB4B3CFE-99F1-4228-944B-F51F17E2CFA5}"
Expand All @@ -31,6 +29,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DatadogNet.iOS.DeviceTests"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DatadogNet.iOS.PackageTests", "tests\DatadogNet.iOS.PackageTests\DatadogNet.iOS.PackageTests.csproj", "{06A389A7-C3A1-4376-9A70-9CDC8523B026}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DatadogNet.Flags.iOS", "src\DatadogNet.Flags.iOS\DatadogNet.Flags.iOS.csproj", "{573CD60D-C97D-4DDF-AA99-4437660167B3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DatadogNet.Profiling.iOS", "src\DatadogNet.Profiling.iOS\DatadogNet.Profiling.iOS.csproj", "{463E235B-6173-498D-A78B-4BE9A6834A6E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -53,18 +55,6 @@ Global
{2AC96ED9-BE17-4201-A89F-8832C23C07E0}.Release|x64.Build.0 = Release|Any CPU
{2AC96ED9-BE17-4201-A89F-8832C23C07E0}.Release|x86.ActiveCfg = Release|Any CPU
{2AC96ED9-BE17-4201-A89F-8832C23C07E0}.Release|x86.Build.0 = Release|Any CPU
{0A67D329-FA08-4301-89CC-17AB1581D5A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0A67D329-FA08-4301-89CC-17AB1581D5A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0A67D329-FA08-4301-89CC-17AB1581D5A3}.Debug|x64.ActiveCfg = Debug|Any CPU
{0A67D329-FA08-4301-89CC-17AB1581D5A3}.Debug|x64.Build.0 = Debug|Any CPU
{0A67D329-FA08-4301-89CC-17AB1581D5A3}.Debug|x86.ActiveCfg = Debug|Any CPU
{0A67D329-FA08-4301-89CC-17AB1581D5A3}.Debug|x86.Build.0 = Debug|Any CPU
{0A67D329-FA08-4301-89CC-17AB1581D5A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0A67D329-FA08-4301-89CC-17AB1581D5A3}.Release|Any CPU.Build.0 = Release|Any CPU
{0A67D329-FA08-4301-89CC-17AB1581D5A3}.Release|x64.ActiveCfg = Release|Any CPU
{0A67D329-FA08-4301-89CC-17AB1581D5A3}.Release|x64.Build.0 = Release|Any CPU
{0A67D329-FA08-4301-89CC-17AB1581D5A3}.Release|x86.ActiveCfg = Release|Any CPU
{0A67D329-FA08-4301-89CC-17AB1581D5A3}.Release|x86.Build.0 = Release|Any CPU
{F5AFA73D-050C-46CF-8345-537B15CA8022}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F5AFA73D-050C-46CF-8345-537B15CA8022}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F5AFA73D-050C-46CF-8345-537B15CA8022}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -197,13 +187,36 @@ Global
{06A389A7-C3A1-4376-9A70-9CDC8523B026}.Release|x64.Build.0 = Release|Any CPU
{06A389A7-C3A1-4376-9A70-9CDC8523B026}.Release|x86.ActiveCfg = Release|Any CPU
{06A389A7-C3A1-4376-9A70-9CDC8523B026}.Release|x86.Build.0 = Release|Any CPU
{573CD60D-C97D-4DDF-AA99-4437660167B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{573CD60D-C97D-4DDF-AA99-4437660167B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{573CD60D-C97D-4DDF-AA99-4437660167B3}.Debug|x64.ActiveCfg = Debug|Any CPU
{573CD60D-C97D-4DDF-AA99-4437660167B3}.Debug|x64.Build.0 = Debug|Any CPU
{573CD60D-C97D-4DDF-AA99-4437660167B3}.Debug|x86.ActiveCfg = Debug|Any CPU
{573CD60D-C97D-4DDF-AA99-4437660167B3}.Debug|x86.Build.0 = Debug|Any CPU
{573CD60D-C97D-4DDF-AA99-4437660167B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{573CD60D-C97D-4DDF-AA99-4437660167B3}.Release|Any CPU.Build.0 = Release|Any CPU
{573CD60D-C97D-4DDF-AA99-4437660167B3}.Release|x64.ActiveCfg = Release|Any CPU
{573CD60D-C97D-4DDF-AA99-4437660167B3}.Release|x64.Build.0 = Release|Any CPU
{573CD60D-C97D-4DDF-AA99-4437660167B3}.Release|x86.ActiveCfg = Release|Any CPU
{573CD60D-C97D-4DDF-AA99-4437660167B3}.Release|x86.Build.0 = Release|Any CPU
{463E235B-6173-498D-A78B-4BE9A6834A6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{463E235B-6173-498D-A78B-4BE9A6834A6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{463E235B-6173-498D-A78B-4BE9A6834A6E}.Debug|x64.ActiveCfg = Debug|Any CPU
{463E235B-6173-498D-A78B-4BE9A6834A6E}.Debug|x64.Build.0 = Debug|Any CPU
{463E235B-6173-498D-A78B-4BE9A6834A6E}.Debug|x86.ActiveCfg = Debug|Any CPU
{463E235B-6173-498D-A78B-4BE9A6834A6E}.Debug|x86.Build.0 = Debug|Any CPU
{463E235B-6173-498D-A78B-4BE9A6834A6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{463E235B-6173-498D-A78B-4BE9A6834A6E}.Release|Any CPU.Build.0 = Release|Any CPU
{463E235B-6173-498D-A78B-4BE9A6834A6E}.Release|x64.ActiveCfg = Release|Any CPU
{463E235B-6173-498D-A78B-4BE9A6834A6E}.Release|x64.Build.0 = Release|Any CPU
{463E235B-6173-498D-A78B-4BE9A6834A6E}.Release|x86.ActiveCfg = Release|Any CPU
{463E235B-6173-498D-A78B-4BE9A6834A6E}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{2AC96ED9-BE17-4201-A89F-8832C23C07E0} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
{0A67D329-FA08-4301-89CC-17AB1581D5A3} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
{F5AFA73D-050C-46CF-8345-537B15CA8022} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
{CB4B3CFE-99F1-4228-944B-F51F17E2CFA5} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
{D01DE9B5-315C-47A1-88BC-705999DD3140} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
Expand All @@ -215,5 +228,7 @@ Global
{36B2500C-19EB-4736-A112-10796ADFDA7A} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
{57699435-10EC-4CA1-983D-9E2E3A43AF47} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
{06A389A7-C3A1-4376-9A70-9CDC8523B026} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
{573CD60D-C97D-4DDF-AA99-4437660167B3} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
{463E235B-6173-498D-A78B-4BE9A6834A6E} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
DataDog-SDK-iOS-net repository versioned CrashReporter.iOS as 1.11.2.1 instead; that made it
impossible to tell which Datadog release a given CrashReporter package belonged to.
-->
<DatadogNativeVersion>2.30.2</DatadogNativeVersion>
<DatadogNativeVersion>3.14.0</DatadogNativeVersion>
<DatadogBindingRevision>1</DatadogBindingRevision>
<VersionPrefix>$(DatadogNativeVersion).$(DatadogBindingRevision)</VersionPrefix>

Expand Down
Loading
Loading