FI from master to network-february-release

.gitignore

@@ -44,6 +44,10 @@ Icon
 # Thumbnails
 ._*
 
+# Ignore repo files
+/scripts/stostools/restoredPackages
+/scripts/stostools/restoredpackages
+
 # Files that might appear in the root of a volume
 .DocumentRevisions-V100
 .fseventsd

.travis.yml

@@ -7,12 +7,6 @@ env:
   matrix:
     - MODE=branchStrategy
     - MODE=syntax CHECK_NAME="Syntax Validator"
-    - MODE=python CHECK_NAME="SDK Generation - Python"
-    - MODE=node CHECK_NAME="SDK Generation - Node"
-    - MODE=typescript CHECK_NAME="SDK Generation - TypeScript"
-    - MODE=ruby CHECK_NAME="SDK Generation - Ruby"
-    - MODE=java CHECK_NAME="SDK Generation - Java"
-    - MODE=go CHECK_NAME="SDK Generation - Go"
     - MODE=semantic PR_ONLY=true CHECK_NAME="Semantic Validator"
     - MODE=semantic PR_ONLY=false
     - MODE=model PR_ONLY=true CHECK_NAME="Model Validator"
@@ -22,41 +16,12 @@ env:
 matrix:
   fast_finish: true
   allow_failures:
-    - env: MODE=node CHECK_NAME="SDK Generation - Node"
-    - env: MODE=typescript CHECK_NAME="SDK Generation - TypeScript"
-    - env: MODE=ruby CHECK_NAME="SDK Generation - Ruby"
-    - env: MODE=java CHECK_NAME="SDK Generation - Java"
-    - env: MODE=go CHECK_NAME="SDK Generation - Go"
     - env: MODE=semantic PR_ONLY=false
     - env: MODE=model PR_ONLY=false
     - env: MODE=model PR_ONLY=true CHECK_NAME="Model Validator"
     - env: MODE=BreakingChange PR_ONLY=true CHECK_NAME="Breaking Changes"
 install: true
 script:
-  - >-
-    if [[ $MODE == 'python' ]]; then
-      travis_wait 30 scripts/swagger-to-sdk.sh Azure/azure-sdk-for-python -v
-    fi
-  - >-
-    if [[ $MODE == 'node' ]]; then
-      travis_wait 30 scripts/swagger-to-sdk.sh Azure/azure-sdk-for-node -v
-    fi
-  - >-
-    if [[ $MODE == 'typescript' ]]; then
-      travis_wait 30 scripts/swagger-to-sdk.sh Azure/azure-sdk-for-js -v
-    fi
-  - >-
-    if [[ $MODE == 'ruby' ]]; then
-      travis_wait 30 scripts/swagger-to-sdk.sh Azure/azure-sdk-for-ruby -v
-    fi
-  - >-
-    if [[ $MODE == 'go' ]]; then
-      travis_wait 30 scripts/swagger-to-sdk.sh Azure/azure-sdk-for-go -o latest -v
-    fi
-  - >-
-    if [[ $MODE == 'java' ]]; then
-      travis_wait 30 scripts/swagger-to-sdk.sh Azure/azure-sdk-for-java -v
-    fi
   - >-
     if [[ $MODE == 'branchStrategy' ]]; then
       # Check to ensure CI is not executing for a PR against the master branch in the private repository

azure-pipelines.yml

@@ -56,6 +56,7 @@ jobs:
     displayName: 'Model Validation'
 
 - job: "BreakingChange"
+  condition: "not(variables['PRIVATE'])"
   pool:
     vmImage: 'Ubuntu 16.04'
   steps:
@@ -69,6 +70,7 @@ jobs:
     displayName: 'Breaking Changes'
 
 - job: "LintDiff"
+  condition: "not(variables['PRIVATE'])"
   variables:
     NODE_OPTIONS: '--max-old-space-size=8192'
   pool:

package.json

