Merge commit

Xabaril · Dec 29, 2020 · 332bda8 · 332bda8
2 parents 3ea6104 + c021b3b
commit 332bda8
Show file tree

Hide file tree

Showing 96 changed files with 1,505 additions and 1,217 deletions.
diff --git a/.github/workflows/cd-docker-demo.yml b/.github/workflows/cd-docker-demo.yml
@@ -4,7 +4,7 @@ on:
     tags:       
       - demo-release-*  # Push events to release-* 
 env:
-  TAG: 4.0.${{ github.run_id }}
+  TAG: 5.0.${{ github.run_id }}
   REGISTRY: esquio.azurecr.io
   ACR_REPO: esquiodemoapp
 jobs:  

diff --git a/.github/workflows/cd-docker-internal-demo.yml b/.github/workflows/cd-docker-internal-demo.yml
@@ -4,7 +4,7 @@ on:
     tags:       
       - internal-demo-release-*  # Push events to release-* 
 env:
-  TAG: 4.0.${{ github.run_id }}
+  TAG: 5.0.${{ github.run_id }}
   REGISTRY: esquio.azurecr.io
   ACR_REPO_APP: esquiodemointernalapp
   ACR_REPO_UI: esquiodemointernalui

diff --git a/.github/workflows/cd-docker-ui-preview.yml b/.github/workflows/cd-docker-ui-preview.yml
@@ -4,7 +4,7 @@ on:
     tags:       
       - ui-preview-*  # Push events to release-* 
 env:
-  TAG: 4.0.${{ github.run_id }}-preview
+  TAG: 5.0.${{ github.run_id }}-preview
   IMAGE_NAME: esquioui
   ESQUIO_REPO: xabarilcoding
 jobs:  

diff --git a/.github/workflows/cd-docker-ui.yml b/.github/workflows/cd-docker-ui.yml
@@ -4,7 +4,7 @@ on:
     tags:       
       - ui-release-*  # Push events to release-* 
 env:
-  TAG: 4.0.0
+  TAG: 5.0.0
   IMAGE_NAME: esquioui
   ESQUIO_REPO: xabarilcoding
 jobs:  

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -36,7 +36,7 @@ jobs:
     - name: Setup .NET Core SDK
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.401
+        dotnet-version: 5.0.100
     - name: dotnet build
       run: dotnet build Esquio.sln -c $BUILD_CONFIG
     - name: dotnet test [UnitTests]

diff --git a/.github/workflows/ci_all_branches.yml b/.github/workflows/ci_all_branches.yml
@@ -33,7 +33,7 @@ jobs:
     - name: Setup .NET Core SDK
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.401
+        dotnet-version: 5.0.100
     - name: dotnet build
       run: dotnet build Esquio.sln -c $BUILD_CONFIG
     - name: dotnet test [UnitTests]

diff --git a/.github/workflows/ci_master.yml b/.github/workflows/ci_master.yml
@@ -39,7 +39,7 @@ jobs:
     - name: Setup .NET Core SDK
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.401
+        dotnet-version: 5.0.100
     - name: dotnet build
       run: dotnet build Esquio.sln -c $BUILD_CONFIG
     - name: dotnet test [UnitTests]

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -36,7 +36,7 @@ jobs:
     - name: Setup .NET Core SDK
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.401
+        dotnet-version: 5.0.100
     - name: dotnet build
       run: dotnet build Esquio.sln -c $BUILD_CONFIG
     - name: dotnet test [UnitTests]

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
@@ -37,7 +37,7 @@ jobs:
     - name: Setup .NET Core SDK
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.401
+        dotnet-version: 5.0.100
     - name: dotnet build
       run: dotnet build Esquio.sln -c $BUILD_CONFIG
     - name: dotnet test [UnitTests]

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -9,65 +9,66 @@
   <ItemGroup>
     <PackageReference Update="Microsoft.NET.Test.Sdk" Version="$(NetTestSdk)" />
     <PackageReference Update="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Update="Microsoft.ApplicationInsights.AspNetCore" Version="2.14.0" />
