Fix broken command line options (#392)

* Add support for ServiceName command line option to the CLI
OData · May 13, 2024 · 7d64bbe · 7d64bbe
1 parent 2720525
commit 7d64bbe
Show file tree

Hide file tree

Showing 42 changed files with 9,128 additions and 32 deletions.
diff --git a/ODataCodeGenTools.sln b/ODataCodeGenTools.sln
@@ -20,42 +20,113 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ODataConnectedService.Share
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ODataConnectedService_VS2022Plus", "src\ODataConnectedService_VS2022Plus\ODataConnectedService_VS2022Plus.csproj", "{15769DAB-F3B0-4E82-A125-CF55ACB04D07}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.OData.Cli.Tests", "test\Microsoft.OData.Cli.Tests\Microsoft.OData.Cli.Tests.csproj", "{FE62623D-B8AF-49E2-AEB2-4EF50419777A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{87FB2A7F-D758-4DBF-8B36-0007A3E156E9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6500B077-1097-408B-B99A-6105EE8F4400}"
+EndProject
 Global
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		src\ODataConnectedService.Shared\ODataConnectedService.Shared.projitems*{15769dab-f3b0-4e82-a125-cf55acb04d07}*SharedItemsImports = 4
-		src\ODataConnectedService.Shared\ODataConnectedService.Shared.projitems*{61e9e534-c672-4109-a6e1-9aa6f14b6c54}*SharedItemsImports = 13
-		src\ODataConnectedService.Shared\ODataConnectedService.Shared.projitems*{a8bc5b8e-9ab7-4257-b8f1-e7c62169f9b5}*SharedItemsImports = 4
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|arm64 = Debug|arm64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|arm64 = Release|arm64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{A8BC5B8E-9AB7-4257-B8F1-E7C62169F9B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A8BC5B8E-9AB7-4257-B8F1-E7C62169F9B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A8BC5B8E-9AB7-4257-B8F1-E7C62169F9B5}.Debug|arm64.ActiveCfg = Debug|arm64
+		{A8BC5B8E-9AB7-4257-B8F1-E7C62169F9B5}.Debug|arm64.Build.0 = Debug|arm64
+		{A8BC5B8E-9AB7-4257-B8F1-E7C62169F9B5}.Debug|x86.ActiveCfg = Debug|x86
+		{A8BC5B8E-9AB7-4257-B8F1-E7C62169F9B5}.Debug|x86.Build.0 = Debug|x86
 		{A8BC5B8E-9AB7-4257-B8F1-E7C62169F9B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A8BC5B8E-9AB7-4257-B8F1-E7C62169F9B5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A8BC5B8E-9AB7-4257-B8F1-E7C62169F9B5}.Release|arm64.ActiveCfg = Release|arm64
+		{A8BC5B8E-9AB7-4257-B8F1-E7C62169F9B5}.Release|arm64.Build.0 = Release|arm64
+		{A8BC5B8E-9AB7-4257-B8F1-E7C62169F9B5}.Release|x86.ActiveCfg = Release|x86
+		{A8BC5B8E-9AB7-4257-B8F1-E7C62169F9B5}.Release|x86.Build.0 = Release|x86
 		{903B31D0-BE14-4D9E-BA76-186FA82B3A37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{903B31D0-BE14-4D9E-BA76-186FA82B3A37}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{903B31D0-BE14-4D9E-BA76-186FA82B3A37}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{903B31D0-BE14-4D9E-BA76-186FA82B3A37}.Debug|arm64.Build.0 = Debug|Any CPU
+		{903B31D0-BE14-4D9E-BA76-186FA82B3A37}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{903B31D0-BE14-4D9E-BA76-186FA82B3A37}.Debug|x86.Build.0 = Debug|Any CPU
 		{903B31D0-BE14-4D9E-BA76-186FA82B3A37}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{903B31D0-BE14-4D9E-BA76-186FA82B3A37}.Release|Any CPU.Build.0 = Release|Any CPU
+		{903B31D0-BE14-4D9E-BA76-186FA82B3A37}.Release|arm64.ActiveCfg = Release|Any CPU
+		{903B31D0-BE14-4D9E-BA76-186FA82B3A37}.Release|arm64.Build.0 = Release|Any CPU
+		{903B31D0-BE14-4D9E-BA76-186FA82B3A37}.Release|x86.ActiveCfg = Release|Any CPU
+		{903B31D0-BE14-4D9E-BA76-186FA82B3A37}.Release|x86.Build.0 = Release|Any CPU
 		{EF809374-384C-4AC2-981A-C12F0044B5AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EF809374-384C-4AC2-981A-C12F0044B5AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF809374-384C-4AC2-981A-C12F0044B5AE}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{EF809374-384C-4AC2-981A-C12F0044B5AE}.Debug|arm64.Build.0 = Debug|Any CPU
+		{EF809374-384C-4AC2-981A-C12F0044B5AE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EF809374-384C-4AC2-981A-C12F0044B5AE}.Debug|x86.Build.0 = Debug|Any CPU
 		{EF809374-384C-4AC2-981A-C12F0044B5AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EF809374-384C-4AC2-981A-C12F0044B5AE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EF809374-384C-4AC2-981A-C12F0044B5AE}.Release|arm64.ActiveCfg = Release|Any CPU
+		{EF809374-384C-4AC2-981A-C12F0044B5AE}.Release|arm64.Build.0 = Release|Any CPU
+		{EF809374-384C-4AC2-981A-C12F0044B5AE}.Release|x86.ActiveCfg = Release|Any CPU
+		{EF809374-384C-4AC2-981A-C12F0044B5AE}.Release|x86.Build.0 = Release|Any CPU
 		{86FAAAEC-3BBD-479C-8A44-D2715A6BD4C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{86FAAAEC-3BBD-479C-8A44-D2715A6BD4C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{86FAAAEC-3BBD-479C-8A44-D2715A6BD4C1}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{86FAAAEC-3BBD-479C-8A44-D2715A6BD4C1}.Debug|arm64.Build.0 = Debug|Any CPU
+		{86FAAAEC-3BBD-479C-8A44-D2715A6BD4C1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{86FAAAEC-3BBD-479C-8A44-D2715A6BD4C1}.Debug|x86.Build.0 = Debug|Any CPU
 		{86FAAAEC-3BBD-479C-8A44-D2715A6BD4C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{86FAAAEC-3BBD-479C-8A44-D2715A6BD4C1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{86FAAAEC-3BBD-479C-8A44-D2715A6BD4C1}.Release|arm64.ActiveCfg = Release|Any CPU
+		{86FAAAEC-3BBD-479C-8A44-D2715A6BD4C1}.Release|arm64.Build.0 = Release|Any CPU
+		{86FAAAEC-3BBD-479C-8A44-D2715A6BD4C1}.Release|x86.ActiveCfg = Release|Any CPU
+		{86FAAAEC-3BBD-479C-8A44-D2715A6BD4C1}.Release|x86.Build.0 = Release|Any CPU
 		{15769DAB-F3B0-4E82-A125-CF55ACB04D07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{15769DAB-F3B0-4E82-A125-CF55ACB04D07}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{15769DAB-F3B0-4E82-A125-CF55ACB04D07}.Debug|arm64.ActiveCfg = Debug|arm64
+		{15769DAB-F3B0-4E82-A125-CF55ACB04D07}.Debug|arm64.Build.0 = Debug|arm64
+		{15769DAB-F3B0-4E82-A125-CF55ACB04D07}.Debug|x86.ActiveCfg = Debug|x86
+		{15769DAB-F3B0-4E82-A125-CF55ACB04D07}.Debug|x86.Build.0 = Debug|x86
 		{15769DAB-F3B0-4E82-A125-CF55ACB04D07}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{15769DAB-F3B0-4E82-A125-CF55ACB04D07}.Release|Any CPU.Build.0 = Release|Any CPU
+		{15769DAB-F3B0-4E82-A125-CF55ACB04D07}.Release|arm64.ActiveCfg = Release|arm64
+		{15769DAB-F3B0-4E82-A125-CF55ACB04D07}.Release|arm64.Build.0 = Release|arm64
+		{15769DAB-F3B0-4E82-A125-CF55ACB04D07}.Release|x86.ActiveCfg = Release|x86
+		{15769DAB-F3B0-4E82-A125-CF55ACB04D07}.Release|x86.Build.0 = Release|x86
+		{FE62623D-B8AF-49E2-AEB2-4EF50419777A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FE62623D-B8AF-49E2-AEB2-4EF50419777A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FE62623D-B8AF-49E2-AEB2-4EF50419777A}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{FE62623D-B8AF-49E2-AEB2-4EF50419777A}.Debug|arm64.Build.0 = Debug|Any CPU
+		{FE62623D-B8AF-49E2-AEB2-4EF50419777A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FE62623D-B8AF-49E2-AEB2-4EF50419777A}.Debug|x86.Build.0 = Debug|Any CPU
+		{FE62623D-B8AF-49E2-AEB2-4EF50419777A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FE62623D-B8AF-49E2-AEB2-4EF50419777A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FE62623D-B8AF-49E2-AEB2-4EF50419777A}.Release|arm64.ActiveCfg = Release|Any CPU
+		{FE62623D-B8AF-49E2-AEB2-4EF50419777A}.Release|arm64.Build.0 = Release|Any CPU
+		{FE62623D-B8AF-49E2-AEB2-4EF50419777A}.Release|x86.ActiveCfg = Release|Any CPU
+		{FE62623D-B8AF-49E2-AEB2-4EF50419777A}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{A8BC5B8E-9AB7-4257-B8F1-E7C62169F9B5} = {6500B077-1097-408B-B99A-6105EE8F4400}
+		{903B31D0-BE14-4D9E-BA76-186FA82B3A37} = {87FB2A7F-D758-4DBF-8B36-0007A3E156E9}
+		{EF809374-384C-4AC2-981A-C12F0044B5AE} = {6500B077-1097-408B-B99A-6105EE8F4400}
+		{86FAAAEC-3BBD-479C-8A44-D2715A6BD4C1} = {6500B077-1097-408B-B99A-6105EE8F4400}
+		{61E9E534-C672-4109-A6E1-9AA6F14B6C54} = {6500B077-1097-408B-B99A-6105EE8F4400}
+		{15769DAB-F3B0-4E82-A125-CF55ACB04D07} = {6500B077-1097-408B-B99A-6105EE8F4400}
+		{FE62623D-B8AF-49E2-AEB2-4EF50419777A} = {87FB2A7F-D758-4DBF-8B36-0007A3E156E9}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {FD696714-8F52-4A00-93F4-43C843F184DB}
 	EndGlobalSection
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		src\ODataConnectedService.Shared\ODataConnectedService.Shared.projitems*{15769dab-f3b0-4e82-a125-cf55acb04d07}*SharedItemsImports = 4
+		src\ODataConnectedService.Shared\ODataConnectedService.Shared.projitems*{61e9e534-c672-4109-a6e1-9aa6f14b6c54}*SharedItemsImports = 13
+		src\ODataConnectedService.Shared\ODataConnectedService.Shared.projitems*{a8bc5b8e-9ab7-4257-b8f1-e7c62169f9b5}*SharedItemsImports = 4
+	EndGlobalSection
 EndGlobal
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -19,6 +19,7 @@ variables:
   productFilesVs2022Plus: 'Microsoft.OData.ConnectedService.VS2022Plus.*?(*.dll|*.config|*.pdb)'
   productFilesODataCLI: 'Microsoft.OData.Cli.*?(*.dll|*.config|*.pdb)'
   testBinPath: '$(connectedServiceDir)\test\ODataConnectedService.Tests\bin\$(BuildConfiguration)\'
+  testBinPathODataCLI: '$(connectedServiceDir)\test\Microsoft.OData.Cli.Tests\bin\$(BuildConfiguration)\'
   vsixPath: '$(productBinPath)'
   vsixFile: 'Microsoft.OData.ConnectedService.vsix'
   vsixFileVs2022Plus: 'Microsoft.OData.ConnectedService.VS2022Plus.vsix'
@@ -30,6 +31,7 @@ variables:
   mainDllVs2022Plus: 'Microsoft.OData.ConnectedService.VS2022Plus.dll'
   mainDllODataCLI: 'Microsoft.OData.Cli.dll'
   testDll: 'ODataConnectedService.Tests.dll'
+  testDllODataCLI: 'Microsoft.OData.Cli.Tests.dll'
   snExe: 'C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\sn.exe'
   snExe64: 'C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\x64\sn.exe'
 
@@ -73,6 +75,13 @@ stages:
         configuration: '$(buildConfiguration)'
         searchFolder:  '$(System.DefaultWorkingDirectory)'
 
+    - task: DotNetCoreCLI@2
+      displayName: Unit Tests (Microsoft.OData.Cli.Tests)
+      inputs:
+        command: test
+        projects: $(connectedServiceDir)\test\Microsoft.OData.Cli.Tests\Microsoft.OData.Cli.Tests.csproj
+        arguments: --configuration $(buildConfiguration) --no-build
+
     - task: CopyFiles@2
       displayName: 'Copy Files - VSIX to Artifacts Staging'
       inputs: