Skip to content

Commit

Permalink
Merge pull request #406 from SkillsFundingAgency/DPP-1599_HandleExpir…
Browse files Browse the repository at this point in the history 
…edCoursesDataLockTriage

DPP-1599 Handle Expired Courses DataLock Triage
  • Loading branch information
@satya-sanikommu
satya-sanikommu authored Aug 30, 2018
2 parents c250452 + 1e63858 commit 45c3add
Show file tree
Hide file tree
Showing 61 changed files with 678 additions and 223 deletions.
1 change: 0 additions & 1 deletion ...AS.CommitmentPayments.WebJob.UnitTests/SFA.DAS.CommitmentPayments.WebJob.UnitTests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 4 additions & 0 deletions src/SFA.DAS.CommitmentPayments.WebJob.UnitTests/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@
<assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.18.0.2306" newVersion="3.18.0.2306" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /></startup></configuration>
4 changes: 4 additions & 0 deletions src/SFA.DAS.CommitmentPayments.WebJob/App.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@
<assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.18.0.2306" newVersion="3.18.0.2306" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<appSettings>
Expand Down
1 change: 0 additions & 1 deletion src/SFA.DAS.CommitmentPayments.WebJob/SFA.DAS.CommitmentPayments.WebJob.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.4.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
</Reference>
<Reference Include="System.IO.Compression" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.Formatting, Version=5.2.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.6\lib\net45\System.Net.Http.Formatting.dll</HintPath>
</Reference>
Expand Down
1 change: 0 additions & 1 deletion ...cYearEndProcessor.UnitTests/SFA.DAS.Commitments.AcademicYearEndProcessor.UnitTests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 4 additions & 0 deletions src/SFA.DAS.Commitments.AcademicYearEndProcessor.UnitTests/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@
<assemblyIdentity name="Microsoft.Azure.KeyVault.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /></startup></configuration>
4 changes: 4 additions & 0 deletions src/SFA.DAS.Commitments.AcademicYearEndProcessor.WebJob/App.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@
<assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.18.0.2306" newVersion="3.18.0.2306" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<appSettings>
Expand Down
1 change: 0 additions & 1 deletion ...cademicYearEndProcessor.WebJob/SFA.DAS.Commitments.AcademicYearEndProcessor.WebJob.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.4.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
</Reference>
<Reference Include="System.IO.Compression" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.Formatting, Version=5.2.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.6\lib\net45\System.Net.Http.Formatting.dll</HintPath>
</Reference>
Expand Down
9 changes: 4 additions & 5 deletions ...hips.WebJob.UnitTests/SFA.DAS.Commitments.AddEpaToApprenticeships.WebJob.UnitTests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@
<Reference Include="nunit.framework, Version=3.10.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\packages\NUnit.3.10.1\lib\net45\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="SFA.DAS.Apprenticeships.Api.Types, Version=0.10.122.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SFA.DAS.Apprenticeships.Api.Types.0.10.122\lib\net45\SFA.DAS.Apprenticeships.Api.Types.dll</HintPath>
<Reference Include="SFA.DAS.Apprenticeships.Api.Types, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SFA.DAS.Apprenticeships.Api.Types.0.11.82\lib\net462\SFA.DAS.Apprenticeships.Api.Types.dll</HintPath>
</Reference>
<Reference Include="SFA.DAS.AssessmentOrgs.Api.Client, Version=0.10.122.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SFA.DAS.AssessmentOrgs.Api.Client.0.10.122\lib\net45\SFA.DAS.AssessmentOrgs.Api.Client.dll</HintPath>
<Reference Include="SFA.DAS.AssessmentOrgs.Api.Client, Version=0.11.75.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SFA.DAS.AssessmentOrgs.Api.Client.0.11.75\lib\net45\SFA.DAS.AssessmentOrgs.Api.Client.dll</HintPath>
</Reference>
<Reference Include="SFA.DAS.NLog.Logger, Version=1.0.0.43242, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SFA.DAS.NLog.Logger.1.0.0.43242\lib\net45\SFA.DAS.NLog.Logger.dll</HintPath>
Expand All @@ -80,7 +80,6 @@
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.Formatting, Version=5.2.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.6\lib\net45\System.Net.Http.Formatting.dll</HintPath>
</Reference>
Expand Down
4 changes: 4 additions & 0 deletions src/SFA.DAS.Commitments.AddEpaToApprenticeships.WebJob.UnitTests/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@
<assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.18.0.2306" newVersion="3.18.0.2306" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /></startup></configuration>
4 changes: 2 additions & 2 deletions src/SFA.DAS.Commitments.AddEpaToApprenticeships.WebJob.UnitTests/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<package id="NLog" version="4.4.6" targetFramework="net461" />
<package id="NUnit" version="3.10.1" targetFramework="net462" />
<package id="NUnit3TestAdapter" version="3.10.0" targetFramework="net462" />
<package id="SFA.DAS.Apprenticeships.Api.Types" version="0.10.122" targetFramework="net461" />
<package id="SFA.DAS.AssessmentOrgs.Api.Client" version="0.10.122" targetFramework="net461" />
<package id="SFA.DAS.Apprenticeships.Api.Types" version="0.11.82" targetFramework="net462" />
<package id="SFA.DAS.AssessmentOrgs.Api.Client" version="0.11.75" targetFramework="net462" />
<package id="SFA.DAS.NLog.Logger" version="1.0.0.43242" targetFramework="net461" />
<package id="SFA.DAS.Provider.Events.Api.Client" version="2.0.0.57315" targetFramework="net461" />
<package id="StructureMap" version="4.4.5" targetFramework="net462" />
Expand Down
4 changes: 4 additions & 0 deletions src/SFA.DAS.Commitments.AddEpaToApprenticeships.WebJob/App.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@
<assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.18.0.2306" newVersion="3.18.0.2306" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<appSettings>
Expand Down
9 changes: 4 additions & 5 deletions ....AddEpaToApprenticeships.WebJob/SFA.DAS.Commitments.AddEpaToApprenticeships.WebJob.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,11 @@
<Reference Include="Polly, Version=5.7.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Polly.5.7.0\lib\net45\Polly.dll</HintPath>
</Reference>
<Reference Include="SFA.DAS.Apprenticeships.Api.Types, Version=0.10.122.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SFA.DAS.Apprenticeships.Api.Types.0.10.122\lib\net45\SFA.DAS.Apprenticeships.Api.Types.dll</HintPath>
<Reference Include="SFA.DAS.Apprenticeships.Api.Types, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SFA.DAS.Apprenticeships.Api.Types.0.11.82\lib\net462\SFA.DAS.Apprenticeships.Api.Types.dll</HintPath>
</Reference>
<Reference Include="SFA.DAS.AssessmentOrgs.Api.Client, Version=0.10.122.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SFA.DAS.AssessmentOrgs.Api.Client.0.10.122\lib\net45\SFA.DAS.AssessmentOrgs.Api.Client.dll</HintPath>
<Reference Include="SFA.DAS.AssessmentOrgs.Api.Client, Version=0.11.75.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SFA.DAS.AssessmentOrgs.Api.Client.0.11.75\lib\net45\SFA.DAS.AssessmentOrgs.Api.Client.dll</HintPath>
</Reference>
<Reference Include="SFA.DAS.Configuration, Version=1.0.0.43116, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SFA.DAS.Configuration.1.0.0.43116\lib\net45\SFA.DAS.Configuration.dll</HintPath>
Expand Down Expand Up @@ -116,7 +116,6 @@
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.4.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
</Reference>
<Reference Include="System.IO.Compression" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.Formatting, Version=5.2.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.6\lib\net45\System.Net.Http.Formatting.dll</HintPath>
</Reference>
Expand Down
4 changes: 2 additions & 2 deletions src/SFA.DAS.Commitments.AddEpaToApprenticeships.WebJob/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net452" />
<package id="NLog" version="4.4.12" targetFramework="net462" />
<package id="Polly" version="5.7.0" targetFramework="net462" />
<package id="SFA.DAS.Apprenticeships.Api.Types" version="0.10.122" targetFramework="net452" />
<package id="SFA.DAS.AssessmentOrgs.Api.Client" version="0.10.122" targetFramework="net452" />
<package id="SFA.DAS.Apprenticeships.Api.Types" version="0.11.82" targetFramework="net462" />
<package id="SFA.DAS.AssessmentOrgs.Api.Client" version="0.11.75" targetFramework="net462" />
<package id="SFA.DAS.Configuration" version="1.0.0.43116" targetFramework="net452" />
<package id="SFA.DAS.Configuration.AzureTableStorage" version="1.0.0.43116" targetFramework="net452" />
<package id="SFA.DAS.NLog.Logger" version="1.0.0.43242" targetFramework="net45" />
Expand Down
2 changes: 1 addition & 1 deletion src/SFA.DAS.Commitments.Api.Client.UnitTests/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.1.2" newVersion="4.1.1.2" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory" publicKeyToken="31bf3856ad364e35" culture="neutral" />
Expand Down
16 changes: 15 additions & 1 deletion src/SFA.DAS.Commitments.Api.IntegrationTests/SFA.DAS.Commitments.Api.IntegrationTests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,10 +291,24 @@
<Reference Include="System.IdentityModel.Tokens.Jwt, Version=4.0.20622.1351, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\System.IdentityModel.Tokens.Jwt.4.0.2.206221351\lib\net45\System.IdentityModel.Tokens.Jwt.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http, Version=4.1.1.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Net.Http.4.3.3\lib\net46\System.Net.Http.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http.Formatting, Version=5.2.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.6\lib\net45\System.Net.Http.Formatting.dll</HintPath>
</Reference>
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
</Reference>
<Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
</Reference>
<Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
</Reference>
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
</Reference>
<Reference Include="System.Spatial, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\System.Spatial.5.7.0\lib\net40\System.Spatial.dll</HintPath>
</Reference>
Expand Down
4 changes: 4 additions & 0 deletions src/SFA.DAS.Commitments.Api.IntegrationTests/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@
<assemblyIdentity name="Microsoft.Azure.KeyVault.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<appSettings>
Expand Down
5 changes: 5 additions & 0 deletions src/SFA.DAS.Commitments.Api.IntegrationTests/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@
<package id="SFA.DAS.NLog.Logger" version="1.0.0.43242" targetFramework="net461" />
<package id="StructureMap" version="4.4.5" targetFramework="net462" />
<package id="System.IdentityModel.Tokens.Jwt" version="4.0.2.206221351" targetFramework="net461" />
<package id="System.Net.Http" version="4.3.3" targetFramework="net462" />
<package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net462" />
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net462" />
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net462" />
<package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net462" />
<package id="System.Spatial" version="5.7.0" targetFramework="net461" />
<package id="System.ValueTuple" version="4.4.0" targetFramework="net462" />
<package id="WindowsAzure.Storage" version="6.2.0" targetFramework="net461" />
Expand Down
1 change: 0 additions & 1 deletion src/SFA.DAS.Commitments.Api.Types.UnitTests/SFA.DAS.Commitments.Api.Types.UnitTests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion src/SFA.DAS.Commitments.Api.UnitTests/SFA.DAS.Commitments.Api.UnitTests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.Formatting, Version=5.2.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.6\lib\net45\System.Net.Http.Formatting.dll</HintPath>
</Reference>
Expand Down
4 changes: 4 additions & 0 deletions src/SFA.DAS.Commitments.Api.UnitTests/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@
<assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.18.0.2306" newVersion="3.18.0.2306" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /></startup></configuration>
9 changes: 9 additions & 0 deletions src/SFA.DAS.Commitments.Api/Controllers/EmployerController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,15 @@

