updates to .NET 4.7.2 and SF 7.1

masnider · masnider · commit ad30cbb29143 · 2020-09-25T11:03:49.000-07:00
diff --git a/Voting/Voting.sfproj b/Voting/Voting.sfproj
@@ -1,6 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" InitialTargets=";ValidateMSBuildFiles">
-  <Import Project="..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.7\build\Microsoft.VisualStudio.Azure.Fabric.Application.props" Condition="Exists('..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.7\build\Microsoft.VisualStudio.Azure.Fabric.Application.props')" />
+  <Import Project="..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.7.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.props" Condition="Exists('..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.7.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.props')" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>af958126-cb44-487a-8292-2d27594966de</ProjectGuid>
     <ProjectVersion>2.0</ProjectVersion>
@@ -39,9 +39,9 @@
     <ApplicationProjectTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Service Fabric Tools\Microsoft.VisualStudio.Azure.Fabric.ApplicationProject.targets</ApplicationProjectTargetsPath>
   </PropertyGroup>
   <Import Project="$(ApplicationProjectTargetsPath)" Condition="Exists('$(ApplicationProjectTargetsPath)')" />
-  <Import Project="..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.7\build\Microsoft.VisualStudio.Azure.Fabric.Application.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.7\build\Microsoft.VisualStudio.Azure.Fabric.Application.targets')" />
-  <Target Name="ValidateMSBuildFiles">
-    <Error Condition="!Exists('..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.7\build\Microsoft.VisualStudio.Azure.Fabric.Application.props')" Text="Unable to find the '..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.7\build\Microsoft.VisualStudio.Azure.Fabric.Application.props' file. Please restore the 'Microsoft.VisualStudio.Azure.Fabric.MSBuild' Nuget package." />
-    <Error Condition="!Exists('..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.7\build\Microsoft.VisualStudio.Azure.Fabric.Application.targets')" Text="Unable to find the '..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.7\build\Microsoft.VisualStudio.Azure.Fabric.Application.targets' file. Please restore the 'Microsoft.VisualStudio.Azure.Fabric.MSBuild' Nuget package." />
+  <Import Project="..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.7.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.7.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.targets')" />
+  <Target Name="ValidateMSBuildFiles" BeforeTargets="PrepareForBuild">
+    <Error Condition="!Exists('..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.7.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.props')" Text="Unable to find the '..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.7.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.props' file. Please restore the 'Microsoft.VisualStudio.Azure.Fabric.MSBuild' Nuget package." />
+    <Error Condition="!Exists('..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.7.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.targets')" Text="Unable to find the '..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.7.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.targets' file. Please restore the 'Microsoft.VisualStudio.Azure.Fabric.MSBuild' Nuget package." />
   </Target>
 </Project>
diff --git a/Voting/packages.config b/Voting/packages.config
@@ -1,4 +1,4 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.VisualStudio.Azure.Fabric.MSBuild" version="1.6.7" targetFramework="net40" />
+  <package id="Microsoft.VisualStudio.Azure.Fabric.MSBuild" version="1.7.1" targetFramework="net40" />
 </packages>
diff --git a/VotingData/Controllers/VoteDataController.cs b/VotingData/Controllers/VoteDataController.cs
@@ -32,9 +32,9 @@ public async Task<IActionResult> Get()
 
             using (ITransaction tx = this.stateManager.CreateTransaction())
             {
-                IAsyncEnumerable<KeyValuePair<string, int>> list = await votesDictionary.CreateEnumerableAsync(tx);
+                var list = await votesDictionary.CreateEnumerableAsync(tx);
 
-                IAsyncEnumerator<KeyValuePair<string, int>> enumerator = list.GetAsyncEnumerator();
+                var enumerator = list.GetAsyncEnumerator();
 
                 List<KeyValuePair<string, int>> result = new List<KeyValuePair<string, int>>();
 
diff --git a/VotingData/Startup.cs b/VotingData/Startup.cs
@@ -33,10 +33,16 @@ 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, ILoggerFactory loggerFactory)
+        public void Configure(IApplicationBuilder app, IHostingEnvironment env)
         {
-            loggerFactory.AddConsole(this.Configuration.GetSection("Logging"));
-            loggerFactory.AddDebug();
+            if (env.IsDevelopment())
+            {
+                app.UseDeveloperExceptionPage();
+            }
+            else
+            {
+                app.UseExceptionHandler("/Home/Error");
+            }
 
             app.UseMvc();
         }
