Merge pull request #1103 from microsoftgraph/dev

Merge dev to main

Author: andrueastman

.azure-pipelines/generation-pipeline.yml

@@ -497,7 +497,7 @@ stages:
         targetClassName: "BaseGraphServiceClient"
         targetNamespace: "com.Microsoft.Graph"
         cleanMetadataFolder: $(cleanOpenAPIFolderV1)
-        customArguments: "-e '/me' -e '/me/**'" # Exclude /me
+        customArguments: "-b -e '/me' -e '/me/**'" # Exclude /me/** and enable backing store
         languageSpecificSteps:
         - template: generation-templates/java-kiota.yml
           parameters:
@@ -526,7 +526,7 @@ stages:
         targetClassName: "BaseGraphServiceClient"
         targetNamespace: "com.Microsoft.Graph"
         cleanMetadataFolder: $(cleanOpenAPIFolderBeta)
-        customArguments: "-e '/me' -e '/me/**'" # Exclude /me
+        customArguments: "-b -e '/me' -e '/me/**'" # Exclude /me/** and enable backing store
         languageSpecificSteps:
         - template: generation-templates/java-kiota.yml
           parameters:
@@ -749,6 +749,7 @@ stages:
         - template: generation-templates/python.yml
           parameters:
             repoName: msgraph-sdk-python
+            baseDirectory: msgraph
 
 - stage: stage_python_beta
   dependsOn:
@@ -770,13 +771,14 @@ stages:
         repoName: 'msgraph-beta-sdk-python'
         branchName: $(betaBranch)
         targetClassName: "BaseGraphServiceClient"
-        targetNamespace: "msgraph.generated"
+        targetNamespace: "msgraph_beta.generated"
         customArguments: "-b -e '/me' -e '/me/**'" # Enable backing store, Exclude me
         cleanMetadataFolder: $(cleanOpenAPIFolderBeta)
         languageSpecificSteps:
         - template: generation-templates/python.yml
           parameters:
             repoName: msgraph-beta-sdk-python
+            baseDirectory: msgraph_beta
 
 - stage: stage_cli_v1_kiota
   dependsOn:

.azure-pipelines/generation-templates/build-and-publish-kiota.yml

@@ -1,5 +1,7 @@
 steps:
 - template: use-dotnet-sdk.yml
+  parameters:
+    version: '8.x' # Kiota is a NET8 app
 
 - checkout: kiota
   displayName: checkout kiota
@@ -10,7 +12,7 @@ steps:
 
 - task: CopyFiles@2
   inputs:
-    sourceFolder: '$(Build.SourcesDirectory)/src/kiota/bin/$(BuildConfiguration)/net7.0'
+    sourceFolder: '$(Build.SourcesDirectory)/src/kiota/bin/$(BuildConfiguration)/net8.0'
     contents: '**/*'
     targetFolder: '$(Build.ArtifactStagingDirectory)'
   displayName: Copy Kiota executable

.azure-pipelines/generation-templates/cli-kiota.yml

