diff --git a/SDKs/_metadata/cognitiveservices_data-plane_FormRecognizer.txt b/SDKs/_metadata/cognitiveservices_data-plane_FormRecognizer.txt deleted file mode 100644 index 4a450476275e..000000000000 --- a/SDKs/_metadata/cognitiveservices_data-plane_FormRecognizer.txt +++ /dev/null @@ -1,14 +0,0 @@ -Installing AutoRest version: latest -AutoRest installed successfully. -Commencing code generation -Generating CSharp code -Executing AutoRest command -cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/cognitiveservices/data-plane/FormRecognizer/readme.md --csharp --version=latest --reflect-api-versions --csharp.output-folder=D:\temp\cognitiveservices\Vision.FormRecognizer\src -2019-05-31 12:25:41 UTC -Azure-rest-api-specs repository information -GitHub fork: Azure -Branch: master -Commit: 1e497e5bc4f055f1e890001f254f4c9892f2287b -AutoRest information -Requested version: latest -Bootstrapper version: autorest@2.0.4283 diff --git a/eng/Directory.Build.Mgmt.props b/eng/Directory.Build.Mgmt.props deleted file mode 100644 index 0a81f78f2aa9..000000000000 --- a/eng/Directory.Build.Mgmt.props +++ /dev/null @@ -1,95 +0,0 @@ - - - $(RepoRoot) - $(LibraryRoot)\tools - $(LibraryToolsFolder)\BuildAssets - $(LibraryToolsFolder)\SdkBuildTools - - - - $(BuildAssetsDir)\targets - $(SdkBuildToolsDir)\targets - $(BuildAssetsDir) - $(SdkBuildToolsDir) - - - - - $(DefaultPathTokenToIgnore) Microsoft.Rest.ClientRuntime.Tracing.Tests - $(DefaultPathTokenToIgnore) Microsoft.Azure.Services.AppAuthentication.IntegrationTests - $(DefaultPathTokenToIgnore) Batch\DataPlane - $(DefaultPathTokenToIgnore) Batch\Support - $(DefaultPathTokenToIgnore) LocationBasedServices - $(DefaultPathTokenToIgnore) BotService - $(DefaultPathTokenToIgnore) TestFramework\TestFramework.Net45Tests - $(DefaultPathTokenToIgnore) appconfiguration - $(DefaultPathTokenToIgnore) core - $(DefaultPathTokenToIgnore) identity - $(DefaultPathTokenToIgnore) storage - $(DefaultPathTokenToIgnore) Template - - - $(DefaultPathTokenToIgnore) datalake-store - $(DefaultPathTokenToIgnore) operationalinsights\Microsoft.Azure.Management.OperationalInsights - $(DefaultPathTokenToIgnore) monitor - $(DefaultPathTokenToIgnore) billing - $(DefaultPathTokenToIgnore) consumption - $(DefaultPathTokenToIgnore) subscription - $(DefaultPathTokenToIgnore) azurestack\Microsoft.AzureStack.Management.Fabric.Admin - $(DefaultPathTokenToIgnore) storage\Microsoft.Azure.Management.Storage - - - $(DefaultPathTokenToIgnore) applicationinsights\Microsoft.Azure.ApplicationInsights - $(DefaultPathTokenToIgnore) batch\Microsoft.Azure.Batch - $(DefaultPathTokenToIgnore) cognitiveservices\AnomalyDetector - $(DefaultPathTokenToIgnore) cognitiveservices\Knowledge.QnAMaker - $(DefaultPathTokenToIgnore) cognitiveservices\Language.LUIS.Authoring - $(DefaultPathTokenToIgnore) cognitiveservices\Language.LUIS.Runtime - $(DefaultPathTokenToIgnore) cognitiveservices\Language.SpellCheck - $(DefaultPathTokenToIgnore) cognitiveservices\Language.TextAnalytics - $(DefaultPathTokenToIgnore) cognitiveservices\Personalizer - $(DefaultPathTokenToIgnore) cognitiveservices\Search.BingAutoSuggest - $(DefaultPathTokenToIgnore) cognitiveservices\Search.BingCustomImageSearch - $(DefaultPathTokenToIgnore) cognitiveservices\Search.BingCustomSearch - $(DefaultPathTokenToIgnore) cognitiveservices\Search.BingEntitySearch - $(DefaultPathTokenToIgnore) cognitiveservices\Search.BingImageSearch - $(DefaultPathTokenToIgnore) cognitiveservices\Search.BingLocalSearch - $(DefaultPathTokenToIgnore) cognitiveservices\Search.BingNewsSearch - $(DefaultPathTokenToIgnore) cognitiveservices\Search.BingVideoSearch - $(DefaultPathTokenToIgnore) cognitiveservices\Search.BingVisualSearch - $(DefaultPathTokenToIgnore) cognitiveservices\Search.BingWebSearch - $(DefaultPathTokenToIgnore) cognitiveservices\Vision.ComputerVision - $(DefaultPathTokenToIgnore) cognitiveservices\Vision.ContentModerator - $(DefaultPathTokenToIgnore) cognitiveservices\Vision.CustomVision.Prediction - $(DefaultPathTokenToIgnore) cognitiveservices\Vision.CustomVision.Training - $(DefaultPathTokenToIgnore) cognitiveservices\Vision.Face - $(DefaultPathTokenToIgnore) cognitiveservices\Vision.FormRecognizer - $(DefaultPathTokenToIgnore) containerregistry\Microsoft.Azure.ContainerRegistry - $(DefaultPathTokenToIgnore) eventgrid\Microsoft.Azure.EventGrid - $(DefaultPathTokenToIgnore) eventhub\Azure.Messaging.EventHubs - $(DefaultPathTokenToIgnore) eventhub\Microsoft.Azure.EventHubs - $(DefaultPathTokenToIgnore) eventhub\Microsoft.Azure.EventHubs.Processor - $(DefaultPathTokenToIgnore) eventhub\Microsoft.Azure.EventHubs.ServiceFabricProcessor - $(DefaultPathTokenToIgnore) hdinsight\Microsoft.Azure.HDInsight.Job - $(DefaultPathTokenToIgnore) keyvault\Azure.Security.Keyvault.Keys - $(DefaultPathTokenToIgnore) keyvault\Azure.Security.KeyVault.Secrets - $(DefaultPathTokenToIgnore) keyvault\Microsoft.Azure.KeyVault - $(DefaultPathTokenToIgnore) keyvault\Microsoft.Azure.KeyVault.Core - $(DefaultPathTokenToIgnore) keyvault\Microsoft.Azure.KeyVault.Cryptography - $(DefaultPathTokenToIgnore) keyvault\Microsoft.Azure.KeyVault.Extensions - $(DefaultPathTokenToIgnore) keyvault\Microsoft.Azure.KeyVault.WebKey - $(DefaultPathTokenToIgnore) operationalinsights\Microsoft.Azure.OperationalInsights - $(DefaultPathTokenToIgnore) servicebus\Microsoft.Azure.ServiceBus - - - - - $(DefaultPathTokenToIgnore) data-plane - - - - - - $(LibraryRoot)sdk - - diff --git a/sdk/machinelearningcompute/Microsoft.Azure.Management.MachineLearningCompute/MachineLearningCompute.sln b/sdk/machinelearningcompute/Microsoft.Azure.Management.MachineLearningCompute/Microsoft.Azure.Management.MachineLearningCompute.sln similarity index 100% rename from sdk/machinelearningcompute/Microsoft.Azure.Management.MachineLearningCompute/MachineLearningCompute.sln rename to sdk/machinelearningcompute/Microsoft.Azure.Management.MachineLearningCompute/Microsoft.Azure.Management.MachineLearningCompute.sln diff --git a/sdk/storagesync/Microsoft.Azure.Management.StorageSync/src/Generated/Models/TriggerChangeDetectionParameters.cs b/sdk/storagesync/Microsoft.Azure.Management.StorageSync/src/Generated/Models/TriggerChangeDetectionParameters.cs index 673d46e744ed..a8e15ecc4c85 100644 --- a/sdk/storagesync/Microsoft.Azure.Management.StorageSync/src/Generated/Models/TriggerChangeDetectionParameters.cs +++ b/sdk/storagesync/Microsoft.Azure.Management.StorageSync/src/Generated/Models/TriggerChangeDetectionParameters.cs @@ -71,11 +71,11 @@ public TriggerChangeDetectionParameters() public string ChangeDetectionMode { get; set; } /// - /// 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. /// [JsonProperty(PropertyName = "paths")] - public IList Paths { get; private set; } + public IList Paths { get; set; } } } diff --git a/src/AzSdk.reference.props b/src/AzSdk.reference.props index f5d38cb21522..fd00801bdaa1 100644 --- a/src/AzSdk.reference.props +++ b/src/AzSdk.reference.props @@ -1,5 +1,4 @@ -<<<<<<< HEAD true @@ -7,12 +6,6 @@ -======= - - - - ->>>>>>> Moved ref files into mgmt directory @@ -43,8 +36,5 @@ true true -<<<<<<< HEAD -======= ->>>>>>> Moved ref files into mgmt directory \ No newline at end of file diff --git a/src/AzSdk.test.reference.props b/src/AzSdk.test.reference.props index 78192332289b..86a0d1a4bc29 100644 --- a/src/AzSdk.test.reference.props +++ b/src/AzSdk.test.reference.props @@ -1,10 +1,4 @@ -<<<<<<< HEAD -======= - - - ->>>>>>> Moved ref files into mgmt directory netcoreapp2.0 @@ -12,16 +6,10 @@ -<<<<<<< HEAD -======= - - - ->>>>>>> Moved ref files into mgmt directory