Merge ~mateus-morais/ubuntu/+source/dotnet8:dotnet-debug-symbols into ubuntu/+source/dotnet8:ubuntu/devel

Proposed by Mateus Rodrigues de Morais
Status: Merged
Merged at revision: 306f75980759e70d1e3d01736b5c0f2a43199d8c
Proposed branch: ~mateus-morais/ubuntu/+source/dotnet8:dotnet-debug-symbols
Merge into: ubuntu/+source/dotnet8:ubuntu/devel
Diff against target: 112 lines (+38/-2)
9 files modified
debian/aspnetcore-runtime-dbg-8.0.install.in (+1/-0)
debian/aspnetcore-targeting-pack-8.0.install.in (+0/-1)
debian/changelog (+8/-0)
debian/control (+18/-0)
debian/dotnet-runtime-dbg-8.0.install.in (+1/-0)
debian/dotnet-sdk-8.0.install.in (+2/-0)
debian/dotnet-sdk-dbg-8.0.install.in (+2/-0)
debian/dotnet-targeting-pack-8.0.install.in (+0/-1)
debian/rules (+6/-0)
Reviewer Review Type Date Requested Status
Julian Andres Klode (community) Approve
git-ubuntu import Pending
Review via email: mp+458951@code.launchpad.net

Description of the change

This merge proposal adds:

- .NET managed debug symbols (.PBDs) as binary packages named *-dbg-8.0, to follow the convention recommended in the upstream documentation [1].

