Skip to content

Commit

Permalink
RP Upgrade 2
Browse files Browse the repository at this point in the history
  • Loading branch information
Abhijeet Shah committed Apr 17, 2017
1 parent 98f0504 commit 1c39c66
Show file tree
Hide file tree
Showing 2,313 changed files with 1,292 additions and 2,948 deletions.
4 changes: 4 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
<NuGetCommand>&quot;$(LibraryToolsFolder)\nuget.exe&quot;</NuGetCommand>
<ImportDirectoryBuildTargets>true</ImportDirectoryBuildTargets>
</PropertyGroup>

<PropertyGroup>
<BuildInParallel>true</BuildInParallel>
</PropertyGroup>

<ItemGroup Condition="'$(PublishTestProjects)' == 'false' Or '$(PublishTestProjects)' == ''">
<LibrariesToBuild Include="$(LibrarySourceFolder)\$(Scope)\*.sln" Condition=" '$(Scope)' != 'all' " />
Expand Down
43 changes: 0 additions & 43 deletions src/SDKs/Batch/Batch.Tests/Batch.Tests.csproj

This file was deleted.

26 changes: 15 additions & 11 deletions src/SDKs/Batch/Batch.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,32 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26228.4
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8CF798F6-5251-41BD-AAF6-E14DC3BAAEA5}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Management", "Management", "{E70E7396-E51D-4234-A20B-9CF4DFE3F0B9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.Management.Batch", "Microsoft.Azure.Management.Batch\Microsoft.Azure.Management.Batch.csproj", "{3CE42B6D-A828-49C0-9ED6-D618264FC59C}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Management.Batch.Tests", "Management\Management.Batch.Tests\Management.Batch.Tests.csproj", "{1EE90E09-F507-4419-8452-132D068572B2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Batch.Tests", "Batch.Tests\Batch.Tests.csproj", "{7B0C740E-4A12-4FBE-AC41-E3F1D77ABF60}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.Management.Batch", "Management\Management.Batch\Microsoft.Azure.Management.Batch.csproj", "{D372980A-B335-45A6-B6C7-CBEE49F21E5F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{3CE42B6D-A828-49C0-9ED6-D618264FC59C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3CE42B6D-A828-49C0-9ED6-D618264FC59C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3CE42B6D-A828-49C0-9ED6-D618264FC59C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3CE42B6D-A828-49C0-9ED6-D618264FC59C}.Release|Any CPU.Build.0 = Release|Any CPU
{7B0C740E-4A12-4FBE-AC41-E3F1D77ABF60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7B0C740E-4A12-4FBE-AC41-E3F1D77ABF60}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7B0C740E-4A12-4FBE-AC41-E3F1D77ABF60}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7B0C740E-4A12-4FBE-AC41-E3F1D77ABF60}.Release|Any CPU.Build.0 = Release|Any CPU
{1EE90E09-F507-4419-8452-132D068572B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1EE90E09-F507-4419-8452-132D068572B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1EE90E09-F507-4419-8452-132D068572B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1EE90E09-F507-4419-8452-132D068572B2}.Release|Any CPU.Build.0 = Release|Any CPU
{D372980A-B335-45A6-B6C7-CBEE49F21E5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D372980A-B335-45A6-B6C7-CBEE49F21E5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D372980A-B335-45A6-B6C7-CBEE49F21E5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D372980A-B335-45A6-B6C7-CBEE49F21E5F}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{1EE90E09-F507-4419-8452-132D068572B2} = {E70E7396-E51D-4234-A20B-9CF4DFE3F0B9}
{D372980A-B335-45A6-B6C7-CBEE49F21E5F} = {E70E7396-E51D-4234-A20B-9CF4DFE3F0B9}
EndGlobalSection
EndGlobal
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$([MSBuild]::GetPathOfFileAbove('AzSdk.test.reference.props'))" />
<PropertyGroup>
<PackageId>Batch.Tests</PackageId>
<Description>Batch.Tests Class Library</Description>
<AssemblyName>Batch.Tests</AssemblyName>
<VersionPrefix>1.0.0-preview</VersionPrefix>
</PropertyGroup>
<PropertyGroup>
<TargetFrameworks>netcoreapp1.1</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="[1.1.3-preview,2.0.0)" />
<PackageReference Include="Microsoft.Azure.Management.Batch" Version="4.2.0" />

<!--<ProjectReference Include="..\Management.Batch\Microsoft.Azure.Management.Batch.csproj" />-->
</ItemGroup>

<ItemGroup>
<None Update="SessionRecords\**\*.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>

<!--Do not remove until VS Test Tools fixes #472-->
<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$([MSBuild]::GetPathOfFileAbove('AzSdk.reference.props'))" />
<PropertyGroup>
<PackageId>Microsoft.Azure.Management.Batch</PackageId>
<Description>Provides management capabilities for Azure Batch service accounts.</Description>
<AssemblyTitle>Microsoft Azure Batch Management Library</AssemblyTitle>
<AssemblyName>Microsoft.Azure.Management.Batch</AssemblyName>
<VersionPrefix>4.2.0</VersionPrefix>
<PackageTags>Microsoft Azure batch management</PackageTags>
</PropertyGroup>
<PropertyGroup>
<TargetFrameworks>net452;netstandard1.4</TargetFrameworks>
</PropertyGroup>
</Project>

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,47 +1,31 @@
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="$([MSBuild]::GetPathOfFileAbove('AzSdk.test.reference.props'))" />
<PropertyGroup>
<PackageId>MachineLearning.Tests</PackageId>
<Description>WebServices.Tests Class Library</Description>
<Authors>Microsoft Corporation</Authors>
<TargetFramework>netcoreapp1.0</TargetFramework>
<DelaySign>true</DelaySign>
<AssemblyName>MachineLearning.Tests</AssemblyName>
<AssemblyOriginatorKeyFile>../../../../tools/MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
<PackageId>MachineLearning.Tests</PackageId>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<PackageProjectUrl>https://github.com/Azure/azure-sdk-for-net</PackageProjectUrl>
<PackageLicenseUrl>https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE</PackageLicenseUrl>
<RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
<PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
<VersionPrefix>1.0.0-preview</VersionPrefix>
</PropertyGroup>
<PropertyGroup>
<TargetFrameworks>netcoreapp1.1</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="[4.1.0-preview]" />
<PackageReference Include="Microsoft.Azure.Management.MachineLearning" Version="1.0.0" />

<ItemGroup>
<Compile Include="..\..\..\..\tools\DisableTestRunParallel.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
<!--<ProjectReference Include="..\Management.MachineLearning\Microsoft.Azure.Management.MachineLearning.csproj" />-->
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Microsoft.Azure.Management.MachineLearning\Microsoft.Azure.Management.MachineLearning.csproj" />
<None Update="SessionRecords\**\*.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="TestData\**\*.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta5-build1225" />
<PackageReference Include="System.Diagnostics.TraceSource" Version="4.0.0" />
<PackageReference Include="Microsoft.Azure.Test.HttpRecorder" Version="[1.6.7-preview,2.0.0)" />
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework" Version="[1.5.0-preview,2.0.0)" />
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="[3.3.1,4.0.0)" />
<PackageReference Include="Microsoft.Azure.ResourceManager" Version="1.0.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="[4.1.0-preview]" />
<PackageReference Include="xunit" Version="2.2.0-beta5-build3474" />
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>

</Project>
</Project>

This file was deleted.

42 changes: 0 additions & 42 deletions src/SDKs/MachineLearning/MachineLearning.Tests/project.json

This file was deleted.

10 changes: 5 additions & 5 deletions src/SDKs/MachineLearning/MachineLearning.sln
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ VisualStudioVersion = 15.0.26228.4
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MachineLearning.Tests", "MachineLearning.Tests\MachineLearning.Tests.csproj", "{2417C6DE-D448-11E5-B985-40A8F066D050}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.Management.MachineLearning", "Microsoft.Azure.Management.MachineLearning\Microsoft.Azure.Management.MachineLearning.csproj", "{9BFCBC70-D442-11E5-8218-40A8F066D050}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.Management.MachineLearning", "Management.MachineLearning\Microsoft.Azure.Management.MachineLearning.csproj", "{55DF5FD9-ABE6-482F-A653-BBBCA5FC0EDA}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -17,10 +17,10 @@ Global
{2417C6DE-D448-11E5-B985-40A8F066D050}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2417C6DE-D448-11E5-B985-40A8F066D050}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2417C6DE-D448-11E5-B985-40A8F066D050}.Release|Any CPU.Build.0 = Release|Any CPU
{9BFCBC70-D442-11E5-8218-40A8F066D050}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9BFCBC70-D442-11E5-8218-40A8F066D050}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9BFCBC70-D442-11E5-8218-40A8F066D050}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9BFCBC70-D442-11E5-8218-40A8F066D050}.Release|Any CPU.Build.0 = Release|Any CPU
{55DF5FD9-ABE6-482F-A653-BBBCA5FC0EDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{55DF5FD9-ABE6-482F-A653-BBBCA5FC0EDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{55DF5FD9-ABE6-482F-A653-BBBCA5FC0EDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{55DF5FD9-ABE6-482F-A653-BBBCA5FC0EDA}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Loading

0 comments on commit 1c39c66

Please sign in to comment.