namespace SFA.DAS.Commitments.Api.Controllers
{
// apparantly .net 4.7.1 *always* uses the framework system.net.http and ignores any package system.net.http
// https://github.com/dotnet/corefx/issues/25050
// but cloud services doesn't support any version > 4.6.2 out of the box, so we'd have to install 4.7.1 on each server
// https://docs.microsoft.com/en-us/azure/cloud-services/cloud-services-dotnet-install-dotnet
// what a palaver!
// better to wait until we switch to app services
// https://azure.microsoft.com/en-us/updates/net-framework-4-7-2-update-coming-to-azure-app-service-apps/
// or .net core

[RoutePrefix("api/employer")]
public class EmployerController : ApiController
{
Expand Down
1 change: 0 additions & 1 deletion src/SFA.DAS.Commitments.Api/Orchestrators/ProviderOrchestrator.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
using SFA.DAS.Commitments.Domain.Entities;

using Apprenticeship = SFA.DAS.Commitments.Api.Types.Apprenticeship.Apprenticeship;
using OrganisationType = SFA.DAS.Commitments.Api.Types.OrganisationType;
using Relationship = SFA.DAS.Commitments.Domain.Entities.Relationship;

namespace SFA.DAS.Commitments.Api.Orchestrators
Expand Down
Loading

0 comments on commit 45c3add

Please sign in to comment.