-    <PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.1" />
-    <PackageReference Update="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.6" />
-    <PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.1" />
-    <PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.1" />
-    <PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="3.2.1" />
-    <PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="3.2.1" />
-    <PackageReference Update="Microsoft.AspNetCore.TestHost" Version="3.1.6" />
-    <PackageReference Update="Microsoft.ApplicationInsights" Version="2.14.0" />
-    <PackageReference Update="Microsoft.ApplicationInsights.AspNetCore" Version="2.14.0" />
-    <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="3.1.6"  />
-    <PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.6" />
-    <PackageReference Update="Microsoft.Extensions.Logging" Version="3.1.6" />
-    <PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="3.1.6" />
-    <PackageReference Update="Microsoft.Extensions.Logging.Console" Version="3.1.6" />
-    <PackageReference Update="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.6" />
-    <PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="3.1.6" />
-    <PackageReference Update="Microsoft.Extensions.Configuration.Binder" Version="3.1.6" />
-    <PackageReference Update="Microsoft.Extensions.Options" Version="3.1.6" />
-    <PackageReference Update="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.6" />
-    <PackageReference Update="Microsoft.Extensions.Primitives" Version="3.1.6" />
-    <PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="3.1.6" />
-    <PackageReference Update="Microsoft.Extensions.Http" Version="3.1.6" />
-    <PackageReference Update="Microsoft.Extensions.Http.Polly" Version="3.1.6"/>
-    <PackageReference Update="Microsoft.Extensions.Hosting" Version="3.1.6" />
-    <PackageReference Update="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="4.1.1" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore" Version="3.1.6" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="3.1.6" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="3.1.6" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.6" />
-    <PackageReference Update="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.4" />
-    <PackageReference Update="Pomelo.EntityFrameworkCore.MySql" Version="3.1.1" />
+    <PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="5.0.0" />
+    <PackageReference Update="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.0" />
+    <PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.0" />
+    <PackageReference Update="Microsoft.Authentication.WebAssembly.Msal" Version="5.0.0" />
+    <PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="5.0.0" />
+    <PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="5.0.0" />
+    <PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.0" />
+    <PackageReference Update="Microsoft.AspNetCore.TestHost" Version="5.0.0" />
+    <PackageReference Update="Microsoft.ApplicationInsights" Version="2.16.0" />
+    <PackageReference Update="Microsoft.ApplicationInsights.AspNetCore" Version="2.16.0" />
+    <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="5.0.0"  />
+    <PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Logging" Version="5.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Options" Version="5.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Primitives" Version="5.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Http" Version="5.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Http.Polly" Version="5.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Hosting" Version="5.0.0" />
+    <PackageReference Update="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.0.0-preview.2" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore" Version="5.0.0" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="5.0.0" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="5.0.0" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.0" />
+    <PackageReference Update="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.0-rc2" />
+    <PackageReference Update="Pomelo.EntityFrameworkCore.MySql" Version="5.0.0-alpha.2.ci.20201109015435+sha.83c699f" />
+
 
-    <PackageReference Update="System.Text.Json" Version="4.7.2" />
-    <PackageReference Update="System.Net.Http.Json" Version="3.2.1" />
-    <PackageReference Update="System.Diagnostics.DiagnosticSource" Version="4.7.1" />
+    <PackageReference Update="System.Text.Json" Version="5.0.0" />
+    <PackageReference Update="System.Net.Http.Json" Version="5.0.0" />
+    <PackageReference Update="System.Diagnostics.DiagnosticSource" Version="5.0.0" />
     <PackageReference Update="System.Threading.Tasks.Extensions" Version="4.5.4" />
 
     <PackageReference Update="xunit" Version="2.4.1" />
-    <PackageReference Update="xunit.runner.visualstudio" Version="2.4.2" />
+    <PackageReference Update="xunit.runner.visualstudio" Version="2.4.3" />
     <PackageReference Update="Respawn" Version="3.3.0" />
     <PackageReference Update="Acheve.TestHost" Version="3.0.0" />
     <PackageReference Update="FluentAssertions" Version="5.10.3" />