diff --git a/VotingData/VotingData.cs b/VotingData/VotingData.cs
@@ -9,6 +9,7 @@ namespace VotingData
     using System.Fabric;
     using System.IO;
     using Microsoft.AspNetCore.Hosting;
+    using Microsoft.Extensions.Logging;
     using Microsoft.Extensions.DependencyInjection;
     using Microsoft.ServiceFabric.Data;
     using Microsoft.ServiceFabric.Services.Communication.AspNetCore;
@@ -43,13 +44,17 @@ protected override IEnumerable<ServiceReplicaListener> CreateServiceReplicaListe
 
                                 return new WebHostBuilder()
                                     .UseKestrel()
+                                    .ConfigureLogging(logging =>
+                                    {
+                                        logging.ClearProviders();
+                                        logging.AddApplicationInsights();
+                                    })
                                     .ConfigureServices(
                                         services => services
                                             .AddSingleton<StatefulServiceContext>(serviceContext)
                                             .AddSingleton<IReliableStateManager>(this.StateManager))
                                     .UseContentRoot(Directory.GetCurrentDirectory())
                                     .UseStartup<Startup>()
-                                    .UseApplicationInsights()
                                     .UseServiceFabricIntegration(listener, ServiceFabricIntegrationOptions.UseUniqueServiceUrl)
                                     .UseUrls(url)
                                     .Build();
diff --git a/VotingData/VotingData.csproj b/VotingData/VotingData.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
     <RuntimeIdentifier>win7-x64</RuntimeIdentifier>
     <IsServiceFabricServiceProject>True</IsServiceFabricServiceProject>
   </PropertyGroup>
@@ -10,14 +10,14 @@
     <Folder Include="wwwroot\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.2.1" />
-    <PackageReference Include="Microsoft.AspNetCore" Version="2.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.4" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.2" />
-    <PackageReference Include="Microsoft.ServiceFabric" Version="6.4.617" />
-    <PackageReference Include="Microsoft.ServiceFabric.AspNetCore.Kestrel" Version="3.3.617" />
-    <PackageReference Include="Microsoft.ServiceFabric.Data" Version="3.3.617" />
-    <PackageReference Include="Microsoft.ServiceFabric.Services" Version="3.3.617" />
+    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.15.0" />
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.8" />
+    <PackageReference Include="Microsoft.ServiceFabric" Version="7.1.458" />
+    <PackageReference Include="Microsoft.ServiceFabric.AspNetCore.Kestrel" Version="4.1.458" />
+    <PackageReference Include="Microsoft.ServiceFabric.Data" Version="4.1.458" />
+    <PackageReference Include="Microsoft.ServiceFabric.Services" Version="4.1.458" />
   </ItemGroup>
   <ItemGroup>
     <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="1.0.1" />