@@ -13,21 +13,21 @@
     "@microsoft.azure/async-io": "^1.0.21",
     "@microsoft.azure/literate": "^1.0.21",
     "@microsoft.azure/polyfill": "^1.0.17",
-    "@ts-common/commonmark-to-markdown": "^1.1.9",
+    "@ts-common/commonmark-to-markdown": "^1.1.10",
     "@ts-common/fs": "0.1.0",
     "@types/js-yaml": "^3.12.0",
     "fs-extra": "^3.0.1",
     "glob": "^5.0.14",
-    "js-yaml": "^3.8.2",
+    "js-yaml": "^3.12.2",
     "json-schema-ref-parser": "^3.1.2",
     "mocha": "*",
-    "oad": "0.1.12",
-    "oav": "^0.13.4",
+    "@azure/oad": "0.2.0",
+    "oav": "^0.14.5",
     "request": "^2.61.0",
     "request-promise-native": "^1.0.5",
     "typescript": "^3.2.4",
-    "z-schema": "^3.25.0",
-    "ts-node": "^8.0.1"
+    "z-schema": "^3.25.1",
+    "ts-node": "^8.0.3"
   },
   "dependencies": {
     "@octokit/rest": "^15.2.6"

scripts/breaking-change.js

@@ -7,7 +7,7 @@ const utils = require('../test/util/utils'),
   fs = require('fs-extra'),
   os = require('os'),
   exec = require('util').promisify(require('child_process').exec),
-  oad = require('oad');
+  oad = require('@azure/oad');
 
 // This map is used to store the mapping between files resolved and stored location
 var resolvedMapForNewSpecs = {};

scripts/momentOfTruth.js

@@ -64,11 +64,7 @@ async function getLinterResult(swaggerPath) {
         throw new Error("AutoRest failed");
     }
 
-    if (stderr !== "") {
-        console.error(`Error: ${stderr}`)
-        process.exit(1)
-    }
-    let resultString = stdout;
+    let resultString = stdout + stderr;
     if (resultString.indexOf('{') !== -1) {
         resultString = resultString.replace(/Processing batch task - {.*} \.\n/g, "");
         resultString = "[" + resultString.substring(resultString.indexOf('{')).trim().replace(/\}\n\{/g, "},\n{") + "]";

scripts/stostools/Directory.Build.props

@@ -0,0 +1,132 @@
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<PropertyGroup>
+		<CurrentDir>$(MSBuildThisFileDirectory)</CurrentDir>
+		<RepoRootRelPath>.\</RepoRootRelPath>		
+		<RepoRootAbspath>$([System.IO.Path]::GetFullPath($(CurrentDir)).Trim('\'))</RepoRootAbspath>
+	</PropertyGroup>
+	<PropertyGroup>
+		<RepoRoot>$(RepoRootAbspath)</RepoRoot>
+		<RepoSrcDir>$(RepoRoot)\src</RepoSrcDir>
+		<RepoToolsDir>$(RepoRoot)\tools</RepoToolsDir>
+		<RepoEngDir>$(RepoRoot)\eng</RepoEngDir>
+		<RepoNugetFeedDir>$(RepoToolsDir)\LocalNugetFeed</RepoNugetFeedDir>
+		<RepoDeveloperDir>$(RepoEngDir)\alias</RepoDeveloperDir>
+		<RepoNugetDir>$(RepoToolsDir)\NugetExe</RepoNugetDir>
+    <NugPkgSrcDir>$(RepoSrcDir)\NugetToolsPackage</NugPkgSrcDir>
+		<RepoNugetRestoreDir>$(RepoRoot)\restoredPackages</RepoNugetRestoreDir>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<DevMode Condition=" '$(DevMode)' == '' ">false</DevMode>
+	</PropertyGroup>
+
+	<PropertyGroup Label="CI paths">
+		<RepoCISrcDir>$(RepoSrcDir)\CI</RepoCISrcDir>
+		<RepoCICommonSrcDir>$(RepoCISrcDir)\CI.Common</RepoCICommonSrcDir>
+		<RepoCIBuildTaskDir>$(RepoCISrcDir)\CI.BuildTasks</RepoCIBuildTaskDir>
+		<CINugPkgSrcDir>$(NugPkgSrcDir)\CI.Tools.Package</CINugPkgSrcDir>
+		<CIBuildOutputDir>$(CINugPkgSrcDir)\build\tasks</CIBuildOutputDir>
+		<CINugPkgPublish_NetStd20Dir>$(CIBuildOutputDir)\netstandard2.0</CINugPkgPublish_NetStd20Dir>
+	</PropertyGroup>
+
+	<PropertyGroup Label="SToS paths">
+		<RepoSToSSrcDir>$(RepoSrcDir)\SwaggerToSdk</RepoSToSSrcDir>
+		<RepoSToSCommonSrcDir>$(RepoSToSSrcDir)\Common\SToS.Common</RepoSToSCommonSrcDir>
+		<RepoSToSBuildTaskSrcDir>$(RepoSToSSrcDir)\BuildTasks\SToS.BuildTasks</RepoSToSBuildTaskSrcDir>
+		<SToSNugPkgSrcRootDir>$(NugPkgSrcDir)\SwaggerToSdk.Tools.Package</SToSNugPkgSrcRootDir>
+		<SToSNugPkgSrcDir>$(SToSNugPkgSrcRootDir)\build</SToSNugPkgSrcDir>
+		<SToSNugPkgSdkDir>$(SToSNugPkgSrcDir)\Sdk</SToSNugPkgSdkDir>
+		<SToSBuildOutputDir>$(SToSNugPkgSrcDir)\tasks</SToSBuildOutputDir>
+		<SToSNugPkgPublish_NetStd20Dir>$(SToSBuildOutputDir)\netstandard2.0</SToSNugPkgPublish_NetStd20Dir>
+		<SToSNugPkgPublish_Net461Dir>$(SToSBuildOutputDir)\net461</SToSNugPkgPublish_Net461Dir>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
+		<Platform Condition="'$(Platform)' == ''">AnyCPU</Platform>
+	</PropertyGroup>
+
+	<!-- 
+    MSBuildRuntimeType can have 'Core', 'Full' and 'Mono' as three possible values 
+    https://docs.microsoft.com/en-us/visualstudio/msbuild/msbuild-reserved-and-well-known-properties?view=vs-2017
+  -->
+	<PropertyGroup>
+		<DotNetRuntimeContext>$(MSBuildRuntimeType)</DotNetRuntimeContext>
+		<FxVersionTasksToUse Condition=" '$(DotNetRuntimeContext)' == 'Core' ">netstandard2.0</FxVersionTasksToUse>    
+		<FxVersionTasksToUse Condition=" '$(FxVersionTasksToUse)' == '' AND '$(DotNetRuntimeContext)' != 'Core' ">net461</FxVersionTasksToUse>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(MSBuildRuntimeType)' == 'Core'">
+		<IsOSX Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">true</IsOSX>
+		<IsLinux Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">true</IsLinux>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<TestDataProjects Include="$(RepoCISrcDir)\CI.BuildTasks\Tests\TestDataProject\*.csproj" />
+
+		<CITestProjects Include="$(RepoCISrcDir)\CI.BuildTasks\Tests\**\*.csproj" Exclude="@(TestDataProjects)" />
+		<SToSTestProjects Include="$(RepoSToSSrcDir)\BuildTasks\Tests\*.csproj;$(RepoSToSSrcDir)\Common\Tests\*.csproj" />
+		<SToSProjects Include="$(RepoSToSBuildTaskSrcDir)\*.csproj;$(RepoSToSCommonSrcDir)\*.csproj" />		
+		<SToSNugPkgProjects Include="$(SToSNugPkgSrcDir)\*.csproj" />
+
+		<NugetPkgProjects Include="@(SToSNugPkgProjects)" />		
+		<ProjectsToBuild Include="@(SToSProjects);@(SToSTestProjects)" />
+		<ProjectsToPublish Include="@(SToSProjects)" />
+	</ItemGroup>
+
+	<!--
+		Detect CI env using available env variables
+		https://<Jenkins server url>/systemInfo
+		https://docs.travis-ci.com/user/environment-variables/#default-environment-variables
+	-->
+	<PropertyGroup>
+		<IsJenkinsCI Condition=" '$(JENKINS_HOME)' != '' ">true</IsJenkinsCI>
+		<IsTravisCI Condition=" '$(Travis)' != '' ">true</IsTravisCI>
+		<IsCIEnvironment Condition=" '$(IsJenkinsCI)' == 'true' OR '$(IsTravisCI)' == 'true' ">true</IsCIEnvironment>
+		<IsCIEnvironment Condition=" '$(IsCIEnvironment)' == '' ">false</IsCIEnvironment>
+	</PropertyGroup>
+
+	<!--
+	===========================================================================================
+	Developer Settings
+		On non-windows machine, user can setup an environment variable that will point to their developer settings props file.
+		The name of the file should be named as  currentUser.props (case sensitive)
+		On windows machine, if the environment variable is not set, we will attempt to use the windows current user env. variable
+
+		Env. variables
+		LocalDevUserBootstrapDirPath == will point to the directory from where currentuser.props should be imported
+		DevMode == flags if you want to be in dev mode, which is basically avoids restoring nuget package and directly loads the build environment
+
+		Default file that will be loaded == currentUser.props (if available)
+	===========================================================================================
+	-->
+	<PropertyGroup Condition=" '$(DevMode)' == 'true' ">
+		<DefaultCurrentUserPropsFileName>currentUser.props</DefaultCurrentUserPropsFileName>		
+		<DeveloperCurrentUserPropFilePath>$(LocalDevUserBootstrapDirPath)\$(DefaultCurrentUserPropsFileName)</DeveloperCurrentUserPropFilePath>
+		<DeveloperCurrentUserPropFilePath Condition=" !Exists($(DeveloperCurrentUserPropFilePath))">$(RepoDeveloperDir)\$(UserName)\$(DefaultCurrentUserPropsFileName)</DeveloperCurrentUserPropFilePath>
+	</PropertyGroup>
+
+	<Import Condition="Exists($(DeveloperCurrentUserPropFilePath)) AND '$(IsCIEnvironment)' != 'true' AND '$(DevMode)' == 'true' " Project="$(DeveloperCurrentUserPropFilePath)" />
+	<PropertyGroup Condition=" '$(IsCIEnvironment)' != 'true' AND '$(DevMode)' == 'true' ">
+		<LocalDevUser Condition=" '$(LocalDevUser)' == '' ">$(UserName)</LocalDevUser>
+		<DefaultCurrentuserTargetsFileName>$(LocalDevUser).bootStrap.targets</DefaultCurrentuserTargetsFileName>
+		<DeveloperCurrentUserPropFilePath>$(RepoDeveloperDir)\$(LocalDevUser)\$(DefaultCurrentUserPropsFileName)</DeveloperCurrentUserPropFilePath>
+	</PropertyGroup>
+
+	<PropertyGroup Condition=" '$(IsCIEnvironment)' != 'true' AND '$(DevMode)' == 'true' ">
+		<LocalDevUserTargetsDir Condition="Exists('$(RepoDeveloperDir)\$(LocalDevUser)')">$(RepoDeveloperDir)\$(LocalDevUser)</LocalDevUserTargetsDir>
+		<LocalDevUserBootstrapPropsFile>$(LocalDevUserTargetsDir)\$(DefaultCurrentuserTargetsFileName)</LocalDevUserBootstrapPropsFile>
+		<CurrentUserPropsFilePath>$(LocalDevUserBootstrapDirPath)\currentUser.props</CurrentUserPropsFilePath>
+
+		<DevMode_SDK_SToSPropsFile>$(SToSNugPkgSdkDir)\SToS.props</DevMode_SDK_SToSPropsFile>
+	</PropertyGroup>
+	<Import Condition="Exists($(LocalDevUserBootstrapPropsFile)) AND '$(IsCIEnvironment)' != 'true' AND '$(DevMode)' == 'true' " Project="$(LocalDevUserBootstrapPropsFile)" />
+
+	<!-- DO NOT MAKE ANY CHANGES BELOW -->
+	<PropertyGroup>
+		<IsJenkinsCI Condition=" '$(JENKINS_HOME)' != '' ">true</IsJenkinsCI>
+		<IsTravisCI Condition=" '$(Travis)' != '' ">true</IsTravisCI>
+		<IsCIEnvironment Condition=" '$(IsJenkinsCI)' == 'true' OR '$(IsTravisCI)' == 'true' ">true</IsCIEnvironment>
+		<IsCIEnvironment Condition=" '$(IsCIEnvironment)' == '' ">false</IsCIEnvironment>
+		<DevMode Condition=" '$(IsCIEnvironment)' == 'true' ">false</DevMode>
+	</PropertyGroup>
+</Project>

scripts/stostools/LaunchSToS.bat

@@ -0,0 +1,31 @@
+@echo OFF
+
+set StartupProj=%1
+set PrNumber=%2
+set LastGithubCommitId=%3
+set GitHubUrl=%4
+set TriggerComment=%5
+set DebugMode=%6
+set LogVerbosity=%7
+
+if "%VSWHERE%"=="" set "VSWHERE=%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
+
+for /f "usebackq tokens=*" %%i in (`"%VSWHERE%" -latest -products * -requires Microsoft.Component.MSBuild -property installationPath`) do (
+  set InstallDir=%%i
+)
+
+CALL "%InstallDir%\Common7\Tools\VsDevCmd.bat"
+
+echo StartupProj: %StartupProj%
+echo Pr#: %PrNumber%
+echo Last Commit Id: %LastGithubCommitId%
+echo GitHub Url: %GitHubUrl%
+echo Trigger Comment: %TriggerComment%
+echo DebugMode: %DebugMode%
+echo Log Verbosity: %LogVerbosity%
+
+dotnet msbuild %startupProj% /t:StartNetSdkCodeGeneration /v:%LogVerbosity% /p:githubprnumber=%PrNumber% /p:githubcommitid=%LastGithubCommitId% /p:giturl=%GitHubUrl%  /p:DebugMode=%DebugMode% /p:triggercomment=%TriggerComment%
+
+REM dotnet msbuild stos.proj /t:StartNetSdkCodeGeneration /v:N /p:githubprnumber=63 /p:githubcommitid=b5ee45302838515adc14857ed45c44ed99a1e517 /p:giturl=https://github.com/Azure/AzSwaggerSpecsTestClone  /p:DebugMode=false /p:triggercomment=startbuild
+REM LaunchSToS.bat stos.proj 63 b5ee45302838515adc14857ed45c44ed99a1e517 https://github.com/Azure/AzSwaggerSpecsTestClone startbuild false D
+REM stostools\LaunchSToS.bat SToS.proj %ghprbPullId% %ghprbActualCommit% %GIT_URL% %ghprbCommentBody% false n

scripts/stostools/nuget.config

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+	<packageSources>
+		<add key="NugetOfficialV3" value="https://api.nuget.org/v3/index.json" />
+		<add key="Local" value="tools/LocalNugetFeed" />
+		<add key="stosprodfeed" value="\\aaptfile01\ADXSDK\NetSDK\SToS\Prod" />
+	</packageSources>
+
+	<config>
+		<add key="globalPackagesFolder" value=".\restoredPackages\" />
+		<add key="RestorePackagesPath" value=".\restoredPackages\" />
+	</config>
+
+	<packageRestore>
+		<!-- Allow NuGet to download missing packages -->
+		<add key="enabled" value="True" />
+
+		<!-- Automatically check for missing packages during build in Visual Studio -->
+		<add key="automatic" value="True" />
+	</packageRestore>
+</configuration>

scripts/stostools/stos.proj

@@ -0,0 +1,43 @@
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <Import Project="Directory.Build.props" />
+    <Import Condition=" '$(DevMode)' != 'true' " Project="SToS.props" Sdk="Microsoft.Internal.SwaggerToSdk.Tools" Version="0.9.0" />
+    <Import Condition=" '$(DevMode)' == 'true' AND Exists('$(DevMode_SDK_SToSPropsFile)') " Project="$(DevMode_SDK_SToSPropsFile)" />    
+
+    <PropertyGroup>
+        <DotNetRuntimeContext>$(MSBuildRuntimeType)</DotNetRuntimeContext>
+        <FxVersionTasksToUse Condition=" '$(DotNetRuntimeContext)' == 'Core' ">netstandard2.0</FxVersionTasksToUse>
+        <FxVersionTasksToUse Condition=" '$(FxVersionTasksToUse)' == '' AND '$(DotNetRuntimeContext)' == 'Full' ">net461</FxVersionTasksToUse>
+    </PropertyGroup>
+    <Target Name="Fn">
+        <Message Text="FxVersionTasksToUse is ......... $(FxVersionTasksToUse)" />
+    </Target>
+
+    <Target Name="StartNetSdkCodeGeneration">
+        <Message Text="Commencing code generation"  Importance = "High"/>
+        <StartNetSdkCodeGeneration
+                GitHubPRNumber="$(githubprnumber)" 
+                    GitHubCommitId="$(githubcommitid)"
+                    RestSpecRepositoryUrl ="$(giturl)"
+                    TriggerComment="$(triggercomment)"
+                    DebugMode="$(debugmode)"
+        >
+            <Output TaskParameter="NetSdkPRMetadataRowId" PropertyName="NetSdkPRMetadataRowId" />
+        </StartNetSdkCodeGeneration>
+    </Target>
+
+    <Target Name="HandleClosedOrMergedRestApiPrs">
+        <Message Text="Handling closed or merged PRs"  Importance = "High"/>
+        <HandleClosedOrMergedRestApiPrs
+                RepositoryUrl="$(RepositoryUrl)"
+        >   
+        </HandleClosedOrMergedRestApiPrs>
+    </Target>
+
+    <Target Name="KV">
+        <GetKVSecrets>
+            <Output TaskParameter="Email" PropertyName="EmailAddress" />
+        </GetKVSecrets>
+
+        <Message Text="Email is $(EmailAddress)" />
+    </Target>
+</Project>

specification/EnterpriseKnowledgeGraph/resource-manager/readme.md

@@ -22,8 +22,8 @@ Please also specify `--azure-libraries-for-java=<path to the root directory of y
 
 ``` yaml $(tag) == 'package-2018-12-03' && $(java) && $(multiapi)
 java:
-  namespace: com.microsoft.azure.management.EnterpriseKnowledgeGraphservice.v2018-12-03
-  output-folder: $(azure-libraries-for-java-folder)/EnterpriseKnowledgeGraphservice/resource-manager/v2018-12-03
+  namespace: com.microsoft.azure.management.EnterpriseKnowledgeGraphService.v2018-12-03
+  output-folder: $(azure-libraries-for-java-folder)/EnterpriseKnowledgeGraphService/resource-manager/v2018-12-03
 regenerate-manager: true
 generate-interface: true
 ```
@@ -88,4 +88,4 @@ csharp:
   namespace: Microsoft.Azure.Management.EnterpriseKnowledgeGraphService
   output-folder: $(csharp-sdks-folder)/EnterpriseKnowledgeGraphService/Microsoft.Azure.Management.EnterpriseKnowledgeGraphService/Generated
   clear-output-folder: true
-```
+```