-    <PackageReference Update="FluentValidation" Version="8.6.2" />
-    <PackageReference Update="FluentValidation.AspNetCore" Version="8.6.2" />
-    <PackageReference Update="MediatR.Extensions.Microsoft.DependencyInjection" Version="8.0.1" />
-    <PackageReference Update="Hellang.Middleware.ProblemDetails" Version="5.1.0" />
-    <PackageReference Update="NSwag.MSBuild" Version="13.6.2"/>
+    <PackageReference Update="FluentValidation" Version="9.3.0" />
+    <PackageReference Update="FluentValidation.AspNetCore" Version="9.3.0" />
+    <PackageReference Update="MediatR.Extensions.Microsoft.DependencyInjection" Version="9.0.0" />
+    <PackageReference Update="Hellang.Middleware.ProblemDetails" Version="5.1.1" />
+    <PackageReference Update="NSwag.MSBuild" Version="13.9.0"/>
     <PackageReference Update="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Update="BlazorInputFile" Version="0.2.0" />
-    <PackageReference Update="BuildBundlerMinifier" Version="3.2.447" />
-    <PackageReference Update="IdentityModel" Version="4.3.1" />
+    <PackageReference Update="BuildBundlerMinifier" Version="3.2.449" />
+    <PackageReference Update="IdentityModel" Version="5.0.0-preview.0" />
     <PackageReference Update="Serilog.Extensions.Logging" Version="3.0.1" />
     <PackageReference Update="Serilog.Settings.Configuration" Version="3.1.0" />
     <PackageReference Update="Serilog.Sinks.ApplicationInsights" Version="3.1.0" />
-    <PackageReference Update="Serilog.Sinks.ColoredConsole" Version="3.0.1" />
-    <PackageReference Update="Swashbuckle.AspNetCore" Version="5.5.1" />
+    <PackageReference Update="Serilog.Sinks.Console" Version="3.1.1" />
+    <PackageReference Update="Swashbuckle.AspNetCore" Version="5.6.3" />
     <PackageReference Update="McMaster.Extensions.CommandLineUtils" Version="3.0.0" />
-    <PackageReference Update="MiniProfiler.AspNetCore.Mvc" Version="4.1.0" />
-    <PackageReference Update="MiniProfiler.Shared" Version="4.1.0" />
+    <PackageReference Update="MiniProfiler.AspNetCore.Mvc" Version="4.2.1" />
+    <PackageReference Update="MiniProfiler.Shared" Version="4.2.1" />
   </ItemGroup>
 </Project>
diff --git a/NuGet.config b/NuGet.config
@@ -1,7 +1,7 @@
 <configuration>
     <packageSources>
         <clear />
-        <add key="blazor-wasm" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor/nuget/v3/index.json" />
         <add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
+		<add key="pomelo-efcore-public" value="https://pkgs.dev.azure.com/pomelo-efcore/Pomelo.EntityFrameworkCore.MySql/_packaging/pomelo-efcore-public/nuget/v3/index.json" />
     </packageSources>
 </configuration>
diff --git a/build/DemoDockerfile b/build/DemoDockerfile
@@ -1,7 +1,7 @@
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.1.6-buster-slim AS base
+FROM mcr.microsoft.com/dotnet/aspnet:5.0-buster-slim AS base
 WORKDIR /app
 EXPOSE 80
-FROM  mcr.microsoft.com/dotnet/core/sdk:3.1.401-buster AS build
+FROM  mcr.microsoft.com/dotnet/sdk:5.0-buster-slim AS build
 WORKDIR /src
 COPY ./Directory.Build.props ./Directory.Build.props
 COPY ./Directory.Build.targets ./Directory.Build.targets

diff --git a/build/UIDockerfile b/build/UIDockerfile
@@ -1,7 +1,7 @@
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.1.6-buster-slim AS base
+FROM mcr.microsoft.com/dotnet/aspnet:5.0-buster-slim AS base
 WORKDIR /app
 EXPOSE 80
-FROM  mcr.microsoft.com/dotnet/core/sdk:3.1.401-buster AS build
+FROM  mcr.microsoft.com/dotnet/sdk:5.0-buster-slim AS build
 WORKDIR /src
 COPY ./Directory.Build.props ./Directory.Build.props
 COPY ./Directory.Build.targets ./Directory.Build.targets

