Skip to content

RTECO-2330-dotnet build-info module ID from PackageId/AssemblyName #3755

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

Open
reshmifrog wants to merge 1 commit into
base: master
Choose a base branch
from
Open

RTECO-2330-dotnet build-info module ID from PackageId/AssemblyName #3755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ require (
github.com/buger/jsonparser v1.3.0
github.com/gocarina/gocsv v0.0.0-20260607070740-0735908c6461
github.com/jfrog/archiver/v3 v3.6.5
github.com/jfrog/build-info-go v1.13.1-0.20261028123549-f0cd26bfc2de
github.com/jfrog/build-info-go v1.13.1-0.20261105093149-115127128fd7
github.com/jfrog/gofrog v1.7.7
github.com/jfrog/jfrog-cli-application v1.0.2-0.20260917110731-d7783acedd8c
github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20261103060251-30c80a7deec4
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,8 +390,8 @@ github.com/jellydator/ttlcache/v3 v3.4.0 h1:YS4P125qQS0tNhtL6aeYkheEaB/m8HCqdMMP
github.com/jellydator/ttlcache/v3 v3.4.0/go.mod h1:Hw9EgjymziQD3yGsQdf1FqFdpp7YjFMd4Srg5EJlgD4=
github.com/jfrog/archiver/v3 v3.6.5 h1:AiNXJoe8jYDOtyykfVuwh26aM4rk/ei+YzBpfBukdzU=
github.com/jfrog/archiver/v3 v3.6.5/go.mod h1:5V9l+Fte30Y4qe9dUOAd3yNTf8lmtVNuhKNrvI8PMhg=
github.com/jfrog/build-info-go v1.13.1-0.20261028123549-f0cd26bfc2de h1:ycdUCYyOZ5TCcRIVT0EfjG/oRMk+QtY3u2XOUcjgt0s=
github.com/jfrog/build-info-go v1.13.1-0.20261028123549-f0cd26bfc2de/go.mod h1:3sv87ey6WTxUckYkj0Iqu9aUaiygQMZKoXNmvT9lK5g=
github.com/jfrog/build-info-go v1.13.1-0.20261105093149-115127128fd7 h1:YrzrrFJYQmZx4NJzcnDnkShmFGjTMCPbaRTZOymTFDY=
github.com/jfrog/build-info-go v1.13.1-0.20261105093149-115127128fd7/go.mod h1:3sv87ey6WTxUckYkj0Iqu9aUaiygQMZKoXNmvT9lK5g=
github.com/jfrog/froggit-go v1.24.0 h1:qSAywpxlPdQfIFIJPprFzfAkbNfKb/OXMo7YD3dVKrE=
github.com/jfrog/froggit-go v1.24.0/go.mod h1:wRDryqyp3oe+eHgME2mpnEQmO8XBECIPagFwj0nHmdI=
github.com/jfrog/go-mockhttp v0.3.1 h1:/wac8v4GMZx62viZmv4wazB5GNKs+GxawuS1u3maJH8=
Expand Down
6 changes: 6 additions & 0 deletions nuget_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,12 @@ func TestDotnetResolve(t *testing.T) {
uniqueDotnetTests := []testDescriptor{
{"dotnetargswithspaces", "multireference", []string{dotnetUtils.DotnetCore.String(), "restore", "src/multireference.proj1/", "--packages", "./packages dir with spaces"}, []string{"proj1"}, []int{5}},
{"multireferencesingleprojectdir", "multireference", []string{dotnetUtils.DotnetCore.String(), "restore", "src/multireference.proj1/"}, []string{"proj1"}, []int{5}},
// The module ID must be the project's NuGet PackageId (<PackageId>, then <AssemblyName>),
// not the project file's base name ("jftest"), so it matches the .nupkg 'dotnet pack' produces.
{"assemblynamerestore", "assemblyname", []string{dotnetUtils.DotnetCore.String(), "restore", "jftest.csproj"}, []string{"JohnsonControls.jftest"}, []int{1}},
{"assemblynamebuild", "assemblyname", []string{dotnetUtils.DotnetCore.String(), "build", "jftest.csproj"}, []string{"JohnsonControls.jftest"}, []int{1}},
{"packageidbuild", "packageid", []string{dotnetUtils.DotnetCore.String(), "build", "jftest.csproj"}, []string{"JohnsonControls.jftest.Package"}, []int{1}},
{"assemblynamewithmodulechange", "assemblyname", []string{dotnetUtils.DotnetCore.String(), "build", "jftest.csproj", "--module=" + ModuleNameJFrogTest}, []string{ModuleNameJFrogTest}, []int{1}},
}
testNativeNugetDotnetResolve(t, uniqueDotnetTests, tests.DotnetBuildName, project.Dotnet)
}
Expand Down
11 changes: 11 additions & 0 deletions testdata/nuget/assemblyname/jftest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- The project file name (jftest) intentionally differs from AssemblyName, which is the NuGet
PackageId 'dotnet pack' embeds in the produced .nupkg. Build-info must use AssemblyName. -->
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<AssemblyName>JohnsonControls.jftest</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
</ItemGroup>
</Project>
11 changes: 11 additions & 0 deletions testdata/nuget/packageid/jftest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- An explicit PackageId takes precedence over both AssemblyName and the project file name (jftest). -->
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<AssemblyName>JohnsonControls.jftest</AssemblyName>
<PackageId>JohnsonControls.jftest.Package</PackageId>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
</ItemGroup>
</Project>
Loading