Skip to content

Commit

Permalink
Merge pull request #14 from NolanMM/NolanM_MainBranch_Rebase
Browse files Browse the repository at this point in the history
Merged Database Services
  • Loading branch information
NolanMM authored Oct 28, 2023
2 parents 28a622c + 998f546 commit 235bb52
Show file tree
Hide file tree
Showing 276 changed files with 6,854 additions and 246 deletions.
Binary file added .vs/Project_V/v17/.wsuo
Binary file not shown.
10 changes: 8 additions & 2 deletions AnalysisServiceTests/AnalysisServiceTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,16 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="Microsoft.CodeCoverage" Version="17.7.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="17.7.2" />
<PackageReference Include="Microsoft.TestPlatform.TestHost" Version="17.7.2" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
<PackageReference Include="coverlet.collector" Version="3.2.0" />
<PackageReference Include="coverlet.collector" Version="6.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
Expand Down
115 changes: 67 additions & 48 deletions AnalysisServiceTests/bin/Debug/net6.0/AnalysisServiceTests.deps.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,19 @@
"dependencies": {
"MSTest.TestAdapter": "2.2.10",
"MSTest.TestFramework": "2.2.10",
"Microsoft.NET.Test.Sdk": "17.5.0",
"Microsoft.CodeCoverage": "17.7.2",
"Microsoft.NET.Test.Sdk": "17.7.2",
"Microsoft.TestPlatform.ObjectModel": "17.7.2",
"Microsoft.TestPlatform.TestHost": "17.7.2",
"Server_Side": "1.0.0",
"coverlet.collector": "3.2.0",
"coverlet.collector": "6.0.0",
"Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions": "14.0.0.0"
},
"runtime": {
"AnalysisServiceTests.dll": {}
}
},
"coverlet.collector/3.2.0": {},
"coverlet.collector/6.0.0": {},
"GraphQL/7.6.1": {
"dependencies": {
"GraphQL-Parser": "8.4.0"
Expand Down Expand Up @@ -93,11 +96,11 @@
}
}
},
"Microsoft.CodeCoverage/17.5.0": {
"Microsoft.CodeCoverage/17.7.2": {
"runtime": {
"lib/netcoreapp3.1/Microsoft.VisualStudio.CodeCoverage.Shim.dll": {
"assemblyVersion": "15.0.0.0",
"fileVersion": "17.500.222.62001"
"fileVersion": "17.700.423.36401"
}
}
},
Expand All @@ -113,31 +116,31 @@
"System.Runtime.CompilerServices.Unsafe": "4.4.0"
}
},
"Microsoft.NET.Test.Sdk/17.5.0": {
"Microsoft.NET.Test.Sdk/17.7.2": {
"dependencies": {
"Microsoft.CodeCoverage": "17.5.0",
"Microsoft.TestPlatform.TestHost": "17.5.0"
"Microsoft.CodeCoverage": "17.7.2",
"Microsoft.TestPlatform.TestHost": "17.7.2"
}
},
"Microsoft.NETCore.Platforms/1.1.0": {},
"Microsoft.NETCore.Targets/1.1.0": {},
"Microsoft.TestPlatform.ObjectModel/17.5.0": {
"Microsoft.TestPlatform.ObjectModel/17.7.2": {
"dependencies": {
"NuGet.Frameworks": "5.11.0",
"NuGet.Frameworks": "6.5.0",
"System.Reflection.Metadata": "1.6.0"
},
"runtime": {
"lib/netcoreapp3.1/Microsoft.TestPlatform.CoreUtilities.dll": {
"assemblyVersion": "15.0.0.0",
"fileVersion": "15.0.0.0"
"fileVersion": "17.700.223.42501"
},
"lib/netcoreapp3.1/Microsoft.TestPlatform.PlatformAbstractions.dll": {
"assemblyVersion": "15.0.0.0",
"fileVersion": "15.0.0.0"
"fileVersion": "17.700.223.42501"
},
"lib/netcoreapp3.1/Microsoft.VisualStudio.TestPlatform.ObjectModel.dll": {
"assemblyVersion": "15.0.0.0",
"fileVersion": "15.0.0.0"
"fileVersion": "17.700.223.42501"
}
},
"resources": {
Expand Down Expand Up @@ -221,31 +224,31 @@
}
}
},
"Microsoft.TestPlatform.TestHost/17.5.0": {
"Microsoft.TestPlatform.TestHost/17.7.2": {
"dependencies": {
"Microsoft.TestPlatform.ObjectModel": "17.5.0",
"Microsoft.TestPlatform.ObjectModel": "17.7.2",
"Newtonsoft.Json": "13.0.1"
},
"runtime": {
"lib/netcoreapp3.1/Microsoft.TestPlatform.CommunicationUtilities.dll": {
"assemblyVersion": "15.0.0.0",
"fileVersion": "15.0.0.0"
"fileVersion": "17.700.223.42501"
},
"lib/netcoreapp3.1/Microsoft.TestPlatform.CrossPlatEngine.dll": {
"assemblyVersion": "15.0.0.0",
"fileVersion": "15.0.0.0"
"fileVersion": "17.700.223.42501"
},
"lib/netcoreapp3.1/Microsoft.TestPlatform.Utilities.dll": {
"assemblyVersion": "15.0.0.0",
"fileVersion": "15.0.0.0"
"fileVersion": "17.700.223.42501"
},
"lib/netcoreapp3.1/Microsoft.VisualStudio.TestPlatform.Common.dll": {
"assemblyVersion": "15.0.0.0",
"fileVersion": "15.0.0.0"
"fileVersion": "17.700.223.42501"
},
"lib/netcoreapp3.1/testhost.dll": {
"assemblyVersion": "15.0.0.0",
"fileVersion": "15.0.0.0"
"fileVersion": "17.700.223.42501"
}
},
"resources": {
Expand Down Expand Up @@ -382,6 +385,14 @@
}
}
},
"MySqlConnector/2.2.7": {
"runtime": {
"lib/net6.0/MySqlConnector.dll": {
"assemblyVersion": "2.0.0.0",
"fileVersion": "2.2.7.0"
}
}
},
"Newtonsoft.Json/13.0.1": {
"runtime": {
"lib/netstandard2.0/Newtonsoft.Json.dll": {
Expand All @@ -390,11 +401,11 @@
}
}
},
"NuGet.Frameworks/5.11.0": {
"NuGet.Frameworks/6.5.0": {
"runtime": {
"lib/netstandard2.0/NuGet.Frameworks.dll": {
"assemblyVersion": "5.11.0.10",
"fileVersion": "5.11.0.10"
"assemblyVersion": "6.5.0.154",
"fileVersion": "6.5.0.154"
}
}
},
Expand Down Expand Up @@ -522,7 +533,8 @@
"GraphQL": "7.6.1",
"GraphQL.Authorization": "7.0.0",
"GraphQL.Server.Transports.AspNetCore": "7.6.0",
"GraphQL.Server.Ui.Voyager": "7.6.0"
"GraphQL.Server.Ui.Voyager": "7.6.0",
"MySqlConnector": "2.2.7"
},
"runtime": {
"Server_Side.dll": {}
Expand All @@ -544,12 +556,12 @@
"serviceable": false,
"sha512": ""
},
"coverlet.collector/3.2.0": {
"coverlet.collector/6.0.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-xjY8xBigSeWIYs4I7DgUHqSNoGqnHi7Fv7/7RZD02rvZyG3hlsjnQKiVKVWKgr9kRKgmV+dEfu8KScvysiC0Wg==",
"path": "coverlet.collector/3.2.0",
"hashPath": "coverlet.collector.3.2.0.nupkg.sha512"
"sha512": "sha512-tW3lsNS+dAEII6YGUX/VMoJjBS1QvsxqJeqLaJXub08y1FSjasFPtQ4UBUsudE9PNrzLjooClMsPtY2cZLdXpQ==",
"path": "coverlet.collector/6.0.0",
"hashPath": "coverlet.collector.6.0.0.nupkg.sha512"
},
"GraphQL/7.6.1": {
"type": "package",
Expand Down Expand Up @@ -600,12 +612,12 @@
"path": "graphql.systemtextjson/7.6.0",
"hashPath": "graphql.systemtextjson.7.6.0.nupkg.sha512"
},
"Microsoft.CodeCoverage/17.5.0": {
"Microsoft.CodeCoverage/17.7.2": {
"type": "package",
"serviceable": true,
"sha512": "sha512-6FQo0O6LKDqbCiIgVQhJAf810HSjFlOj7FunWaeOGDKxy8DAbpHzPk4SfBTXz9ytaaceuIIeR6hZgplt09m+ig==",
"path": "microsoft.codecoverage/17.5.0",
"hashPath": "microsoft.codecoverage.17.5.0.nupkg.sha512"
"sha512": "sha512-ntbkwIqwszkfCRjxVZOyEQiHauiYsY9NtYjw9ASsoxDSiG8YtV6AGcOAwrAk3TZv2UOq4MrpX+3MYEeMHSb03w==",
"path": "microsoft.codecoverage/17.7.2",
"hashPath": "microsoft.codecoverage.17.7.2.nupkg.sha512"
},
"Microsoft.Extensions.DependencyInjection.Abstractions/2.0.0": {
"type": "package",
Expand All @@ -628,12 +640,12 @@
"path": "microsoft.extensions.primitives/2.0.0",
"hashPath": "microsoft.extensions.primitives.2.0.0.nupkg.sha512"
},
"Microsoft.NET.Test.Sdk/17.5.0": {
"Microsoft.NET.Test.Sdk/17.7.2": {
"type": "package",
"serviceable": true,
"sha512": "sha512-IJ4eSPcsRbwbAZehh1M9KgejSy0u3d0wAdkJytfCh67zOaCl5U3ltruUEe15MqirdRqGmm/ngbjeaVeGapSZxg==",
"path": "microsoft.net.test.sdk/17.5.0",
"hashPath": "microsoft.net.test.sdk.17.5.0.nupkg.sha512"
"sha512": "sha512-WOSF/GUYcnrLGkdvCbXDRig2rShtBwfQc5l7IxQE6PZI3CeXAqF1SpyzwlGA5vw+MdEAXs3niy+ZkGBBWna6tw==",
"path": "microsoft.net.test.sdk/17.7.2",
"hashPath": "microsoft.net.test.sdk.17.7.2.nupkg.sha512"
},
"Microsoft.NETCore.Platforms/1.1.0": {
"type": "package",
Expand All @@ -649,19 +661,19 @@
"path": "microsoft.netcore.targets/1.1.0",
"hashPath": "microsoft.netcore.targets.1.1.0.nupkg.sha512"
},
"Microsoft.TestPlatform.ObjectModel/17.5.0": {
"Microsoft.TestPlatform.ObjectModel/17.7.2": {
"type": "package",
"serviceable": true,
"sha512": "sha512-QwiBJcC/oEA1kojOaB0uPWOIo4i6BYuTBBYJVhUvmXkyYqZ2Ut/VZfgi+enf8LF8J4sjO98oRRFt39MiRorcIw==",
"path": "microsoft.testplatform.objectmodel/17.5.0",
"hashPath": "microsoft.testplatform.objectmodel.17.5.0.nupkg.sha512"
"sha512": "sha512-aHzQWgDMVBnk39HhQVmn06w+YxzF1h2V5/M4WgrNQAn7q97GR4Si3vLRTDlmJo9nK/Nknce+H4tXx4gqOKyLeg==",
"path": "microsoft.testplatform.objectmodel/17.7.2",
"hashPath": "microsoft.testplatform.objectmodel.17.7.2.nupkg.sha512"
},
"Microsoft.TestPlatform.TestHost/17.5.0": {
"Microsoft.TestPlatform.TestHost/17.7.2": {
"type": "package",
"serviceable": true,
"sha512": "sha512-X86aikwp9d4SDcBChwzQYZihTPGEtMdDk+9t64emAl7N0Tq+OmlLAoW+Rs+2FB2k6QdUicSlT4QLO2xABRokaw==",
"path": "microsoft.testplatform.testhost/17.5.0",
"hashPath": "microsoft.testplatform.testhost.17.5.0.nupkg.sha512"
"sha512": "sha512-pv9yVD7IKPLJV28zYjLsWFiM3j506I2ye+6NquG8vsbm/gR7lgyig8IgY6Vo57VMvGaAKwtUECzcj+C5tH271Q==",
"path": "microsoft.testplatform.testhost/17.7.2",
"hashPath": "microsoft.testplatform.testhost.17.7.2.nupkg.sha512"
},
"MSTest.TestAdapter/2.2.10": {
"type": "package",
Expand All @@ -677,19 +689,26 @@
"path": "mstest.testframework/2.2.10",
"hashPath": "mstest.testframework.2.2.10.nupkg.sha512"
},
"MySqlConnector/2.2.7": {
"type": "package",
"serviceable": true,
"sha512": "sha512-rwFa71MlOJ142S+BXDvtLRdAIn7l6PTNWu+Xehs2qRehK8dckjKqwvK8azEADCMkQyXS1LXgh9HkSvItpTi6WA==",
"path": "mysqlconnector/2.2.7",
"hashPath": "mysqlconnector.2.2.7.nupkg.sha512"
},
"Newtonsoft.Json/13.0.1": {
"type": "package",
"serviceable": true,
"sha512": "sha512-ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==",
"path": "newtonsoft.json/13.0.1",
"hashPath": "newtonsoft.json.13.0.1.nupkg.sha512"
},
"NuGet.Frameworks/5.11.0": {
"NuGet.Frameworks/6.5.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-eaiXkUjC4NPcquGWzAGMXjuxvLwc6XGKMptSyOGQeT0X70BUZObuybJFZLA0OfTdueLd3US23NBPTBb6iF3V1Q==",
"path": "nuget.frameworks/5.11.0",
"hashPath": "nuget.frameworks.5.11.0.nupkg.sha512"
"sha512": "sha512-QWINE2x3MbTODsWT1Gh71GaGb5icBz4chS8VYvTgsBnsi8esgN6wtHhydd7fvToWECYGq7T4cgBBDiKD/363fg==",
"path": "nuget.frameworks/6.5.0",
"hashPath": "nuget.frameworks.6.5.0.nupkg.sha512"
},
"runtime.native.System/4.3.0": {
"type": "package",
Expand Down
Binary file modified AnalysisServiceTests/bin/Debug/net6.0/AnalysisServiceTests.dll
Binary file not shown.
Binary file modified AnalysisServiceTests/bin/Debug/net6.0/AnalysisServiceTests.pdb
Binary file not shown.
Binary file modified AnalysisServiceTests/bin/Debug/net6.0/CoverletSourceRootsMapping
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified AnalysisServiceTests/bin/Debug/net6.0/NuGet.Frameworks.dll
Binary file not shown.
18 changes: 17 additions & 1 deletion AnalysisServiceTests/bin/Debug/net6.0/Server_Side.deps.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"GraphQL": "7.6.1",
"GraphQL.Authorization": "7.0.0",
"GraphQL.Server.Transports.AspNetCore": "7.6.0",
"GraphQL.Server.Ui.Voyager": "7.6.0"
"GraphQL.Server.Ui.Voyager": "7.6.0",
"MySqlConnector": "2.2.7"
},
"runtime": {
"Server_Side.dll": {}
Expand Down Expand Up @@ -102,6 +103,14 @@
"System.Runtime.CompilerServices.Unsafe": "4.4.0"
}
},
"MySqlConnector/2.2.7": {
"runtime": {
"lib/net6.0/MySqlConnector.dll": {
"assemblyVersion": "2.0.0.0",
"fileVersion": "2.2.7.0"
}
}
},
"System.Runtime.CompilerServices.Unsafe/4.4.0": {}
}
},
Expand Down Expand Up @@ -181,6 +190,13 @@
"path": "microsoft.extensions.primitives/2.0.0",
"hashPath": "microsoft.extensions.primitives.2.0.0.nupkg.sha512"
},
"MySqlConnector/2.2.7": {
"type": "package",
"serviceable": true,
"sha512": "sha512-rwFa71MlOJ142S+BXDvtLRdAIn7l6PTNWu+Xehs2qRehK8dckjKqwvK8azEADCMkQyXS1LXgh9HkSvItpTi6WA==",
"path": "mysqlconnector/2.2.7",
"hashPath": "mysqlconnector.2.2.7.nupkg.sha512"
},
"System.Runtime.CompilerServices.Unsafe/4.4.0": {
"type": "package",
"serviceable": true,
Expand Down
Binary file modified AnalysisServiceTests/bin/Debug/net6.0/Server_Side.dll
Binary file not shown.
Binary file modified AnalysisServiceTests/bin/Debug/net6.0/Server_Side.exe
Binary file not shown.
Binary file modified AnalysisServiceTests/bin/Debug/net6.0/Server_Side.pdb
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified AnalysisServiceTests/bin/Debug/net6.0/testhost.dll
Binary file not shown.
Binary file modified AnalysisServiceTests/bin/Debug/net6.0/testhost.exe
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 235bb52

Please sign in to comment.