diff --git a/.github/workflows/InitDev,Unit tests,Integration tests,Package.yml b/.github/workflows/InitDev,Unit tests,Integration tests,Package.yml
index 85ba4ec6a..7537364ed 100644
--- a/.github/workflows/InitDev,Unit tests,Integration tests,Package.yml
+++ b/.github/workflows/InitDev,Unit tests,Integration tests,Package.yml
@@ -16,7 +16,7 @@ on:
env:
INFORMATIONAL_VERSION: "6.1"
- BUILD_INCREMENTER: "1"
+ BUILD_INCREMENTER: "-1050"
CONFIGURATION: "Release"
VERSION_MAJOR: "6"
VERSION_MINOR: "1"
@@ -140,4 +140,4 @@ jobs:
uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
with:
name: NugetPackages.Artifacts
- path: ${{ github.workspace }}/Ed-Fi-ODS-Implementation/NugetPackages/*.nupkg
+ path: ${{ github.workspace }}/Ed-Fi-ODS-Implementation/NugetPackages/*.nupkg
diff --git a/Application/Ed-Fi-Ods.sln b/Application/Ed-Fi-Ods.sln
index aebd58a7b..2875e1d89 100644
--- a/Application/Ed-Fi-Ods.sln
+++ b/Application/Ed-Fi-Ods.sln
@@ -93,6 +93,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EdFi.Ods.Api.IntegrationTes
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EdFi.Ods.Features.UnitTests", "..\..\Ed-Fi-ODS\tests\EdFi.Ods.Features.UnitTests\EdFi.Ods.Features.UnitTests.csproj", "{CBEDAB3E-3182-41D6-9C87-D2B4B426FBC7}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EdFi.Ods.Profiles.Dps", "EdFi.Ods.Profiles.Dps\EdFi.Ods.Profiles.Dps.csproj", "{5A352475-2846-49EB-9F52-B64218203925}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -203,6 +205,10 @@ Global
{CBEDAB3E-3182-41D6-9C87-D2B4B426FBC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CBEDAB3E-3182-41D6-9C87-D2B4B426FBC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CBEDAB3E-3182-41D6-9C87-D2B4B426FBC7}.Release|Any CPU.Build.0 = Release|Any CPU
+ {5A352475-2846-49EB-9F52-B64218203925}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {5A352475-2846-49EB-9F52-B64218203925}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {5A352475-2846-49EB-9F52-B64218203925}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {5A352475-2846-49EB-9F52-B64218203925}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -236,6 +242,7 @@ Global
{538782E7-25DC-494D-902D-3EE2EC839DC6} = {26FBA24F-2F1E-47EA-BDE2-EF57AE81D65D}
{3ED34C57-BFEF-4FA1-9497-28D7D611D1B9} = {3AD03A98-4A2C-42F1-997D-2468A0CCB77D}
{CBEDAB3E-3182-41D6-9C87-D2B4B426FBC7} = {14352B5E-2434-4117-A063-2BBD4D87464D}
+ {5A352475-2846-49EB-9F52-B64218203925} = {6B596494-5C35-4A04-93A8-13B21EBF9910}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {91F27EA2-CFF0-4054-A019-B8AA23AF9319}
diff --git a/Application/EdFi.Ods.Api.IntegrationTestHarness/EdFi.Ods.Api.IntegrationTestHarness.csproj b/Application/EdFi.Ods.Api.IntegrationTestHarness/EdFi.Ods.Api.IntegrationTestHarness.csproj
index a9fe7dd9f..d7ed8d8f3 100644
--- a/Application/EdFi.Ods.Api.IntegrationTestHarness/EdFi.Ods.Api.IntegrationTestHarness.csproj
+++ b/Application/EdFi.Ods.Api.IntegrationTestHarness/EdFi.Ods.Api.IntegrationTestHarness.csproj
@@ -25,7 +25,7 @@
PreserveNewest
-
+
diff --git a/Application/EdFi.Ods.Features.OwnershipBasedAuthorization/Security/OwnershipInitializationCreateEntityDecorator.cs b/Application/EdFi.Ods.Features.OwnershipBasedAuthorization/Security/OwnershipInitializationCreateEntityDecorator.cs
index 2413ca7aa..da0354563 100644
--- a/Application/EdFi.Ods.Features.OwnershipBasedAuthorization/Security/OwnershipInitializationCreateEntityDecorator.cs
+++ b/Application/EdFi.Ods.Features.OwnershipBasedAuthorization/Security/OwnershipInitializationCreateEntityDecorator.cs
@@ -18,6 +18,7 @@
using EdFi.Ods.Common.Infrastructure.Filtering;
using EdFi.Security.DataAccess.Repositories;
using NHibernate;
+using EdFi.Ods.Common.Context;
namespace EdFi.Ods.Features.OwnershipBasedAuthorization.Security
{
@@ -41,7 +42,7 @@ public class OwnershipInitializationCreateEntityDecorator
///
///
///
- ///
+ ///
public OwnershipInitializationCreateEntityDecorator(
ICreateEntity next,
IAuthorizationContextProvider authorizationContextProvider,
@@ -53,7 +54,7 @@ public OwnershipInitializationCreateEntityDecorator(
ISessionFactory sessionFactory,
IApiKeyContextProvider apiKeyContextProvider,
IViewBasedSingleItemAuthorizationQuerySupport viewBasedSingleItemAuthorizationQuerySupport,
- IDataManagementRequestContextProvider dataManagementRequestContextProvider)
+ IContextProvider dataManagementResourceContextProvider)
: base(
authorizationContextProvider,
authorizationFilteringProvider,
@@ -64,7 +65,7 @@ public OwnershipInitializationCreateEntityDecorator(
sessionFactory,
apiKeyContextProvider,
viewBasedSingleItemAuthorizationQuerySupport,
- dataManagementRequestContextProvider)
+ dataManagementResourceContextProvider)
{
_next = Preconditions.ThrowIfNull(next, nameof(next));
_apiKeyContextProvider = Preconditions.ThrowIfNull(apiKeyContextProvider, nameof(apiKeyContextProvider));
diff --git a/Application/EdFi.Ods.Profiles.Dps/EdFi.Ods.Profiles.Dps.csproj b/Application/EdFi.Ods.Profiles.Dps/EdFi.Ods.Profiles.Dps.csproj
new file mode 100644
index 000000000..87d8ee732
--- /dev/null
+++ b/Application/EdFi.Ods.Profiles.Dps/EdFi.Ods.Profiles.Dps.csproj
@@ -0,0 +1,34 @@
+
+
+ net6.0
+ EdFi.Ods.Profiles.Dps
+ EdFi.Ods.Profiles.Dps
+ true
+ true
+
+
+ DEBUG;TRACE
+ full
+ true
+
+
+
+
+
+
+
+
+ True
+ True
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Application/EdFi.Ods.Profiles.Dps/Marker_EdFi_Ods_Profiles_Dps.cs b/Application/EdFi.Ods.Profiles.Dps/Marker_EdFi_Ods_Profiles_Dps.cs
new file mode 100644
index 000000000..e62d00db9
--- /dev/null
+++ b/Application/EdFi.Ods.Profiles.Dps/Marker_EdFi_Ods_Profiles_Dps.cs
@@ -0,0 +1,5 @@
+namespace EdFi.Ods.Profiles.Dps
+{
+ // TODO: Rename this interface to match the marker interface convention
+ public interface Marker_EdFi_Ods_Profiles_Dps { }
+}
diff --git a/Application/EdFi.Ods.Profiles.Dps/Profiles.xml b/Application/EdFi.Ods.Profiles.Dps/Profiles.xml
new file mode 100644
index 000000000..b8a17e9c7
--- /dev/null
+++ b/Application/EdFi.Ods.Profiles.Dps/Profiles.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Application/EdFi.Ods.Profiles.Dps/assemblyMetadata.json b/Application/EdFi.Ods.Profiles.Dps/assemblyMetadata.json
new file mode 100644
index 000000000..3a3d1f14c
--- /dev/null
+++ b/Application/EdFi.Ods.Profiles.Dps/assemblyMetadata.json
@@ -0,0 +1,4 @@
+{
+ "assemblyModelType": "profile",
+ "assemblyMetadataFormatVersion": "1.0.0"
+}
\ No newline at end of file
diff --git a/Application/EdFi.Ods.WebApi/EdFi.Ods.WebApi.csproj b/Application/EdFi.Ods.WebApi/EdFi.Ods.WebApi.csproj
index 6750d3c0d..729470e90 100644
--- a/Application/EdFi.Ods.WebApi/EdFi.Ods.WebApi.csproj
+++ b/Application/EdFi.Ods.WebApi/EdFi.Ods.WebApi.csproj
@@ -44,6 +44,7 @@
+
diff --git a/logistics/scripts/modules/settings/settings-management.psm1 b/logistics/scripts/modules/settings/settings-management.psm1
index 98fd62473..d548c4674 100644
--- a/logistics/scripts/modules/settings/settings-management.psm1
+++ b/logistics/scripts/modules/settings/settings-management.psm1
@@ -537,6 +537,12 @@ function Add-TestSpecificAppSettings([hashtable] $Settings = @{ }, [string] $Pro
$newSettings = @{
ConnectionStrings = @{ }
+ ApiSettings = @{
+ Mode = "SharedInstance"
+ }
+ Plugin = @{
+ Folder = "Plugin"
+ }
}
$csbs = Get-ConnectionStringBuildersFromSettings $Settings
@@ -593,11 +599,11 @@ function New-DevelopmentAppSettings([hashtable] $Settings = @{ }) {
$newDevelopmentSettings = Merge-Hashtables $developmentSettingsByProject[$project], $newDevelopmentSettings
$newDevelopmentSettings = Add-TestSpecificAppSettings $newDevelopmentSettings $project
- $newDevelopmentSettings = Add-TestHarnessSpecificAppSettings $newDevelopmentSettings $project
$newDevelopmentSettings = Merge-Hashtables $newDevelopmentSettings, $credentialSettingsByProject[$project], $Settings
$newDevelopmentSettings = Remove-WebApiSpecificSettings $newDevelopmentSettings $project
+ $newDevelopmentSettings = Add-TestHarnessSpecificAppSettings $newDevelopmentSettings $project
$projectPath = Get-RepositoryResolvedPath $Project