Skip to content

Commit

Permalink
Search SDK: Fixing build issue caused by .NET Core RTM upgrade (#2150)
Browse files Browse the repository at this point in the history
The build issue in Search.Tests went uncaught for a long time because it was
not being included in the command-line build. This was due to the behavior of
the custom FilterOutAutoRestLibraries build task, which expects a 1-1
correspondence of AutoRest libraries to test projects. To fix this, we have
(finally) split our very-unfinished preview Management library into its own
project, Microsoft.Azure.Management.Search.
  • Loading branch information
brjohnstmsft authored and Hovsep committed Jun 30, 2016
1 parent 5893d4c commit 8072b29
Show file tree
Hide file tree
Showing 33 changed files with 139 additions and 24 deletions.
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"src/TestFramework/Microsoft.Azure.Test.HttpRecorder",
"src/TestFramework/Microsoft.Rest.ClientRuntime.Azure.TestFramework",
"src/Search/Microsoft.Azure.Search",
"src/Search/Microsoft.Azure.Management.Search",
"src/ResourceManagement/Graph.RBAC/Microsoft.Azure.Graph.RBAC",
"src/ResourceManagement/Authorization/Microsoft.Azure.Management.Authorization",
"src/ResourceManagement/Cdn/Microsoft.Azure.Management.Cdn",
Expand All @@ -20,7 +21,6 @@
"src/ResourceManagement/Storage/Microsoft.Azure.Management.Storage",
"src/ResourceManagement/TrafficManager/Microsoft.Azure.Management.TrafficManager",
"src/ResourceManagement/Websites/Microsoft.Azure.Management.Websites",

"src/ResourceManagement/DataLake.StoreUploader/Microsoft.Azure.Management.DataLake.StoreUploader",
"src/ResourceManagement/DataLake.StoreUploader/Microsoft.Azure.Management.DataLake.StoreUploader"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>4E616081-9A63-4778-B1D3-4CF35C5A5763</ProjectGuid>
<RootNamespace>Microsoft.Azure.Management.Search</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See License.txt in the project root for
// license information.

using System.Reflection;
using System.Resources;

[assembly: AssemblyTitle("Microsoft Azure Search Management Library")]
[assembly: AssemblyDescription("Makes it easy to manage Azure Search services from a .NET application.")]

[assembly: AssemblyVersion("0.9.0.0")]
[assembly: AssemblyFileVersion("0.9.0.0")]

[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Microsoft")]
[assembly: AssemblyProduct("Microsoft Azure .NET SDK")]
[assembly: AssemblyCopyright("Copyright (c) Microsoft Corporation")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: NeutralResourcesLanguage("en")]
85 changes: 85 additions & 0 deletions src/Search/Microsoft.Azure.Management.Search/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
{
"version": "0.9.0-preview",
"title": "Microsoft Azure Search Management Library",
"description": "Makes it easy to manage Azure Search services from a .NET application.",
"authors": [ "Microsoft" ],

"packOptions": {
"summary": "Class library for managing Azure Search services.",
"projectUrl": "https://github.com/Azure/azure-sdk-for-net",
"licenseUrl": "https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE",
"iconUrl": "http://go.microsoft.com/fwlink/?LinkID=288890",
"tags": [ "Microsoft Azure Search", "Microsoft Azure Search Management", "REST HTTP client", "search", "azureofficial", "windowsazureofficial" ],
"requireLicenseAcceptance": true,
"releaseNotes": "This is a preview release of the Azure Search Management SDK for .NET, based on version 2015-02-28 of the Azure Search Management REST API.",
},

"buildOptions": {
"delaySign": true,
"publicSign": false,
"keyFile": "../../../tools/MSSharedLibKey.snk"
},

"frameworks": {
"net45": {
"frameworkAssemblies": {
"System.Collections": "",
"System.Linq.Expressions": "",
"System.Runtime": "",
"System.Runtime.Serialization": "",
"System.Threading.Tasks": "",
},
"dependencies": {
"Microsoft.Rest.ClientRuntime.Azure": "[3.1.0,4.0.0)"
}
},
"netstandard1.5": {
"buildOptions": { "define": [ "PORTABLE" ] },
"imports": ["dnxcore50"],
"dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1",
"System.Collections": "4.0.11",
"System.Collections.Concurrent": "4.0.12",
"System.Diagnostics.Debug": "4.0.11",
"System.Diagnostics.Tools": "4.0.1",
"System.Diagnostics.Tracing": "4.1.0",
"System.Globalization": "4.0.11",
"System.IO": "4.1.0",
"System.IO.Compression": "4.1.0",
"System.Linq": "4.1.0",
"System.Net.Http": "4.1.0",
"System.Net.Primitives": "4.0.11",
"System.ObjectModel": "4.0.12",
"System.Reflection": "4.1.0",
"System.Reflection.Extensions": "4.0.1",
"System.Reflection.Primitives": "4.0.1",
"System.Resources.ResourceManager": "4.0.1",
"System.Runtime": "4.1.0",
"System.Runtime.Extensions": "4.1.0",
"System.Runtime.InteropServices": "4.1.0",
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0",
"System.Runtime.Numerics": "4.0.1",
"System.Text.Encoding": "4.0.11",
"System.Text.Encoding.Extensions": "4.0.11",
"System.Text.RegularExpressions": "4.1.0",
"System.Threading": "4.0.11",
"System.Threading.Tasks": "4.0.11",
"System.Xml.ReaderWriter": "4.0.11",
"System.Xml.XDocument": "4.0.11",
"System.Runtime.Serialization.Primitives": "4.1.1",
"System.Dynamic.Runtime": "4.0.11",
"Microsoft.Rest.ClientRuntime.Azure": "[3.3.1,4.0.0)"
}
},
"netstandard1.1": {
"buildOptions": { "define": [ "PORTABLE" ] },
"imports": ["dnxcore50", "portable-net45+win8"],
"dependencies": {
"NETStandard.Library": "1.6.0",
"System.Runtime.Serialization.Primitives": "4.1.1",
"System.Dynamic.Runtime": "4.0.11",
"Microsoft.Rest.ClientRuntime.Azure": "[3.3.1,4.0.0)"
}
}
}
}
1 change: 1 addition & 0 deletions src/Search/Search.Management.Tests/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"Microsoft.Rest.ClientRuntime.Azure.TestFramework": "[1.2.4-preview,2.0.0)",
"Microsoft.Rest.ClientRuntime.Azure": "[3.3.1,4.0.0)",
"Microsoft.Azure.Management.ResourceManager": "1.1.1-preview",
"Microsoft.Azure.Management.Search": "0.9.0-preview",
"xunit": "2.2.0-beta2-build3300",
"dotnet-test-xunit": "2.2.0-preview2-build1029"
}
Expand Down
2 changes: 1 addition & 1 deletion src/Search/Search.Tests/Tests/LookupTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace Microsoft.Azure.Search.Tests
{
using System;
using System.Net;
using Microsoft.AspNet.WebUtilities;
using Microsoft.AspNetCore.WebUtilities;
using Microsoft.Azure.Search.Models;
using Microsoft.Azure.Search.Tests.Utilities;
using Microsoft.Rest.Azure;
Expand Down
4 changes: 2 additions & 2 deletions src/Search/Search.Tests/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"description": "Search.Tests Class Library",
"authors": [ "Microsoft Corporation" ],


"packOptions": {
"tags": [ "" ],
"projectUrl": "",
Expand All @@ -30,6 +29,7 @@
"version": "1.0.0"
},
"Search.Management.Tests": "1.0.0",
"Microsoft.Azure.Search": "3.0.0-preview",
"Microsoft.Azure.Search": "2.0.0-preview",
"Microsoft.AspNetCore.WebUtilities": "1.0.0"
}
}
24 changes: 6 additions & 18 deletions src/Search/Search.sln
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.24720.0
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Search.Management.Tests", "Search.Management.Tests\Search.Management.Tests.xproj", "{B89334CA-F73C-4B04-9B38-D61FEE4D9DE8}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Azure.Search", "Microsoft.Azure.Search\Microsoft.Azure.Search.xproj", "{2C21CBE7-5D68-434A-BB20-463886BE5551}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Search.Tests", "Search.Tests\Search.Tests.xproj", "{3B082B9B-96DD-4112-88E3-BE89BAE124C1}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "HttpRecorder", "..\TestFramework\Microsoft.Azure.Test.HttpRecorder\HttpRecorder.xproj", "{5D12D45A-E55F-410E-B8AF-9DC90E81B237}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TestFramework", "..\TestFramework\Microsoft.Rest.ClientRuntime.Azure.TestFramework\TestFramework.xproj", "{C4C4E1C8-B99D-4D90-8C27-6D0C0A268BA5}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Azure.Management.ResourceManager", "..\ResourceManagement\Resource\Microsoft.Azure.Management.ResourceManager\Microsoft.Azure.Management.ResourceManager.xproj", "{A5986BDB-0D0D-48AA-9E49-ECE96BAC8ADE}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Azure.Management.Search", "Microsoft.Azure.Management.Search\Microsoft.Azure.Management.Search.xproj", "{4E616081-9A63-4778-B1D3-4CF35C5A5763}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -33,18 +29,10 @@ Global
{3B082B9B-96DD-4112-88E3-BE89BAE124C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3B082B9B-96DD-4112-88E3-BE89BAE124C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3B082B9B-96DD-4112-88E3-BE89BAE124C1}.Release|Any CPU.Build.0 = Release|Any CPU
{5D12D45A-E55F-410E-B8AF-9DC90E81B237}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5D12D45A-E55F-410E-B8AF-9DC90E81B237}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5D12D45A-E55F-410E-B8AF-9DC90E81B237}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5D12D45A-E55F-410E-B8AF-9DC90E81B237}.Release|Any CPU.Build.0 = Release|Any CPU
{C4C4E1C8-B99D-4D90-8C27-6D0C0A268BA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C4C4E1C8-B99D-4D90-8C27-6D0C0A268BA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C4C4E1C8-B99D-4D90-8C27-6D0C0A268BA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C4C4E1C8-B99D-4D90-8C27-6D0C0A268BA5}.Release|Any CPU.Build.0 = Release|Any CPU
{A5986BDB-0D0D-48AA-9E49-ECE96BAC8ADE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A5986BDB-0D0D-48AA-9E49-ECE96BAC8ADE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A5986BDB-0D0D-48AA-9E49-ECE96BAC8ADE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A5986BDB-0D0D-48AA-9E49-ECE96BAC8ADE}.Release|Any CPU.Build.0 = Release|Any CPU
{4E616081-9A63-4778-B1D3-4CF35C5A5763}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4E616081-9A63-4778-B1D3-4CF35C5A5763}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4E616081-9A63-4778-B1D3-4CF35C5A5763}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4E616081-9A63-4778-B1D3-4CF35C5A5763}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
2 changes: 1 addition & 1 deletion src/Search/global.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"projects": [ "../TestFramework", "Microsoft.Azure.Search", "Search.Management.Tests", "Search.Tests" ]
"projects": [ "Microsoft.Azure.Search", "Microsoft.Azure.Management.Search", "Search.Management.Tests", "Search.Tests" ]
}

0 comments on commit 8072b29

Please sign in to comment.