openactive · Reikyo · Apr 16, 2025 · Apr 16, 2025 · Apr 16, 2025 · Apr 16, 2025
diff --git a/.github/workflows/openactive-test-suite.yml b/.github/workflows/openactive-test-suite.yml
@@ -182,8 +182,8 @@ jobs:
     needs:
       - test-server
       - test-fake-database
-    # runs on an Windows 2019 virtual machine, not an Ubuntu machine
-    runs-on: windows-2019
+    # runs on a Windows virtual machine, not an Ubuntu virtual machine (latest is used to force failure if dependencies become outdated)
+    runs-on: windows-latest
 
     strategy:
       fail-fast: false
@@ -213,9 +213,9 @@ jobs:
     # Building and deploying Framework is done using `msbuild` as opposed to `dotnet build`/`dotnet run`. It is started
     # using IIS Express    
     - name: Setup MSBuild path
-      uses: microsoft/setup-msbuild@v1.0.2
+      uses: microsoft/setup-msbuild@v2
     - name: Setup NuGet
-      uses: NuGet/setup-nuget@v1.0.5
+      uses: NuGet/setup-nuget@v2
     - name: Install OpenActive.Server.NET dependencies
       run: nuget restore .\server\
     - name: Build .NET Framework Reference Implementation

diff --git a/...es/BookingSystem.AspNetCore.IdentityServer/BookingSystem.AspNetCore.IdentityServer.csproj b/...es/BookingSystem.AspNetCore.IdentityServer/BookingSystem.AspNetCore.IdentityServer.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Examples/BookingSystem.AspNetCore/BookingSystem.AspNetCore.csproj b/Examples/BookingSystem.AspNetCore/BookingSystem.AspNetCore.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+    <LangVersion>8.0</LangVersion>
     <UserSecretsId>aspnet-BookingSystem.AspNetCore-443B4F82-A20C-41CE-9924-329A0BCF0D14</UserSecretsId>
     <Configurations>Release;Debug</Configurations>
   </PropertyGroup>

diff --git a/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj b/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj
@@ -12,6 +12,7 @@
     <RootNamespace>BookingSystem.AspNetFramework.Tests</RootNamespace>
     <AssemblyName>BookingSystem.AspNetFramework.Tests</AssemblyName>
     <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <LangVersion>8.0</LangVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <NuGetPackageImportStamp>
@@ -132,4 +133,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj b/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj
@@ -15,6 +15,7 @@
     <RootNamespace>BookingSystem.AspNetFramework</RootNamespace>
     <AssemblyName>BookingSystem.AspNetFramework</AssemblyName>
     <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <LangVersion>8.0</LangVersion>
     <MvcBuildViews>false</MvcBuildViews>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
@@ -316,6 +317,7 @@
     <Reference Include="System.Web.Routing" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Configuration" />
+    <Reference Include="System.Runtime.Caching" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <Private>True</Private>
@@ -448,6 +450,7 @@
       <DependentUpon>Global.asax</DependentUpon>
     </Compile>
     <Compile Include="Helpers\AuthenticationHelper.cs" />
+    <Compile Include="Helpers\FeedGenerationHelper.cs" />
     <Compile Include="Helpers\OpenBookingInputFormatter.cs" />
     <Compile Include="Extensions\RequiredStatusTypeExtensions.cs" />
     <Compile Include="Helpers\ResponseContentHelper.cs" />
@@ -460,6 +463,7 @@
     <Compile Include="Settings\AppSettings.cs" />
     <Compile Include="Settings\EngineConfig.cs" />
     <Compile Include="Stores\FacilityStore.cs" />
+    <Compile Include="Stores\IdempotencyStore.cs" />
     <Compile Include="Stores\OrderStore.cs" />
     <Compile Include="Stores\OrderTransaction.cs" />
     <Compile Include="Stores\SellerStore.cs" />
@@ -540,4 +544,4 @@
   </Target>
   <Target Name="AfterBuild">
   </Target> -->
-</Project>
+</Project>
diff --git a/Examples/BookingSystem.AspNetFramework/Feeds/FacilitiesFeeds.cs b/Examples/BookingSystem.AspNetFramework/Feeds/FacilitiesFeeds.cs
@@ -1,5 +1,5 @@
 using Bogus;
-using BookingSystem.AspNetCore.Helpers;
+using BookingSystem.AspNetFramework.Helpers;
 using OpenActive.DatasetSite.NET;
 using OpenActive.FakeDatabase.NET;
 using OpenActive.NET;
