Skip to content

Commit

Permalink
Merge #11818
Browse files Browse the repository at this point in the history 
11818: Revert "Update Pulumi codegen to net6.0" r=t0yv0 a=t0yv0

Reverts #11543

After discussing with `@danielrbradley` the providers ecosystem is not ready for releasing this yet, as auto-merge workflows will blow up providers CI. Tracking merging pre-requisites first in https://github.com/pulumi/home/issues/2531 which will unblock this.

Co-authored-by: Anton Tayanovskyy <anton.tayanovskyy@gmail.com>
  • Loading branch information
@bors @t0yv0
bors[bot] and t0yv0 committed Jan 11, 2023
2 parents 351ee2b + af937ec commit 0b3373b
Show file tree
Hide file tree
Showing 43 changed files with 42 additions and 46 deletions.
4 changes: 0 additions & 4 deletions changelog/pending/20221206--sdk-dotnet--drop-support-for-net-core-3-1.yaml
View file

This file was deleted.

2 changes: 1 addition & 1 deletion pkg/codegen/dotnet/templates.go
View file
Expand Up @@ -132,7 +132,7 @@ const csharpProjectFileTemplateText = `<Project Sdk="Microsoft.NET.Sdk">
<RepositoryUrl>{{.Package.Repository}}</RepositoryUrl>
<PackageIcon>logo.png</PackageIcon>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
<UseSharedCompilation>false</UseSharedCompilation>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion pkg/codegen/testing/test/testdata/azure-native-nested-types/dotnet/Pulumi.AzureNative.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<RepositoryUrl>https://github.com/pulumi/pulumi-azure-native</RepositoryUrl>
<PackageIcon>logo.png</PackageIcon>

<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
<UseSharedCompilation>false</UseSharedCompilation>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion pkg/codegen/testing/test/testdata/cyclic-types/dotnet/Pulumi.Example.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<RepositoryUrl></RepositoryUrl>
<PackageIcon>logo.png</PackageIcon>

<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
<UseSharedCompilation>false</UseSharedCompilation>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion pkg/codegen/testing/test/testdata/dash-named-schema/dotnet/Pulumi.FooBar.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<RepositoryUrl></RepositoryUrl>
<PackageIcon>logo.png</PackageIcon>

<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
<UseSharedCompilation>false</UseSharedCompilation>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion pkg/codegen/testing/test/testdata/dashed-import-schema/dotnet/Pulumi.Plant.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<RepositoryUrl></RepositoryUrl>
<PackageIcon>logo.png</PackageIcon>

<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
<UseSharedCompilation>false</UseSharedCompilation>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion pkg/codegen/testing/test/testdata/different-enum/dotnet/Pulumi.Plant.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<RepositoryUrl></RepositoryUrl>
<PackageIcon>logo.png</PackageIcon>

<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
<UseSharedCompilation>false</UseSharedCompilation>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion pkg/codegen/testing/test/testdata/enum-reference/dotnet/Pulumi.Example.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<RepositoryUrl></RepositoryUrl>
<PackageIcon>logo.png</PackageIcon>

<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
<UseSharedCompilation>false</UseSharedCompilation>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion pkg/codegen/testing/test/testdata/external-enum/dotnet/Pulumi.Example.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<RepositoryUrl></RepositoryUrl>
<PackageIcon>logo.png</PackageIcon>

<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
<UseSharedCompilation>false</UseSharedCompilation>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion pkg/codegen/testing/test/testdata/external-resource-schema/dotnet/Pulumi.Example.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<RepositoryUrl></RepositoryUrl>
<PackageIcon>logo.png</PackageIcon>

<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
<UseSharedCompilation>false</UseSharedCompilation>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion pkg/codegen/testing/test/testdata/functions-secrets/dotnet/Pulumi.Mypkg.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<RepositoryUrl></RepositoryUrl>
<PackageIcon>logo.png</PackageIcon>

<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
<UseSharedCompilation>false</UseSharedCompilation>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion pkg/codegen/testing/test/testdata/hyphen-url/dotnet/Pulumi.Registrygeoreplication.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<RepositoryUrl></RepositoryUrl>
<PackageIcon>logo.png</PackageIcon>

<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
<UseSharedCompilation>false</UseSharedCompilation>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion pkg/codegen/testing/test/testdata/naming-collisions/dotnet/Pulumi.Example.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<RepositoryUrl></RepositoryUrl>
<PackageIcon>logo.png</PackageIcon>

<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
<UseSharedCompilation>false</UseSharedCompilation>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion pkg/codegen/testing/test/testdata/nested-module-thirdparty/dotnet/Pulumi.FooBar.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<RepositoryUrl></RepositoryUrl>
<PackageIcon>logo.png</PackageIcon>

<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
<UseSharedCompilation>false</UseSharedCompilation>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion pkg/codegen/testing/test/testdata/nested-module/dotnet/Pulumi.Foo.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<RepositoryUrl></RepositoryUrl>
<PackageIcon>logo.png</PackageIcon>

<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
<UseSharedCompilation>false</UseSharedCompilation>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion pkg/codegen/testing/test/testdata/other-owned/dotnet/Other.Example.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<RepositoryUrl></RepositoryUrl>
<PackageIcon>logo.png</PackageIcon>

<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
<UseSharedCompilation>false</UseSharedCompilation>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion pkg/codegen/testing/test/testdata/output-funcs-edgeorder/dotnet/Pulumi.Myedgeorder.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<RepositoryUrl></RepositoryUrl>
<PackageIcon>logo.png</PackageIcon>

<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
<UseSharedCompilation>false</UseSharedCompilation>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion pkg/codegen/testing/test/testdata/output-funcs-tfbridge20/dotnet/Pulumi.Mypkg.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<RepositoryUrl></RepositoryUrl>
<PackageIcon>logo.png</PackageIcon>

<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
<UseSharedCompilation>false</UseSharedCompilation>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion pkg/codegen/testing/test/testdata/output-funcs/dotnet/Pulumi.Mypkg.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<RepositoryUrl></RepositoryUrl>
<PackageIcon>logo.png</PackageIcon>

<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
<UseSharedCompilation>false</UseSharedCompilation>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion pkg/codegen/testing/test/testdata/plain-and-default/dotnet/Pulumi.FooBar.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<RepositoryUrl></RepositoryUrl>
<PackageIcon>logo.png</PackageIcon>

<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
<UseSharedCompilation>false</UseSharedCompilation>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion pkg/codegen/testing/test/testdata/plain-object-defaults/dotnet/Pulumi.Example.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<RepositoryUrl></RepositoryUrl>
<PackageIcon>logo.png</PackageIcon>

<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
<UseSharedCompilation>false</UseSharedCompilation>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion pkg/codegen/testing/test/testdata/plain-object-disable-defaults/dotnet/Pulumi.Example.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<RepositoryUrl></RepositoryUrl>
<PackageIcon>logo.png</PackageIcon>

<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
<UseSharedCompilation>false</UseSharedCompilation>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion pkg/codegen/testing/test/testdata/plain-schema-gh6957/dotnet/Pulumi.Xyz.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<RepositoryUrl></RepositoryUrl>
<PackageIcon>logo.png</PackageIcon>

<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
<UseSharedCompilation>false</UseSharedCompilation>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...ing/test/testdata/provider-config-schema/dotnet/Configstation.Pulumi.Configstation.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<RepositoryUrl></RepositoryUrl>
<PackageIcon>logo.png</PackageIcon>

<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
<UseSharedCompilation>false</UseSharedCompilation>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion pkg/codegen/testing/test/testdata/regress-8403/dotnet/Pulumi.Mongodbatlas.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<RepositoryUrl></RepositoryUrl>
<PackageIcon>logo.png</PackageIcon>

<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
<UseSharedCompilation>false</UseSharedCompilation>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion pkg/codegen/testing/test/testdata/regress-node-8110/dotnet/Pulumi.My8110.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<RepositoryUrl></RepositoryUrl>
<PackageIcon>logo.png</PackageIcon>

<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
<UseSharedCompilation>false</UseSharedCompilation>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion pkg/codegen/testing/test/testdata/replace-on-change/dotnet/Pulumi.Example.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<RepositoryUrl></RepositoryUrl>
<PackageIcon>logo.png</PackageIcon>

<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
<UseSharedCompilation>false</UseSharedCompilation>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion .../testing/test/testdata/resource-args-python-case-insensitive/dotnet/Pulumi.Example.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<RepositoryUrl></RepositoryUrl>
<PackageIcon>logo.png</PackageIcon>

<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
<UseSharedCompilation>false</UseSharedCompilation>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion pkg/codegen/testing/test/testdata/resource-args-python/dotnet/Pulumi.Example.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<RepositoryUrl></RepositoryUrl>
<PackageIcon>logo.png</PackageIcon>

<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
<UseSharedCompilation>false</UseSharedCompilation>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion pkg/codegen/testing/test/testdata/resource-property-overlap/dotnet/Pulumi.Example.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<RepositoryUrl></RepositoryUrl>
<PackageIcon>logo.png</PackageIcon>

<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
<UseSharedCompilation>false</UseSharedCompilation>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion pkg/codegen/testing/test/testdata/secrets/dotnet/Pulumi.Mypkg.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<RepositoryUrl></RepositoryUrl>
<PackageIcon>logo.png</PackageIcon>

<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
<UseSharedCompilation>false</UseSharedCompilation>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion pkg/codegen/testing/test/testdata/simple-enum-schema/dotnet/Pulumi.Plant.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<RepositoryUrl></RepositoryUrl>
<PackageIcon>logo.png</PackageIcon>

<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
<UseSharedCompilation>false</UseSharedCompilation>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...ing/test/testdata/simple-methods-schema-single-value-returns/dotnet/Pulumi.Example.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<RepositoryUrl></RepositoryUrl>
<PackageIcon>logo.png</PackageIcon>

<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
<UseSharedCompilation>false</UseSharedCompilation>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion pkg/codegen/testing/test/testdata/simple-methods-schema/dotnet/Pulumi.Example.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<RepositoryUrl></RepositoryUrl>
<PackageIcon>logo.png</PackageIcon>

<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
<UseSharedCompilation>false</UseSharedCompilation>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion .../testing/test/testdata/simple-plain-schema-with-root-package/dotnet/Pulumi.Example.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<RepositoryUrl></RepositoryUrl>
<PackageIcon>logo.png</PackageIcon>

<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
<UseSharedCompilation>false</UseSharedCompilation>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion pkg/codegen/testing/test/testdata/simple-plain-schema/dotnet/Pulumi.Example.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<RepositoryUrl></RepositoryUrl>
<PackageIcon>logo.png</PackageIcon>

<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
<UseSharedCompilation>false</UseSharedCompilation>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...g/test/testdata/simple-resource-schema-custom-pypackage-name/dotnet/Pulumi.Example.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<RepositoryUrl></RepositoryUrl>
<PackageIcon>logo.png</PackageIcon>

<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
<UseSharedCompilation>false</UseSharedCompilation>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion pkg/codegen/testing/test/testdata/simple-resource-schema/dotnet/Pulumi.Example.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<RepositoryUrl></RepositoryUrl>
<PackageIcon>logo.png</PackageIcon>

<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
<UseSharedCompilation>false</UseSharedCompilation>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion pkg/codegen/testing/test/testdata/simple-yaml-schema/dotnet/Pulumi.Example.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<RepositoryUrl></RepositoryUrl>
<PackageIcon>logo.png</PackageIcon>

<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
<UseSharedCompilation>false</UseSharedCompilation>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion sdk/go/auto/test/errors/compilation_error/dotnet/dotnet.csproj
View file
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion sdk/go/auto/test/errors/runtime_error/dotnet/adsfsdf.csproj
View file
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion sdk/python/lib/test/automation/errors/compilation_error/dotnet/dotnet.csproj
View file
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion sdk/python/lib/test/automation/errors/runtime_error/dotnet/adsfsdf.csproj
View file
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
</PropertyGroup>

Expand Down

0 comments on commit 0b3373b

Please sign in to comment.