Skip to content

Commit

Permalink
Merge pull request #29 from NolanMM/27-integration-analysis-services-…
Browse files Browse the repository at this point in the history
…with-database-system

28 Modify Analysis Services
  • Loading branch information
NolanMM authored Nov 24, 2023
2 parents 72a8ebe + a90a8f1 commit d6da558
Show file tree
Hide file tree
Showing 83 changed files with 720 additions and 946 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.400\\RuntimeIdentifierGraph.json"
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.100\\RuntimeIdentifierGraph.json"
}
}
},
Expand Down Expand Up @@ -181,7 +181,7 @@
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.400\\RuntimeIdentifierGraph.json"
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.100\\RuntimeIdentifierGraph.json"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\gautam\.nuget\packages\</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.7.0</NuGetToolVersion>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.8.0</NuGetToolVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<SourceRoot Include="C:\Users\gautam\.nuget\packages\" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
15f9fb8efb0fbdd4d69a9fc48ca9c9b35ba74174
71537b33f5a14f9471225137a272c4ebd4c805394bc0180c1c917e7bcd4a8689
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = AnalysisServiceTests
build_property.ProjectDir = C:\Users\gautam\Desktop\Project 5\Project Code\AnalysisServiceTests\
build_property.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop =
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion AnalysisServiceTests/obj/project.assets.json
Original file line number Diff line number Diff line change
Expand Up @@ -3012,7 +3012,7 @@
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.400\\RuntimeIdentifierGraph.json"
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.100\\RuntimeIdentifierGraph.json"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion AnalysisServiceTests/obj/project.nuget.cache
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": 2,
"dgSpecHash": "CTu4U7fERPSqCJUbHoQutxHGBhEDqLzoMYe7KYE7OfSgM+dJRV436XZ6wljLLEPcMjvejBPT5zxBpWZHJEsc3A==",
"dgSpecHash": "37VdGOQ+dgz6RCKosbMrHdxMVwVB7oThiVMo7deV7pE5IC/5Nug+aAHfYQjZ7rV1PPwU5wvZtqEkhDIZ7uT/qg==",
"success": true,
"projectFilePath": "C:\\Users\\gautam\\Desktop\\Project 5\\Project Code\\AnalysisServiceTests\\AnalysisServiceTests.csproj",
"expectedPackageFiles": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,40 +1,35 @@
{
"format": 1,
"restore": {
"C:\\Users\\Minh\\Desktop\\Test_Cloning\\DatabaseAnalysisModuleTests\\DatabaseAnalysisModuleTests.csproj": {}
"C:\\Users\\gautam\\Desktop\\Project 5\\Project Code\\DatabaseAnalysisModuleTests\\DatabaseAnalysisModuleTests.csproj": {}
},
"projects": {
"C:\\Users\\Minh\\Desktop\\Test_Cloning\\DatabaseAnalysisModuleTests\\DatabaseAnalysisModuleTests.csproj": {
"C:\\Users\\gautam\\Desktop\\Project 5\\Project Code\\DatabaseAnalysisModuleTests\\DatabaseAnalysisModuleTests.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\Minh\\Desktop\\Test_Cloning\\DatabaseAnalysisModuleTests\\DatabaseAnalysisModuleTests.csproj",
"projectUniqueName": "C:\\Users\\gautam\\Desktop\\Project 5\\Project Code\\DatabaseAnalysisModuleTests\\DatabaseAnalysisModuleTests.csproj",
"projectName": "DatabaseAnalysisModuleTests",
"projectPath": "C:\\Users\\Minh\\Desktop\\Test_Cloning\\DatabaseAnalysisModuleTests\\DatabaseAnalysisModuleTests.csproj",
"packagesPath": "C:\\Users\\Minh\\.nuget\\packages\\",
"outputPath": "C:\\Users\\Minh\\Desktop\\Test_Cloning\\DatabaseAnalysisModuleTests\\obj\\",
"projectPath": "C:\\Users\\gautam\\Desktop\\Project 5\\Project Code\\DatabaseAnalysisModuleTests\\DatabaseAnalysisModuleTests.csproj",
"packagesPath": "C:\\Users\\gautam\\.nuget\\packages\\",
"outputPath": "C:\\Users\\gautam\\Desktop\\Project 5\\Project Code\\DatabaseAnalysisModuleTests\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
],
"configFilePaths": [
"C:\\Users\\Minh\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Users\\gautam\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"C:\\Program Files\\dotnet\\library-packs": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
"C:\\Users\\Minh\\Desktop\\Test_Cloning\\Server_Side\\Server_Side.csproj": {
"projectPath": "C:\\Users\\Minh\\Desktop\\Test_Cloning\\Server_Side\\Server_Side.csproj"
"C:\\Users\\gautam\\Desktop\\Project 5\\Project Code\\Server_Side\\Server_Side.csproj": {
"projectPath": "C:\\Users\\gautam\\Desktop\\Project 5\\Project Code\\Server_Side\\Server_Side.csproj"
}
}
}
Expand Down Expand Up @@ -82,33 +77,28 @@
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.403\\RuntimeIdentifierGraph.json"
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.100\\RuntimeIdentifierGraph.json"
}
}
},
"C:\\Users\\Minh\\Desktop\\Test_Cloning\\Server_Side\\Server_Side.csproj": {
"C:\\Users\\gautam\\Desktop\\Project 5\\Project Code\\Server_Side\\Server_Side.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\Minh\\Desktop\\Test_Cloning\\Server_Side\\Server_Side.csproj",
"projectUniqueName": "C:\\Users\\gautam\\Desktop\\Project 5\\Project Code\\Server_Side\\Server_Side.csproj",
"projectName": "Server_Side",
"projectPath": "C:\\Users\\Minh\\Desktop\\Test_Cloning\\Server_Side\\Server_Side.csproj",
"packagesPath": "C:\\Users\\Minh\\.nuget\\packages\\",
"outputPath": "C:\\Users\\Minh\\Desktop\\Test_Cloning\\Server_Side\\obj\\",
"projectPath": "C:\\Users\\gautam\\Desktop\\Project 5\\Project Code\\Server_Side\\Server_Side.csproj",
"packagesPath": "C:\\Users\\gautam\\.nuget\\packages\\",
"outputPath": "C:\\Users\\gautam\\Desktop\\Project 5\\Project Code\\Server_Side\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
],
"configFilePaths": [
"C:\\Users\\Minh\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Users\\gautam\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"C:\\Program Files\\dotnet\\library-packs": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
Expand Down Expand Up @@ -175,7 +165,7 @@
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.403\\RuntimeIdentifierGraph.json"
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.100\\RuntimeIdentifierGraph.json"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Minh\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\gautam\.nuget\packages\</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.7.0</NuGetToolVersion>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.8.0</NuGetToolVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<SourceRoot Include="C:\Users\Minh\.nuget\packages\" />
<SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
<SourceRoot Include="C:\Users\gautam\.nuget\packages\" />
</ItemGroup>
<ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<Import Project="$(NuGetPackageRoot)mstest.testadapter\2.2.10\build\net5.0\MSTest.TestAdapter.props" Condition="Exists('$(NuGetPackageRoot)mstest.testadapter\2.2.10\build\net5.0\MSTest.TestAdapter.props')" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3fb458e0c4aa14c066105d7bde4def9fd3e3abca
53102f49aa94b4d46d582c364e09db46738f10cdbc0b74eedec14f0275eef30d
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = DatabaseAnalysisModuleTests
build_property.ProjectDir = C:\Users\gautam\Desktop\Project 5\Project Code\DatabaseAnalysisModuleTests\
build_property.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop =
Binary file not shown.
Binary file not shown.
24 changes: 9 additions & 15 deletions DatabaseAnalysisModuleTests/obj/project.assets.json
Original file line number Diff line number Diff line change
Expand Up @@ -2923,40 +2923,34 @@
]
},
"packageFolders": {
"C:\\Users\\Minh\\.nuget\\packages\\": {},
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}
"C:\\Users\\gautam\\.nuget\\packages\\": {}
},
"project": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\Minh\\Desktop\\Test_Cloning\\DatabaseAnalysisModuleTests\\DatabaseAnalysisModuleTests.csproj",
"projectUniqueName": "C:\\Users\\gautam\\Desktop\\Project 5\\Project Code\\DatabaseAnalysisModuleTests\\DatabaseAnalysisModuleTests.csproj",
"projectName": "DatabaseAnalysisModuleTests",
"projectPath": "C:\\Users\\Minh\\Desktop\\Test_Cloning\\DatabaseAnalysisModuleTests\\DatabaseAnalysisModuleTests.csproj",
"packagesPath": "C:\\Users\\Minh\\.nuget\\packages\\",
"outputPath": "C:\\Users\\Minh\\Desktop\\Test_Cloning\\DatabaseAnalysisModuleTests\\obj\\",
"projectPath": "C:\\Users\\gautam\\Desktop\\Project 5\\Project Code\\DatabaseAnalysisModuleTests\\DatabaseAnalysisModuleTests.csproj",
"packagesPath": "C:\\Users\\gautam\\.nuget\\packages\\",
"outputPath": "C:\\Users\\gautam\\Desktop\\Project 5\\Project Code\\DatabaseAnalysisModuleTests\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
],
"configFilePaths": [
"C:\\Users\\Minh\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Users\\gautam\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"C:\\Program Files\\dotnet\\library-packs": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
"C:\\Users\\Minh\\Desktop\\Test_Cloning\\Server_Side\\Server_Side.csproj": {
"projectPath": "C:\\Users\\Minh\\Desktop\\Test_Cloning\\Server_Side\\Server_Side.csproj"
"C:\\Users\\gautam\\Desktop\\Project 5\\Project Code\\Server_Side\\Server_Side.csproj": {
"projectPath": "C:\\Users\\gautam\\Desktop\\Project 5\\Project Code\\Server_Side\\Server_Side.csproj"
}
}
}
Expand Down Expand Up @@ -3004,7 +2998,7 @@
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.403\\RuntimeIdentifierGraph.json"
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.100\\RuntimeIdentifierGraph.json"
}
}
}
Expand Down
Loading

0 comments on commit d6da558

Please sign in to comment.