Merge pull request #1 from Azure/search-preview

Merge from Azure/azure-sdk-for-net service-preview

.travis.yml

@@ -19,8 +19,10 @@ install:
   - cat /etc/*release
   - sudo sh -c 'echo "deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet-release/ trusty main" > /etc/apt/sources.list.d/dotnetdev.list'
   - sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 417A0893
+  - wget -q https://packages.microsoft.com/config/ubuntu/14.04/packages-microsoft-prod.deb
+  - sudo dpkg -i packages-microsoft-prod.deb  
   - sudo apt-get update
-  - sudo apt-get install dotnet-dev-1.0.4
+  - sudo apt-get install dotnet-sdk-2.1.201
 script:
   - ./testSdkOnLinux.sh
 after_script:

README.md

@@ -17,7 +17,7 @@ For a full list of packages available for download in this repository, please se
 ### Prerequisites:
   Install VS 2017 (Professional or higher) + VS2017 Update 1
   (https://www.visualstudio.com/).
-  To know more about VS 2017 and it's project system (https://docs.microsoft.com/en-us/visualstudio/#pivot=workloads&panel=windows)
+  To know more about VS 2017 and its project system (https://docs.microsoft.com/en-us/visualstudio/#pivot=workloads&panel=windows)
 
 ### Directory Restructure
 Directory structure has been simplified and consolidated in fewer directories
@@ -85,7 +85,7 @@ In "SDKs\< RPName >", you will find projects for services that have already been
     - The file 'generate.cmd', used to generate library code for the given service, can also be found in this project
   - Services also contain a project for their tests
 
-### Branches: vs17Dev vs. master
+### Branches: psSdkJson6 vs. master
 
 The **psSdkJson6** branch contains the code generated from AutoRest tool.
 
@@ -110,12 +110,36 @@ The **master** branch contains the code generated from Hydra/Hyak.
  9.  A Pull request of your Azure SDK for .NET changes against **psSdkJson6** branch of the [Azure SDK for .NET](https://github.com/azure/azure-sdk-for-net)
  11. Both the pull requests will be reviewed and merged by the Azure SDK team
 
+### New Resource Provider
+1. If you have never created an SDK for your service before, you will need the following things to get your SDK in the repo
+2. Follow the standard process described above.
+3. Directory names helps in using basic heuristics in finding projects as well it's associated test projects during CI process.
+4. Create a new directory (name of your service e.g. Compute, Storage etc)
+5. If you have a data plane as well as management plane follow the following directory structure.
+ - `SDKs\<RPName>\management\Management.<RPName>\Microsoft.Azure.Management.<RPName>.csproj`
+ - `SDKs\<RPName\management\<RPName>.Tests\Management.<RPName>.Tests.csproj`
+ - `SDKs\<RPName>\dataplane\Microsoft.Azure.<RPName>\Microsoft.Azure.<RPName>.csproj`
+ - `SDKs\<RPName\dataplane\Microsoft.Azure.<RPName>.Tests\Microsoft.Azure.<RPName>.Tests.csproj`
+6. If you only have management plane SDK then have the following directory structure
+ - `SDKs\<RPName>\Management.<RPName>\Microsoft.Azure.Management.<RPName>.csproj`
+ - `SDKs\<RPName\<RPName>.Tests\Management.<RPName>.Tests.csproj`
+7. Copy .csproj from any other .csproj and update the following information in the new .csproj
+ - PackageId
+ - Description
+ - AssemblyTitle
+ - AssemblyName
+ - Version
+ - PackageTags
+ - PackageReleaseNotes (this is important because this information is displayed on www.nuget.org when your nuget package is published
+8. Copy existing generate.ps1 file from another dirctory and update the `ResourceProvider` name that is applicable to your SDK. Resource provider refers to the relative path of your REST spec directory in Azure-Rest-Api-Specs repository
+During SDK generation, this path helps to locate the REST API spec from the `https://github.com/Azure/azure-rest-api-specs`
+
 ### Code Review Process
 
 Before a pull request will be considered by the Azure SDK team, the following requirements must be met:
 
 - Prior to issuing the pull request:
-  - All code must have completed any necessary legal signoff for being publically viewable (Patent review, JSR review, etc.)
+  - All code must have completed any necessary legal signoff for being publicly viewable (Patent review, JSR review, etc.)
   - The changes cannot break any existing functional/unit tests that are part of the central repository.
     - This includes all tests, even those not associated with the given feature area.
   - Code submitted must have basic unit test coverage, and have all the unit tests pass. Testing is the full responsibility of the service team

src/AzSdk.reference.props

@@ -1,8 +1,8 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<Import Project="$([MSBuild]::GetPathOfFileAbove('AzSdk.props'))" />
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="[3.3.12, 4.0.0)" /> 
-		<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="[2.3.11, 3.0.0)" />
+		<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="[3.3.13, 4.0.0)" /> 
+		<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="[2.3.12, 3.0.0)" />
 	</ItemGroup>
 
 	<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.4' ">    

src/AzSdk.test.reference.props

@@ -1,7 +1,8 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<Import Project="$([MSBuild]::GetPathOfFileAbove('test.props'))" />
+	<Import Project="$([MSBuild]::GetPathOfFileAbove('test.props'))" />	
+
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Test.HttpRecorder" Version="[1.8.1,2.0.0)" />
+    <PackageReference Include="Microsoft.Azure.Test.HttpRecorder" Version="[1.10.99-Private]" />
     <PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework" Version="[1.7.1,2.0.0)" />
     <PackageReference Include="Microsoft.Azure.ResourceManager" Version="[1.1.0-preview]" />
 

src/AzureStack/.gitignore

@@ -0,0 +1,2 @@
+!Backup*
+

src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/AzureBridge.Tests.csproj

@@ -8,9 +8,9 @@
         <VersionPrefix>1.0.0</VersionPrefix>
     </PropertyGroup>
 
-    <PropertyGroup>
-        <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
-    </PropertyGroup>
+    <!-- <PropertyGroup> -->
+        <!-- <TargetFrameworks>netcoreapp1.1</TargetFrameworks> -->
+    <!-- </PropertyGroup> -->
 
     <ItemGroup>
         <ProjectReference Include="..\AzureBridge.Admin\Microsoft.AzureStack.Management.AzureBridge.Admin.csproj" />

src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/generate.ps1

@@ -1,9 +1 @@
-powershell.exe -ExecutionPolicy Bypass `
-    -NoLogo `
-    -NonInteractive `
-    -NoProfile `
-    -File "$(split-path $SCRIPT:MyInvocation.MyCommand.Path -parent)\..\..\..\..\tools\generateTool.ps1" `
-    -ResourceProvider "azsadmin/resource-manager/azurebridge" `
-    -PowershellInvoker `
-    -AutoRestVersion "latest" `
-    -SdkRootDirectory $PSScriptRoot
+Start-AutoRestCodeGeneration -ResourceProvider "azsadmin/resource-manager/azurebridge" -AutoRestVersion "latest" -SdkRootDirectory $PSScriptRoot

src/AzureStack/Admin/BackupAdmin/AzSdk.RP.props

@@ -0,0 +1,7 @@
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!--This file and it's contents are updated at build time moving or editing might result in build failure. Take due deligence while editing this file-->
+  <PropertyGroup>
+    <AzureApiTag>Backup.Admin_2016-05-01;</AzureApiTag>
+    <PackageTags>$(PackageTags);$(CommonTags);$(AzureApiTag);</PackageTags>
+  </PropertyGroup>
+</Project>

src/AzureStack/Admin/BackupAdmin/Backup.Admin.Tests/Backup.Tests.csproj

@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('AzSdk.test.reference.props'))" />
+  <PropertyGroup>
+    <PackageId>Backup.Admin.Tests</PackageId>
+    <Description>Backup.Admin.Tests Class Library</Description>
+    <AssemblyName>Backup.Admin.Tests</AssemblyName>
+    <VersionPrefix>1.0.0</VersionPrefix>    
+  </PropertyGroup>
+  <!-- <PropertyGroup> -->
+    <!-- <TargetFrameworks>netcoreapp1.1</TargetFrameworks> -->
+  <!-- </PropertyGroup> -->
+
+  <ItemGroup>
+    <ProjectReference Include="..\Backup.Admin\Microsoft.AzureStack.Management.Backup.Admin.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="SessionRecords\**\*.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
+
+</Project>

src/AzureStack/Admin/BackupAdmin/Backup.Admin.Tests/Properties/AssemblyInfo.cs

@@ -0,0 +1,19 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("Backup.Tests")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Backup.Tests")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2017")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+[assembly: ComVisible(false)]
+
+[assembly: Guid("1b24bc4a-6e4d-4feb-b5d5-c9684c60a308")]
+
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]