diff --git a/VotingWeb/Startup.cs b/VotingWeb/Startup.cs
@@ -33,15 +33,11 @@ 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, ILoggerFactory loggerFactory)
+        public void Configure(IApplicationBuilder app, IHostingEnvironment env)
         {
-            loggerFactory.AddConsole(this.Configuration.GetSection("Logging"));
-            loggerFactory.AddDebug();
-
             if (env.IsDevelopment())
             {
                 app.UseDeveloperExceptionPage();
-                app.UseBrowserLink();
             }
             else
             {
diff --git a/VotingWeb/VotingWeb.cs b/VotingWeb/VotingWeb.cs
@@ -11,6 +11,7 @@ namespace VotingWeb
     using System.IO;
     using System.Net.Http;
     using Microsoft.AspNetCore.Hosting;
+    using Microsoft.Extensions.Logging;
     using Microsoft.Extensions.DependencyInjection;
     using Microsoft.ServiceFabric.Services.Communication.AspNetCore;
     using Microsoft.ServiceFabric.Services.Communication.Runtime;
@@ -45,14 +46,18 @@ protected override IEnumerable<ServiceInstanceListener> CreateServiceInstanceLis
 
                                 return new WebHostBuilder()
                                     .UseKestrel()
+                                    .ConfigureLogging(logging =>
+                                    {
+                                        logging.ClearProviders();
+                                        logging.AddApplicationInsights();
+                                    })
                                     .ConfigureServices(
                                         services => services
                                             .AddSingleton<HttpClient>(new HttpClient())
                                             .AddSingleton<FabricClient>(new FabricClient())
                                             .AddSingleton<StatelessServiceContext>(serviceContext))
                                     .UseContentRoot(Directory.GetCurrentDirectory())
                                     .UseStartup<Startup>()
-                                    .UseApplicationInsights()
                                     .UseServiceFabricIntegration(listener, ServiceFabricIntegrationOptions.None)
                                     .UseUrls(url)
                                     .Build();
diff --git a/VotingWeb/VotingWeb.csproj b/VotingWeb/VotingWeb.csproj
@@ -1,23 +1,23 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
     <RuntimeIdentifier>win7-x64</RuntimeIdentifier>
     <IsServiceFabricServiceProject>True</IsServiceFabricServiceProject>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.2.1" />
-    <PackageReference Include="Microsoft.AspNetCore" Version="2.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.4" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.3" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.2" />
-    <PackageReference Include="Microsoft.ServiceFabric" Version="6.4.617" />
-    <PackageReference Include="Microsoft.ServiceFabric.AspNetCore.Kestrel" Version="3.3.617" />
-    <PackageReference Include="Microsoft.ServiceFabric.Data" Version="3.3.617" />
-    <PackageReference Include="Microsoft.ServiceFabric.Services" Version="3.3.617" />
-    <PackageReference Include="Microsoft.ServiceFabric.Services.Remoting" Version="3.3.617" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.0.3" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.4" />
+    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.15.0" />
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.8" />
+    <PackageReference Include="Microsoft.ServiceFabric" Version="7.1.458" />
+    <PackageReference Include="Microsoft.ServiceFabric.AspNetCore.Kestrel" Version="4.1.458" />
+    <PackageReference Include="Microsoft.ServiceFabric.Data" Version="4.1.458" />
+    <PackageReference Include="Microsoft.ServiceFabric.Services" Version="4.1.458" />
+    <PackageReference Include="Microsoft.ServiceFabric.Services.Remoting" Version="4.1.458" />
   </ItemGroup>
   <ItemGroup>
     <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="1.0.1" />

Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,9 @@ public async Task<IActionResult> Get()`
`32`	`32`
`33`	`33`	`using (ITransaction tx = this.stateManager.CreateTransaction())`
`34`	`34`	`{`
`35`		`- IAsyncEnumerable<KeyValuePair<string, int>> list = await votesDictionary.CreateEnumerableAsync(tx);`
	`35`	`+ var list = await votesDictionary.CreateEnumerableAsync(tx);`
`36`	`36`
`37`		`- IAsyncEnumerator<KeyValuePair<string, int>> enumerator = list.GetAsyncEnumerator();`
	`37`	`+ var enumerator = list.GetAsyncEnumerator();`
`38`	`38`
`39`	`39`	`List<KeyValuePair<string, int>> result = new List<KeyValuePair<string, int>>();`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,16 @@ public void ConfigureServices(IServiceCollection services)`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.`
`36`		`- public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)`
	`36`	`+ public void Configure(IApplicationBuilder app, IHostingEnvironment env)`
`37`	`37`	`{`
`38`		`- loggerFactory.AddConsole(this.Configuration.GetSection("Logging"));`
`39`		`- loggerFactory.AddDebug();`
	`38`	`+ if (env.IsDevelopment())`
	`39`	`+ {`
	`40`	`+ app.UseDeveloperExceptionPage();`
	`41`	`+ }`
	`42`	`+ else`
	`43`	`+ {`
	`44`	`+ app.UseExceptionHandler("/Home/Error");`
	`45`	`+ }`
`40`	`46`
`41`	`47`	`app.UseMvc();`
`42`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,15 +33,11 @@ public void ConfigureServices(IServiceCollection services)`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.`
`36`		`- public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)`
	`36`	`+ public void Configure(IApplicationBuilder app, IHostingEnvironment env)`
`37`	`37`	`{`
`38`		`- loggerFactory.AddConsole(this.Configuration.GetSection("Logging"));`
`39`		`- loggerFactory.AddDebug();`
`40`		`-`
`41`	`38`	`if (env.IsDevelopment())`
`42`	`39`	`{`
`43`	`40`	`app.UseDeveloperExceptionPage();`
`44`		`- app.UseBrowserLink();`
`45`	`41`	`}`
`46`	`42`	`else`
`47`	`43`	`{`