Update for 0.1.4-preview release (#86)

* Update for 0.1.4-preview release

* cleanup

* Add back submodule update

Author: jason-dou

generated/microsoftgraph/microsoft.graph/beta/types.json

@@ -1979,14 +1979,14 @@
           "$ref": "#/0"
         },
         "flags": 0,
-        "description": "Contains the name of the field that a value is associated with."
+        "description": "Key."
       },
       "value": {
         "type": {
           "$ref": "#/0"
         },
         "flags": 0,
-        "description": "Contains the corresponding value for the specified key."
+        "description": "Value."
       }
     }
   },

generated/microsoftgraph/microsoft.graph/beta/types.md

@@ -240,8 +240,8 @@
 
 ## MicrosoftGraphKeyValue
 ### Properties
-* **key**: string: Contains the name of the field that a value is associated with.
-* **value**: string: Contains the corresponding value for the specified key.
+* **key**: string: Key.
+* **value**: string: Value.
 
 ## MicrosoftGraphOnPremisesProvisioningError
 ### Properties

msgraph-metadata

@@ -8,7 +8,9 @@ parameters:
     default: false
 
 steps:
-  - template: ./generate-types.yml
+  # Official release takes existing generated types
+  - ${{ if eq(parameters.Official, false) }}:
+      - template: ./generate-types.yml
 
   # Build the solution
   - task: DotNetCoreCLI@2
@@ -29,14 +31,14 @@ steps:
     displayName: "Run BinSkim - Product Binaries"
     inputs:
       InputType: Basic
-      AnalyzeTarget: '$(ProductBinPath)/**/Microsoft.Graph.Bicep.Types.dll'
+      AnalyzeTarget: "$(ProductBinPath)/**/Microsoft.Graph.Bicep.Types.dll"
       AnalyzeSymPath: "$(ProductBinPath)"
       AnalyzeVerbose: true
       AnalyzeHashes: true
       AnalyzeEnvironment: true
 
   - ${{ if eq(parameters.Official, true) }}:
-    - template: ./esrp/codesign.yml
+      - template: ./esrp/codesign.yml
 
   - task: DotNetCoreCLI@2
     displayName: "Pack Typeloader"
@@ -55,13 +57,13 @@ steps:
       pwsh: true
 
   - ${{ if eq(parameters.Official, true) }}:
-    - template: ./esrp/codesign-nuget.yml
+      - template: ./esrp/codesign-nuget.yml
 
   - task: CopyFiles@2
     displayName: "Copy Product Binaries"
     inputs:
       SourceFolder: "$(ProductBinPath)"
-      Contents: '**/Microsoft.Graph.Bicep.Types.dll'
+      Contents: "**/Microsoft.Graph.Bicep.Types.dll"
       TargetFolder: "$(Build.ArtifactStagingDirectory)/ProductBinaries"
 
   - task: CopyFiles@2
@@ -70,7 +72,7 @@ steps:
       SourceFolder: "$(Build.SourcesDirectory)/swagger"
       Contents: "**"
       TargetFolder: "$(Build.ArtifactStagingDirectory)/swagger"
-  
+
   - task: CopyFiles@2
     displayName: "Copy generated Dir"
     inputs:
@@ -79,7 +81,7 @@ steps:
       TargetFolder: "$(Build.ArtifactStagingDirectory)/generated"
 
   - task: PublishBuildArtifacts@1
-    displayName: 'Publish Files: $(ArtifactName)'
+    displayName: "Publish Files: $(ArtifactName)"
     inputs:
-      ArtifactName: '$(ArtifactName)'
-      PathtoPublish: '$(Build.ArtifactStagingDirectory)'
+      ArtifactName: "$(ArtifactName)"
+      PathtoPublish: "$(Build.ArtifactStagingDirectory)"

pipelines/common-templates/common-steps.yml

@@ -0,0 +1,45 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+<#
+.Synopsis
+    Update the generated Bicep types and Swagger spec.
+.Description
+    Update the generated Bicep types and Swagger spec by updating the latest msgraph metadata
+    and running the generation scripts.
+#>
+
+$SwaggerGenerationPrefix = "./src/swagger-generation"
+$GeneratorPrefix = "./src/generator"
+$AutoRestPrefix = "./src/autorest"
+
+# Build bicep-types
+Write-Host "Building bicep-types"
+Push-Location bicep-types/src/bicep-types
+npm ci
+npm run build
+Pop-Location
+Write-Host "bicep-types successfully built"
+
+# Update msgraph-metadata submodule
+Write-Host "Updating msgraph-metadata submodule"
+git submodule update --recursive --remote msgraph-metadata
+Write-Host "msgraph-metadata submodule successfully updated"
+
+# Build auto-rest
+Write-Host "Building Autorest"
+npm ci --prefix $AutoRestPrefix
+npm run --prefix $AutoRestPrefix build
+Write-Host "Autorest successfully built"
+
+# Generate Swagger spec
+Write-Host "Generating Swagger spec"
+npm ci --prefix $SwaggerGenerationPrefix
+npm run --prefix $SwaggerGenerationPrefix start -- --output=C:\Git\msgraph-bicep-types\swagger\specification\microsoftgraph\resource-manager\microsoftgraph\preview
+Write-Host "Swagger spec successfully generated"
+
+# Generate Bicep types
+Write-Host "Generating Bicep types"
+npm ci --prefix $GeneratorPrefix
+npm run --prefix $GeneratorPrefix generate -- --specs-dir ..\..\swagger\ --single-path microsoftgraph
+write-Host "Bicep types successfully generated"

scripts/UpdateGeneratedTypes.ps1

@@ -14,7 +14,7 @@
     <DelaySign>true</DelaySign>
     <AssemblyOriginatorKeyFile>35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <VersionPrefix>0.1.3</VersionPrefix>
+    <VersionPrefix>0.1.4</VersionPrefix>
     <VersionSuffix>preview</VersionSuffix>
   </PropertyGroup>
   <ItemGroup>

src/Microsoft.Graph.Bicep.Types/Microsoft.Graph.Bicep.Types.csproj

@@ -1333,11 +1333,11 @@
       "properties": {
         "key": {
           "type": "string",
-          "description": "Contains the name of the field that a value is associated with."
+          "description": "Key."
         },
         "value": {
           "type": "string",
-          "description": "Contains the corresponding value for the specified key."
+          "description": "Value."
         }
       }
     },

src/swagger-generation/output/microsoftgraph-beta.json

@@ -1333,11 +1333,11 @@
       "properties": {
         "key": {
           "type": "string",
-          "description": "Contains the name of the field that a value is associated with."
+          "description": "Key."
         },
         "value": {
           "type": "string",
-          "description": "Contains the corresponding value for the specified key."
+          "description": "Value."
         }
       }
     },