Upgrade Azure CS examples to azure-native v2 and .NET 6 (pulumi#1582)

GeorgeJose7 · Feb 12, 2024 · 70fa289 · 70fa289
1 parent 43fb674
commit 70fa289
Show file tree

Hide file tree

Showing 23 changed files with 31 additions and 25 deletions.
diff --git a/azure-cs-aci/Azure.Aci.csproj b/azure-cs-aci/Azure.Aci.csproj
@@ -8,7 +8,7 @@
 
  <ItemGroup>
  <PackageReference Include="Pulumi" Version="3.*" />
- <PackageReference Include="Pulumi.AzureNative" Version="1.*" />
+ <PackageReference Include="Pulumi.AzureNative" Version="2.*" />
  </ItemGroup>
 
 </Project>
diff --git a/azure-cs-aks-cosmos-helm/AksCosmosStack.csproj b/azure-cs-aks-cosmos-helm/AksCosmosStack.csproj
@@ -2,14 +2,14 @@
 
  <PropertyGroup>
  <OutputType>Exe</OutputType>
- <TargetFramework>net5.0</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
  <Nullable>enable</Nullable>
  </PropertyGroup>
 
  <ItemGroup>
  <PackageReference Include="Pulumi" Version="3.*" />
  <PackageReference Include="Pulumi.AzureAD" Version="4.*" />
- <PackageReference Include="Pulumi.AzureNative" Version="1.*" />
+ <PackageReference Include="Pulumi.AzureNative" Version="2.*" />
  <PackageReference Include="Pulumi.Kubernetes" Version="3.*" />
  <PackageReference Include="Pulumi.Random" Version="4.*" />
  <PackageReference Include="Pulumi.Tls" Version="4.*" />

diff --git a/azure-cs-aks-helm/MyConfig.cs b/azure-cs-aks-helm/MyConfig.cs
@@ -21,7 +21,7 @@ class MyConfig
 
  public MyConfig()
  {
- var cfg = new Config();
+ var cfg = new Pulumi.Config();
 
  this.K8SVersion = cfg.Get("k8sVersion") ?? "1.26.3";
  this.NodeCount = cfg.GetInt32("nodeCount") ?? 2;

diff --git a/azure-cs-aks-helm/azure-cs-aks-helm.csproj b/azure-cs-aks-helm/azure-cs-aks-helm.csproj
@@ -8,7 +8,7 @@
 
  <ItemGroup>
  <PackageReference Include="Pulumi" Version="3.*" />
- <PackageReference Include="Pulumi.AzureNative" Version="1.*" />
+ <PackageReference Include="Pulumi.AzureNative" Version="2.*" />
  <PackageReference Include="Pulumi.AzureAd" Version="4.*" />
  <PackageReference Include="Pulumi.Kubernetes" Version="3.*" />
  <PackageReference Include="Pulumi.Random" Version="4.*" />

diff --git a/azure-cs-aks-multicluster/MyStack.cs b/azure-cs-aks-multicluster/MyStack.cs
@@ -6,10 +6,10 @@
 using Pulumi.AzureAD;
 using Pulumi.AzureNative.Resources;
 using Pulumi.AzureNative.ContainerService;
-using Pulumi.AzureNative.ContainerService.V20190201;
 using Pulumi.AzureNative.ContainerService.Inputs;
 using ManagedCluster = Pulumi.AzureNative.ContainerService.ManagedCluster;
 using ManagedClusterArgs = Pulumi.AzureNative.ContainerService.ManagedClusterArgs;
+using Pulumi.AzureNative.ContainerService.V20190601;
 
 class MyStack : Stack
 {

diff --git a/azure-cs-aks-multicluster/azure-cs-aks-multicluster.csproj b/azure-cs-aks-multicluster/azure-cs-aks-multicluster.csproj
@@ -9,7 +9,7 @@
  <ItemGroup>
  <PackageReference Include="Pulumi" Version="3.*" />
  <PackageReference Include="Pulumi.Azuread" Version="4.*" />
- <PackageReference Include="Pulumi.AzureNative" Version="1.*" />
+ <PackageReference Include="Pulumi.AzureNative" Version="2.*" />
  </ItemGroup>
 
 </Project>
diff --git a/azure-cs-aks/Azure.Aks.csproj b/azure-cs-aks/Azure.Aks.csproj
@@ -9,7 +9,7 @@
  <ItemGroup>
  <PackageReference Include="Pulumi" Version="3.*" />
  <PackageReference Include="Pulumi.AzureAD" Version="4.*" />
- <PackageReference Include="Pulumi.AzureNative" Version="1.*" />
+ <PackageReference Include="Pulumi.AzureNative" Version="2.*" />
  <PackageReference Include="Pulumi.Random" Version="4.*" />
  <PackageReference Include="Pulumi.Tls" Version="4.*" />
  </ItemGroup>

diff --git a/azure-cs-appservice-docker/Azure.AppService.Docker.csproj b/azure-cs-appservice-docker/Azure.AppService.Docker.csproj
@@ -8,7 +8,7 @@
 
  <ItemGroup>
  <PackageReference Include="Pulumi" Version="3.*" />
- <PackageReference Include="Pulumi.AzureNative" Version="1.*" />
+ <PackageReference Include="Pulumi.AzureNative" Version="2.*" />
  <PackageReference Include="Pulumi.Docker" Version="2.*" />
  <PackageReference Include="Pulumi.Random" Version="4.*" />
  </ItemGroup>

diff --git a/azure-cs-appservice/AppServiceStack.cs b/azure-cs-appservice/AppServiceStack.cs
@@ -2,6 +2,7 @@
 
 using Pulumi;
 using Pulumi.AzureNative.Insights;
+using Pulumi.AzureNative.OperationalInsights;
 using Pulumi.AzureNative.Resources;
 using Pulumi.AzureNative.Sql;
 using Pulumi.AzureNative.Storage;
@@ -54,11 +55,16 @@ public AppServiceStack()
 
  var codeBlobUrl = SignedBlobReadUrl(blob, container, storageAccount, resourceGroup);
 
+ var workspace = new Workspace("loganalyticsWorkspace", new WorkspaceArgs{
+ ResourceGroupName = resourceGroup.Name,
+ });
+
  var appInsights = new Component("appInsights", new ComponentArgs
  {
  ApplicationType = "web",
  Kind = "web",
  ResourceGroupName = resourceGroup.Name,
+ WorkspaceResourceId = workspace.Id
  });
 
  var config = new Config();

diff --git a/azure-cs-appservice/Azure.AppService.csproj b/azure-cs-appservice/Azure.AppService.csproj
@@ -8,7 +8,7 @@
 
  <ItemGroup>
  <PackageReference Include="Pulumi" Version="3.*" />
- <PackageReference Include="Pulumi.AzureNative" Version="1.*" />
+ <PackageReference Include="Pulumi.AzureNative" Version="2.*" />
  </ItemGroup>
 
 </Project>
diff --git a/azure-cs-call-azure-api/azure-cs-call-azure-api.csproj b/azure-cs-call-azure-api/azure-cs-call-azure-api.csproj
@@ -2,13 +2,13 @@
 
  <PropertyGroup>
  <OutputType>Exe</OutputType>
- <TargetFramework>net5.0</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
  <RootNamespace>azure_cs_call_azure_sdk</RootNamespace>
  </PropertyGroup>
 
  <ItemGroup>
  <PackageReference Include="Pulumi" Version="3.*" />
- <PackageReference Include="Pulumi.AzureNative" Version="1.*" />
+ <PackageReference Include="Pulumi.AzureNative" Version="2.*" />
  </ItemGroup>
 
 </Project>
diff --git a/azure-cs-containerapps/Azure.ContainerApps.csproj b/azure-cs-containerapps/Azure.ContainerApps.csproj
@@ -8,7 +8,7 @@
 
  <ItemGroup>
  <PackageReference Include="Pulumi" Version="3.*" />
- <PackageReference Include="Pulumi.AzureNative" Version="1.*" />
+ <PackageReference Include="Pulumi.AzureNative" Version="2.*" />
  <PackageReference Include="Pulumi.Docker" Version="3.*" />
  </ItemGroup>
 

diff --git a/azure-cs-cosmosdb-logicapp/CosmosDBLogicApp.csproj b/azure-cs-cosmosdb-logicapp/CosmosDBLogicApp.csproj
@@ -8,7 +8,7 @@
 
  <ItemGroup>
  <PackageReference Include="Pulumi" Version="3.*" />
- <PackageReference Include="Pulumi.AzureNative" Version="1.*" />
+ <PackageReference Include="Pulumi.AzureNative" Version="2.*" />
  <PackageReference Include="Pulumi.Docker" Version="2.*" />
  <PackageReference Include="Pulumi.Random" Version="4.*" />
  </ItemGroup>

diff --git a/azure-cs-credential-rotation-one-set/AppStack.cs b/azure-cs-credential-rotation-one-set/AppStack.cs
@@ -232,7 +232,7 @@ public AppStack()
 
  var expiresAt = DateTimeOffset.Now.AddMinutes(1).ToUnixTimeSeconds();
  var secret = new Secret("secret",
- new SecretArgs
+ new KeyVault.SecretArgs
  {
  SecretName = secretName,
  VaultName = keyVault.Name,

diff --git a/azure-cs-credential-rotation-one-set/Azure.CredentialRotation.OneSet.csproj b/azure-cs-credential-rotation-one-set/Azure.CredentialRotation.OneSet.csproj
@@ -8,7 +8,7 @@
 
  <ItemGroup>
  <PackageReference Include="Pulumi" Version="3.*" />
- <PackageReference Include="Pulumi.AzureNative" Version="1.*" />
+ <PackageReference Include="Pulumi.AzureNative" Version="2.*" />
  <PackageReference Include="Pulumi.Random" Version="3.*" />
  </ItemGroup>
 

diff --git a/azure-cs-functions/Azure.Functions.csproj b/azure-cs-functions/Azure.Functions.csproj
@@ -8,7 +8,7 @@
 
  <ItemGroup>
  <PackageReference Include="Pulumi" Version="3.*" />
- <PackageReference Include="Pulumi.AzureNative" Version="1.*" />
+ <PackageReference Include="Pulumi.AzureNative" Version="2.*" />
  </ItemGroup>
 
 </Project>
diff --git a/azure-cs-net5-aks-webapp/Azure.Dotnet5.csproj b/azure-cs-net5-aks-webapp/Azure.Dotnet5.csproj
@@ -2,14 +2,14 @@
 
  <PropertyGroup>
  <OutputType>Exe</OutputType>
- <TargetFramework>net5.0</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
  <Nullable>enable</Nullable>
  </PropertyGroup>
 
  <ItemGroup>
  <PackageReference Include="Pulumi" Version="3.*" />
  <PackageReference Include="Pulumi.AzureAD" Version="4.*" />
- <PackageReference Include="Pulumi.AzureNative" Version="1.*" />
+ <PackageReference Include="Pulumi.AzureNative" Version="2.*" />
  <PackageReference Include="Pulumi.Docker" Version="2.*" />
  <PackageReference Include="Pulumi.Kubernetes" Version="3.*" />
  <PackageReference Include="Pulumi.Random" Version="3.*" />

diff --git a/azure-cs-sqlserver/Azure.SQLServer.csproj b/azure-cs-sqlserver/Azure.SQLServer.csproj
@@ -8,7 +8,7 @@
 
  <ItemGroup>
  <PackageReference Include="Pulumi" Version="3.*" />
- <PackageReference Include="Pulumi.AzureNative" Version="1.*" />
+ <PackageReference Include="Pulumi.AzureNative" Version="2.*" />
  <PackageReference Include="Pulumi.Docker" Version="2.*" />
  <PackageReference Include="Pulumi.Random" Version="4.*" />
  </ItemGroup>

diff --git a/azure-cs-static-website/Azure.StaticWebsite.csproj b/azure-cs-static-website/Azure.StaticWebsite.csproj
@@ -8,7 +8,7 @@
 
  <ItemGroup>
  <PackageReference Include="Pulumi" Version="3.*" />
- <PackageReference Include="Pulumi.AzureNative" Version="1.*" />
+ <PackageReference Include="Pulumi.AzureNative" Version="2.*" />
  <PackageReference Include="Pulumi.Docker" Version="2.*" />
  <PackageReference Include="Pulumi.Random" Version="4.*" />
  </ItemGroup>

diff --git a/azure-cs-synapse/Azure.Synapse.csproj b/azure-cs-synapse/Azure.Synapse.csproj
@@ -8,7 +8,7 @@
 
  <ItemGroup>
  <PackageReference Include="Pulumi" Version="3.*" />
- <PackageReference Include="Pulumi.AzureNative" Version="1.*" />
+ <PackageReference Include="Pulumi.AzureNative" Version="2.*" />
  <PackageReference Include="Pulumi.Random" Version="4.*" />
  </ItemGroup>
 

diff --git a/docker-cs-multi-container-app/App/App.csproj b/docker-cs-multi-container-app/App/App.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
  <PropertyGroup>
- <TargetFramework>net5.0</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
  </PropertyGroup>
 
  <ItemGroup>

diff --git a/testing-unit-cs-mocks/UnitTesting.csproj b/testing-unit-cs-mocks/UnitTesting.csproj
@@ -12,7 +12,7 @@
  <PackageReference Include="NUnit" Version="3.12.0" />
  <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
  <PackageReference Include="Pulumi" Version="3.*" />
- <PackageReference Include="Pulumi.AzureNative" Version="1.*" />
+ <PackageReference Include="Pulumi.AzureNative" Version="2.*" />
  </ItemGroup>
 
  <ItemGroup>

diff --git a/testing-unit-cs-top-level-program/infra/Infra.csproj b/testing-unit-cs-top-level-program/infra/Infra.csproj
@@ -8,7 +8,7 @@
 
  <ItemGroup>
  <PackageReference Include="Pulumi" Version="3.*" />
- <PackageReference Include="Pulumi.AzureNative" Version="1.67.0" />
+ <PackageReference Include="Pulumi.AzureNative" Version="2.*" />
  </ItemGroup>
 
  <ItemGroup>