Skip to content

Commit

Permalink
Upgrade .NET version (pulumi#879)
Browse files Browse the repository at this point in the history
  • Loading branch information
MisinformedDNA committed Jan 21, 2021
1 parent 0a38cb1 commit 432ad05
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 15 deletions.
2 changes: 1 addition & 1 deletion azure-cs-msi-keyvault-rbac/AppStack.cs
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public AppStack()
StorageAccountName = storageAccount.Name,
StorageContainerName = storageContainer.Name,
Type = "Block",
Source = new FileArchive("./webapp/bin/Debug/netcoreapp2.2/publish"),
Source = new FileArchive("./webapp/bin/Debug/netcoreapp3.1/publish"),
});

var clientConfig = Output.Create(GetClientConfig.InvokeAsync());
Expand Down
3 changes: 2 additions & 1 deletion azure-cs-msi-keyvault-rbac/webapp/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;

namespace webapp
{
Expand All @@ -26,7 +27,7 @@ public void ConfigureServices(IServiceCollection services)
}

// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
public void Configure(IApplicationBuilder app, IHostingEnvironment env)
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
{
if (env.IsDevelopment())
{
Expand Down
4 changes: 1 addition & 3 deletions azure-cs-msi-keyvault-rbac/webapp/webapp.csproj
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore" Version="2.1.7" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.3" />
<PackageReference Include="System.Data.SqlClient" Version="4.6.0" />
<PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.0.3" />
<PackageReference Include="Microsoft.Azure.Storage.Blob" Version="10.0.3" />
Expand Down
2 changes: 1 addition & 1 deletion azure-py-msi-keyvault-rbac/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def createFirewallRules(arg):
storage_account_name=storage_account.name,
storage_container_name=container.name,
type="Block",
source=asset.FileArchive("./webapp/bin/Debug/netcoreapp2.2/publish")
source=asset.FileArchive("./webapp/bin/Debug/netcoreapp3.1/publish")
)

client_config = core.get_client_config()
Expand Down
3 changes: 2 additions & 1 deletion azure-py-msi-keyvault-rbac/webapp/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;

namespace webapp
{
Expand All @@ -26,7 +27,7 @@ public void ConfigureServices(IServiceCollection services)
}

// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
public void Configure(IApplicationBuilder app, IHostingEnvironment env)
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
{
if (env.IsDevelopment())
{
Expand Down
4 changes: 1 addition & 3 deletions azure-py-msi-keyvault-rbac/webapp/webapp.csproj
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore" Version="2.1.7" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.3" />
<PackageReference Include="System.Data.SqlClient" Version="4.6.0" />
<PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.0.3" />
<PackageReference Include="Microsoft.Azure.Storage.Blob" Version="10.0.3" />
Expand Down
2 changes: 1 addition & 1 deletion azure-ts-msi-keyvault-rbac/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ const blob = new azure.storage.Blob("zip", {
storageContainerName: storageContainer.name,
type: "Block",

source: new pulumi.asset.FileArchive("./webapp/bin/Debug/netcoreapp2.2/publish"),
source: new pulumi.asset.FileArchive("./webapp/bin/Debug/netcoreapp3.1/publish"),
});

const clientConfig = azure.core.getClientConfig({ async: true });
Expand Down
3 changes: 2 additions & 1 deletion azure-ts-msi-keyvault-rbac/webapp/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;

namespace webapp
{
Expand All @@ -26,7 +27,7 @@ public void ConfigureServices(IServiceCollection services)
}

// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
public void Configure(IApplicationBuilder app, IHostingEnvironment env)
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
{
if (env.IsDevelopment())
{
Expand Down
4 changes: 1 addition & 3 deletions azure-ts-msi-keyvault-rbac/webapp/webapp.csproj
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore" Version="2.1.7" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.3" />
<PackageReference Include="System.Data.SqlClient" Version="4.6.0" />
<PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.0.3" />
<PackageReference Include="Microsoft.Azure.Storage.Blob" Version="10.0.3" />
Expand Down

0 comments on commit 432ad05

Please sign in to comment.