Skip to content

Commit

Permalink
Merge #11345
Browse files Browse the repository at this point in the history 
11345: Do not reference Pulumi nuget if a project reference to Pulumi.csproj already exists r=Zaid-Ajaj a=Zaid-Ajaj

When generating dotnet SDKs, if a schema doesn't specify a package reference to Pulumi nuget, we add it automatically by default. However, when generating test dotnet sdks, we also use project references that refer to the local Pulumi SDK and it is not correct to have either (although usually it compiles if you don't use latest SDK changes) 

This PR makes it so that if we are already referencing a local Pulumi SDK via a project reference, then we don't add a package reference to Pulumi



Co-authored-by: Zaid Ajaj <zaid.naom@gmail.com>
  • Loading branch information
@bors @Zaid-Ajaj
bors[bot] and Zaid-Ajaj committed Nov 14, 2022
2 parents d5265c0 + 9fde68e commit 9051101
Show file tree
Hide file tree
Showing 29 changed files with 17 additions and 29 deletions.
18 changes: 17 additions & 1 deletion pkg/codegen/dotnet/gen.go
View file
Expand Up @@ -2182,9 +2182,25 @@ func genProjectFile(pkg *schema.Package,
if packageReferences == nil {
packageReferences = map[string]string{}
}

// if we don't have a package reference to Pulumi SDK from nuget
// we need to add it, unless we are referencing a local Pulumi SDK project via a project reference
if _, ok := packageReferences["Pulumi"]; !ok {
packageReferences["Pulumi"] = "[3.23.0,4)"
referencedLocalPulumiProject := false
for _, projectReference := range projectReferences {
if strings.HasSuffix(projectReference, "Pulumi.csproj") {
referencedLocalPulumiProject = true
break
}
}

// only add a package reference to Pulumi if we're not referencing a local Pulumi project
// which we usually do when testing schemas locally
if !referencedLocalPulumiProject {
packageReferences["Pulumi"] = "[3.23.0,4)"
}
}

w := &bytes.Buffer{}
err := csharpProjectFileTemplate.Execute(w, csharpProjectFileTemplateContext{
XMLDoc: fmt.Sprintf(`.\%s.xml`, assemblyName),
Expand Down
1 change: 0 additions & 1 deletion pkg/codegen/testing/test/testdata/azure-native-nested-types/dotnet/Pulumi.AzureNative.csproj
View file
Expand Up @@ -45,7 +45,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="[3.23.0,4)" />
<PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
</ItemGroup>

Expand Down
1 change: 0 additions & 1 deletion pkg/codegen/testing/test/testdata/cyclic-types/dotnet/Pulumi.Example.csproj
View file
Expand Up @@ -45,7 +45,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="[3.23.0,4)" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion pkg/codegen/testing/test/testdata/dash-named-schema/dotnet/Pulumi.FooBar.csproj
View file
Expand Up @@ -45,7 +45,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="[3.23.0,4)" />
<PackageReference Include="Pulumi.Aws" Version="4.20" ExcludeAssets="contentFiles" />
<PackageReference Include="Pulumi.Kubernetes" Version="3.7" ExcludeAssets="contentFiles" />
<PackageReference Include="Pulumi.Random" Version="4.2" ExcludeAssets="contentFiles" />
Expand Down
1 change: 0 additions & 1 deletion pkg/codegen/testing/test/testdata/dashed-import-schema/dotnet/Pulumi.Plant.csproj
View file
Expand Up @@ -45,7 +45,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="[3.23.0,4)" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion pkg/codegen/testing/test/testdata/functions-secrets/dotnet/Pulumi.Mypkg.csproj
View file
Expand Up @@ -45,7 +45,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="[3.23.0,4)" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion pkg/codegen/testing/test/testdata/hyphen-url/dotnet/Pulumi.Registrygeoreplication.csproj
View file
Expand Up @@ -45,7 +45,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="[3.23.0,4)" />
<PackageReference Include="Pulumi.AzureNative" Version="1.28.*" ExcludeAssets="contentFiles" />
</ItemGroup>

Expand Down
1 change: 0 additions & 1 deletion pkg/codegen/testing/test/testdata/naming-collisions/dotnet/Pulumi.Example.csproj
View file
Expand Up @@ -45,7 +45,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="[3.23.0,4)" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion pkg/codegen/testing/test/testdata/nested-module-thirdparty/dotnet/Pulumi.FooBar.csproj
View file
Expand Up @@ -45,7 +45,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="[3.23.0,4)" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion pkg/codegen/testing/test/testdata/output-funcs-edgeorder/dotnet/Pulumi.Myedgeorder.csproj
View file
Expand Up @@ -45,7 +45,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="[3.23.0,4)" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion pkg/codegen/testing/test/testdata/output-funcs-tfbridge20/dotnet/Pulumi.Mypkg.csproj
View file
Expand Up @@ -50,7 +50,6 @@
<PackageReference Include="Moq" Version="4.13.1" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="Pulumi" Version="[3.23.0,4)" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion pkg/codegen/testing/test/testdata/output-funcs/dotnet/Pulumi.Mypkg.csproj
View file
Expand Up @@ -50,7 +50,6 @@
<PackageReference Include="Moq" Version="4.13.1" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="Pulumi" Version="[3.23.0,4)" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion pkg/codegen/testing/test/testdata/plain-and-default/dotnet/Pulumi.FooBar.csproj
View file
Expand Up @@ -45,7 +45,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="[3.23.0,4)" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion pkg/codegen/testing/test/testdata/plain-object-defaults/dotnet/Pulumi.Example.csproj
View file
Expand Up @@ -45,7 +45,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="[3.23.0,4)" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion pkg/codegen/testing/test/testdata/plain-object-disable-defaults/dotnet/Pulumi.Example.csproj
View file
Expand Up @@ -45,7 +45,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="[3.23.0,4)" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion pkg/codegen/testing/test/testdata/plain-schema-gh6957/dotnet/Pulumi.Xyz.csproj
View file
Expand Up @@ -45,7 +45,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="[3.23.0,4)" />
<PackageReference Include="Pulumi.Aws" Version="4.*" ExcludeAssets="contentFiles" />
</ItemGroup>

Expand Down
1 change: 0 additions & 1 deletion pkg/codegen/testing/test/testdata/regress-8403/dotnet/Pulumi.Mongodbatlas.csproj
View file
Expand Up @@ -45,7 +45,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="[3.23.0,4)" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion pkg/codegen/testing/test/testdata/regress-node-8110/dotnet/Pulumi.My8110.csproj
View file
Expand Up @@ -45,7 +45,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="[3.23.0,4)" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion pkg/codegen/testing/test/testdata/replace-on-change/dotnet/Pulumi.Example.csproj
View file
Expand Up @@ -45,7 +45,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="[3.23.0,4)" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion .../testing/test/testdata/resource-args-python-case-insensitive/dotnet/Pulumi.Example.csproj
View file
Expand Up @@ -45,7 +45,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="[3.23.0,4)" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion pkg/codegen/testing/test/testdata/resource-args-python/dotnet/Pulumi.Example.csproj
View file
Expand Up @@ -45,7 +45,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="[3.23.0,4)" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion pkg/codegen/testing/test/testdata/resource-property-overlap/dotnet/Pulumi.Example.csproj
View file
Expand Up @@ -45,7 +45,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="[3.23.0,4)" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion pkg/codegen/testing/test/testdata/secrets/dotnet/Pulumi.Mypkg.csproj
View file
Expand Up @@ -45,7 +45,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="[3.23.0,4)" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion pkg/codegen/testing/test/testdata/simple-enum-schema/dotnet/Pulumi.Plant.csproj
View file
Expand Up @@ -45,7 +45,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="[3.23.0,4)" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion ...ing/test/testdata/simple-methods-schema-single-value-returns/dotnet/Pulumi.Example.csproj
View file
Expand Up @@ -45,7 +45,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="[3.23.0,4)" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion pkg/codegen/testing/test/testdata/simple-methods-schema/dotnet/Pulumi.Example.csproj
View file
Expand Up @@ -45,7 +45,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="[3.23.0,4)" />
<PackageReference Include="Pulumi.Random" Version="4.2.0" ExcludeAssets="contentFiles" />
</ItemGroup>

Expand Down
1 change: 0 additions & 1 deletion .../testing/test/testdata/simple-plain-schema-with-root-package/dotnet/Pulumi.Example.csproj
View file
Expand Up @@ -45,7 +45,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="[3.23.0,4)" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion pkg/codegen/testing/test/testdata/simple-plain-schema/dotnet/Pulumi.Example.csproj
View file
Expand Up @@ -45,7 +45,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="[3.23.0,4)" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion pkg/codegen/testing/test/testdata/simple-resource-schema/dotnet/Pulumi.Example.csproj
View file
Expand Up @@ -45,7 +45,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="[3.23.0,4)" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 9051101

Please sign in to comment.