Skip to content

Commit 76b5f6e

Browse files
bhanurpbhanurp
authored
Fix failing nuget tests on mac and windows (#2935)
1 parent 2e2ca5a commit 76b5f6e

File tree

4 files changed

+23
-11
lines changed

4 files changed

+23
-11
lines changed

‎nuget_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ type testDescriptor struct {
4949
func TestNugetResolve(t *testing.T) {
5050
uniqueNugetTests := []testDescriptor{
5151
{"nugetargswithspaces", "packagesconfig", []string{dotnetUtils.Nuget.String(), "restore", "-PackagesDirectory", "./packages dir with spaces"}, []string{"packagesconfig"}, []int{6}},
52-
{"packagesconfigwithoutmodulechnage", "packagesconfig", []string{dotnetUtils.Nuget.String(), "restore"}, []string{"packagesconfig"}, []int{6}},
53-
{"packagesconfigwithmodulechnage", "packagesconfig", []string{dotnetUtils.Nuget.String(), "restore", "--module=" + ModuleNameJFrogTest}, []string{ModuleNameJFrogTest}, []int{6}},
52+
{"packagesconfigwithoutmodulechange", "packagesconfig", []string{dotnetUtils.Nuget.String(), "restore"}, []string{"packagesconfig"}, []int{6}},
53+
{"packagesconfigwithmodulechange", "packagesconfig", []string{dotnetUtils.Nuget.String(), "restore", "--module=" + ModuleNameJFrogTest}, []string{ModuleNameJFrogTest}, []int{6}},
5454
{"packagesconfigwithconfigpath", "packagesconfig", []string{dotnetUtils.Nuget.String(), "restore", "./packages.config", "-SolutionDirectory", "."}, []string{"packagesconfig"}, []int{6}},
55-
{"multipackagesconfigwithoutmodulechnage", "multipackagesconfig", []string{dotnetUtils.Nuget.String(), "restore"}, []string{"proj1", "proj2", "proj3"}, []int{4, 3, 2}},
56-
{"multipackagesconfigwithmodulechnage", "multipackagesconfig", []string{dotnetUtils.Nuget.String(), "restore", "--module=" + ModuleNameJFrogTest}, []string{ModuleNameJFrogTest}, []int{8}},
55+
{"multipackagesconfigwithoutmodulechange", "multipackagesconfig", []string{dotnetUtils.Nuget.String(), "restore"}, []string{"proj1", "proj2", "proj3"}, []int{4, 3, 2}},
56+
{"multipackagesconfigwithmodulechange", "multipackagesconfig", []string{dotnetUtils.Nuget.String(), "restore", "--module=" + ModuleNameJFrogTest}, []string{ModuleNameJFrogTest}, []int{8}},
5757
{"multipackagesconfigwithslnPath", "multipackagesconfig", []string{dotnetUtils.Nuget.String(), "restore", "./multipackagesconfig.sln"}, []string{"proj1", "proj2", "proj3"}, []int{4, 3, 2}},
5858
{"multipackagesconfigsingleprojectdir", "multipackagesconfig", []string{dotnetUtils.Nuget.String(), "restore", "./proj2/", "-SolutionDirectory", "."}, []string{"proj2"}, []int{3}},
5959
{"multipackagesconfigsingleprojectconfig", "multipackagesconfig", []string{dotnetUtils.Nuget.String(), "restore", "./proj1/packages.config", "-SolutionDirectory", "."}, []string{"proj1"}, []int{4}},
@@ -72,10 +72,10 @@ func TestDotnetResolve(t *testing.T) {
7272
func testNativeNugetDotnetResolve(t *testing.T, uniqueTests []testDescriptor, buildName string, projectType project.ProjectType) {
7373
initNugetTest(t)
7474
testDescriptors := append(slices.Clone(uniqueTests), []testDescriptor{
75-
{"referencewithoutmodulechnage", "reference", []string{projectType.String(), "restore"}, []string{"reference"}, []int{6}},
76-
{"referencewithmodulechnage", "reference", []string{projectType.String(), "restore", "--module=" + ModuleNameJFrogTest}, []string{ModuleNameJFrogTest}, []int{6}},
77-
{"multireferencewithoutmodulechnage", "multireference", []string{projectType.String(), "restore"}, []string{"proj1", "proj2"}, []int{5, 3}},
78-
{"multireferencewithmodulechnage", "multireference", []string{projectType.String(), "restore", "--module=" + ModuleNameJFrogTest}, []string{ModuleNameJFrogTest}, []int{6}},
75+
{"referencewithoutmodulechange", "reference", []string{projectType.String(), "restore"}, []string{"reference"}, []int{6}},
76+
{"referencewithmodulechange", "reference", []string{projectType.String(), "restore", "--module=" + ModuleNameJFrogTest}, []string{ModuleNameJFrogTest}, []int{6}},
77+
{"multireferencewithoutmodulechange", "multireference", []string{projectType.String(), "restore"}, []string{"proj1", "proj2"}, []int{5, 3}},
78+
{"multireferencewithmodulechange", "multireference", []string{projectType.String(), "restore", "--module=" + ModuleNameJFrogTest}, []string{ModuleNameJFrogTest}, []int{6}},
7979
{"multireferencewithslnpath", "multireference", []string{projectType.String(), "restore", "src/multireference.sln"}, []string{"proj1", "proj2"}, []int{5, 3}},
8080
{"multireferencewithslndir", "multireference", []string{projectType.String(), "restore", "src/"}, []string{"proj1", "proj2"}, []int{5, 3}},
8181
{"multireferencesingleprojectcsproj", "multireference", []string{projectType.String(), "restore", "src/multireference.proj2/proj2.csproj"}, []string{"proj2"}, []int{3}},

‎testdata/nuget/differentlocations/solutions/differentlocations.sln

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ VisualStudioVersion = 15.0.27428.2005
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "proj1", "../src/proj1/proj1.csproj", "{D1FFA0DC-0ACC-4108-ADC1-2A71122C09AF}"
66
EndProject
7-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "proj2", "../src/proj2/proj2.csproj", "{D1FFA0DC-0ACC-4108-ADC1-2A71122C09AF}"
7+
Project("{3671D144-B1DC-4936-998D-A4382CD20D7F}") = "proj2", "../src/proj2/proj2.csproj", "{DB6AED76-EB92-4294-AF75-BA5567A63F46}"
88
EndProject
99
Global
1010
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -16,6 +16,10 @@ Global
1616
{D1FFA0DC-0ACC-4108-ADC1-2A71122C09AF}.Debug|Any CPU.Build.0 = Debug|x86
1717
{D1FFA0DC-0ACC-4108-ADC1-2A71122C09AF}.Release|Any CPU.ActiveCfg = Debug|x86
1818
{D1FFA0DC-0ACC-4108-ADC1-2A71122C09AF}.Release|Any CPU.Build.0 = Debug|x86
19+
{DB6AED76-EB92-4294-AF75-BA5567A63F46}.Debug|Any CPU.ActiveCfg = Debug|x86
20+
{DB6AED76-EB92-4294-AF75-BA5567A63F46}.Debug|Any CPU.Build.0 = Debug|x86
21+
{DB6AED76-EB92-4294-AF75-BA5567A63F46}.Release|Any CPU.ActiveCfg = Debug|x86
22+
{DB6AED76-EB92-4294-AF75-BA5567A63F46}.Release|Any CPU.Build.0 = Debug|x86
1923
EndGlobalSection
2024
GlobalSection(SolutionProperties) = preSolution
2125
HideSolutionNode = FALSE

‎testdata/nuget/multireference/multireference.sln

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ VisualStudioVersion = 15.0.27428.2005
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "proj1", "src/multireference.proj1/proj1.csproj", "{D1FFA0DC-0ACC-4108-ADC1-2A71122C09AF}"
66
EndProject
7-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "proj2", "src/multireference.proj2/proj2.csproj", "{D1FFA0DC-0ACC-4108-ADC1-2A71122C09AF}"
7+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "proj2", "src/multireference.proj2/proj2.csproj", "{9A71C857-5221-4246-8513-E582FDF6E8C3}"
88
EndProject
99
Global
1010
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -16,6 +16,10 @@ Global
1616
{D1FFA0DC-0ACC-4108-ADC1-2A71122C09AF}.Debug|Any CPU.Build.0 = Debug|x86
1717
{D1FFA0DC-0ACC-4108-ADC1-2A71122C09AF}.Release|Any CPU.ActiveCfg = Debug|x86
1818
{D1FFA0DC-0ACC-4108-ADC1-2A71122C09AF}.Release|Any CPU.Build.0 = Debug|x86
19+
{9A71C857-5221-4246-8513-E582FDF6E8C3}.Debug|Any CPU.ActiveCfg = Debug|x86
20+
{9A71C857-5221-4246-8513-E582FDF6E8C3}.Debug|Any CPU.Build.0 = Debug|x86
21+
{9A71C857-5221-4246-8513-E582FDF6E8C3}.Release|Any CPU.ActiveCfg = Debug|x86
22+
{9A71C857-5221-4246-8513-E582FDF6E8C3}.Release|Any CPU.Build.0 = Debug|x86
1923
EndGlobalSection
2024
GlobalSection(SolutionProperties) = preSolution
2125
HideSolutionNode = FALSE

‎testdata/nuget/multireference/src/multireference.sln

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ VisualStudioVersion = 15.0.27428.2005
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "proj1", "multireference.proj1/proj1.csproj", "{D1FFA0DC-0ACC-4108-ADC1-2A71122C09AF}"
66
EndProject
7-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "proj2", "multireference.proj2/proj2.csproj", "{D1FFA0DC-0ACC-4108-ADC1-2A71122C09AF}"
7+
Project("{B157F88D-FB7A-4CFA-B2CB-A63F32BDA0DB}") = "proj2", "multireference.proj2/proj2.csproj", "{9A71C857-5221-4246-8513-E582FDF6E8C3}"
88
EndProject
99
Global
1010
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -16,6 +16,10 @@ Global
1616
{D1FFA0DC-0ACC-4108-ADC1-2A71122C09AF}.Debug|Any CPU.Build.0 = Debug|x86
1717
{D1FFA0DC-0ACC-4108-ADC1-2A71122C09AF}.Release|Any CPU.ActiveCfg = Debug|x86
1818
{D1FFA0DC-0ACC-4108-ADC1-2A71122C09AF}.Release|Any CPU.Build.0 = Debug|x86
19+
{9A71C857-5221-4246-8513-E582FDF6E8C3}.Debug|Any CPU.ActiveCfg = Debug|x86
20+
{9A71C857-5221-4246-8513-E582FDF6E8C3}.Debug|Any CPU.Build.0 = Debug|x86
21+
{9A71C857-5221-4246-8513-E582FDF6E8C3}.Release|Any CPU.ActiveCfg = Debug|x86
22+
{9A71C857-5221-4246-8513-E582FDF6E8C3}.Release|Any CPU.Build.0 = Debug|x86
1923
EndGlobalSection
2024
GlobalSection(SolutionProperties) = preSolution
2125
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)