Incorporate new mgmt changes

Azure · Jun 11, 2019 · e0791ca · e0791ca
1 parent c5224e1
commit e0791ca
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 134 deletions.
diff --git a/SDKs/_metadata/cognitiveservices_data-plane_FormRecognizer.txt b/SDKs/_metadata/cognitiveservices_data-plane_FormRecognizer.txt
diff --git a/eng/Directory.Build.Mgmt.props b/eng/Directory.Build.Mgmt.props
diff --git a/...earningCompute/MachineLearningCompute.sln → ...ure.Management.MachineLearningCompute.sln b/...earningCompute/MachineLearningCompute.sln → ...ure.Management.MachineLearningCompute.sln
diff --git a/...oft.Azure.Management.StorageSync/src/Generated/Models/TriggerChangeDetectionParameters.cs b/...oft.Azure.Management.StorageSync/src/Generated/Models/TriggerChangeDetectionParameters.cs
@@ -71,11 +71,11 @@ public TriggerChangeDetectionParameters()
         public string ChangeDetectionMode { get; set; }
 
         /// <summary>
-        /// Gets array of relative paths on the Azure File share to be included
-        /// in the change detection. Can be files and directories.
+        /// Gets or sets array of relative paths on the Azure File share to be
+        /// included in the change detection. Can be files and directories.
         /// </summary>
         [JsonProperty(PropertyName = "paths")]
-        public IList<string> Paths { get; private set; }
+        public IList<string> Paths { get; set; }
 
     }
 }
diff --git a/src/AzSdk.reference.props b/src/AzSdk.reference.props
@@ -1,18 +1,11 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-<<<<<<< HEAD
 	<PropertyGroup>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="[3.3.19, 4.0.0)" /> 
 		<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="[2.3.19, 3.0.0)" />
 		<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.1" PrivateAssets="All" />
-=======
-	<Import Project="$([MSBuild]::GetPathOfFileAbove('AzSdk.props'))" />
-	<ItemGroup>
-		<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="[3.3.19, 4.0.0)" /> 
-		<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="[2.3.19, 3.0.0)" />
->>>>>>> Moved ref files into mgmt directory
 	</ItemGroup>
 
 	<PropertyGroup>
@@ -43,8 +36,5 @@
 		<EnablePreBuildTarget Condition=" '$(EnablePreBuildTarget)' == '' ">true</EnablePreBuildTarget>
 		<EnablePostBuildTarget Condition=" '$(EnablePostBuildTarget)' == '' ">true</EnablePostBuildTarget>
 	</PropertyGroup>
-<<<<<<< HEAD
 
-=======
->>>>>>> Moved ref files into mgmt directory
 </Project>
diff --git a/src/AzSdk.test.reference.props b/src/AzSdk.test.reference.props
@@ -1,27 +1,15 @@
-<<<<<<< HEAD
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">	
-=======
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<Import Project="$([MSBuild]::GetPathOfFileAbove('test.props'))" />	
-
->>>>>>> Moved ref files into mgmt directory
   <PropertyGroup>
 		<TargetFrameworks>netcoreapp2.0</TargetFrameworks>
 	</PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Test.HttpRecorder" Version="[1.13.3, 2.0.0)" />
     <PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework" Version="[1.7.6, 2.0.0)" />
     <PackageReference Include="Microsoft.Azure.ResourceManager" Version="[1.1.0-preview]" />
-<<<<<<< HEAD
     <PackageReference Include="xunit" Version="2.3.1" />
 		<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
 		<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.1" PrivateAssets="All" />
-=======
-
-    <!-- This is needed for discovering tests in test explorer -->
-    <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />	
->>>>>>> Moved ref files into mgmt directory
   </ItemGroup>
 </Project>