Merge pull request #1151 from microsoftgraph/hotfix/main-dev-conflicts

baywet · web-flow · commit c266dbb4c9bb · 2024-01-26T08:16:17.000-05:00
Merges dev into main (#1143)
diff --git a/scripts/generate-typescript.ps1 b/scripts/generate-typescript.ps1
@@ -30,4 +30,4 @@ foreach($rootSegment in $rootSegments) {
 }
 $modelsPackagePath = "$targetDirectory/$modelsPackageDirectoryName"
 Invoke-Expression "$kiotaPath generate -o $modelsPackagePath -d $descriptionPath -c $clientName -l TypeScript -n github.com/microsoftgraph/msgraph-sdk-typescript/ -e '/me' -e '/me/**' $additionalArguments"
-Invoke-Expression "$PSScriptRoot\remove-typescript-fluent-api-from-main-package.ps1 -targetDirectory '$modelsPackagePath'"
+Invoke-Expression "$PSScriptRoot\remove-typescript-fluent-api-from-main-package.ps1 -targetDirectory '$modelsPackagePath'"

Original file line number	Diff line number	Diff line change
`@@ -30,4 +30,4 @@ foreach($rootSegment in $rootSegments) {`
`30`	`30`	`}`
`31`	`31`	`$modelsPackagePath = "$targetDirectory/$modelsPackageDirectoryName"`
`32`	`32`	`Invoke-Expression "$kiotaPath generate -o $modelsPackagePath -d $descriptionPath -c $clientName -l TypeScript -n github.com/microsoftgraph/msgraph-sdk-typescript/ -e '/me' -e '/me/**' $additionalArguments"`
`33`		`-Invoke-Expression "$PSScriptRoot\remove-typescript-fluent-api-from-main-package.ps1 -targetDirectory '$modelsPackagePath'"`
	`33`	`+Invoke-Expression "$PSScriptRoot\remove-typescript-fluent-api-from-main-package.ps1 -targetDirectory '$modelsPackagePath'"`