Merge psSdkJson6 to SdkBuildTools (#3831)

* Regenerate SDK for new added api key management swagger spec (#3767)

* Generate .NET SDK for application insights

* update assembly version

* address code review feedback

* address code review feedback

* regenerate sdk for adding management api keys functions

* remove local used LaunchSettings.json file

* generate from the pulic swagger

* increase version in csproj file

* Update Batch changelog to have a clearer format (#3775)

* Removing build tools outside of branches (#3780)

* Moving old files which are not used anymore to legacy directory

* Separate build tools from branch. Moving forward build tools will be downloaded from a central location, this helps in propogating build changes to any branch dynamically. After this change build process on a new machine or fresh install will be a two step process. First download the build tools by executing msbuild build.proj and once it finishes, then execute whatever target you need to do e.g. msbuild build.proj /t:RunTests /p:Scope=SDKs\Compute. After downloading all build related assets will be downloaded under <root>\tools\SdkBuildTools. Moving bunch of legacy code to legacy directory. Removing build tasks out of this branch, currently being moved to legacy directory

* Update README.md

Updating readme to document recent build changes that were done to extract build tools out of main branch.

* Adding data factory CRUD scenario test (#3774)

* This is the first batch of scenario tests for the ADF V2 SDK.
  * Partially addresses #3726; more tests need to be added

* Update Batch supporting assemblies (#3794)

* [ADLA] - Update changelog for version 3.0.2 (#3792)

* Merge from private Networking (#3771)

* Regenerated Networking SDK on 2017-09-01, private

* Expose new operation for VpnDeviceConfiguration for Vpn Gateways

* Adding AzureReachabilityReport and AvailableProvidersList APIs + tests

* Updating version of Network SDK

* Disabling tests for AzureReachabilityReport and AvailableProvidersList APIs

* Updated version

* Caa record support in Azure DNS (#3785)

* upgrade .net.test.sk project to stable version

* support for CAA records

* changing assembly file version to reflect nuget version

* update swagger from public repo

* addressing code review comments

* bumping up assembly verson to 2.0.0.0

* [ADLA - ADLS] - [HOTFIX] - Update changelog (#3802)

* [ADLA] - Update changelog for version 3.0.2

* [ADLA] - Update changelog

* [ADLS] - Update changelog

* Update changelog

* 3.0.1 for ADLA was never published to nuget

* 2.2.1 for ADLS was never published to nuget

* Adding .NET SDK changes for Server DNS Aliasing (#3803)

* Auto generated files for .NET SDK for Server DNS Aliasing. Also contains removing unused declarations from bunch of files. Everything generated automatically

* Adding tests for server dns aliasing and their recording

* Fixing sql_resource_manager.txt

* Updating new version of SDK in AssemblyInfo.cs and csproj file

* Small cosmetic changes to address Jared

* Revert "Small cosmetic changes to address Jared"

This reverts commit 5a5e426.

* Reverting version change in project and AssemblyInfo files; addressing small change requests from Jared in pull request

* [ACR] Update SDK to 2017-10-01 version (#3778)

* Update ACR SDK to 2017-10-01 version

* Update csproj, re-record tests

* Address PR review feedback

Address PR review feedback

* Fix issue with missing Unit enumeration values, fix documentation issues, improved tests for multi-dim metrics API (#3809)

* [Monitor] Fixing doc issues, adding two values to the metric unit enumeration, generating metadata files

* Increasing version number due to a bug fix and documentation updates

* [Monitor] Adding multi-dimensional metrics tests

* Re-generate SDKs/Resource (#3793)

* Updated Network SDK version (#3814)

* Added Zone Redundant Property To Database, Elastic Pool and Edition Capability (#3800)

* Add zone redundant property for database, elastic pool and capability edition

* Added zone redundant property release notes

* Revert "Removing build tools outside of branches (#3780)"

This reverts commit deceaf3.

* Revert "Revert "Removing build tools outside of branches (#3780)""

This reverts commit 58265b9.

* Rerun tests to fix validation errors

* Remove null capability test

* Cancel pipeline run (#3812)

* Cancel pipeline run api

* Makin cancel run to factory operation

* Example and unit test for cancel pipeline run api.

* Regenerating SDK accoring to latest instructions

* Scenario test for cancel run api

* Scenario test for pipeline run 2

* Regenerating SDK and adding text file with generation metadata

* Adding version 0.2.1

* Merged ADMS changes for Oct. SDK release

* Add linked service scenario test (resolves #3726) (#3798)

* Adds a simple CRUD test for linked services
  * Also change all tests to check for proper HTTP response codes on
    each API call
  * Resolves #3726

* Updated RecoveryServices.Backup Tests (#3822)

- Updated tests to address Azure/azure-sdk-for-python#1422
- Updated test settings (VM name etc) for Backup tests and re-recorded
tests

.gitignore.bak

@@ -0,0 +1,150 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+.vs/
+*.lock.json
+developer/
+
+# Build results
+binaries/
+[Dd]ebug*/
+[Rr]elease/
+build/
+restoredPackages/
+PolicheckOutput/
+tools/net46/
+<<<<<<< HEAD
+tools/SdkBuildTools
+tools/BuildAssets/tasks/net46/*runtimeconfig*.json
+=======
+tools/SdkBuildTools/
+>>>>>>> sdkMaster/psSdkJson6
+tools/Microsoft.WindowsAzure.Build.Tasks/packages/
+PublishedNugets/
+src/NuGet.Config
+tools/7-zip/
+
+[Tt]est[Rr]esult
+[Bb]uild[Ll]og.*
+
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.vspscc
+*.vssscc
+.builds
+
+*.pidb
+
+*.log
+*.scc
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+
+# Visual Studio profiler
+*.psess
+*.vsp
+
+# Code analysis
+*.CodeAnalysisLog.xml
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+
+*.[Rr]e[Ss]harper
+
+# NCrunch
+*.ncrunch*
+.*crunch*.local.xml
+
+# Installshield output folder
+[Ee]xpress
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish
+
+# Publish Web Output
+*.Publish.xml
+
+# Others
+[Bb]in
+[Oo]bj
+TestResults
+[Tt]est[Rr]esult*
+*.Cache
+ClientBin
+[Ss]tyle[Cc]op.*
+~$*
+*.dbmdl
+
+*.[Pp]ublish.xml
+
+Generated_Code #added for RIA/Silverlight projects
+
+# Build tasks
+tools/*.dll
+
+# Sensitive files
+*.keys
+*.pfx
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+
+# NuGet
+packages
+packages/repositories.config
+testPackages
+
+# Mac development
+.DS_Store
+
+# Specification DLLs
+*.Specification.dll
+
+# Generated readme.txt files #
+src/*/readme.txt
+
+build.out
+.nuget/
+
+# Azure Project
+csx/
+*.GhostDoc.xml
+pingme.txt

.gitignore.orig

@@ -0,0 +1,150 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+.vs/
+*.lock.json
+developer/
+
+# Build results
+binaries/
+[Dd]ebug*/
+[Rr]elease/
+build/
+restoredPackages/
+PolicheckOutput/
+tools/net46/
+<<<<<<< HEAD
+tools/SdkBuildTools
+tools/BuildAssets/tasks/net46/*runtimeconfig*.json
+=======
+tools/SdkBuildTools/
+>>>>>>> sdkMaster/psSdkJson6
+tools/Microsoft.WindowsAzure.Build.Tasks/packages/
+PublishedNugets/
+src/NuGet.Config
+tools/7-zip/
+
+[Tt]est[Rr]esult
+[Bb]uild[Ll]og.*
+
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.vspscc
+*.vssscc
+.builds
+
+*.pidb
+
+*.log
+*.scc
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+
+# Visual Studio profiler
+*.psess
+*.vsp
+
+# Code analysis
+*.CodeAnalysisLog.xml
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+
+*.[Rr]e[Ss]harper
+
+# NCrunch
+*.ncrunch*
+.*crunch*.local.xml
+
+# Installshield output folder
+[Ee]xpress
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish
+
+# Publish Web Output
+*.Publish.xml
+
+# Others
+[Bb]in
+[Oo]bj
+TestResults
+[Tt]est[Rr]esult*
+*.Cache
+ClientBin
+[Ss]tyle[Cc]op.*
+~$*
+*.dbmdl
+
+*.[Pp]ublish.xml
+
+Generated_Code #added for RIA/Silverlight projects
+
+# Build tasks
+tools/*.dll
+
+# Sensitive files
+*.keys
+*.pfx
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+
+# NuGet
+packages
+packages/repositories.config
+testPackages
+
+# Mac development
+.DS_Store
+
+# Specification DLLs
+*.Specification.dll
+
+# Generated readme.txt files #
+src/*/readme.txt
+
+build.out
+.nuget/
+
+# Azure Project
+csx/
+*.GhostDoc.xml
+pingme.txt

README.md

@@ -28,23 +28,28 @@ src\SDKs\Compute
 
 ### To build:
 =======
+#### If you have recently cloned the repo or did a pull from upstream or did git clean -xdf you need to the following before you do anything else in order to build your projects
+ 1. Open VS 2017 command prompt
+ 2. Navigate to repository root directory
+ 3. execute MsBuild.exe build.proj (this will pull all the build related tools needed to build the repo)
+ 4. Follow below steps to start building your repo/project
+
 #### If you are building from VS, add a nuget feed source that points to < root >\tools\LocalNugetFeed directory
-#### Full Build
+ 1. Open any solution, eg "SDKs\Compute\Compute.sln"
+ 2. Build solution from VS
+
+#### Full Build from command line
 
  1. Open VS 2017 command prompt
  2. Navigate to repository root directory
  3. Invoke **msbuild** build.proj /t:Build
  will Build
  ##### *Build* without any scope will build all SDK's and create nuget packages.
 
-#### Build one nuget package
+#### Create single nuget package
 In order to build one package and run it's test
 `msbuild build.proj /t:CreateNugetPackage /p:scope=SDKs\Compute`
 Nuget package will be created in root directory under \binaries\packages
-
-#### Build Using Visual Studio:
- 1. Open any solution, eg "SDKs\Compute\Compute.sln"
- 2. Build solution
 
 ### To run the tests:
 Using Visual Studio:

src/SDKs/Batch/Support/FileConventions/Src/AzureBatchFileConventions/AzureBatchFileConventions.csproj

@@ -8,7 +8,7 @@ by task and job id and the type of output.
     </Description>
     <AssemblyTitle>Microsoft Azure Batch File Conventions</AssemblyTitle>
     <AssemblyName>Microsoft.Azure.Batch.Conventions.Files</AssemblyName>
-    <VersionPrefix>3.0.0</VersionPrefix>
+    <VersionPrefix>3.1.0</VersionPrefix>
     <PackageTags>Microsoft, Azure, Batch, windowsazureofficial</PackageTags>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
     <PackageReleaseNotes>
@@ -35,7 +35,7 @@ Updated dependent libraries.
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Batch" Version="[7.0.0,8.0.0)" />
+    <PackageReference Include="Azure.Batch" Version="[8.0.0,9.0.0)" />
     <PackageReference Include="WindowsAzure.Storage" Version="8.1.1" />
   </ItemGroup>
 

src/SDKs/Batch/Support/FileConventions/Src/AzureBatchFileConventions/Properties/AssemblyInfo.cs

@@ -20,7 +20,7 @@
 [assembly: AssemblyDescription("A convention-based library for saving and retrieving Azure Batch task output files.")]
 
 [assembly: AssemblyVersion("3.0.0.0")] 
-[assembly: AssemblyFileVersion("3.0.0.0")]
+[assembly: AssemblyFileVersion("3.1.0.0")]
 [assembly: AssemblyCompany("Microsoft Corporation")]
 [assembly: AssemblyProduct("Microsoft Azure")]
 [assembly: AssemblyCopyright("Copyright © Microsoft Corporation. All rights reserved.")]

src/SDKs/Batch/Support/FileConventions/Tests/AzureBatchFileConventions.Tests/AzureBatchFileConventions.Tests.csproj

@@ -23,7 +23,6 @@
     <OutputPath>bin\$(Configuration)\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Azure.Batch" Version="7.0.0" />
     <PackageReference Include="FsCheck.Xunit" Version="2.9.0-rc3" />
     <PackageReference Include="NSubstitute" Version="2.0.3" />
     <PackageReference Include="xunit" Version="2.3.0-beta1-build3642" />

src/SDKs/Batch/Support/FileStaging/Batch.FileStaging/AssemblyAttributes.cs

@@ -20,8 +20,8 @@
 [assembly: AssemblyTitle("Microsoft.Azure.Batch.FileStaging")]
 [assembly: AssemblyDescription("Client library for uploading resource files for tasks in the Azure Batch service.")]
 
-[assembly: AssemblyVersion("7.0.0.0")]
-[assembly: AssemblyFileVersion("7.0.0.0")]
+[assembly: AssemblyVersion("8.0.0.0")]
+[assembly: AssemblyFileVersion("8.0.0.0")]
 [assembly: AssemblyCompany("Microsoft Corporation")]
 [assembly: AssemblyProduct("Microsoft Azure")]
 [assembly: AssemblyCopyright("Copyright (c) Microsoft Corporation. All rights reserved.")]