diff --git a/build/dependencies.props b/build/dependencies.props
@@ -1,25 +1,22 @@
 <Project>
   <PropertyGroup Label="SDK Versions">
-    <NetStandardTargetVersion21>netstandard2.1</NetStandardTargetVersion21>
-    <NetStandardTargetVersion20>netstandard2.0</NetStandardTargetVersion20>
-    <NetCoreTargetVersion>netcoreapp3.1</NetCoreTargetVersion>
-    <NetStandardMultiTarget>netstandard2.0;netstandard2.1</NetStandardMultiTarget>
-    <NetTestSdk>16.6.1</NetTestSdk>
-    <RazorLangVersion>3.0</RazorLangVersion>
+    <NetFrameworkVersion>net5.0</NetFrameworkVersion>
+    <NetStandardVersion>netstandard21</NetStandardVersion>
+    <NetTestSdk>16.8.0</NetTestSdk>
     <LangVersion>preview</LangVersion>
     <GitHubSourceLink>1.0.0</GitHubSourceLink>
   </PropertyGroup>  
 
   <PropertyGroup Label="Esquio Versions">
-    <esquio>4.0.0$(VersionSuffix)</esquio>
-    <esquioaspnetcore>4.0.2$(VersionSuffix)</esquioaspnetcore>
-    <esquioaspnetcoreapplicationinsightsprocessor>4.0.1$(VersionSuffix)</esquioaspnetcoreapplicationinsightsprocessor>
-    <esquioconfigurationstore>4.0.0$(VersionSuffix)</esquioconfigurationstore>
-    <esquiodatabasestore>4.0.0$(VersionSuffix)</esquiodatabasestore>
-    <esquioentityframeworkstore>4.0.0$(VersionSuffix)</esquioentityframeworkstore>
-    <esquiominiprofiler>4.0.0$(VersionSuffix)</esquiominiprofiler>
-    <esquiocli>4.0.0$(VersionSuffix)</esquiocli>
-    <esquiohttpstore>4.1.0$(VersionSuffix)</esquiohttpstore>
-    <esquioblazorwasm>4.0.0$(VersionSuffix)</esquioblazorwasm>
+    <esquio>5.0.0$(VersionSuffix)</esquio>
+    <esquioaspnetcore>5.0.0$(VersionSuffix)</esquioaspnetcore>
+    <esquioaspnetcoreapplicationinsightsprocessor>5.0.0$(VersionSuffix)</esquioaspnetcoreapplicationinsightsprocessor>
+    <esquioconfigurationstore>5.0.0$(VersionSuffix)</esquioconfigurationstore>
+    <esquiodatabasestore>5.0.0$(VersionSuffix)</esquiodatabasestore>
+    <esquioentityframeworkstore>5.0.0$(VersionSuffix)</esquioentityframeworkstore>
+    <esquiominiprofiler>5.0.0$(VersionSuffix)</esquiominiprofiler>
+    <esquiocli>5.0.0$(VersionSuffix)</esquiocli>
+    <esquiohttpstore>5.0.0$(VersionSuffix)</esquiohttpstore>
+    <esquioblazorwasm>5.0.0$(VersionSuffix)</esquioblazorwasm>
   </PropertyGroup>
 </Project>
diff --git a/demos/WebApp/WebApp.csproj b/demos/WebApp/WebApp.csproj
@@ -1,21 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>$(NetCoreTargetVersion)</TargetFramework>
+    <TargetFramework>$(NetFrameworkVersion)</TargetFramework>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <LangVersion>preview</LangVersion>
     <UserSecretsId>c04b3d87-8463-4ad4-a4e5-176d01da450d</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore"  />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer"/>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design"/>
-    <PackageReference Include="MiniProfiler.AspNetCore.Mvc"/>
-    <PackageReference Include="Microsoft.Extensions.Http.Polly"/>
+    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" />
+    <PackageReference Include="MiniProfiler.AspNetCore.Mvc" />
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" />
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\samples\GettingStarted.AspNetCore.Toggles\GettingStarted.AspNetCore.Toggles.csproj" />
     <ProjectReference Include="..\..\src\Esquio.AspNetCore.ApplicationInsightProcessor\Esquio.AspNetCore.ApplicationInsightProcessor.csproj" />
     <ProjectReference Include="..\..\src\Esquio.AspNetCore\Esquio.AspNetCore.csproj" />
     <ProjectReference Include="..\..\src\Esquio.Configuration.Store\Esquio.Configuration.Store.csproj" />

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "projects": [ "src", "tests", "samples"],
   "sdk": {
-    "version": "3.1.401"
+    "version": "5.0.100"
   }
 }