@@ -17,6 +17,7 @@ steps:
     BuildConfiguration: $(buildConfiguration)
     OutputFullPath: $(kiotaDirectory)/output/*
     RepoModelsDir: $(Build.SourcesDirectory)/${{ parameters.repoName }}/src/generated/
+    WorkspaceRootDir: $(Build.SourcesDirectory)/${{ parameters.repoName }}
 
 - task: DotNetCoreCLI@2
   displayName: Restore packages

.azure-pipelines/generation-templates/python.yml

@@ -2,16 +2,19 @@ parameters:
   - name: repoName
     type: string
 
+  - name: baseDirectory
+    type: string
+
 steps:
 - pwsh: '$(scriptsDirectory)/clean-python-files.ps1'
   displayName: 'Remove generated models and requests from the repo generated folder'
   env:
-    RepoModelsDir: '$(Build.SourcesDirectory)/${{ parameters.repoName }}/msgraph/generated'
+    RepoModelsDir: '$(Build.SourcesDirectory)/${{ parameters.repoName }}/${{ parameters.baseDirectory }}/generated'
 
 - pwsh: '$(scriptsDirectory)/copy-python-models.ps1'
   displayName: 'Update models'
   env:
     BuildConfiguration: $(buildConfiguration)
     OutputFullPath: $(kiotaDirectory)/output/*
-    RepoModelsDir: '$(Build.SourcesDirectory)/${{ parameters.repoName }}/msgraph/generated'
+    RepoModelsDir: '$(Build.SourcesDirectory)/${{ parameters.repoName }}/${{ parameters.baseDirectory }}/generated'
 

.azure-pipelines/generation-templates/set-up-for-generation-kiota.yml

@@ -10,6 +10,8 @@ parameters:
 steps:
 - template: set-user-config.yml
 - template: use-dotnet-sdk.yml
+  parameters:
+    version: '8.x' # Kiota is a NET8 app
 - ${{ parameters.downloadSteps }}
 
 #Download the openAPI artifacts

.github/policies/MSGraph-SDK-Code-Generator-branch-protection.yml

@@ -10,7 +10,7 @@ configuration:
   branchProtectionRules:
 
   - branchNamePattern: dev
-    # This branch pattern applies to the following branches as of 06/12/2023 10:31:12:
+    # This branch pattern applies to the following branches:
     # dev
 
     # Specifies whether this branch can be deleted. boolean
@@ -30,21 +30,22 @@ configuration:
     # Are commits required to be signed. boolean. TODO: all contributors must have commit signing on local machines.
     requiresCommitSignatures: false
     # Are conversations required to be resolved before merging? boolean
-    requiresConversationResolution: false
+    requiresConversationResolution: true
     # Are merge commits prohibited from being pushed to this branch. boolean
     requiresLinearHistory: false
     # Required status checks to pass before merging. Values can be any string, but if the value does not correspond to any existing status check, the status check will be stuck on pending for status since nothing exists to push an actual status
     requiredStatusChecks:
     - build
+    - CodeQL
     # Require branches to be up to date before merging. Requires requiredStatusChecks. boolean
-    requiresStrictStatusChecks: false
+    requiresStrictStatusChecks: true
     # Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
     restrictsPushes: false
     # Restrict who can dismiss pull request reviews. boolean
     restrictsReviewDismissals: false
 
   - branchNamePattern: main
-    # This branch pattern applies to the following branches as of 06/12/2023 10:31:12:
+    # This branch pattern applies to the following branches:
     # main
 
     # Specifies whether this branch can be deleted. boolean
@@ -64,14 +65,15 @@ configuration:
     # Are commits required to be signed. boolean. TODO: all contributors must have commit signing on local machines.
     requiresCommitSignatures: false
     # Are conversations required to be resolved before merging? boolean
-    requiresConversationResolution: false
+    requiresConversationResolution: true
     # Are merge commits prohibited from being pushed to this branch. boolean
     requiresLinearHistory: false
     # Required status checks to pass before merging. Values can be any string, but if the value does not correspond to any existing status check, the status check will be stuck on pending for status since nothing exists to push an actual status
     requiredStatusChecks:
     - build
-    # Require branches to be up to date before merging. Requires requiredStatusChecks. boolean
-    requiresStrictStatusChecks: false
+    - CodeQL
+    # Require branches to be up to date before merging. boolean
+    requiresStrictStatusChecks: true
     # Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
     restrictsPushes: false
     # Restrict who can dismiss pull request reviews. boolean

.github/workflows/codeql.yml

@@ -0,0 +1,86 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "dev", "main" ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "dev" ]
+  schedule:
+    - cron: '1 * * * 1' # At minute 0 on Monday
+
+jobs:
+  analyze:
+    name: Analyze
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners
+    # Consider using larger runners for possible analysis time improvements.
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'csharp' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby', 'swift' ]
+        # Use only 'java' to analyze code written in Java, Kotlin or both
+        # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+      with:
+        submodules: recursive
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+
+    # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+      with:
+        working-directory: ${{ github.workspace }}/src/Typewriter
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    #   If the Autobuild fails above, remove it and uncomment the following three lines.
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #     echo "Run, Build Application using script"
+    #     ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:${{matrix.language}}"

GraphODataTemplateWriter.Test/GraphODataTemplateWriter.Test.csproj

@@ -16,7 +16,7 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="MSTest.TestAdapter">
       <Version>3.1.1</Version>
     </PackageReference>

apidoctor

@@ -9,3 +9,11 @@ Write-Host "Removed the existing generated files in the repo." -ForegroundColor
 New-Item -ItemType directory -Path $env:RepoModelsDir
 Move-Item $env:OutputFullPath $env:RepoModelsDir
 Write-Host "Moved the models from $modelsDirectory into the local repo." -ForegroundColor Green
+
+$helpUpdateScript = Join-Path -Path $env:WorkspaceRootDir -ChildPath .azure-pipelines/powershell/HelpUpdate.ps1
+. $helpUpdateScript
+
+Update-UsersMeAlias -WorkspaceRootDir $env:WorkspaceRootDir
+Update-MeUserIdHelp -WorkspaceRootDir $env:WorkspaceRootDir
+
+Write-Host "Updated 'me' help content in $env:RepoModelsDir" -ForegroundColor Green