Update to ASP.NET Core 7 (#130)

* Update to ASP.NET Core 7 preview 1 Update to preview 1 of ASP.NET Core 7. * Fix compiler warning Fix compiler warning about possible null. * Update to ASP.NET Core 7 preview 2 Update to preview 2 of ASP.NET Core 7. * Update to ASP.NET Core 7 preview 3 Update to preview 3 of ASP.NET Core 7. * Update to ASP.NET Core 7 preview 4 Update to preview 4 of ASP.NET Core 7. * Update to ASP.NET Core 7 preview 5 Update to preview 5 of ASP.NET Core 7. * Update to ASP.NET Core 7 preview 6 Update to preview 6 of ASP.NET Core 7. * Update to ASP.NET Core 7 preview 7 Update to preview 7 of ASP.NET Core 7. * Update to ASP.NET Core 7 RC1 Update to release candidate 1 of ASP.NET Core 7. * Update to ASP.NET Core 7 RC2 Update to release candidate 2 of ASP.NET Core 7. * Update to ASP.NET Core 7 Update to the stable release of ASP.NET Core 7.
justeattakeaway · Nov 7, 2022 · 204bb9f · 204bb9f
1 parent 672dacf
commit 204bb9f
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 11 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -6,7 +6,7 @@
       "type": "coreclr",
       "request": "launch",
       "preLaunchTask": "build",
-      "program": "${workspaceRoot}/src/ApplePayJS/bin/Debug/net6.0/JustEat.ApplePayJS.dll",
+      "program": "${workspaceRoot}/src/ApplePayJS/bin/Debug/net7.0/JustEat.ApplePayJS.dll",
       "args": [],
       "cwd": "${workspaceRoot}/src/ApplePayJS",
       "stopAtEntry": false,

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -15,7 +15,7 @@
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>$(PackageProjectUrl).git</RepositoryUrl>
     <TypeScriptToolsVersion>latest</TypeScriptToolsVersion>
-    <VersionPrefix>6.0.0</VersionPrefix>
+    <VersionPrefix>7.0.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
   </PropertyGroup>
 </Project>
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ The key components to look at for the implementation are:
 
 To setup the repository to run the sample, perform the steps below:
 
-  1. Install the latest [.NET 6.0 SDK](https://www.microsoft.com/net/download/core), Visual Studio 2022 or Visual Studio Code.
+  1. Install the latest [.NET 7 SDK](https://www.microsoft.com/net/download/core), Visual Studio 2022 or Visual Studio Code.
   1. Fork this repository.
   1. Clone the repository from your fork to your local machine: ```git clone https://github.com/{username}/ApplePayJSSample.git```
   1. Restore the Bower, npm and NuGet packages.

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.402",
+    "version": "7.0.100",
     "allowPrerelease": false
   }
 }
diff --git a/src/ApplePayJS/ApplePayJS.csproj b/src/ApplePayJS/ApplePayJS.csproj
@@ -11,7 +11,7 @@
     <PackageTags>applepay</PackageTags>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <RootNamespace>JustEat.ApplePayJS</RootNamespace>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <TypeScriptToolsVersion>latest</TypeScriptToolsVersion>
     <UserSecretsId>JustEat.ApplePayJS</UserSecretsId>
   </PropertyGroup>
@@ -32,7 +32,6 @@
   <Target Name="AddGeneratedContentItems" BeforeTargets="AssignTargetPaths">
     <ItemGroup>
       <Content Include="wwwroot/**" CopyToPublishDirectory="PreserveNewest" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);@(Content)" />
-      <Content Include="wwwroot/.well-known/**" CopyToPublishDirectory="PreserveNewest" Exclude="$(DefaultItemExcludes)" />
     </ItemGroup>
   </Target>
 </Project>
diff --git a/src/ApplePayJS/Views/Home/Index.cshtml b/src/ApplePayJS/Views/Home/Index.cshtml
@@ -11,7 +11,7 @@
     ViewData["Title"] = "Sample integration";
     var token = Antiforgery.GetAndStoreTokens(Context);
 
-    var language = Context.Request.Query["lang"].FirstOrDefault() ?? Config["ApplePay:DefaultLanguage"];
+    var language = Context.Request.Query["lang"].FirstOrDefault() ?? Config["ApplePay:DefaultLanguage"] ?? string.Empty;
     var region = new System.Globalization.RegionInfo(language);
 
     var countryCode = region.TwoLetterISORegionName;

diff --git a/src/ApplePayJS/package-lock.json b/src/ApplePayJS/package-lock.json
diff --git a/src/ApplePayJS/package.json b/src/ApplePayJS/package.json
@@ -1,7 +1,7 @@
 {
   "name": "justeatapplepayjs",
   "private": true,
-  "version": "6.0.0",
+  "version": "7.0.0",
   "devDependencies": {
     "@types/applepayjs": "3.0.0",
     "@types/jquery": "3.3.34",

diff --git a/tests/ApplePayJS.Tests/ApplePayJS.Tests.csproj b/tests/ApplePayJS.Tests/ApplePayJS.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
@@ -11,7 +11,7 @@
     <PackageReference Include="GitHubActionsTestLogger" Version="2.0.1" />
     <PackageReference Include="JustEat.HttpClientInterception" Version="3.1.2" />
     <PackageReference Include="MartinCostello.Logging.XUnit" Version="0.3.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageReference Include="Microsoft.Playwright" Version="1.27.2" />
     <PackageReference Include="Shouldly" Version="4.1.0" />