Merge pull request #1112 from microsoftgraph/dev

Merge dev to main

Author: andrueastman

.azure-pipelines/generation-pipeline.yml

@@ -532,61 +532,6 @@ stages:
           parameters:
             repoName: msgraph-beta-sdk-java
 
-- stage: stage_php_v1
-  dependsOn:
-  - stage_build_and_publish_typewriter
-  - stage_v1_metadata
-  condition: |
-    and
-    (
-      eq(dependencies.stage_build_and_publish_typewriter.result, 'Succeeded'),
-      in(dependencies.stage_v1_metadata.result, 'Succeeded', 'Skipped')
-    )
-  jobs:
-  - job: php_v1
-    steps:
-    - template: generation-templates/language-generation.yml
-      parameters:
-        language: 'PHP'
-        version: ''
-        repoName: 'msgraph-sdk-php'
-        branchName: $(v1Branch)
-        cleanMetadataFile: $(cleanMetadataFileV1)
-        cleanMetadataFolder: $(cleanMetadataFolderV1)
-        languageSpecificSteps:
-        - template: generation-templates/php-v1.yml
-          parameters:
-             repoName: 'msgraph-sdk-php'
-
-- stage: stage_php_beta
-  dependsOn:
-  - stage_build_and_publish_typewriter
-  - stage_beta_metadata
-  condition: |
-    and
-    (
-      eq(dependencies.stage_build_and_publish_typewriter.result, 'Succeeded'),
-      in(dependencies.stage_beta_metadata.result, 'Succeeded', 'Skipped')
-    )
-  jobs:
-  - job: php_beta
-    steps:
-    - template: generation-templates/language-generation.yml
-      parameters:
-        language: 'PHP'
-        version: 'beta'
-        repoName: 'msgraph-sdk-php'
-        branchName: $(betaBranch)
-        cleanMetadataFile: $(cleanMetadataFileBeta)
-        cleanMetadataFolder: $(cleanMetadataFolderBeta)
-        languageSpecificSteps:
-        - template: generation-templates/php-beta.yml
-          parameters:
-             phpBetaGenerationDirectory: $(Build.SourcesDirectory)/msgraph-sdk-php/src/Beta/
-             repoName: 'msgraph-sdk-php'
-             migration: false
-             pathToCopy: '/com/Beta/*'
-
 - stage: stage_php_beta_kiota
   dependsOn:
     - stage_build_and_publish_kiota
@@ -615,6 +560,7 @@ stages:
                 parameters:
                   repoName: msgraph-beta-sdk-php
             customArguments: "-b -e '/me' -e '/me/**'" # Exclude me and Enable the backing store
+
 - stage: stage_php_v1_kiota
   dependsOn:
     - stage_build_and_publish_kiota
@@ -636,13 +582,14 @@ stages:
             branchName: 'kiota/$(v1Branch)'
             targetClassName: "BaseGraphClient"
             targetNamespace: 'Microsoft\\Graph\\Generated'
-            baseBranchName: 'feat/kiota-preview'
+            baseBranchName: 'dev'
             cleanMetadataFolder: $(cleanOpenAPIFolderV1)
             languageSpecificSteps:
               - template: generation-templates/php-kiota.yml
                 parameters:
                   repoName: msgraph-sdk-php
             customArguments: "-b -e '/me' -e '/me/**'" # Exclude me and Enable the backing store
+
 - stage: stage_typescript_v1
   dependsOn:
   - stage_build_and_publish_typewriter
@@ -827,7 +774,7 @@ stages:
       parameters:
         language: 'cli'
         version: ''
-        repoName: 'msgraph-cli'
+        repoName: 'msgraph-beta-cli'
         baseBranchName : 'main'
         branchName: 'kiota/$(betaBranch)'
         targetClassName: "GraphClient"

apidoctor

@@ -51,7 +51,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Inflector.NetStandard" Version="1.2.2" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Mono.TextTemplating">
       <Version>2.3.1</Version>

src/GraphODataTemplateWriter/GraphODataTemplateWriter.csproj

@@ -26,7 +26,7 @@
       <Version>5.1.2</Version>
     </PackageReference>
     <PackageReference Include="NLog">
-      <Version>5.2.5</Version>
+      <Version>5.2.6</Version>
     </PackageReference>
     <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
   </ItemGroup>