Merge branch 'dev' into psp-6945

bcgov · Oct 4, 2023 · 3a93ab0 · 3a93ab0
2 parents 9725422 + 028981b
commit 3a93ab0
Show file tree

Hide file tree

Showing 9 changed files with 42,365 additions and 30,613 deletions.
diff --git a/etl/LISDB_PIMS_MANAGEMENT/Integration Services Project1/Integration Services Project1.dtproj b/etl/LISDB_PIMS_MANAGEMENT/Integration Services Project1/Integration Services Project1.dtproj
diff --git a/...B_PIMS_MANAGEMENT/Integration Services Project1/Integration Services Project1.dtproj.user b/...B_PIMS_MANAGEMENT/Integration Services Project1/Integration Services Project1.dtproj.user
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<DataTransformationsUserConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Configurations>
+    <Configuration>
+      <Name>Development</Name>
+      <Options>
+        <AssessmentRuleSuppressionSetting />
+        <UseWinAuth>false</UseWinAuth>
+        <WinAuthUserName />
+        <WinAuthDomain />
+        <UserIDs />
+        <UserPasswords />
+        <OfflineMode>false</OfflineMode>
+        <ProgressReporting>true</ProgressReporting>
+        <ParameterConfigurationSensitiveValues>
+          <ConfigurationSetting>
+            <Id>LastModifiedTime</Id>
+            <Name>LastModifiedTime</Name>
+            <Value xsi:type="xsd:dateTime">2023-09-28T23:18:30.6360735Z</Value>
+          </ConfigurationSetting>
+        </ParameterConfigurationSensitiveValues>
+      </Options>
+    </Configuration>
+  </Configurations>
+</DataTransformationsUserConfiguration>
diff --git a/etl/LISDB_PIMS_MANAGEMENT/Integration Services Project1/Package.dtsx b/etl/LISDB_PIMS_MANAGEMENT/Integration Services Project1/Package.dtsx
diff --git a/etl/LISDB_PIMS_MANAGEMENT/Integration Services Project1/Project.params b/etl/LISDB_PIMS_MANAGEMENT/Integration Services Project1/Project.params
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<SSIS:Parameters xmlns:SSIS="www.microsoft.com/SqlServer/SSIS" />
diff --git a/etl/LISDB_PIMS_MANAGEMENT/LISDB_PIMS_MANAGEMENT.sln b/etl/LISDB_PIMS_MANAGEMENT/LISDB_PIMS_MANAGEMENT.sln
@@ -0,0 +1,22 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.33027.164
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{C9674DCB-5085-4A16-B785-4C70DD1589BD}") = "Integration Services Project1", "Integration Services Project1\Integration Services Project1.dtproj", "{6903397E-286F-48C2-8837-2B9D79E0850C}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Development|Default = Development|Default
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{6903397E-286F-48C2-8837-2B9D79E0850C}.Development|Default.ActiveCfg = Development
+		{6903397E-286F-48C2-8837-2B9D79E0850C}.Development|Default.Build.0 = Development
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {3E706E5D-18F3-4535-838C-64D6BE4E4002}
+	EndGlobalSection
+EndGlobal
diff --git a/etl/PAIMS_PIMS_ACQUISITION/PAIMS_PIMS_ACQUISITION/PAIMS_ACQUISITION_TO_PIMS_DATASET.dtsx b/etl/PAIMS_PIMS_ACQUISITION/PAIMS_PIMS_ACQUISITION/PAIMS_ACQUISITION_TO_PIMS_DATASET.dtsx
diff --git a/etl/PAIMS_PIMS_ACQUISITION/PAIMS_PIMS_ACQUISITION/PAIMS_PIMS_ACQUISITION.dtproj b/etl/PAIMS_PIMS_ACQUISITION/PAIMS_PIMS_ACQUISITION/PAIMS_PIMS_ACQUISITION.dtproj
@@ -41,10 +41,10 @@
                 <SSIS:Property SSIS:Name="Name">PAIMS_ACQUISITION_TO_PIMS_DATASET</SSIS:Property>
                 <SSIS:Property SSIS:Name="VersionMajor">1</SSIS:Property>
                 <SSIS:Property SSIS:Name="VersionMinor">0</SSIS:Property>
-                <SSIS:Property SSIS:Name="VersionBuild">2428</SSIS:Property>
+                <SSIS:Property SSIS:Name="VersionBuild">2475</SSIS:Property>
                 <SSIS:Property SSIS:Name="VersionComments">
                 </SSIS:Property>
-                <SSIS:Property SSIS:Name="VersionGUID">{BC006787-0CDF-40F2-8943-68C49B1CF095}</SSIS:Property>
+                <SSIS:Property SSIS:Name="VersionGUID">{0988AE26-5B69-402F-996E-5E89DBEB2CAF}</SSIS:Property>
                 <SSIS:Property SSIS:Name="PackageFormatVersion">8</SSIS:Property>
                 <SSIS:Property SSIS:Name="Description">
                 </SSIS:Property>

diff --git a/source/backend/api/Pims.Api.csproj b/source/backend/api/Pims.Api.csproj
@@ -2,8 +2,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <UserSecretsId>0ef6255f-9ea0-49ec-8c65-c172304b4926</UserSecretsId>
-    <Version>4.0.0-64.3</Version>
-    <Version>4.0.0-64.3</Version>
+    <Version>4.0.0-64.4</Version>
+    <Version>4.0.0-64.4</Version>
     <AssemblyVersion>4.0.0.64</AssemblyVersion>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <ProjectGuid>16BC0468-78F6-4C91-87DA-7403C919E646</ProjectGuid>

diff --git a/source/frontend/package.json b/source/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "4.0.0-64.3",
+  "version": "4.0.0-64.4",
   "private": true,
   "dependencies": {
     "@bcgov/bc-sans": "1.0.1",