Skip to content

Commit

Permalink
FI from master to network-february-release (#5391)
Browse files Browse the repository at this point in the history
* Add mixedreality 2019-02-28 API version to Go SDK (#5271)

* Remove ARM gateway Node.js configuration (#5283)

* Updates to Scheduled Query Rule swagger (#5175)

- making aznsaction paramter optional
  - removing hidden-link value from tags
pu

* Fix JavaScript configuration for ARM Private DNS SDK (#5284)

* Fix JavaScript configuration for ARM Private DNS SDK

* Add quotes

* Add private preview API for Azure Image Builder (#5055)

* Add private preview API for Azure Image Builder

* Review comments

 - Added list-by-resource-group and list-by-subscription
 - Added default error response
 - Removed explicit operation url (implied by async contract)
 - Adjusted 'delete' response codes to match expectations
 - Allow patch for tags
 - Added provider operations API

* Review comment: use "nextLink" for paging

* Adding readme files for SDK generation

* PR: rename 'tags' -> 'artifactTags' for distributor

* Add examples, fix minor issues in swagger

* Updating Blueprint spec to include resource group tags (#5263)

* Add Showback model (#5217)

* Add Showback model

* fix ShowbackRule.json example

* remove "," from line 1709

* Add Put Rule

* Fix Scope

* Update json with pull request changes

* change recurring to enum

* chore: Graphservice -> GraphService (#5098)

* Enable SSL on custom domains using users certificate or CDN managed certificate (#5276)

* Translator Text API V3 (#5230)

* Translator Text API V3

* Fix path and override

* Fix a typo and few other improvements in descriptions.

* Remove after_scripts

* Update readme.md

* Update readme.md

* Update MariaDB api version (#5280)

* Adding Swagger and examples for VirtualClusters operation group (#5248)

* Adding Swagger file for VirtualClusters operation group, together with examples.

* Fixing api version, typos and location in examples.

* Adding virtualclusters.json to readme.md

* Security - Updating API versions of alerts and pricing types (#5269)

* Security - Updating api versions of alerts and pricing types

* fix codegen paths for Go SDK

* typo: asscociation -> association (#5252)

* Fix lintdiff issue (#5299)

* fix Go SDK package path for mariadb stable release (#5298)

* changes to improve documentation of endpoint health statuses for routing (#5290)

* add netapp to Go SDK (#5308)

* Update MariaDB default API version to 2018-06-01 (#5302)

* new application insignts api version for unified schema in action (#5292)

* Added Azure App Configuration event data schema. (#5309)

* Added Azure App Configuration event data schema.

* Added a few missing pieces.

* Prefixed event names with our service prefix 'AppConfiguration'.
* Added Microsoft.AppConfiguration to the event grid data-plane readme.

* Updated api-version path to '2018-01-01' from '2018-02-01'.

* Apim Cache resource + DELETE long running + refactor to align with tooling. (#5260)

* api import and service delete long running operation

* Bring your own Cache

align with spec generated from tooling

user and notification align

Refactor products and apis

* align with spec generated from tooling

user and notification align

Refactor products and apis

validating examples

validating examples

move all parameters to apimanagement.json

Fix reference issue with tagcontract and example DeleteCache.

* switch to plural example file names for LIST

* bring back updatehostname and updatecertificate

* Dev adhybridhealthservice microsoft.ad hybrid health service 2014 01 01 binilkk (#5042)

* Fixes for:

Issue #1 : #4576 (comment)

Typo in the DeltaOperationType Enum.

Issue #2 : #4844 (comment)

GlobalAdmins list is marked as an object, while it's an array.

* Updated the Specification as example for Risky IP Download report.

* Added the Result details

* Fixed review comments, changed the URI scheme as well as changed get/post methods

* Addressing Review Feedback, changing POST call of blobUri -> generateBlobUri

* Update UserAssignedIdentities spec in Web (#5288)

* Update UserAssignedIdentities spec in Web

Microsoft.Web recently added support for UserAssigned managed service identities (in preview), but the swagger spec is incorrect for the identity payload as it follows the old construct of sending an array of identityIds as opposed to the updated spec which instead sends a dictionary object called userAssignedIdentities. 

Spec + history outlined here:
http://sharepoint/sites/AzureUX/Sparta/_layouts/15/WopiFrame2.aspx?sourcedoc=%7b633632B4-02E4-4DE2-92A9-EDCAF9BE73D4%7d&file=ARM%2BMSI.docx&action=default 

Our swagger contains identityids[] because of previous work to future support UserAssigned identities, but never released the feature in that state, rather we opted to wait for the new spec to be supported and then integrated with that on our end. 

Our MSI implementation reflects Microsoft.Compute's spec for user assigned.

https://github.com/Azure/azure-rest-api-specs/blob/78e1feab142c605839aa3cec23442ca26b8ef04d/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json

* fix linterdiff tool

* Add private dns module name for java codegen (#5312)

* Update Swagger Files For ManagedInstanceAdministrator (#5095)

* Update Swagger Files For ManagedInstanceAdministrator

* Fix for double wording

* Comments resolved

* Bringing consistency between to "ResourceGroup" definition (#5256)

* Bringing consistency between this "ResourceGroup" definition and the one in Common.

* Fixing broken references

* reverted security python readme to pre multi api (#5301)

* [Azure Search] Add Search API to data plane Swagger spec (#5315)

* [Azure Search] Updating some Swagger descriptions to be more doc-friendly

Sometimes we over-describe things, especially "comma-separated lists" in
query string parameters. These are modeled as arrays in Swagger, which are
already understood to be comma-separated lists. They are modeled as
collections in generated code, so they are decidedly not comma-separated
lists in that context. So removing this phrase is a win-win.

* [Azure Search] Adding some missing readOnly attributes

* Adding Search API to the Azure Search data plane spec

* [Azure Search] Use regexes to generate code for server-side paging

This change introduces some very hacky regexes to customize the generated
code for server-side paging of the GET and POST Search APIs. They work by
splitting the generated SearchGet and SearchPost operations in two, so that
the portion that operates on a URL and request body can be reused.

This workaround is necessary because AutoRest lacks flexibility around
paging. The current x-ms-pageable implementation doesn't work for us because
it doesn't model additional top-level response properties or continuation
POST requests (only nextLink/GET).

The only other alternative to this approach besides custom code would have
been to try to parse the nextLink URL query string to reconstitute parameters
to pass to the generated SearchGet and SearchPost operations. This is
unacceptable for Azure Search, since it would exclude custom parameters that
can't be modeled in Swagger, like personalization IDs for custom ranking.
Neither AutoRest nor apparently Open API support modeling arbitrary query
string parameters.

Ideally we'll find a pattern common to other data plane APIs so we don't have
to hack this with regexes for every target language, but it's good enough for
now.

* [Azure Search] Rename some client properties for consistency

* [Azure Search] Make AutocompleteMode non-nullable

* [Hub Generated] Review request for Microsoft.Web to add version 2018-02-01 (#5137)

* Add Hosting Environment network dependencies

* Address PR description feedback

* Add Network Dependencies examples

* Fix casing

* Remove incorrect pagination from examples.

* Add missing MarketplaceOrdering operations to swagger (#5279)

* Add missing MarketplaceOrdering operations to swagger

* Add examples

* Add example files

* Apply suggestions from code review

Clarify operation descriptions

Co-Authored-By: zachraMSFT <zachra@microsoft.com>

* Fix Hosting Environment Network Dependencies pagination (#5320)

* Add regex validation for ManagedClusterAgentPoolProfile.name (#5324)

* Adding instance pools swagger (#5225)

* Initializing instance pools swagger and examples - no usages / managed instances get by instance pool

* updates to use common resource and sku definitions

* Update instance pool swagger with typo fixes

* Updates to instance pool swagger and reverting readme.md to exclude instance pools reference

* Fix whitespace diff

* Making a whitespace change to re-try linter validation

* Updates to add list instances pools by subscription and update license type param to use enum which is limited to LicenseIncluded and BasePrice

* Enhanced A2ARecoveryPointDetails with "disks" (#5307)

* [DiskRP] Adding swagger spec for 09-30-2018 (#5232)

* commit for the older swagger version to make the PR easier to look at

* Adding the DiskRP 09-30-2018 swagger spec. This includes support for hyperVGeneration, encryptionSettingCollections, diskState, Upload Disks, and Write access

* adding the updated readme

* updating the examples to use 09-30-2018

* removing extraneous examples

* adding a description for the EncryptionSettingsElementand fixing linter issues

* [Computer Vision] Add read to CV OCR API. (#5314)

* Add read to OCR API.

* Add description to OCR related JSON properties.

* Mark asyncBatchAnalyze as long running operation.

* Update page property.

* Revert "Mark asyncBatchAnalyze as long running operation."

This reverts commit 51742b3.

* added links to limits for application gateway (#5265)

* typo: Winodws -> Windows (#5321)

* MultiApi EventHub (#5331)

* try 2 bootstrapping swagger to .net sdk tools (#5334)

* bootstrapping swagger to .net sdk tools

* deleting nuget.exe binary. Updating configs to locally restore pacakges. Adding the directory that will be used in restoring packages locally to .gitignore

* changing directory

* updating feed location to a readonly directory

* Azure Search: Resource Manager: Support 'None' Identity type (#5319)

* Azure Search: Resource Manager: Support 'None' Identity type

* Azure Search: Resource Manager: Adding serice identity creation\removal examples

* [ADLA] - Catalog - Add stream path to USqlTableFragment (#5329)

* [Hub Generated] Review request for Microsoft.Consumption to add version 2019-01-01 (#5311)

* Add GTM scopes for budgets API

* Removed the extra period at the end of the statement

* fixing stos.proj parameter (#5338)

* change flag name from useUnifiedSchema into useCommonAlertSchema per UX requirement (#5323)

* Enhanced A2A protection input and response details (#5330)

Enhanced A2AEnableProtectionInput & A2AReplicationDetails objects with recoveryAvailabilityZone, recoveryAzureNetworkId, and recoverySubnetName.

* [Hub Generated] Review request for Microsoft.ContainerService to add version 2019-02-01 (#5350)

* Adds base for updating Microsoft.ContainerService from version preview/2018-08-01-preview to version 2019-02-01

* Updates readme

* Updates API version in new specs and examples

* [AKS] add availabilityZones to agent pool profile (#5120)

* including orchestratorVersion and provisioning state for agent pool (#5156)

* including orchestratorVersion and provisioning state for agent pool

* fixing the readme.go.md

* including enablePodSecurityPoliy properties for managedcluster and updating examples

* fixing the example for enablePodSecurityPolicy

* including apiServerAuthorizedIPRanges (#5286)

* including apiServerAuthorizedIPRanges

* support azure network policy

* mark the new features as PREVIEW in description  (#5310)

* mark the new features as PREVIEW

* mark vmss as required for az

* Azure Event Grid: Add 2019-02-01-preview tags for Ruby and Go readme files (#5349)

* Add 2019-02-01-preview tags for Ruby and Go readme files

* fix wrong preview subdirectory

* Update some descriptions. (#5305)

* update description. (#5335)

* Added VNet API (#5351)

* EventHub : corrected typo  (#5360)

* corrected typo in uri

* removed unused parameters

* Add annotations property to trigger (#5332)

* EventHub: Revert the NetworkRuleSet  (#5363)

* Revert "EventHub : corrected typo  (#5360)"

This reverts commit 1495122.

* Revert "Added VNet API (#5351)"

This reverts commit f2ab4a8.

* Remove the AzureDataLakeStoreCosmosStructuredStreamDataset since it's internal only (#5277)

* Removing SDK generation from Travis-CI (#5367)

* Microsoft.DataBoxEdge RP: Corrected comments of trigger and extendedinfo APIs, corrected examples (#5322)

* Corrected comments of trigger and extendedinfo APIs, corrected examples

* Microsoft.DataBoxEdge RP: Have better examples

* Corrected parameter description in order API

* oad => @azure/oad (#5362)

* oad => @azure/oad

* oad => @azure/oad

* SRP Swagger changes for 2018-11-01 (#5300)

* SRP Swagger changes for 2018-11-01

* Address CR comments

* Restrict ManagementPolicyRule -> type property to have only values from defined enum

* Make ManagementPolicySchema/version an enum string

* Remove 'version' property from ManagementPolicy schema

* Added List Policies API to SecurityAlerts (#5070)

* Added SecurityAlert List API

Added List api to:
Manged Server + Managed Database
Logical Server + Logical Database

* FIxed a description

this property is for databases+servers

* Added missing Database exmaples

Added missing examples for database security alert

* Added missing description change

For Server Security Alerts

* Revert "FIxed a description"

This reverts commit e01a332.

* Revert "Added missing description change"

This reverts commit 17aeab7.

* Update DatabaseSecurityAlertListByDatabase.json

* fixed examples

* Update DatabaseSecurityAlertCreateMin.json

Deleted wild comma

* Update readme.md

* Minor fixes

Changed tabs to spaces.
Added location for servers exmaples.

* Removed location

removed the location property from examples

* graph: improve API coverage on application & service principal  (#5181)

* [graphrbac]: fix bugs in permission grant apis

* fix paging

* add missing property

* remove pageable

* author pagable in the right way

* breaking changes over a wrong spec

* remove additionalProperties which causes wrong code-gen

* add suppressions

* use code to surpress

* address review feedabck

* moev ahead with the established pattern anyway

* address review feedbacks

* clean up all

* update operation id

* add one more property per CLI user's ask

* Add insights 2019-03-01 package to Go SDK (#5373)

* Add insights 2019-03-01 package to Go SDK

* move global settings before packages

* fix package tag for new API version (#5378)

* Remove GZRS and RAGZRS sku from SRP 2018-11-01 because feature slipped. (#5377)

* typo: upto -> up to (#5376)

* typo: graphrbac/data-plane/Microsoft.GraphRbac/stable/1.6 (#5375)

- requied -> required
- authorizaed -> authorized
- Organizatio -> Organization
- Allorganizations -> AllOrganizations
- Microsof -> Microsoft
- perperties -> prorperties
- servie -> service
- altenative -> alternative
- thubmbprint -> thumbprint

* Azure DevOps Pipeline workaround for private repository (#5374)

* Fix PolicyInsights code generation issue (#5389)

* Add replica creation parameters to Postgres ResourceProvider for SDK (#5379)

*  Add replica creation parameters to Postgres ResourceProvider for SDK

* Add replica creation parameters to Postgres ResourceProvider for SDK

* Add replica creation parameters to Postgres ResourceProvider for SDK

* Add replica creation parameters to Postgres ResourceProvider for SDK

* Add replica creation parameters to Postgres ResourceProvider for SDK
  • Loading branch information
sergey-shandar authored Mar 15, 2019
1 parent 9619481 commit 8f28f7f
Show file tree
Hide file tree
Showing 409 changed files with 42,862 additions and 8,090 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
35 changes: 0 additions & 35 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ jobs:
displayName: 'Model Validation'

- job: "BreakingChange"
condition: "not(variables['PRIVATE'])"
pool:
vmImage: 'Ubuntu 16.04'
steps:
Expand All @@ -69,6 +70,7 @@ jobs:
displayName: 'Breaking Changes'

- job: "LintDiff"
condition: "not(variables['PRIVATE'])"
variables:
NODE_OPTIONS: '--max-old-space-size=8192'
pool:
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion scripts/breaking-change.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {};
Expand Down
6 changes: 1 addition & 5 deletions scripts/momentOfTruth.js
Original file line number Diff line number Diff line change
Expand Up @@ -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{") + "]";
Expand Down
132 changes: 132 additions & 0 deletions scripts/stostools/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -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>
31 changes: 31 additions & 0 deletions scripts/stostools/LaunchSToS.bat
Original file line number Diff line number Diff line change
@@ -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
21 changes: 21 additions & 0 deletions scripts/stostools/nuget.config
Original file line number Diff line number Diff line change
@@ -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>
43 changes: 43 additions & 0 deletions scripts/stostools/stos.proj
Original file line number Diff line number Diff line change
@@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand Down Expand Up @@ -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
```
```
Loading

0 comments on commit 8f28f7f

Please sign in to comment.