@@ -305,4 +305,4 @@ Offer GenerateOffer(SlotTable slot, QuantitativeValue ageRange)
         }
 
     }
-}
+}
diff --git a/Examples/BookingSystem.AspNetFramework/Feeds/SessionsFeeds.cs b/Examples/BookingSystem.AspNetFramework/Feeds/SessionsFeeds.cs
@@ -9,7 +9,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Bogus;
-using BookingSystem.AspNetCore.Helpers;
+using BookingSystem.AspNetFramework.Helpers;
 using ServiceStack;
 using System.Globalization;
 

diff --git a/Examples/BookingSystem.AspNetFramework/Helpers/FeedGenerationHelper.cs b/Examples/BookingSystem.AspNetFramework/Helpers/FeedGenerationHelper.cs
diff --git a/Examples/BookingSystem.AspNetFramework/Stores/FacilityStore.cs b/Examples/BookingSystem.AspNetFramework/Stores/FacilityStore.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using BookingSystem.AspNetCore.Helpers;
+using BookingSystem.AspNetFramework.Helpers;
 using OpenActive.DatasetSite.NET;
 using OpenActive.FakeDatabase.NET;
 using OpenActive.NET;

diff --git a/Examples/BookingSystem.AspNetFramework/Stores/SessionStore.cs b/Examples/BookingSystem.AspNetFramework/Stores/SessionStore.cs
@@ -8,7 +8,7 @@
 using OpenActive.FakeDatabase.NET;
 using RequiredStatusType = OpenActive.FakeDatabase.NET.RequiredStatusType;
 using System.Threading.Tasks;
-using BookingSystem.AspNetCore.Helpers;
+using BookingSystem.AspNetFramework.Helpers;
 
 namespace BookingSystem
 {

diff --git a/Examples/BookingSystem.AspNetFramework/Utils/ServiceConfig.cs b/Examples/BookingSystem.AspNetFramework/Utils/ServiceConfig.cs
@@ -1,6 +1,7 @@
 using BookingSystem.AspNetFramework.Helpers;
 using BookingSystem.AspNetFramework.Controllers;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging.Abstractions;
 using OpenActive.Server.NET;
 using System.Configuration;
 using System.Web.Http;
@@ -32,7 +33,7 @@ public static void Register(HttpConfiguration config)
             services.AddTransient<DatasetSiteController>();
             services.AddTransient<OpenDataController>();
             services.AddTransient<OpenBookingController>();
-            services.AddSingleton<IBookingEngine>(sp => EngineConfig.CreateStoreBookingEngine(appSettings, new FakeBookingSystem(false)));
+            services.AddSingleton<IBookingEngine>(sp => EngineConfig.CreateStoreBookingEngine(appSettings, new FakeBookingSystem(false, new NullLogger<FakeBookingSystem>())));
 
             var resolver = new DependencyResolver(services.BuildServiceProvider(true));
             config.DependencyResolver = resolver;

diff --git a/Fakes/OpenActive.FakeDatabase.NET.Tests/OpenActive.FakeDatabase.NET.Tests.csproj b/Fakes/OpenActive.FakeDatabase.NET.Tests/OpenActive.FakeDatabase.NET.Tests.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+    <LangVersion>8.0</LangVersion>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/Fakes/OpenActive.FakeDatabase.NET/OpenActive.FakeDatabase.NET.csproj b/Fakes/OpenActive.FakeDatabase.NET/OpenActive.FakeDatabase.NET.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <LangVersion>8.0</LangVersion>
     <AssemblyName>OpenActive.FakeDatabase.NET</AssemblyName>
     <RootNamespace>OpenActive.FakeDatabase.NET</RootNamespace>
     <PackageId>OpenActive.FakeDatabase.NET</PackageId>
@@ -30,7 +31,7 @@
 
   <ItemGroup>
     <PackageReference Include="Bogus" Version="33.0.2" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ServiceStack.OrmLite.Sqlite.Core" Version="5.11.0" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />

diff --git a/OpenActive.Server.NET.Tests/OpenActive.Server.NET.Tests.csproj b/OpenActive.Server.NET.Tests/OpenActive.Server.NET.Tests.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+    <LangVersion>8.0</LangVersion>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/OpenActive.Server.NET/OpenActive.Server.NET.csproj b/OpenActive.Server.NET/OpenActive.Server.NET.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <LangVersion>8.0</LangVersion>
     <Authors>OpenActive Community</Authors>
     <Company>OpenActive</Company>
     <Copyright>OpenActive</Copyright>