- Moves RID-specific runtime targeting packs to the dotnet-sdk-8.0 package, also as recommended by the upstream documentation (LP: #2046458) [2].

PPA for review: https://launchpad.net/~mateus-morais/+archive/ubuntu/dotnet8-debug-symbols

[1] https://learn.microsoft.com/en-us/dotnet/core/distribution-packaging#debug-packages
[2] https://learn.microsoft.com/en-us/dotnet/core/distribution-packaging#recommended-packages

To post a comment you must log in.
Revision history for this message
Julian Andres Klode (juliank) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/aspnetcore-runtime-dbg-8.0.install.in b/debian/aspnetcore-runtime-dbg-8.0.install.in
0new file mode 1006440new file mode 100644
index 0000000..d30661f
--- /dev/null
+++ b/debian/aspnetcore-runtime-dbg-8.0.install.in
@@ -0,0 +1 @@
1artifacts/debug-symbols/shared/Microsoft.AspNetCore.App/@major@.0.* @basedir@/shared/Microsoft.AspNetCore.App
diff --git a/debian/aspnetcore-targeting-pack-8.0.install.in b/debian/aspnetcore-targeting-pack-8.0.install.in
index adbdc26..0923d96 100644
--- a/debian/aspnetcore-targeting-pack-8.0.install.in
+++ b/debian/aspnetcore-targeting-pack-8.0.install.in
@@ -1,2 +1 @@
1@basedir@/packs/Microsoft.AspNetCore.App.Ref1@basedir@/packs/Microsoft.AspNetCore.App.Ref
2@basedir@/packs/Microsoft.AspNetCore.App.Runtime.@rid@-@arch@
diff --git a/debian/changelog b/debian/changelog
index bad0aa7..d0825ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
1dotnet8 (8.0.101-8.0.1-0ubuntu2) noble; urgency=medium
2
3 * Added new binary packages for debug symbols.
4 * Moved RID-specific targeting packs to dotnet-sdk-8.0 binary package
5 per Microsoft documentation. (LP: #2046458)
6
7 -- Mateus Rodrigues de Morais <mateus.morais@canonical.com> Wed, 17 Jan 2024 17:30:29 -0300
8
1dotnet8 (8.0.101-8.0.1-0ubuntu1) noble; urgency=medium9dotnet8 (8.0.101-8.0.1-0ubuntu1) noble; urgency=medium
210
3 * New upstream release11 * New upstream release
diff --git a/debian/control b/debian/control
index e718baf..1546eb3 100644
--- a/debian/control
+++ b/debian/control
@@ -184,3 +184,21 @@ Description: Internal - targeting pack for Microsoft.NETCore.App 8.0
184 This package provides a targeting pack for Microsoft.NETCore.App 8.0184 This package provides a targeting pack for Microsoft.NETCore.App 8.0
185 that allows developers to compile against and target Microsoft.NETCore.App 8.0185 that allows developers to compile against and target Microsoft.NETCore.App 8.0
186 applications using the .NET SDK. This not meant for general use.186 applications using the .NET SDK. This not meant for general use.
187
188Package: aspnetcore-runtime-dbg-8.0
189Architecture: amd64 arm64
190Depends: aspnetcore-runtime-8.0, ${misc:Depends}, ${shlibs:Depends}
191Description: ASP.NET Runtime debug symbols.
192 This package provides the PDB debug symbols for Microsoft.AspNetCore.App 8.0.
193
194Package: dotnet-runtime-dbg-8.0
195Architecture: amd64 arm64
196Depends: dotnet-runtime-8.0, ${misc:Depends}, ${shlibs:Depends}
197Description: .NET Runtime debug symbols.
198 This package provides the PDB debug symbols for Microsoft.NETCore.App 8.0.
199
200Package: dotnet-sdk-dbg-8.0
201Architecture: amd64 arm64
202Depends: dotnet-sdk-8.0, ${misc:Depends}, ${shlibs:Depends}
203Description: .NET SDK debug symbols.
204 This package provides the PDB debug symbols for the .NET 8.0 SDK.
diff --git a/debian/dotnet-runtime-dbg-8.0.install.in b/debian/dotnet-runtime-dbg-8.0.install.in
187new file mode 100644205new file mode 100644
index 0000000..db3660b
--- /dev/null
+++ b/debian/dotnet-runtime-dbg-8.0.install.in
@@ -0,0 +1 @@
1artifacts/debug-symbols/shared/Microsoft.NETCore.App/@major@.0.* @basedir@/shared/Microsoft.NETCore.App
diff --git a/debian/dotnet-sdk-8.0.install.in b/debian/dotnet-sdk-8.0.install.in
index aebc001..3d12adc 100644
--- a/debian/dotnet-sdk-8.0.install.in
+++ b/debian/dotnet-sdk-8.0.install.in
@@ -1,3 +1,5 @@
1@basedir@/metadata1@basedir@/metadata
2@basedir@/sdk-manifests/@major@.0.*2@basedir@/sdk-manifests/@major@.0.*
3@basedir@/sdk/@major@.0.*3@basedir@/sdk/@major@.0.*
4@basedir@/packs/Microsoft.NETCore.App.Runtime.@rid@-@arch@
5@basedir@/packs/Microsoft.AspNetCore.App.Runtime.@rid@-@arch@
diff --git a/debian/dotnet-sdk-dbg-8.0.install.in b/debian/dotnet-sdk-dbg-8.0.install.in
4new file mode 1006446new file mode 100644
index 0000000..3244f46
--- /dev/null
+++ b/debian/dotnet-sdk-dbg-8.0.install.in
@@ -0,0 +1,2 @@
1artifacts/debug-symbols/sdk/@major@.0.* @basedir@/sdk
2artifacts/debug-symbols/packs @basedir@
diff --git a/debian/dotnet-targeting-pack-8.0.install.in b/debian/dotnet-targeting-pack-8.0.install.in
index 00ad479..42e9d2b 100644
--- a/debian/dotnet-targeting-pack-8.0.install.in
+++ b/debian/dotnet-targeting-pack-8.0.install.in
@@ -1,2 +1 @@
1@basedir@/packs/Microsoft.NETCore.App.Ref1@basedir@/packs/Microsoft.NETCore.App.Ref
2@basedir@/packs/Microsoft.NETCore.App.Runtime.@rid@-@arch@
diff --git a/debian/rules b/debian/rules
index 142df90..9601df6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -104,6 +104,9 @@ override_dh_gencontrol:
104 dh_gencontrol -pdotnet-targeting-pack-8.0 -- -v$(_FULL_RUNTIME_VERSION)104 dh_gencontrol -pdotnet-targeting-pack-8.0 -- -v$(_FULL_RUNTIME_VERSION)
105 dh_gencontrol -pdotnet-templates-8.0 -- -v$(_FULL_SDK_VERSION)105 dh_gencontrol -pdotnet-templates-8.0 -- -v$(_FULL_SDK_VERSION)
106 dh_gencontrol -pnetstandard-targeting-pack-2.1-8.0 -- -v$(_FULL_SDK_VERSION)106 dh_gencontrol -pnetstandard-targeting-pack-2.1-8.0 -- -v$(_FULL_SDK_VERSION)
107 dh_gencontrol -paspnetcore-runtime-dbg-8.0 -- -v$(_FULL_RUNTIME_VERSION)
108 dh_gencontrol -pdotnet-runtime-dbg-8.0 -- -v$(_FULL_RUNTIME_VERSION)
109 dh_gencontrol -pdotnet-sdk-dbg-8.0 -- -v$(_FULL_SDK_VERSION)
107110
108override_dh_install:111override_dh_install:
109112
@@ -111,6 +114,9 @@ override_dh_install:
111 install -dm 0755 $(DESTDIR)/$(DOTNETETCDIR)114 install -dm 0755 $(DESTDIR)/$(DOTNETETCDIR)
112 ls artifacts/$(_RUNTIME_ARCH)/Release115 ls artifacts/$(_RUNTIME_ARCH)/Release
113 tar xf artifacts/$(_RUNTIME_ARCH)/Release/dotnet-sdk-*-$(_RUNTIME_ID)-$(_RUNTIME_ARCH).tar.gz -C $(DESTDIR)/$(DOTNETLIBDIR)116 tar xf artifacts/$(_RUNTIME_ARCH)/Release/dotnet-sdk-*-$(_RUNTIME_ID)-$(_RUNTIME_ARCH).tar.gz -C $(DESTDIR)/$(DOTNETLIBDIR)
117 # Extract debug symbols to their own directory for easy handling
118 mkdir -p artifacts/debug-symbols
119 tar xf artifacts/$(_RUNTIME_ARCH)/Release/dotnet-symbols-sdk-*-$(_RUNTIME_ID)-$(_RUNTIME_ARCH).tar.gz -C artifacts/debug-symbols
114120
115 # See https://github.com/dotnet/source-build/issues/2579121 # See https://github.com/dotnet/source-build/issues/2579
116 find $(DESTDIR)/$(DOTNETLIBDIR) -type f -name 'testhost.x86' -delete122 find $(DESTDIR)/$(DOTNETLIBDIR) -type f -name 'testhost.x86' -delete

Subscribers

People subscribed via source and target branches