diff --git a/.github/workflows/CodeQL Security Scan.yml b/.github/workflows/CodeQL Security Scan.yml index e42b6bcdfb..57651bec51 100644 --- a/.github/workflows/CodeQL Security Scan.yml +++ b/.github/workflows/CodeQL Security Scan.yml @@ -12,7 +12,7 @@ on: permissions: read-all env: - INFORMATIONAL_VERSION: "7.3" + INFORMATIONAL_VERSION: "7.4" BUILD_INCREMENTER: "-1486" CONFIGURATION: "Release" HEAD_REF: ${{ GITHUB.HEAD_REF }} diff --git a/.github/workflows/Lib edFi.admin.dataaccess.yml b/.github/workflows/Lib edFi.admin.dataaccess.yml index be280ac1da..0814088776 100644 --- a/.github/workflows/Lib edFi.admin.dataaccess.yml +++ b/.github/workflows/Lib edFi.admin.dataaccess.yml @@ -17,8 +17,8 @@ concurrency: cancel-in-progress: true env: - INFORMATIONAL_VERSION: "7.3" - BUILD_INCREMENTER: "-439" + INFORMATIONAL_VERSION: "7.4" + BUILD_INCREMENTER: "-912" CONFIGURATION: "Release" AZURE_ARTIFACT_URL: "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json" AZURE_ARTIFACT_NUGET_KEY: ${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }} diff --git a/.github/workflows/Lib edFi.common.yml b/.github/workflows/Lib edFi.common.yml index a9ec8717ff..992b74be36 100644 --- a/.github/workflows/Lib edFi.common.yml +++ b/.github/workflows/Lib edFi.common.yml @@ -17,8 +17,8 @@ concurrency: cancel-in-progress: true env: - INFORMATIONAL_VERSION: "7.3" - BUILD_INCREMENTER: "-428" + INFORMATIONAL_VERSION: "7.4" + BUILD_INCREMENTER: "-896" CONFIGURATION: "Release" AZURE_ARTIFACT_URL: "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json" AZURE_ARTIFACT_NUGET_KEY: ${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }} diff --git a/.github/workflows/Lib edFi.loadtools.yml b/.github/workflows/Lib edFi.loadtools.yml index 42242fb0e8..8c5ffd8bb0 100644 --- a/.github/workflows/Lib edFi.loadtools.yml +++ b/.github/workflows/Lib edFi.loadtools.yml @@ -17,8 +17,8 @@ concurrency: cancel-in-progress: true env: - INFORMATIONAL_VERSION: "7.3" - BUILD_INCREMENTER: "-431" + INFORMATIONAL_VERSION: "7.4" + BUILD_INCREMENTER: "-895" CONFIGURATION: "Release" AZURE_ARTIFACT_URL: "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json" AZURE_ARTIFACT_NUGET_KEY: ${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }} diff --git a/.github/workflows/Lib edFi.ods.api.yml b/.github/workflows/Lib edFi.ods.api.yml index 8e248f56b0..f5663f043f 100644 --- a/.github/workflows/Lib edFi.ods.api.yml +++ b/.github/workflows/Lib edFi.ods.api.yml @@ -17,8 +17,8 @@ concurrency: cancel-in-progress: true env: - INFORMATIONAL_VERSION: "7.3" - BUILD_INCREMENTER: "-425" + INFORMATIONAL_VERSION: "7.4" + BUILD_INCREMENTER: "-844" CONFIGURATION: "Release" AZURE_ARTIFACT_URL: "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json" AZURE_ARTIFACT_NUGET_KEY: ${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }} diff --git a/.github/workflows/Lib edFi.ods.common.yml b/.github/workflows/Lib edFi.ods.common.yml index b006ab6c28..49d9b67f9b 100644 --- a/.github/workflows/Lib edFi.ods.common.yml +++ b/.github/workflows/Lib edFi.ods.common.yml @@ -17,8 +17,8 @@ concurrency: cancel-in-progress: true env: - INFORMATIONAL_VERSION: "7.3" - BUILD_INCREMENTER: "-426" + INFORMATIONAL_VERSION: "7.4" + BUILD_INCREMENTER: "-893" CONFIGURATION: "Release" AZURE_ARTIFACT_URL: "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json" AZURE_ARTIFACT_NUGET_KEY: ${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }} diff --git a/.github/workflows/Lib edFi.ods.standard.yml b/.github/workflows/Lib edFi.ods.standard.yml index f84ba67267..e012ffcc34 100644 --- a/.github/workflows/Lib edFi.ods.standard.yml +++ b/.github/workflows/Lib edFi.ods.standard.yml @@ -17,8 +17,8 @@ concurrency: cancel-in-progress: true env: - INFORMATIONAL_VERSION: "7.3" - BUILD_INCREMENTER: "-409" + INFORMATIONAL_VERSION: "7.4" + BUILD_INCREMENTER: "-598" CONFIGURATION: "Release" AZURE_ARTIFACT_URL: "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json" AZURE_ARTIFACT_NUGET_KEY: ${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }} diff --git a/.github/workflows/Lib edFi.security.dataaccess.yml b/.github/workflows/Lib edFi.security.dataaccess.yml index 54c4c8c6c8..f7bc3a9748 100644 --- a/.github/workflows/Lib edFi.security.dataaccess.yml +++ b/.github/workflows/Lib edFi.security.dataaccess.yml @@ -17,8 +17,8 @@ concurrency: cancel-in-progress: true env: - INFORMATIONAL_VERSION: "7.3" - BUILD_INCREMENTER: "-431" + INFORMATIONAL_VERSION: "7.4" + BUILD_INCREMENTER: "-897" CONFIGURATION: "Release" AZURE_ARTIFACT_URL: "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json" AZURE_ARTIFACT_NUGET_KEY: ${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }} diff --git a/.github/workflows/Pkg EdFi.Database.Admin.yml b/.github/workflows/Pkg EdFi.Database.Admin.yml index f3ab20a737..7752544de2 100644 --- a/.github/workflows/Pkg EdFi.Database.Admin.yml +++ b/.github/workflows/Pkg EdFi.Database.Admin.yml @@ -15,8 +15,8 @@ on: permissions: read-all env: - INFORMATIONAL_VERSION: "7.3" - BUILD_INCREMENTER: "-504" + INFORMATIONAL_VERSION: "7.4" + BUILD_INCREMENTER: "-644" AZURE_ARTIFACT_URL: "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json" AZURE_ARTIFACT_NUGET_KEY: ${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }} VSS_NUGET_EXTERNAL_FEED_ENDPOINTS : '{"endpointCredentials": [{"endpoint": "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json","password": "${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }}"}]}' diff --git a/.github/workflows/Pkg EdFi.Database.Security.yml b/.github/workflows/Pkg EdFi.Database.Security.yml index aa2d336013..03fb6a7996 100644 --- a/.github/workflows/Pkg EdFi.Database.Security.yml +++ b/.github/workflows/Pkg EdFi.Database.Security.yml @@ -15,8 +15,8 @@ on: permissions: read-all env: - INFORMATIONAL_VERSION: "7.3" - BUILD_INCREMENTER: "-537" + INFORMATIONAL_VERSION: "7.4" + BUILD_INCREMENTER: "-591" AZURE_ARTIFACT_URL: "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json" AZURE_ARTIFACT_NUGET_KEY: ${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }} VSS_NUGET_EXTERNAL_FEED_ENDPOINTS : '{"endpointCredentials": [{"endpoint": "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json","password": "${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }}"}]}' diff --git a/.github/workflows/Pkg EdFi.Ods.CodeGen.yml b/.github/workflows/Pkg EdFi.Ods.CodeGen.yml index e9bff9ec0e..209818cc33 100644 --- a/.github/workflows/Pkg EdFi.Ods.CodeGen.yml +++ b/.github/workflows/Pkg EdFi.Ods.CodeGen.yml @@ -19,8 +19,8 @@ concurrency: cancel-in-progress: true env: - INFORMATIONAL_VERSION: "7.3" - BUILD_INCREMENTER: "-3155" + INFORMATIONAL_VERSION: "7.4" + BUILD_INCREMENTER: "-4134" CONFIGURATION: "Release" AZURE_ARTIFACT_URL: "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json" AZURE_ARTIFACT_NUGET_KEY: ${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }} diff --git a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.PostgreSQL.yml b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.PostgreSQL.yml index 7937fab7e9..cb0b623383 100644 --- a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.PostgreSQL.yml +++ b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.PostgreSQL.yml @@ -18,8 +18,8 @@ on: permissions: read-all env: - INFORMATIONAL_VERSION: "7.3" - BUILD_INCREMENTER: "-985" + INFORMATIONAL_VERSION: "7.4" + BUILD_INCREMENTER: "-1298" AZURE_ARTIFACT_URL: "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json" AZURE_ARTIFACT_NUGET_KEY: ${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }} VSS_NUGET_EXTERNAL_FEED_ENDPOINTS : '{"endpointCredentials": [{"endpoint": "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json","password": "${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }}"}]}' diff --git a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.PostgreSQL.yml b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.PostgreSQL.yml index ffc20af914..dcde610638 100644 --- a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.PostgreSQL.yml +++ b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.PostgreSQL.yml @@ -18,8 +18,8 @@ on: permissions: read-all env: - INFORMATIONAL_VERSION: "7.3" - BUILD_INCREMENTER: "-778" + INFORMATIONAL_VERSION: "7.4" + BUILD_INCREMENTER: "-1221" AZURE_ARTIFACT_URL: "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json" AZURE_ARTIFACT_NUGET_KEY: ${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }} VSS_NUGET_EXTERNAL_FEED_ENDPOINTS : '{"endpointCredentials": [{"endpoint": "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json","password": "${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }}"}]}' diff --git a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.yml b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.yml index 3fcd3e62be..349b003957 100644 --- a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.yml +++ b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.yml @@ -18,8 +18,8 @@ on: permissions: read-all env: - INFORMATIONAL_VERSION: "7.3" - BUILD_INCREMENTER: "-777" + INFORMATIONAL_VERSION: "7.4" + BUILD_INCREMENTER: "-997" AZURE_ARTIFACT_URL: "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json" AZURE_ARTIFACT_NUGET_KEY: ${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }} VSS_NUGET_EXTERNAL_FEED_ENDPOINTS : '{"endpointCredentials": [{"endpoint": "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json","password": "${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }}"}]}' diff --git a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.yml b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.yml index 392b39e9f5..7d03272c95 100644 --- a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.yml +++ b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.yml @@ -18,8 +18,8 @@ on: permissions: read-all env: - INFORMATIONAL_VERSION: "7.3" - BUILD_INCREMENTER: "-923" + INFORMATIONAL_VERSION: "7.4" + BUILD_INCREMENTER: "-1265" AZURE_ARTIFACT_URL: "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json" AZURE_ARTIFACT_NUGET_KEY: ${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }} VSS_NUGET_EXTERNAL_FEED_ENDPOINTS : '{"endpointCredentials": [{"endpoint": "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json","password": "${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }}"}]}' diff --git a/.github/workflows/Pkg EdFi.Ods.Populated.Template.PostgreSQL.yml b/.github/workflows/Pkg EdFi.Ods.Populated.Template.PostgreSQL.yml index 75392908da..c62f2227e9 100644 --- a/.github/workflows/Pkg EdFi.Ods.Populated.Template.PostgreSQL.yml +++ b/.github/workflows/Pkg EdFi.Ods.Populated.Template.PostgreSQL.yml @@ -18,8 +18,8 @@ on: permissions: read-all env: - INFORMATIONAL_VERSION: "7.3" - BUILD_INCREMENTER: "-942" + INFORMATIONAL_VERSION: "7.4" + BUILD_INCREMENTER: "-1246" AZURE_ARTIFACT_URL: "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json" AZURE_ARTIFACT_NUGET_KEY: ${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }} VSS_NUGET_EXTERNAL_FEED_ENDPOINTS : '{"endpointCredentials": [{"endpoint": "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json","password": "${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }}"}]}' diff --git a/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.PostgreSQL.yml b/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.PostgreSQL.yml index a4d88f598f..831a621b2a 100644 --- a/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.PostgreSQL.yml +++ b/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.PostgreSQL.yml @@ -18,8 +18,8 @@ on: permissions: read-all env: - INFORMATIONAL_VERSION: "7.3" - BUILD_INCREMENTER: "-770" + INFORMATIONAL_VERSION: "7.4" + BUILD_INCREMENTER: "-995" AZURE_ARTIFACT_URL: "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json" AZURE_ARTIFACT_NUGET_KEY: ${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }} VSS_NUGET_EXTERNAL_FEED_ENDPOINTS : '{"endpointCredentials": [{"endpoint": "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json","password": "${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }}"}]}' diff --git a/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.yml b/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.yml index 26f6425f00..6d72acaec8 100644 --- a/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.yml +++ b/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.yml @@ -18,8 +18,8 @@ on: permissions: read-all env: - INFORMATIONAL_VERSION: "7.3" - BUILD_INCREMENTER: "-773" + INFORMATIONAL_VERSION: "7.4" + BUILD_INCREMENTER: "-999" AZURE_ARTIFACT_URL: "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json" AZURE_ARTIFACT_NUGET_KEY: ${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }} VSS_NUGET_EXTERNAL_FEED_ENDPOINTS : '{"endpointCredentials": [{"endpoint": "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json","password": "${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }}"}]}' diff --git a/.github/workflows/Pkg EdFi.Ods.Populated.Template.yml b/.github/workflows/Pkg EdFi.Ods.Populated.Template.yml index 25ed16df17..58de6adb2a 100644 --- a/.github/workflows/Pkg EdFi.Ods.Populated.Template.yml +++ b/.github/workflows/Pkg EdFi.Ods.Populated.Template.yml @@ -18,8 +18,8 @@ on: permissions: read-all env: - INFORMATIONAL_VERSION: "7.3" - BUILD_INCREMENTER: "-942" + INFORMATIONAL_VERSION: "7.4" + BUILD_INCREMENTER: "-1271" AZURE_ARTIFACT_URL: "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json" AZURE_ARTIFACT_NUGET_KEY: ${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }} VSS_NUGET_EXTERNAL_FEED_ENDPOINTS : '{"endpointCredentials": [{"endpoint": "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json","password": "${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }}"}]}' diff --git a/.github/workflows/Pkg EdFi.ProjectTemplates.Installer.yml b/.github/workflows/Pkg EdFi.ProjectTemplates.Installer.yml index 26dc524c01..6bfb0ec4af 100644 --- a/.github/workflows/Pkg EdFi.ProjectTemplates.Installer.yml +++ b/.github/workflows/Pkg EdFi.ProjectTemplates.Installer.yml @@ -19,8 +19,8 @@ concurrency: cancel-in-progress: true env: - INFORMATIONAL_VERSION: "7.3" - BUILD_INCREMENTER: "-839" + INFORMATIONAL_VERSION: "7.4" + BUILD_INCREMENTER: "-896" AZURE_ARTIFACT_URL: "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json" AZURE_ARTIFACT_NUGET_KEY: ${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }} VSS_NUGET_EXTERNAL_FEED_ENDPOINTS : '{"endpointCredentials": [{"endpoint": "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json","password": "${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }}"}]}' diff --git a/Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj b/Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj index 6876f95ceb..8df7029fa3 100644 --- a/Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj +++ b/Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj @@ -22,7 +22,7 @@ - + diff --git a/Application/EdFi.Ods.Api/Constants/ApiVersionConstants.cs b/Application/EdFi.Ods.Api/Constants/ApiVersionConstants.cs index 4918ec27cc..1a96137cda 100644 --- a/Application/EdFi.Ods.Api/Constants/ApiVersionConstants.cs +++ b/Application/EdFi.Ods.Api/Constants/ApiVersionConstants.cs @@ -22,12 +22,12 @@ public static class ApiVersionConstants /// /// Informational version of the ods api. /// - public const string InformationalVersion = "7.3"; + public const string InformationalVersion = "7.4"; /// /// Semantic version of the ods api. /// - public const string Version = "7.3"; + public const string Version = "7.4"; /// /// Suite version of the ods api. diff --git a/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj b/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj index e68635683a..a1ffe9d972 100644 --- a/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj +++ b/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj @@ -26,8 +26,8 @@ - - + + diff --git a/Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj b/Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj index 9c1ea8fe9d..b786ffc78b 100644 --- a/Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj +++ b/Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj @@ -22,7 +22,7 @@ - + diff --git a/Application/EdFi.Ods.Repositories.NHibernate.Tests/EdFi.Ods.Repositories.NHibernate.Tests.csproj b/Application/EdFi.Ods.Repositories.NHibernate.Tests/EdFi.Ods.Repositories.NHibernate.Tests.csproj index 2e57766933..9998a8ae91 100644 --- a/Application/EdFi.Ods.Repositories.NHibernate.Tests/EdFi.Ods.Repositories.NHibernate.Tests.csproj +++ b/Application/EdFi.Ods.Repositories.NHibernate.Tests/EdFi.Ods.Repositories.NHibernate.Tests.csproj @@ -26,7 +26,7 @@ - + diff --git a/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj b/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj index 9d41137f36..d25a4a57c1 100644 --- a/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj +++ b/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj @@ -20,8 +20,8 @@ - - + + diff --git a/Application/EdFi.Ods.Standard/Standard/4.0.0/Artifacts/Metadata/ApiModel.json b/Application/EdFi.Ods.Standard/Standard/4.0.0/Artifacts/Metadata/ApiModel.json index c498d63d71..6ade716277 100644 --- a/Application/EdFi.Ods.Standard/Standard/4.0.0/Artifacts/Metadata/ApiModel.json +++ b/Application/EdFi.Ods.Standard/Standard/4.0.0/Artifacts/Metadata/ApiModel.json @@ -1,5 +1,5 @@ { - "odsApiVersion": "7.3", + "odsApiVersion": "7.4", "schemaDefinition": { "logicalName": "Ed-Fi", "physicalName": "edfi", diff --git a/Application/EdFi.Ods.Standard/Standard/4.0.0/Artifacts/MsSql/Structure/Ods/1500-UpdateVersionTo74.sql b/Application/EdFi.Ods.Standard/Standard/4.0.0/Artifacts/MsSql/Structure/Ods/1500-UpdateVersionTo74.sql new file mode 100644 index 0000000000..66715bf746 --- /dev/null +++ b/Application/EdFi.Ods.Standard/Standard/4.0.0/Artifacts/MsSql/Structure/Ods/1500-UpdateVersionTo74.sql @@ -0,0 +1,18 @@ +-- SPDX-License-Identifier: Apache-2.0 +-- Licensed to the Ed-Fi Alliance under one or more agreements. +-- The Ed-Fi Alliance licenses this file to you under the Apache License, Version 2.0. +-- See the LICENSE and NOTICES files in the project root for more information. + +IF object_id('util.GetEdFiOdsVersion', 'FN') IS NOT NULL +BEGIN + DROP FUNCTION util.GetEdFiOdsVersion; +END +GO + +CREATE FUNCTION util.GetEdFiOdsVersion() +RETURNS VARCHAR(60) +AS +BEGIN + RETURN '7.4' +END +GO \ No newline at end of file diff --git a/Application/EdFi.Ods.Standard/Standard/4.0.0/Artifacts/PgSql/Structure/Ods/1490-UpdateVersionTo74.sql b/Application/EdFi.Ods.Standard/Standard/4.0.0/Artifacts/PgSql/Structure/Ods/1490-UpdateVersionTo74.sql new file mode 100644 index 0000000000..6904d8c64c --- /dev/null +++ b/Application/EdFi.Ods.Standard/Standard/4.0.0/Artifacts/PgSql/Structure/Ods/1490-UpdateVersionTo74.sql @@ -0,0 +1,11 @@ +-- SPDX-License-Identifier: Apache-2.0 +-- Licensed to the Ed-Fi Alliance under one or more agreements. +-- The Ed-Fi Alliance licenses this file to you under the Apache License, Version 2.0. +-- See the LICENSE and NOTICES files in the project root for more information. + +CREATE OR REPLACE FUNCTION util.GetEdFiOdsVersion() +RETURNS VARCHAR(60) AS $$ +BEGIN + RETURN '7.4'; +END; +$$ LANGUAGE plpgsql; \ No newline at end of file diff --git a/Application/EdFi.Ods.Standard/Standard/5.2.0/Artifacts/Metadata/ApiModel.json b/Application/EdFi.Ods.Standard/Standard/5.2.0/Artifacts/Metadata/ApiModel.json index 422a5de090..6bdb226b3d 100644 --- a/Application/EdFi.Ods.Standard/Standard/5.2.0/Artifacts/Metadata/ApiModel.json +++ b/Application/EdFi.Ods.Standard/Standard/5.2.0/Artifacts/Metadata/ApiModel.json @@ -1,5 +1,5 @@ { - "odsApiVersion": "7.3", + "odsApiVersion": "7.4", "schemaDefinition": { "logicalName": "Ed-Fi", "physicalName": "edfi", diff --git a/Application/EdFi.Ods.Standard/Standard/5.2.0/Artifacts/MsSql/Structure/Ods/1500-UpdateVersionTo74.sql b/Application/EdFi.Ods.Standard/Standard/5.2.0/Artifacts/MsSql/Structure/Ods/1500-UpdateVersionTo74.sql new file mode 100644 index 0000000000..66715bf746 --- /dev/null +++ b/Application/EdFi.Ods.Standard/Standard/5.2.0/Artifacts/MsSql/Structure/Ods/1500-UpdateVersionTo74.sql @@ -0,0 +1,18 @@ +-- SPDX-License-Identifier: Apache-2.0 +-- Licensed to the Ed-Fi Alliance under one or more agreements. +-- The Ed-Fi Alliance licenses this file to you under the Apache License, Version 2.0. +-- See the LICENSE and NOTICES files in the project root for more information. + +IF object_id('util.GetEdFiOdsVersion', 'FN') IS NOT NULL +BEGIN + DROP FUNCTION util.GetEdFiOdsVersion; +END +GO + +CREATE FUNCTION util.GetEdFiOdsVersion() +RETURNS VARCHAR(60) +AS +BEGIN + RETURN '7.4' +END +GO \ No newline at end of file diff --git a/Application/EdFi.Ods.Standard/Standard/5.2.0/Artifacts/PgSql/Structure/Ods/1490-UpdateVersionTo74.sql b/Application/EdFi.Ods.Standard/Standard/5.2.0/Artifacts/PgSql/Structure/Ods/1490-UpdateVersionTo74.sql new file mode 100644 index 0000000000..6904d8c64c --- /dev/null +++ b/Application/EdFi.Ods.Standard/Standard/5.2.0/Artifacts/PgSql/Structure/Ods/1490-UpdateVersionTo74.sql @@ -0,0 +1,11 @@ +-- SPDX-License-Identifier: Apache-2.0 +-- Licensed to the Ed-Fi Alliance under one or more agreements. +-- The Ed-Fi Alliance licenses this file to you under the Apache License, Version 2.0. +-- See the LICENSE and NOTICES files in the project root for more information. + +CREATE OR REPLACE FUNCTION util.GetEdFiOdsVersion() +RETURNS VARCHAR(60) AS $$ +BEGIN + RETURN '7.4'; +END; +$$ LANGUAGE plpgsql; \ No newline at end of file diff --git a/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj b/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj index bc3cbf0217..57ff5bc6b9 100644 --- a/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj +++ b/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj @@ -27,8 +27,8 @@ - - + + diff --git a/Application/EdFi.Ods.Tests/_EmbeddedResources/Extensions.Sample-ApiModel-EXTENSION-For-Tests.json b/Application/EdFi.Ods.Tests/_EmbeddedResources/Extensions.Sample-ApiModel-EXTENSION-For-Tests.json index 5eb4e28eb7..3b88f859b8 100644 --- a/Application/EdFi.Ods.Tests/_EmbeddedResources/Extensions.Sample-ApiModel-EXTENSION-For-Tests.json +++ b/Application/EdFi.Ods.Tests/_EmbeddedResources/Extensions.Sample-ApiModel-EXTENSION-For-Tests.json @@ -1,5 +1,5 @@ { - "odsApiVersion": "7.3", + "odsApiVersion": "7.4", "schemaDefinition": { "logicalName": "Sample", "physicalName": "sample", diff --git a/Application/EdFi.Security.DataAccess/EdFi.Security.DataAccess.csproj b/Application/EdFi.Security.DataAccess/EdFi.Security.DataAccess.csproj index 03619950ec..a9ffea47b2 100644 --- a/Application/EdFi.Security.DataAccess/EdFi.Security.DataAccess.csproj +++ b/Application/EdFi.Security.DataAccess/EdFi.Security.DataAccess.csproj @@ -21,7 +21,7 @@ - + diff --git a/Samples/Extensions/AlternativeEducationProgram/AlternativeEducationProgramMetaEd/MetaEdOutput/SampleAlternativeEducationProgram/ApiMetadata/ApiModel-EXTENSION.json b/Samples/Extensions/AlternativeEducationProgram/AlternativeEducationProgramMetaEd/MetaEdOutput/SampleAlternativeEducationProgram/ApiMetadata/ApiModel-EXTENSION.json index bd28699c93..3eb93dc9c8 100644 --- a/Samples/Extensions/AlternativeEducationProgram/AlternativeEducationProgramMetaEd/MetaEdOutput/SampleAlternativeEducationProgram/ApiMetadata/ApiModel-EXTENSION.json +++ b/Samples/Extensions/AlternativeEducationProgram/AlternativeEducationProgramMetaEd/MetaEdOutput/SampleAlternativeEducationProgram/ApiMetadata/ApiModel-EXTENSION.json @@ -1,5 +1,5 @@ { - "odsApiVersion": "7.3", + "odsApiVersion": "7.4", "schemaDefinition": { "logicalName": "SampleAlternativeEducationProgram", "physicalName": "samplealternativeeducationprogram", diff --git a/Samples/Extensions/StudentTranscript/StudentTranscriptMetaEd/MetaEdOutput/SampleStudentTranscript/ApiMetadata/ApiModel-EXTENSION.json b/Samples/Extensions/StudentTranscript/StudentTranscriptMetaEd/MetaEdOutput/SampleStudentTranscript/ApiMetadata/ApiModel-EXTENSION.json index 1ef779f721..44bf0991d7 100644 --- a/Samples/Extensions/StudentTranscript/StudentTranscriptMetaEd/MetaEdOutput/SampleStudentTranscript/ApiMetadata/ApiModel-EXTENSION.json +++ b/Samples/Extensions/StudentTranscript/StudentTranscriptMetaEd/MetaEdOutput/SampleStudentTranscript/ApiMetadata/ApiModel-EXTENSION.json @@ -1,5 +1,5 @@ { - "odsApiVersion": "7.3", + "odsApiVersion": "7.4", "schemaDefinition": { "logicalName": "SampleStudentTranscript", "physicalName": "samplestudenttranscript", diff --git a/Utilities/DataLoading/EdFi.BulkLoadClient.Console/EdFi.BulkLoadClient.Console.csproj b/Utilities/DataLoading/EdFi.BulkLoadClient.Console/EdFi.BulkLoadClient.Console.csproj index e2a81ba1b0..1340af4535 100644 --- a/Utilities/DataLoading/EdFi.BulkLoadClient.Console/EdFi.BulkLoadClient.Console.csproj +++ b/Utilities/DataLoading/EdFi.BulkLoadClient.Console/EdFi.BulkLoadClient.Console.csproj @@ -36,7 +36,7 @@ - + diff --git a/Utilities/DataLoading/EdFi.LoadTools.Test/EdFi.LoadTools.Test.csproj b/Utilities/DataLoading/EdFi.LoadTools.Test/EdFi.LoadTools.Test.csproj index 81f389890a..7d6f702ce8 100644 --- a/Utilities/DataLoading/EdFi.LoadTools.Test/EdFi.LoadTools.Test.csproj +++ b/Utilities/DataLoading/EdFi.LoadTools.Test/EdFi.LoadTools.Test.csproj @@ -22,13 +22,13 @@ - + - + - + diff --git a/Utilities/DataLoading/EdFi.LoadTools.Test/Mapping/MapperTests.cs b/Utilities/DataLoading/EdFi.LoadTools.Test/Mapping/MapperTests.cs index 1a6d65c6a1..dc7bb8c748 100644 --- a/Utilities/DataLoading/EdFi.LoadTools.Test/Mapping/MapperTests.cs +++ b/Utilities/DataLoading/EdFi.LoadTools.Test/Mapping/MapperTests.cs @@ -25,7 +25,7 @@ public class MapperTests ""firstName"": ""Barry"", ""lastSurname"": ""Tanner"", ""sexType"": ""Male"", - ""birthDate"": ""1965-08-19T00:00:00"", + ""birthDate"": ""1965-08-19"", ""hispanicLatinoEthnicity"": false, ""oldEthnicityType"": ""Hispanic"", ""highestCompletedLevelOfEducationDescriptor"": ""Master's"", diff --git a/Utilities/DataLoading/EdFi.LoadTools/EdFi.LoadTools.csproj b/Utilities/DataLoading/EdFi.LoadTools/EdFi.LoadTools.csproj index ade04432a6..db65a04730 100644 --- a/Utilities/DataLoading/EdFi.LoadTools/EdFi.LoadTools.csproj +++ b/Utilities/DataLoading/EdFi.LoadTools/EdFi.LoadTools.csproj @@ -22,7 +22,7 @@ - + diff --git a/Utilities/DataLoading/EdFi.SmokeTest.Console/EdFi.SmokeTest.Console.csproj b/Utilities/DataLoading/EdFi.SmokeTest.Console/EdFi.SmokeTest.Console.csproj index 243013e03a..e0900920f9 100644 --- a/Utilities/DataLoading/EdFi.SmokeTest.Console/EdFi.SmokeTest.Console.csproj +++ b/Utilities/DataLoading/EdFi.SmokeTest.Console/EdFi.SmokeTest.Console.csproj @@ -40,7 +40,7 @@ - + diff --git a/tests/EdFi.Admin.DataAccess.UnitTests/EdFi.Admin.DataAccess.UnitTests.csproj b/tests/EdFi.Admin.DataAccess.UnitTests/EdFi.Admin.DataAccess.UnitTests.csproj index 71bc9e9cf8..602d754583 100644 --- a/tests/EdFi.Admin.DataAccess.UnitTests/EdFi.Admin.DataAccess.UnitTests.csproj +++ b/tests/EdFi.Admin.DataAccess.UnitTests/EdFi.Admin.DataAccess.UnitTests.csproj @@ -22,7 +22,7 @@ - + diff --git a/tests/EdFi.Ods.WebApi.CompositeSpecFlowTests/EdFi.Ods.WebApi.CompositeSpecFlowTests.csproj b/tests/EdFi.Ods.WebApi.CompositeSpecFlowTests/EdFi.Ods.WebApi.CompositeSpecFlowTests.csproj index e9d806470f..f72a21e178 100644 --- a/tests/EdFi.Ods.WebApi.CompositeSpecFlowTests/EdFi.Ods.WebApi.CompositeSpecFlowTests.csproj +++ b/tests/EdFi.Ods.WebApi.CompositeSpecFlowTests/EdFi.Ods.WebApi.CompositeSpecFlowTests.csproj @@ -32,8 +32,8 @@ - - + + diff --git a/tests/EdFi.Ods.WebApi.IntegrationTests/EdFi.Ods.WebApi.IntegrationTests.csproj b/tests/EdFi.Ods.WebApi.IntegrationTests/EdFi.Ods.WebApi.IntegrationTests.csproj index 91e3c63087..473aed4fcd 100644 --- a/tests/EdFi.Ods.WebApi.IntegrationTests/EdFi.Ods.WebApi.IntegrationTests.csproj +++ b/tests/EdFi.Ods.WebApi.IntegrationTests/EdFi.Ods.WebApi.IntegrationTests.csproj @@ -21,8 +21,8 @@ - - + + diff --git a/tests/EdFi.Security.DataAccess.UnitTests/EdFi.Security.DataAccess.UnitTests.csproj b/tests/EdFi.Security.DataAccess.UnitTests/EdFi.Security.DataAccess.UnitTests.csproj index b2778b8e43..e19f6c8c9b 100644 --- a/tests/EdFi.Security.DataAccess.UnitTests/EdFi.Security.DataAccess.UnitTests.csproj +++ b/tests/EdFi.Security.DataAccess.UnitTests/EdFi.Security.DataAccess.UnitTests.csproj @@ -22,7 +22,7 @@ - +