diff --git a/install-sdk.ps1 b/install-sdk.ps1
@@ -1,2 +1,2 @@
-$SdkVersion = "3.1.401"
+$SdkVersion = "5.0.100"
 & "./dotnet-install.ps1" -Version $SdkVersion
diff --git a/install-sdk.sh b/install-sdk.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-SdkVersion="3.1.401"
+SdkVersion="5.0.100"
 ./dotnet-install.sh -Version $SdkVersion
 export PATH="$PATH:$HOME/.dotnet"
diff --git a/.../GettingStarted.AspNetCore.ClientEndpoint/GettingStarted.AspNetCore.ClientEndpoint.csproj b/.../GettingStarted.AspNetCore.ClientEndpoint/GettingStarted.AspNetCore.ClientEndpoint.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>$(NetCoreTargetVersion)</TargetFramework>
+    <TargetFramework>$(NetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...ngStarted.AspNetCore.EvaluationSession/GettingStarted.AspNetCore.EvaluationSession.csproj b/...ngStarted.AspNetCore.EvaluationSession/GettingStarted.AspNetCore.EvaluationSession.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>$(NetCoreTargetVersion)</TargetFramework>
+    <TargetFramework>$(NetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/GettingStarted.AspNetCore.EvaluationSession/Startup.cs b/samples/GettingStarted.AspNetCore.EvaluationSession/Startup.cs
@@ -54,7 +54,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             {
                 endpoints.MapControllerRoute(
                     name: "default",
-                    pattern: "{controller=Home}/{action=Index}/{id?}").RequireFeature("HiddenGem");
+                    pattern: "{controller=Home}/{action=Index}/{id?}");
             });
         }
     }

diff --git a/samples/GettingStarted.AspNetCore.EvaluationSession/appsettings.json b/samples/GettingStarted.AspNetCore.EvaluationSession/appsettings.json
@@ -14,7 +14,7 @@
         "Features": [
           {
             "Name": "PrivacyFeature",
-            "Enabled": false,
+            "Enabled": true,
             "Toggles": []
           },
           {

diff --git a/samples/GettingStarted.AspNetCore.Intro/GettingStarted.AspNetCore.Intro.csproj b/samples/GettingStarted.AspNetCore.Intro/GettingStarted.AspNetCore.Intro.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>$(NetCoreTargetVersion)</TargetFramework>
+    <TargetFramework>$(NetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/GettingStarted.AspNetCore.IntroOptions/GettingStarted.AspNetCore.IntroOptions.csproj b/samples/GettingStarted.AspNetCore.IntroOptions/GettingStarted.AspNetCore.IntroOptions.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>$(NetCoreTargetVersion)</TargetFramework>
+    <TargetFramework>$(NetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...pNetCore.Mvc.ApplicationInsights/GettingStarted.AspNetCore.Mvc.ApplicationInsights.csproj b/...pNetCore.Mvc.ApplicationInsights/GettingStarted.AspNetCore.Mvc.ApplicationInsights.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>$(NetCoreTargetVersion)</TargetFramework>
+    <TargetFramework>$(NetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...es/GettingStarted.AspNetCore.Mvc.HttpStore/GettingStarted.AspNetCore.Mvc.HttpStore.csproj b/...es/GettingStarted.AspNetCore.Mvc.HttpStore/GettingStarted.AspNetCore.Mvc.HttpStore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>$(NetCoreTargetVersion)</TargetFramework>
+    <TargetFramework>$(NetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/GettingStarted.AspNetCore.Mvc/GettingStarted.AspNetCore.Mvc.csproj b/samples/GettingStarted.AspNetCore.Mvc/GettingStarted.AspNetCore.Mvc.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>$(NetCoreTargetVersion)</TargetFramework>
+    <TargetFramework>$(NetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>