diff --git a/.gitignore b/.gitignore index 51e1e635620f7..9e1c379c5502f 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,8 @@ binaries/ [Rr]elease/ build/ restoredPackages/ +tools/net46/ +tools/Microsoft.WindowsAzure.Build.Tasks/packages/ PublishedNugets/ src/NuGet.Config tools/7-zip/ diff --git a/Directory.Build.props b/Directory.Build.props index afc420775ea13..6f37985a3f06d 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -15,34 +15,16 @@ All "$(LibraryToolsFolder)\nuget.exe" 1234 + true true $(IgnorePathTokens) Microsoft.Azure.KeyVault.Samples Gallery Intune FileConventions FileStaging ConfigureAwaitAnalyzer ObjectModelCodeGeneration Azure.Batch.IntegrationTests Azure.Batch.ProtocolTests IntegrationTestCommon - $(OnPremiseBuildTasks) true false - - - true - - - - - - - - - - - $(LibraryRoot)src\UpgradeVS17\SdkCommon\ClientRuntime diff --git a/build.proj b/build.proj index 026bf5cb9d6dd..c11e49de8a065 100644 --- a/build.proj +++ b/build.proj @@ -9,6 +9,7 @@ + diff --git a/src/SDKs/Authorization/Authorization.Tests/Tests/BasicTests.cs b/src/SDKs/Authorization/Authorization.Tests/Tests/BasicTests.cs index 02a5242d50ff1..875e95f9bfd53 100644 --- a/src/SDKs/Authorization/Authorization.Tests/Tests/BasicTests.cs +++ b/src/SDKs/Authorization/Authorization.Tests/Tests/BasicTests.cs @@ -430,8 +430,7 @@ public void RoleAssignmentListForScopeTest() } } - //[Fact(Skip = "Graph issue when adding user to group, needs investigation")] - [Fact] + [Fact(Skip = "Graph issue when adding user to group, needs investigation")] public void RoleAssignmentListWithAssignedToFilterTest() { HttpMockServer.RecordsDirectory = GetSessionsDirectoryPath(); diff --git a/src/SDKs/RedisCache/Management.Redis/Microsoft.Azure.Management.Redis.xproj b/src/SDKs/RedisCache/Management.Redis/Microsoft.Azure.Management.Redis.xproj deleted file mode 100644 index a5cecd9a3e7a5..0000000000000 --- a/src/SDKs/RedisCache/Management.Redis/Microsoft.Azure.Management.Redis.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - a8dc2fff-5761-4f7d-9d8f-80917b251768 - Microsoft.Azure.Management.Redis - .\obj - .\bin\ - - - - 2.0 - - - \ No newline at end of file diff --git a/src/SDKs/RedisCache/Management.Redis/project.json b/src/SDKs/RedisCache/Management.Redis/project.json deleted file mode 100644 index 4e2567ae5704c..0000000000000 --- a/src/SDKs/RedisCache/Management.Redis/project.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "version": "4.3.0-preview", - "description": "Provides redis cache management capabilities for Microsoft Azure.", - "authors": [ "Microsoft" ], - - "packOptions": { - "summary": "Provides redis cache management capabilities for Microsoft Azure.", - "iconUrl": "http://go.microsoft.com/fwlink/?LinkID=288890", - "tags": [ "Microsoft Azure Redis Cache management", "redis management", "REST HTTP client", "azureofficial", "windowsazureofficial", "netcore451511" ], - "projectUrl": "https://github.com/Azure/azure-sdk-for-net", - "releaseNotes": "https://github.com/Azure/azure-sdk-for-net/blob/AutoRest/src/ResourceManagement/RedisCache/ReleaseNotes.md", - "licenseUrl": "https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE", - "requireLicenseAcceptance": true - }, - - "buildOptions": { - "delaySign": true, - "publicSign": false, - "keyFile": "../../../../tools/MSSharedLibKey.snk", - "xmlDoc": true - }, - - "dependencies": { - "Microsoft.Rest.ClientRuntime.Azure": "[3.3.5,4.0.0)", - "Microsoft.Rest.ClientRuntime": "[2.3.5,3.0.0)" - }, - - "frameworks": { - "net45": { - "dependencies": { - } - }, - "netstandard1.5": { - "imports": ["dnxcore50"], - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "NETStandard.Library": "1.6.1", - "System.Diagnostics.Tools": "4.3.0", - "System.Net.Http": "4.3.0", - "System.Runtime.Serialization.Primitives": "4.1.1", - "System.Threading.Tasks": "4.3.0" - } - }, - "netstandard1.1": { - "imports": ["dnxcore50"], - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "NETStandard.Library": "1.6.1", - "System.Runtime.Serialization.Primitives": "4.1.1" - } - } - } -} diff --git a/src/SDKs/RedisCache/RedisCache.Tests/RedisCache.Tests.xproj b/src/SDKs/RedisCache/RedisCache.Tests/RedisCache.Tests.xproj deleted file mode 100644 index 7ae341bb3ea2c..0000000000000 --- a/src/SDKs/RedisCache/RedisCache.Tests/RedisCache.Tests.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 4980e1e9-7021-452e-863a-87e4d9a47898 - AzureRedisCache.Tests - .\obj - .\bin\ - - - 2.0 - - - - - - \ No newline at end of file diff --git a/src/SDKs/RedisCache/RedisCache.Tests/ScenarioTests/CreateUpdateDeleteFunctionalTests.cs b/src/SDKs/RedisCache/RedisCache.Tests/ScenarioTests/CreateUpdateDeleteFunctionalTests.cs index e8a2b7af8c257..4b7ec078016cd 100644 --- a/src/SDKs/RedisCache/RedisCache.Tests/ScenarioTests/CreateUpdateDeleteFunctionalTests.cs +++ b/src/SDKs/RedisCache/RedisCache.Tests/ScenarioTests/CreateUpdateDeleteFunctionalTests.cs @@ -26,6 +26,7 @@ public CreateUpdateDeleteFunctionalTests(TestsFixture data) fixture = data; } + /* [Fact(Skip = "Missing cleanup.json file")] public void CreateUpdateDeleteTest() { @@ -93,5 +94,6 @@ public void CreateUpdateDeleteTest() _client.Redis.Delete(resourceGroupName: fixture.ResourceGroupName, name: fixture.RedisCacheName); } } + */ } } diff --git a/src/SDKs/RedisCache/RedisCache.Tests/ScenarioTests/GetListKeysFunctionalTests.cs b/src/SDKs/RedisCache/RedisCache.Tests/ScenarioTests/GetListKeysFunctionalTests.cs index a24afd99bbce5..b432db27a6ee2 100644 --- a/src/SDKs/RedisCache/RedisCache.Tests/ScenarioTests/GetListKeysFunctionalTests.cs +++ b/src/SDKs/RedisCache/RedisCache.Tests/ScenarioTests/GetListKeysFunctionalTests.cs @@ -31,6 +31,7 @@ public GetListKeysFunctionalTests(TestsFixtureWithCacheCreate data) HttpMockServer.RecordsDirectory = GetSessionsDirectoryPath(); } + /* [Fact(Skip = "Missing cleanup.json file")] public void GetTest() { @@ -146,6 +147,8 @@ public void RegenerateKeyTest() } } + */ + private static string GetSessionsDirectoryPath() { string executingAssemblyPath = typeof(AzureRedisCache.Tests.GetListKeysFunctionalTests).GetTypeInfo().Assembly.Location; diff --git a/src/SDKs/RedisCache/RedisCache.Tests/project.json b/src/SDKs/RedisCache/RedisCache.Tests/project.json deleted file mode 100644 index 4aa935eb24c33..0000000000000 --- a/src/SDKs/RedisCache/RedisCache.Tests/project.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "version": "1.0.0-*", - "description": "AzureRedisCache.Tests Class Library", - "authors": [ "Microsoft Corporation" ], - - "packOptions": { - "summary": "AzureRedisCache.Tests Tests.", - "tags": [ "" ], - "projectUrl": "https://github.com/Azure/azure-sdk-for-net", - "licenseUrl": "https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE", - }, - "buildOptions": { - "delaySign": true, - "publicSign": false, - "keyFile": "../../../../tools/MSSharedLibKey.snk", - "compile": "../../../../tools/DisableTestRunParallel.cs" - }, - - "testRunner": "xunit", - "frameworks": { - "netcoreapp1.0": { - "imports": ["dnxcore50", "portable-net45+win8"], - "dependencies": { - } - } - }, - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0" - }, - "Microsoft.Azure.Management.Redis": { - "target": "project", - "type": "build" - }, - "Microsoft.Azure.Test.HttpRecorder": "[1.6.7-preview,2.0.0)", - "Microsoft.Rest.ClientRuntime.Azure.TestFramework": "[1.5.1-preview,2.0.0)", - "Microsoft.Rest.ClientRuntime.Azure": "[3.3.4,4.0.0)", - "Microsoft.Azure.ResourceManager": "1.0.0-preview", - "xunit": "2.2.0-beta2-build3300", - "dotnet-test-xunit": "2.2.0-preview2-build1029" - } -} \ No newline at end of file diff --git a/src/SDKs/RedisCache/global.json b/src/SDKs/RedisCache/global.json deleted file mode 100644 index da00a9022cd30..0000000000000 --- a/src/SDKs/RedisCache/global.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "projects": [ "Microsoft.Azure.Management.Redis", "AzureRedisCache.Tests" ] -} \ No newline at end of file diff --git a/src/SdkCommon/Test/ClientRuntime.Tracing.Tests/Log4NetTracingInterceptorTest.cs b/src/SdkCommon/Test/ClientRuntime.Tracing.Tests/Log4NetTracingInterceptorTest.cs index 2efa0758ec075..6955f4fe7513a 100644 --- a/src/SdkCommon/Test/ClientRuntime.Tracing.Tests/Log4NetTracingInterceptorTest.cs +++ b/src/SdkCommon/Test/ClientRuntime.Tracing.Tests/Log4NetTracingInterceptorTest.cs @@ -62,7 +62,7 @@ public void LogsRequest() string actual = File.ReadAllText(logFileName); Assert.Equal(expected, actual); } - + [Fact] public void LogsResponse() { @@ -182,47 +182,4 @@ public void LogsNullExit() Assert.Equal(expected, actual); } } - - public class Log4NetTracingInterceptor - { - public Log4NetTracingInterceptor(string foo) - { - - } - - internal void Configuration(object p1, object p2, object p3) - { - throw new NotImplementedException(); - } - - internal void EnterMethod(string invocationId, object instance, string method, IDictionary parameters) - { - throw new NotImplementedException(); - } - - internal void ExitMethod(string invocationId, string returnValue) - { - throw new NotImplementedException(); - } - - internal void Information(string infoMessage) - { - throw new NotImplementedException(); - } - - internal void ReceiveResponse(string invocationId, HttpResponseMessage response) - { - throw new NotImplementedException(); - } - - internal void SendRequest(string invocationId, HttpRequestMessage request) - { - throw new NotImplementedException(); - } - - internal void TraceError(string invocationId, HttpOperationException exception) - { - throw new NotImplementedException(); - } - } } \ No newline at end of file diff --git a/src/SdkCommon/TestDependencies/Properties/AssemblyInfo.cs b/src/SdkCommon/TestDependencies/Properties/AssemblyInfo.cs deleted file mode 100644 index e908268af1f70..0000000000000 --- a/src/SdkCommon/TestDependencies/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,39 +0,0 @@ -// 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.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Spec.Dependencies")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Spec.Dependencies")] -[assembly: AssemblyCopyright("Copyright © 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("5589dc65-04b4-4fff-911d-252c52c9180d")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/SdkCommon/TestDependencies/TestDependencies.cdissproj.disable b/src/SdkCommon/TestDependencies/TestDependencies.cdissproj.disable deleted file mode 100644 index 7b58b9ff22cb0..0000000000000 --- a/src/SdkCommon/TestDependencies/TestDependencies.cdissproj.disable +++ /dev/null @@ -1,70 +0,0 @@ - - - - - {40F35645-00EE-4DF2-B66E-7624546B66DF} - Library - Properties - TestDependencies - TestDependencies - 512 - true - fe5c26fd - true - - - - - $(LibraryNugetPackageFolder)\Hyak.Common.1.0.3\lib\net45\Hyak.Common.dll - - - $(LibraryNugetPackageFolder)\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - - - $(LibraryNugetPackageFolder)\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll - - - $(LibraryNugetPackageFolder)\Microsoft.Azure.Test.Framework.1.0.5785.18045-prerelease\lib\net45\Microsoft.Azure.Test.Framework.dll - - - $(LibraryNugetPackageFolder)\Microsoft.Azure.Test.HttpRecorder.1.0.5785.18045-prerelease\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll - - - False - $(LibraryNugetPackageFolder)\Microsoft.Data.Edm.5.6.2\lib\net40\Microsoft.Data.Edm.dll - - - False - $(LibraryNugetPackageFolder)\Microsoft.Data.OData.5.6.2\lib\net40\Microsoft.Data.OData.dll - - - False - $(LibraryNugetPackageFolder)\Microsoft.Data.Services.Client.5.6.2\lib\net40\Microsoft.Data.Services.Client.dll - - - False - $(LibraryNugetPackageFolder)\Microsoft.WindowsAzure.ConfigurationManager.1.8.0.0\lib\net35-full\Microsoft.WindowsAzure.Configuration.dll - - - False - $(LibraryNugetPackageFolder)\WindowsAzure.Storage.4.3.0\lib\net40\Microsoft.WindowsAzure.Storage.dll - - - False - $(LibraryNugetPackageFolder)\System.Spatial.5.6.2\lib\net40\System.Spatial.dll - - - $(LibraryNugetPackageFolder)\xunit.1.9.2\lib\net20\xunit.dll - - - - - - - - Designer - - - - - \ No newline at end of file diff --git a/src/SdkCommon/TestDependencies/packages.config b/src/SdkCommon/TestDependencies/packages.config deleted file mode 100644 index 8bf69c96538ab..0000000000000 --- a/src/SdkCommon/TestDependencies/packages.config +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/SdkCommon/TestFramework/Microsoft.Azure.Test.HttpRecorder/Microsoft.Azure.Test.HttpRecorder.csproj b/src/SdkCommon/TestFramework/Microsoft.Azure.Test.HttpRecorder/Microsoft.Azure.Test.HttpRecorder.csproj index a4c907f2edb91..c762cd124d882 100644 --- a/src/SdkCommon/TestFramework/Microsoft.Azure.Test.HttpRecorder/Microsoft.Azure.Test.HttpRecorder.csproj +++ b/src/SdkCommon/TestFramework/Microsoft.Azure.Test.HttpRecorder/Microsoft.Azure.Test.HttpRecorder.csproj @@ -1,5 +1,5 @@  - + Microsoft.Azure.Test.HttpRecorder HttpRecorder Library for recording Clinet/Server communication in Azure diff --git a/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks.Tests/Build.Tasks.Tests.csproj b/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks.Tests/Build.Tasks.Tests.csproj index 46cc1ccd1eaa8..7a2cede283219 100644 --- a/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks.Tests/Build.Tasks.Tests.csproj +++ b/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks.Tests/Build.Tasks.Tests.csproj @@ -1,11 +1,27 @@  - net452 + net46 + + + + + + PreserveNewest + + + + + + + + + + @@ -15,8 +31,6 @@ - - diff --git a/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks.Tests/CategorizeProjectTaskTest.cs b/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks.Tests/CategorizeProjectTaskTest.cs index 745c74a188f06..c8b868ee72e90 100644 --- a/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks.Tests/CategorizeProjectTaskTest.cs +++ b/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks.Tests/CategorizeProjectTaskTest.cs @@ -1,4 +1,7 @@ -using Microsoft.WindowsAzure.Build.Tasks; +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +using Microsoft.WindowsAzure.Build.Tasks; using System; using System.Collections.Generic; using System.Text; @@ -7,6 +10,7 @@ using System.IO; using System.Linq; using Microsoft.Build.Framework; +using Microsoft.Build.Evaluation; namespace Build.Tasks.Tests { @@ -24,7 +28,7 @@ public CategorizeProjectTaskTest() [Fact] public void IgnoreDirTokens() { - SDKCategorizeProjects cproj = new SDKCategorizeProjects(); + Microsoft.WindowsAzure.Build.Tasks.SDKCategorizeProjects cproj = new Microsoft.WindowsAzure.Build.Tasks.SDKCategorizeProjects(); cproj.SourceRootDirPath = sourceRootDir; cproj.BuildScope = "All"; cproj.IgnoreDirNameForSearchingProjects = string.Join(" ", ignoreDir, "ClientIntegrationTesting", "FileStaging"); @@ -32,8 +36,8 @@ public void IgnoreDirTokens() if (cproj.Execute()) { //Using a random number, basically if the number of projects drop below a certain, should fail this test - Assert.True(cproj.SDKProjectsToBuild.Count() > 10); - Assert.True(cproj.SDKTestProjectsToBuild.Count() > 10); + Assert.True(cproj.net452SdkProjectsToBuild.Count() > 10); + Assert.True(cproj.netCore11TestProjectsToBuild.Count() > 10); } else { @@ -51,13 +55,10 @@ public void CategorizeProjects() if(cproj.Execute()) { - //Using a random number, basically if the number of projects drop below a certain, should fail this test - Assert.True(cproj.SDKProjectsToBuild.Count() > 20); - Assert.True(cproj.SDKTestProjectsToBuild.Count() > 20); - } - else - { - Assert.True(false); + int totalSdkProjectCount = cproj.net452SdkProjectsToBuild.Count() + cproj.netStd14SdkProjectsToBuild.Count(); + Assert.Equal(112, totalSdkProjectCount); + Assert.Equal(54, cproj.netCore11TestProjectsToBuild.Count()); + Assert.Equal(7, cproj.net452TestProjectsToBuild.Count()); } } @@ -71,14 +72,9 @@ public void ScopedProject() if (cproj.Execute()) { - Assert.True(cproj.SDKProjectsToBuild.Count() == 1); - Assert.True(cproj.SDKTestProjectsToBuild.Count() == 1); + Assert.Equal(cproj.net452SdkProjectsToBuild.Count(), 1); + Assert.Equal(cproj.netCore11TestProjectsToBuild.Count(), 1); } - else - { - Assert.True(false); - } - } [Fact] @@ -91,8 +87,8 @@ public void IgnoredProjects() if (cproj.Execute()) { - Assert.True(cproj.SDKProjectsToBuild.Count() > 0); - Assert.True(cproj.SDKTestProjectsToBuild.Count() > 0); + Assert.True(cproj.net452SdkProjectsToBuild.Count() > 0); + Assert.True(cproj.netCore11TestProjectsToBuild.Count() > 0); } else { @@ -110,12 +106,8 @@ public void ClientRuntimeProjects() if (cproj.Execute()) { - Assert.True(cproj.SDKProjectsToBuild.Count() == 1); - Assert.True(cproj.SDKTestProjectsToBuild.Count() == 1); - } - else - { - Assert.True(false); + Assert.Equal(cproj.net452SdkProjectsToBuild.Count(), 1); + Assert.Equal(cproj.netCore11TestProjectsToBuild.Count(), 1); } } @@ -133,15 +125,8 @@ public void SDKCommonProjects() //longer treated as regular nuget packages (targeting net452 and netStd1.4) //but rather projects that are built without any targetFx // - Assert.True(cproj.SDKProjectsToBuild.Count() == 3); - Assert.True(cproj.SDKTestProjectsToBuild.Count() == 5); - - Assert.True(cproj.WellKnowSDKNet452Projects.Count() > 0); - Assert.True(cproj.WellKnowTestSDKNet452Projects.Count() > 0); - } - else - { - Assert.True(false); + Assert.Equal(7, cproj.net452SdkProjectsToBuild.Count()); + Assert.Equal(5, cproj.netCore11TestProjectsToBuild.Count()); } } @@ -158,12 +143,9 @@ public void TestFrameworkDir() //Since HttpRecorder and TestFramework are multi-targeting, they are no //longer treated as regular nuget packages (targeting net452 and netStd1.4) //but rather projects that are build without any targetFx - Assert.Null(cproj.SDKProjectsToBuild); - Assert.True(cproj.SDKTestProjectsToBuild.Count() == 2); - } - else - { - Assert.True(false); + Assert.Equal(0, cproj.netStd14SdkProjectsToBuild.Count()); + Assert.Equal(2, cproj.net452SdkProjectsToBuild.Count()); + Assert.Equal(2, cproj.netCore11TestProjectsToBuild.Count()); } } @@ -178,20 +160,15 @@ public void FindTestProject() if (cproj.Execute()) { - Assert.True(cproj.SDKProjectsToBuild.Count() == 1); - Assert.True(cproj.SDKTestProjectsToBuild.Count() == 1); - } - else - { - - Assert.True(false); + Assert.Equal(1, cproj.netStd14SdkProjectsToBuild.Count()); + Assert.Equal(1, cproj.netCore11TestProjectsToBuild.Count()); } } [Fact] public void TestIgnoredTokesn() { - //Operational Insights have named their projects as test.csproj rather than tests.csproj + //Gallery projects are being ignored SDKCategorizeProjects cproj = new SDKCategorizeProjects(); cproj.SourceRootDirPath = sourceRootDir; cproj.BuildScope = @"SDKs\Gallery"; @@ -199,19 +176,21 @@ public void TestIgnoredTokesn() if (cproj.Execute()) { - Assert.Null(cproj.SDKProjectsToBuild); - Assert.Null(cproj.SDKTestProjectsToBuild); - } - else - { - Assert.True(false); + Assert.Equal(0, cproj.net452SdkProjectsToBuild.Count()); + Assert.Equal(0, cproj.netCore11TestProjectsToBuild.Count()); } } private string GetSourceRootDir() { string srcRootDir = string.Empty; - string currDir = Path.GetDirectoryName(this.GetType().GetTypeInfo().Assembly.Location); + string currDir = Directory.GetCurrentDirectory(); + + if(!Directory.Exists(currDir)) + { + currDir = Path.GetDirectoryName(this.GetType().GetTypeInfo().Assembly.Location); + } + string dirRoot = Directory.GetDirectoryRoot(currDir); var buildProjFile = Directory.EnumerateFiles(currDir, "build.proj", SearchOption.TopDirectoryOnly); diff --git a/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks.Tests/SampleProjFiles/sdkMultiTarget.proj b/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks.Tests/SampleProjFiles/sdkMultiTarget.proj new file mode 100644 index 0000000000000..ff3f5272aad88 --- /dev/null +++ b/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks.Tests/SampleProjFiles/sdkMultiTarget.proj @@ -0,0 +1,28 @@ + + + + Microsoft.Azure.Test.HttpRecorder + HttpRecorder Library for recording Clinet/Server communication in Azure + 1.7.0 + Microsoft.Azure.Test.HttpRecorder + Microsoft.Azure.Test.HttpRecorder + Microsoft AutoRest ClientRuntime HttpRecorder REST;$(CommonNugetPackageTags) + + + net452;netcoreapp1.1 + + + + + + + + + + + + + + + + diff --git a/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks.Tests/sdkProjectTaskItem.cs b/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks.Tests/sdkProjectTaskItem.cs new file mode 100644 index 0000000000000..dc9b087a87d6c --- /dev/null +++ b/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks.Tests/sdkProjectTaskItem.cs @@ -0,0 +1,59 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +using Microsoft.Build.Framework; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Collections; +using System.IO; + +namespace Build.Tasks.Tests +{ + + class sdkProjectTaskItem : ITaskItem + { + string _itemSpec; + + public sdkProjectTaskItem(string taskItemPath) + { + if(File.Exists(taskItemPath)) + { + _itemSpec = taskItemPath; + } + } + public string ItemSpec + { get => _itemSpec; set => _itemSpec = value; } + + public ICollection MetadataNames => throw new NotImplementedException(); + + public int MetadataCount => throw new NotImplementedException(); + + public IDictionary CloneCustomMetadata() + { + throw new NotImplementedException(); + } + + public void CopyMetadataTo(ITaskItem destinationItem) + { + throw new NotImplementedException(); + } + + public string GetMetadata(string metadataName) + { + throw new NotImplementedException(); + } + + public void RemoveMetadata(string metadataName) + { + throw new NotImplementedException(); + } + + public void SetMetadata(string metadataName, string metadataValue) + { + throw new NotImplementedException(); + } + } +} diff --git a/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks/Microsoft.WindowsAzure.Build.Tasks.csproj b/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks/Microsoft.WindowsAzure.Build.Tasks.csproj index 091c6cdcb8f7c..4a266c66f06a8 100644 --- a/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks/Microsoft.WindowsAzure.Build.Tasks.csproj +++ b/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks/Microsoft.WindowsAzure.Build.Tasks.csproj @@ -1,68 +1,26 @@ - - - + + - Debug - AnyCPU - {16D89061-2C1E-4E31-B16E-8A7B5B9FF51C} - Library - Properties - Microsoft.WindowsAzure.Build.Tasks - Microsoft.WindowsAzure.Build.Tasks - v4.5.2 - 512 - - true + net46 + - - true - full - false + + ..\..\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - ..\ - TRACE - prompt - 4 + - - - - - - - - - - - - + + - - - - - - - - - + + + + - - \ No newline at end of file diff --git a/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks/SDKCategorizeProjects.cs b/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks/SDKCategorizeProjects.cs index 13734a1818939..28eb4f19545c1 100644 --- a/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks/SDKCategorizeProjects.cs +++ b/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks/SDKCategorizeProjects.cs @@ -1,13 +1,16 @@ -using System; -using Microsoft.Build.Utilities; -using Microsoft.Build.Framework; -using System.IO; -using System.Linq; -using System.Collections.Generic; +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. using Microsoft.Build.Evaluation; -using Microsoft.Build.Execution; +using Microsoft.Build.Framework; +using Microsoft.Build.Utilities; using Microsoft.WindowsAzure.Build.Tasks.Utilities; +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using ThreadingTsk = System.Threading.Tasks; namespace Microsoft.WindowsAzure.Build.Tasks { @@ -28,34 +31,15 @@ namespace Microsoft.WindowsAzure.Build.Tasks public class SDKCategorizeProjects : Task { #region fields - private string _defaultFileExt = "*.csproj"; - private string _defaultBuildScope = "All"; - private string[] _defaultTestProjTokens; private string KV_IGNOREDIRNAME = "Microsoft.Azure.KeyVault.Samples"; - private string _ignoreDirNameForSearchingProjects; - - List wkProj45Paths; - List wkTest45Projects; - - private List _searchedAllProjects; - private List _finalDirListForSearchingProjects; - private List _overAllIgnoreProjects; -#endregion + #endregion public SDKCategorizeProjects() { - _searchedAllProjects = new List(); - _finalDirListForSearchingProjects = new List(); - _overAllIgnoreProjects = new List(); - - _defaultTestProjTokens = new string[] { "*tests.csproj", "*test.csproj", "*KeyVault.TestFramework.csproj" }; - wkProj45Paths = new List() { "*Etw.csproj", "*Log4net.csproj", "*Azure.TestFramework.csproj", "*Test.HttpRecorder.csproj" }; - wkTest45Projects = new List() { "*Net45Tests.csproj", "*Tracing.Tests.csproj" }; + } - #region Task properties - /// /// Source Root Dir Path to search projects /// @@ -77,7 +61,7 @@ public string IgnoreDirNameForSearchingProjects { get { - if(string.IsNullOrEmpty(_ignoreDirNameForSearchingProjects)) + if (string.IsNullOrEmpty(_ignoreDirNameForSearchingProjects)) { _ignoreDirNameForSearchingProjects = KV_IGNOREDIRNAME; } @@ -89,24 +73,31 @@ public string IgnoreDirNameForSearchingProjects _ignoreDirNameForSearchingProjects = value; } } - + /// /// List of project file extension. /// Currently only hard coded to .csproj files /// private string SearchProjectFileExt { get; set; } + #region OUTPUT /// /// List of projects that needs to be built /// [Output] - public ITaskItem[] SDKProjectsToBuild { get; private set; } + public ITaskItem[] net452SdkProjectsToBuild { get; private set; } + + /// + /// List of Test Projects that needs to be build + /// + [Output] + public ITaskItem[] netStd14SdkProjectsToBuild { get; private set; } /// /// List of Test Projects that needs to be build /// [Output] - public ITaskItem[] SDKTestProjectsToBuild { get; private set; } + public ITaskItem[] netCore11SdkProjectsToBuild { get; private set; } /// /// List of .NET 452 projects that will be separated from the list of projects that @@ -114,10 +105,14 @@ public string IgnoreDirNameForSearchingProjects /// /// [Output] - public ITaskItem[] WellKnowSDKNet452Projects { get; private set; } + public ITaskItem[] netCore11TestProjectsToBuild { get; private set; } - //[Output] - //public ITaskItem[] Foo { get; private set; } + [Output] + public ITaskItem[] net452TestProjectsToBuild { get; private set; } + + [Output] + public ITaskItem[] unSupportedProjectsToBuild { get; private set; } + /// /// List of .NET 452 test projects that will be separated from the list of projects that @@ -127,387 +122,281 @@ public string IgnoreDirNameForSearchingProjects public ITaskItem[] WellKnowTestSDKNet452Projects { get; private set; } #endregion + /// + /// Executes the Categorization task + /// The primary objective is to do the following: + /// 1) Find supported/unsupported TargetFramework specified in the project file + /// 2) Categorize if a project is a test project or not (currently we rely on references added to the project to decide if a project is Test or not) + /// At the end of this task we get 6 outputs + /// Each output array is a list of project categorized according to the TargetFramework the project is targeting. + /// + /// public override bool Execute() { List sdkProjects = new List(); List testProjects = new List(); - List sdkTaskItems = new List(); - List testTaskItems = new List(); - - Init(); - if (BuildScope.Equals("All", StringComparison.OrdinalIgnoreCase)) - { - sdkProjects = SearchOnlySdkProjects(SourceRootDirPath); - testProjects = SearchOnlyTestProjects(SourceRootDirPath); - } - else //We set default scope to All if empty/null, so safe to evaluate to Else in this case - { - sdkProjects = ScopedSdkProjects(SourceRootDirPath, BuildScope); - testProjects = ScopedTestProjects(SourceRootDirPath, BuildScope); - } - - UpdateWellKnowProjectList(); - - foreach (string testProj in testProjects) - { - TaskItem ti = new TaskItem(testProj); - testTaskItems.Add(ti); - } + List allProjects = new List(); + List ignorePathList = new List(); - foreach(string projPath in sdkProjects) + string[] ignoreTokens = IgnoreDirNameForSearchingProjects.Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries); + foreach (string igTkn in ignoreTokens) { - TaskItem ti = new TaskItem(projPath); - - //This will be enabled, once we find a good way to parse project files that are .NET SDK based. - //Currently the build engine unable to execute property functions and gives error. Need to find if I am using - // the righ set of API's. - //We want to avoid parsing xml project file as much as possible. - - //Dictionary targetFxMetaData = GetMetaData(ti); - //foreach (KeyValuePair kv in targetFxMetaData) - //{ - // ti.SetMetadata(kv.Key, kv.Value); - //} - - sdkTaskItems.Add(ti); - } - - if(sdkTaskItems.Any()) - { - SDKProjectsToBuild = sdkTaskItems.ToArray(); + ignorePathList.Add(igTkn); } - if(testTaskItems.Any()) + if(!ignorePathList.Contains(KV_IGNOREDIRNAME)) { - SDKTestProjectsToBuild = testTaskItems.ToArray(); + ignorePathList.Add(KV_IGNOREDIRNAME); } - return true; - } - - #region Scoped - private List ScopedSdkProjects(string rootSearchDirPath, string scope) - { - List finalSdkProj = new List(); - string searchProjInDirPath = Path.Combine(rootSearchDirPath, scope); - if (Directory.Exists(searchProjInDirPath)) + ProjectSearchUtility ProjUtil = new ProjectSearchUtility(SourceRootDirPath, ignorePathList); + if (BuildScope.Equals("All", StringComparison.OrdinalIgnoreCase)) { - var scopedSdkProjs = SearchOnlySdkProjects(searchProjInDirPath); - //var stestProj = SearchOnlyTestProjects(searchProjInDirPath); - - //var scopedSdkProjs = ssdkProj.Except(stestProj, new ObjectComparer((left, right) => left.Equals(right, StringComparison.OrdinalIgnoreCase))); - if (scopedSdkProjs.Any()) - { - finalSdkProj.AddRange(scopedSdkProjs); - } + sdkProjects = ProjUtil.GetAllSDKProjects(); + testProjects = ProjUtil.GetFilteredTestProjects(); } - return finalSdkProj; - } - - private List ScopedTestProjects(string rootSearchDirPath, string scope) - { - List testProj = new List(); - string searchProjInDirPath = Path.Combine(rootSearchDirPath, scope); - if (Directory.Exists(searchProjInDirPath)) + else //We set default scope to All if empty/null, so safe to evaluate to Else in this case { - testProj = SearchOnlyTestProjects(searchProjInDirPath); + sdkProjects = ProjUtil.GetScopedSDKProjects(BuildScope); + testProjects = ProjUtil.GetScopedTestProjects(BuildScope); } - return testProj; - } - //private List GetScopedDirs(string dirScope) - //{ - // List finalScopeDirs = new List(); - // var allDirs = Directory.EnumerateDirectories(SourceRootDirPath, "*", SearchOption.AllDirectories); - // var ignoredDirs = Directory.EnumerateDirectories(SourceRootDirPath, IgnoreDirForSearchingProjects, SearchOption.AllDirectories); - // var scopeDirs = allDirs.Except(ignoredDirs); + allProjects.AddRange(sdkProjects); + allProjects.AddRange(testProjects); - // if(scopeDirs.Any()) - // { - // finalScopeDirs = scopeDirs.ToList(); - // } + ConcurrentBag projWithMetaData = new ConcurrentBag(); - // return finalScopeDirs; - //} - #endregion - - #region All - /// - /// This searches all the projects from the root directory sepcified - /// This also creates ignore list of projects - /// - /// - /// - /// - private List SearchAllProjectFiles(string rootSearchDirPath, string projectExts) - { - List searchedProjects = new List(); - if (string.IsNullOrWhiteSpace(projectExts) || string.IsNullOrEmpty(projectExts)) - { - projectExts = _defaultFileExt; - } - List projectExtList = projectExts.Split(';').ToList(); + var projTimeBefore = DateTime.Now; + projWithMetaData = GetProjectData(allProjects, projWithMetaData); + //projWithMetaData = GetMetaData(allProjects, projWithMetaData); + var projTimeAfter = DateTime.Now; - var allProjFiles = Directory.EnumerateFiles(SourceRootDirPath, _defaultFileExt, SearchOption.AllDirectories); - var ignoredFiles = GetAndUpdateIgnoredProjects(SourceRootDirPath); + Debug.WriteLine("Parsing Projects took {0}", (projTimeAfter - projTimeBefore).TotalSeconds.ToString()); - var finalProjects = allProjFiles.Except(ignoredFiles, new ObjectComparer((left, right) => left.Equals(right, StringComparison.OrdinalIgnoreCase))); + var net452SdkProjects = from s in projWithMetaData where (s.IsTargetFxSupported = true && s.FxMoniker == TargetFrameworkMoniker.net452 && s.ProjectType == SdkProjctType.Sdk) select s.ProjectTaskItem; + var netStd14SdkProjects = from s in projWithMetaData where (s.IsTargetFxSupported = true && s.FxMoniker == TargetFrameworkMoniker.netstandard14 && s.ProjectType == SdkProjctType.Sdk) select s.ProjectTaskItem; + var netCore11SdkProjects = from s in projWithMetaData where (s.IsTargetFxSupported = true && s.FxMoniker == TargetFrameworkMoniker.netcoreapp11 && s.ProjectType == SdkProjctType.Sdk) select s.ProjectTaskItem; + var testNetCore11Projects = from s in projWithMetaData where (s.IsTargetFxSupported = true && s.FxMoniker == TargetFrameworkMoniker.netcoreapp11 && s.ProjectType == SdkProjctType.Test) select s.ProjectTaskItem; + var testNet452Projects = from s in projWithMetaData where (s.IsTargetFxSupported = true && s.FxMoniker == TargetFrameworkMoniker.net452 && s.ProjectType == SdkProjctType.Test) select s.ProjectTaskItem; + var unSupportedProjects = from s in projWithMetaData where (s.IsTargetFxSupported = false) select s.ProjectTaskItem; - if (finalProjects.Any()) - _searchedAllProjects.AddRange(finalProjects); + net452SdkProjectsToBuild = net452SdkProjects?.ToArray(); + netStd14SdkProjectsToBuild = netStd14SdkProjects?.ToArray(); + netCore11SdkProjectsToBuild = netCore11SdkProjects?.ToArray(); + netCore11TestProjectsToBuild = testNetCore11Projects?.ToArray(); + net452TestProjectsToBuild = testNet452Projects?.ToArray(); + unSupportedProjectsToBuild = unSupportedProjects?.ToArray(); - return _searchedAllProjects; + return true; } - private List SearchOnlySdkProjects(string rootSearchDirPath) + /// + /// This function parses project file and gets meta data + /// This is where we categorize if a project is a test project or not (second check based on the references added to the project) + /// This is where we find if the project has any supported target framework. + /// + /// List of project file paths + /// Collection where parsed data will be saved to get parsed project data + /// + internal ConcurrentBag GetProjectData(List projectList, ConcurrentBag supportedProjectBag) { - List sdkProjFiles = new List(); - var sdkProj = Directory.EnumerateFiles(rootSearchDirPath, _defaultFileExt, SearchOption.AllDirectories)?.ToList(); - var testProj = SearchOnlyTestProjects(rootSearchDirPath); + SdkProjctType pType = SdkProjctType.Sdk; + var projList = from p in projectList select new TaskItem(p); + IBuildEngine buildEng = this.BuildEngine; - var finalSdkProj = sdkProj.Except(_overAllIgnoreProjects, new ObjectComparer((left, right) => left.Equals(right, StringComparison.OrdinalIgnoreCase))); - finalSdkProj = finalSdkProj.Except(testProj, new ObjectComparer((left, right) => left.Equals(right, StringComparison.OrdinalIgnoreCase))); + ConcurrentBag projCollection = new ConcurrentBag(); - if (finalSdkProj.Any()) + ThreadingTsk.Parallel.ForEach(projList, (proj) => { - sdkProjFiles.AddRange(finalSdkProj); - } - //_sdkProjFiles = _searchedAllProjects.FindAll((pf) => ((!pf.EndsWith("test.csproj")) || (!pf.EndsWith("tests.csproj")))); - //} - - return sdkProjFiles; - } - - private List SearchOnlyTestProjects(string rootSearchDirPath) - { - List testProj = new List(); - List tp = new List(); - foreach(string token in _defaultTestProjTokens) - { - var intrimTP = Directory.EnumerateFiles(rootSearchDirPath, token, SearchOption.AllDirectories)?.ToList(); - - if(intrimTP.Any()) + try { - tp.AddRange(intrimTP); + projCollection.Add(new SdkProjectMetaData() { MsBuildProject = new Project(proj.ItemSpec), ProjectTaskItem = proj }); } - } + catch (Exception ex) + { + if (buildEng != null) + { + Log.LogWarningFromException(ex); + } + else + { + Debug.WriteLine(ex.Message); + } + } + }); + - var finalTp = tp.Except(_overAllIgnoreProjects, new ObjectComparer((left, right) => left.Equals(right, StringComparison.OrdinalIgnoreCase)))?.ToList(); - if (finalTp.Any()) + foreach(SdkProjectMetaData sdkProjMD in projCollection) { - testProj.AddRange(finalTp); - } - return testProj; - } - #endregion + string targetFxList = sdkProjMD.MsBuildProject.GetPropertyValue("TargetFrameworks"); + if (string.IsNullOrEmpty(targetFxList)) + { + targetFxList = sdkProjMD.MsBuildProject.GetPropertyValue("TargetFramework"); + } + ICollection pkgs = sdkProjMD.MsBuildProject.GetItemsIgnoringCondition("PackageReference"); + if (pkgs.Any()) + { + var testReference = pkgs.Where((p) => p.EvaluatedInclude.Equals("xunit", StringComparison.OrdinalIgnoreCase)); + if (testReference.Any()) + { + pType = SdkProjctType.Test; + } + else + { + pType = SdkProjctType.Sdk; + } + } - private List GetAllProjectFilesFromDirs(string projFileSearchPattern, SearchOption searchingOption, params string[] searchDirs) - { - List results = new List(); - foreach (string dir in searchDirs) - { - var projs = Directory.EnumerateFiles(dir, "*test*.csproj", SearchOption.AllDirectories); - if (projs.Any()) + var fxNames = targetFxList?.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries)?.ToList(); + foreach (string fx in fxNames) { - results.AddRange(projs); + bool isFxSupported = IsTargetFxSupported(fx, out TargetFrameworkMoniker tfxMoniker); + SdkProjectMetaData sp = new SdkProjectMetaData(project: sdkProjMD.ProjectTaskItem, fxMoniker: tfxMoniker, fullProjectPath: sdkProjMD.ProjectTaskItem.ItemSpec, isTargetFxSupported: isFxSupported, projectType: pType); + supportedProjectBag.Add(sp); } } - return results; + return supportedProjectBag; } - private Dictionary GetMetaData(ITaskItem projSpec) - { - Dictionary fxDict = new Dictionary(); - int monikerCount = 0; - string[] fxMonikers = new string[] { "TargetFx1", "TargetFx2" }; - - var ver = ProjectCollection.GlobalProjectCollection.DefaultToolsVersion; - Project loadedPoj = ProjectCollection.GlobalProjectCollection.LoadProject(projSpec.ItemSpec); - - - - string targetFxList = loadedPoj.GetPropertyValue("TargetFrameworks"); - var fxNames = targetFxList.Split(';').ToList(); - - KeyValuePair kv = new KeyValuePair(); - - foreach(string fn in fxNames) - { - fxDict.Add(fxMonikers[monikerCount], fn); - Log.LogMessage("Adding FxMoniker {0}={1}", fxMonikers[monikerCount], fn); - monikerCount++; - } - - return fxDict; - } - /// - /// Potential fragmentation logic - /// - private void UpdateWellKnowProjectList() + internal ConcurrentBag GetMetaData(List projectList, ConcurrentBag supportedProjectBag) { - List wkSdkProjs = SearchWellKnowProjects(wkProj45Paths); - List wkTestSdkProjs = SearchWellKnowProjects(wkTest45Projects); - - List wkTTi = new List(); - List wkTi = new List(); - - foreach (string testProj in wkTestSdkProjs) - { - TaskItem ti = new TaskItem(testProj); - wkTTi.Add(ti); - } - - foreach (string projPath in wkSdkProjs) - { - TaskItem ti = new TaskItem(projPath); - wkTi.Add(ti); - } + SdkProjctType pType = SdkProjctType.Sdk; + var projList = from p in projectList select new TaskItem(p); + IBuildEngine buildEng = this.BuildEngine; + //Object obj = new object(); - if (wkTTi.Any()) + //ThreadingTsk.Parallel.ForEach(projList, (proj) => + foreach (ITaskItem proj in projList) { - WellKnowTestSDKNet452Projects = wkTTi.ToArray(); - } - - if (wkTi.Any()) - { - WellKnowSDKNet452Projects = wkTi.ToArray(); - } - } - - private List SearchWellKnowProjects(List searchPatternList) - { - List searchedProjects = new List(); - foreach (string projSearchPattern in searchPatternList) - { - var sdk45Proj = Directory.EnumerateFiles(SourceRootDirPath, projSearchPattern, SearchOption.AllDirectories); - if (sdk45Proj.Any()) + //lock (obj) + //{ + try { - searchedProjects.AddRange(sdk45Proj); + Project loadedProj = new Project(proj.ItemSpec); + + string targetFxList = loadedProj.GetPropertyValue("TargetFrameworks"); + if (string.IsNullOrEmpty(targetFxList)) + { + targetFxList = loadedProj.GetPropertyValue("TargetFramework"); + } + ICollection pkgs = loadedProj.GetItemsIgnoringCondition("PackageReference"); + if (pkgs.Any()) + { + var testReference = pkgs.Where((p) => p.EvaluatedInclude.Equals("xunit", StringComparison.OrdinalIgnoreCase)); + if (testReference.Any()) + { + pType = SdkProjctType.Test; + } + else + { + pType = SdkProjctType.Sdk; + } + } + + var fxNames = targetFxList?.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries)?.ToList(); + foreach (string fx in fxNames) + { + bool isFxSupported = IsTargetFxSupported(fx, out TargetFrameworkMoniker tfxMoniker); + SdkProjectMetaData sp = new SdkProjectMetaData(project: proj, fxMoniker: tfxMoniker, fullProjectPath: proj.ItemSpec, isTargetFxSupported: isFxSupported, projectType: pType); + supportedProjectBag.Add(sp); + } } + catch (Exception ex) + { + if (buildEng != null) + { + Log.LogWarningFromException(ex); + } + else + { + Debug.WriteLine(ex.Message); + } + } + //} + //loadedProj = null; } + //); - return searchedProjects; + return supportedProjectBag; } - private void Init() + + private bool IsTargetFxSupported(string fxMoniker, out TargetFrameworkMoniker targetFx) { - if (!Directory.Exists(SourceRootDirPath)) - throw new DirectoryNotFoundException("'{0}' does not exists. Please provide a valid directory to search for projects that needs to be build"); - - if((string.IsNullOrWhiteSpace(BuildScope)) || (string.IsNullOrEmpty(BuildScope))) + string lcMoniker = fxMoniker.ToLower(); + bool fxSupported = false; + TargetFrameworkMoniker validMoniker = TargetFrameworkMoniker.UnSupported; + switch (lcMoniker) { - Log.LogMessage("Empty Scope Detected, setting BuildScope to 'All'"); - BuildScope = _defaultBuildScope; + case "net452": + validMoniker = TargetFrameworkMoniker.net452; + fxSupported = true; + break; + + case "netcoreapp1.1": + validMoniker = TargetFrameworkMoniker.netcoreapp11; + fxSupported = true; + break; + + case "netstandard1.4": + validMoniker = TargetFrameworkMoniker.netstandard14; + fxSupported = true; + break; + + case "net46": + validMoniker = TargetFrameworkMoniker.net46; + fxSupported = false; + break; + + case "net461": + validMoniker = TargetFrameworkMoniker.net461; + fxSupported = false; + break; } - //Get All Projects - SearchAllProjectFiles(SourceRootDirPath, SearchProjectFileExt); - - //Get overall ignore list - _overAllIgnoreProjects.AddRange(SearchWellKnowProjects(wkProj45Paths)); - _overAllIgnoreProjects.AddRange(SearchWellKnowProjects(wkTest45Projects)); + targetFx = validMoniker; + return fxSupported; } + } - private List GetAndUpdateIgnoredProjects(string sourceRootDir) - { - //ClientIntegrationTesting - // FileConventions - // FileStaging - string[] ignoreTokens = null; - - if(!string.IsNullOrEmpty(IgnoreDirNameForSearchingProjects)) - { - IgnoreDirNameForSearchingProjects = IgnoreDirNameForSearchingProjects.Trim(); - ignoreTokens = IgnoreDirNameForSearchingProjects.Split(' '); - } + public class SdkProjectMetaData + { + public TargetFrameworkMoniker FxMoniker { get; set; } + public string FullProjectPath { get; set; } + public bool IsTargetFxSupported { get; set; } - var allProjFiles = Directory.EnumerateFiles(sourceRootDir, _defaultFileExt, SearchOption.AllDirectories); + public SdkProjctType ProjectType { get; set; } - foreach(string tokenToIgnore in ignoreTokens) - { - var ignoredFiles = from s in allProjFiles where s.Contains(tokenToIgnore) select s; - if(ignoredFiles.Any()) - { - _overAllIgnoreProjects.AddRange(ignoredFiles); - } - } + public ITaskItem ProjectTaskItem { get; set; } + + public SdkProjectMetaData() { } - _overAllIgnoreProjects.AddRange(SearchWellKnowProjects(wkProj45Paths)); - _overAllIgnoreProjects.AddRange(SearchWellKnowProjects(wkTest45Projects)); + public Project MsBuildProject { get; set; } - return _overAllIgnoreProjects; + public SdkProjectMetaData(ITaskItem project, TargetFrameworkMoniker fxMoniker, string fullProjectPath, bool isTargetFxSupported, SdkProjctType projectType = SdkProjctType.Sdk) + { + ProjectTaskItem = project; + FxMoniker = fxMoniker; + FullProjectPath = fullProjectPath; + IsTargetFxSupported = isTargetFxSupported; + ProjectType = projectType; } } -} -/* - * - * string[] dirArray = null; - var dirs = GetScopedDirs(searchProjInDirPath); - if(dirs.Any()) - { - dirArray = dirs.ToArray(); - } - - List allScopedSdkProjs = GetAllProjectFilesFromDirs("*.csproj", SearchOption.AllDirectories, dirArray); - List scopedTestProjs = ScopedTestProjects(rootSearchDirPath, scope); - - var onlySdk = allScopedSdkProjs.Except(scopedTestProjs); - if(onlySdk.Any()) - { - sdkProj = onlySdk.ToList(); - } - } - - return sdkProj; -//var allDirs = Directory.EnumerateDirectories(SourceRootDirPath, "*", SearchOption.TopDirectoryOnly); - //var ignoredDirs = Directory.EnumerateDirectories(SourceRootDirPath, IgnoreDirForSearchingProjects, SearchOption.AllDirectories); - - //var projectsToSearchInDirs = allDirs.Except(ignoredDirs); - //if(projectsToSearchInDirs.Any()) - //{ - // _finalDirListForSearchingProjects = projectsToSearchInDirs.ToList(); - //} - - //if(_finalDirListForSearchingProjects.Any()) - //{ - // foreach (string searchDir in _finalDirListForSearchingProjects) - // { - // foreach (string pExt in projectExtList) - // { - // string fileSearchPattern = string.Concat("*", pExt); - // var projectFiles = Directory.EnumerateFiles(SourceRootDirPath, fileSearchPattern, SearchOption.AllDirectories); - // _searchedAllProjects.AddRange(projectFiles); - // } - // } - //} - - - //foreach (string dir in _finalDirListForSearchingProjects) - //{ - // var tp = Directory.EnumerateFiles(dir, "*test*.csproj", SearchOption.AllDirectories); - // if(tp.Any()) - // { - // testProj.AddRange(tp); - // } - //} - - - var dirs = GetScopedDirs(searchProjInDirPath); - if (dirs.Any()) - { - dirArray = dirs.ToArray(); - } - - testProj = GetAllProjectFilesFromDirs("*test*.csproj", SearchOption.AllDirectories, dirArray); - //List sDirs = GetScopedDirs(searchProjInDirPath); - //foreach(string dir in sDirs) - //{ - // var projs = SearchProjectFiles(dir, "*test*.csproj", SearchOption.AllDirectories); - // if(projs.Any()) - // { - // testProj.AddRange(projs); - // } - //} + public enum TargetFrameworkMoniker + { + net45, + net452, + net46, + net461, + netcoreapp11, + netstandard14, + UnSupported + } -*/ + public enum SdkProjctType + { + Sdk, + Test + } +} diff --git a/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks/Utilities/Check.cs b/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks/Utilities/Check.cs new file mode 100644 index 0000000000000..14c97cac10fe9 --- /dev/null +++ b/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks/Utilities/Check.cs @@ -0,0 +1,72 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + + +namespace Microsoft.WindowsAzure.Build.Tasks.Utilities +{ + using System; + using System.IO; + + /// + /// Utility to check Null/Empty and throw appropriate exceptions + /// + public static class Check + { + /// + /// Checks if the argument passed in is NotNull + /// Throws NullReferenceException if the arugment is Null + /// + /// arument info for logging purpose + /// argument info for logging + public static void NotNull(object argument, string argumentName = "argument") + { + if (argument == null) + { + throw new NullReferenceException(string.Format("{0} provided is null", argumentName)); + } + } + + /// + /// Checks if the string argument passed in is NonEmpty and NotNull + /// Throws NullReferenceException if the arugment is Null or Empty + /// + /// arument info for logging purpose + /// argument info for logging + public static void NotEmptyNotNull(string argument, string argumentName = "argument") + { + if (string.IsNullOrEmpty(argument)) + { + throw new NullReferenceException(string.Format("{0} provided is either Null or Empty string", argumentName)); + } + } + + /// + /// Checks if the FilePath exists + /// Throws FileNotFoundException if the filePath does not exists + /// + /// file path info for logging purpose + public static void FileExists(string filePath) + { + NotNull(filePath, "File Path"); + if (!File.Exists(filePath)) + { + throw new FileNotFoundException(string.Format("'{0}' does not exists. Please check the validity of the path", filePath)); + } + } + + /// + /// Checks if the DirectoryPath exists + /// Throws DirectoryNotFoundException if the DirectoryPath does not exists + /// + /// Directory Path + public static void DirectoryExists(string dirPath) + { + NotNull(dirPath, "Directory Path"); + if (!Directory.Exists(dirPath)) + { + throw new DirectoryNotFoundException(string.Format("'{0}' does not exists. Please check the validity of the directory path", dirPath)); + } + } + + } +} diff --git a/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks/Utilities/ObjectComparer.cs b/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks/Utilities/ObjectComparer.cs index f55407209604e..1dd2898d51f0e 100644 --- a/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks/Utilities/ObjectComparer.cs +++ b/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks/Utilities/ObjectComparer.cs @@ -1,4 +1,7 @@ -namespace Microsoft.WindowsAzure.Build.Tasks.Utilities +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +namespace Microsoft.WindowsAzure.Build.Tasks.Utilities { using System; using System.Collections.Generic; diff --git a/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks/Utilities/ProjectSearchUtility.cs b/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks/Utilities/ProjectSearchUtility.cs new file mode 100644 index 0000000000000..615b8c6118b1c --- /dev/null +++ b/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks/Utilities/ProjectSearchUtility.cs @@ -0,0 +1,274 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Microsoft.WindowsAzure.Build.Tasks.Utilities +{ + public class ProjectSearchUtility + { + #region Fields + const string DEFAULT_PROJECT_EXTENSION = "*.csproj"; + + private List _projExtList; + private List _ignorePathTokenList; + private List _testProjectTokenList; + + private List _allProjs; + private List _testProjs; + private List _ignoreProjs; + + #endregion + + #region Properties + public List ProjectExtensionList + { + get + { + if (_projExtList == null) + { + _projExtList = new List() { DEFAULT_PROJECT_EXTENSION }; + } + return _projExtList; + } + } + + public List IgnorePathTokenList + { + get + { + if (_ignorePathTokenList == null) + { + _ignorePathTokenList = new List(); + } + return _ignorePathTokenList; + } + + private set + { + _ignorePathTokenList = value; + } + + } + + public List TestProjectTokenList + { + get + { + if (_testProjectTokenList == null) + { + _testProjectTokenList = new List() { "*tests.csproj", "*test.csproj", "*KeyVault.TestFramework.csproj" }; + } + return _testProjectTokenList; + } + } + + public IReadOnlyList AllProjectList + { + get + { + if (_allProjs == null) + { + _allProjs = new List(); + + _allProjs = SearchProjects(RootDirForSearch); + } + + return _allProjs.AsReadOnly(); + } + } + + public IReadOnlyList AllTestProjectList + { + get + { + if (_testProjs == null) + { + _testProjs = new List(); + _testProjs = SearchTestProjects(RootDirForSearch); + } + + return _testProjs.AsReadOnly(); + } + } + + public IReadOnlyList IgnoredProjectList + { + get + { + if (_ignoreProjs == null) + { + _ignoreProjs = new List(); + + foreach (string iP in IgnorePathTokenList) + { + var ignorePaths = from proj in AllProjectList where proj.Contains(iP) select proj; + if (ignorePaths.Any()) + { + _ignoreProjs.AddRange(ignorePaths); + } + } + } + + return _ignoreProjs.AsReadOnly(); + } + } + + /// + /// In Azure SDK For NET repo, this path will be until src e.g 'C:\Azure-SDK-FOR-NET\src' + /// + public string RootDirForSearch { get; private set; } + #endregion + + #region Constructor + public ProjectSearchUtility(string rootDirPath) + { + Check.DirectoryExists(rootDirPath); + RootDirForSearch = rootDirPath; + } + + public ProjectSearchUtility(string rootDirPath, List ignorePathTokens) : this(rootDirPath) + { + //Check.NotNull(projectExtensions, "Project Extensions param array"); + IgnorePathTokenList = ignorePathTokens; + } + + public ProjectSearchUtility(string rootDirPath, List ignorePathTokens, params string[] projectExtensionsToSearch) : this(rootDirPath, ignorePathTokens) + { + //Check.NotNull(ignorePathTokens, "Ignore Token Path List"); + foreach (string ext in projectExtensionsToSearch) + { + if (!ProjectExtensionList.Contains(ext)) + ProjectExtensionList.Add(ext); + } + } + #endregion + + /// + /// Finds all projects that can be found under RootDirForSearch using ProjectExtensionList. + /// + /// true: will filter out all projects using IgnorePathTokenList. false: will not apply any filter + /// + public List GetFilteredProjects() + { + IEnumerable filteredProjects = AllProjectList.Except(IgnoredProjectList, new ObjectComparer((left, right) => left.Equals(right, StringComparison.OrdinalIgnoreCase))); + return filteredProjects?.ToList(); + + /* + List ignoreProjectPaths = new List(); + foreach (string iP in IgnorePathTokenList) + { + var ignorePaths = from proj in AllProjectList where proj.Contains(iP) select proj; + if (ignorePaths.Any()) + { + ignoreProjectPaths.AddRange(ignorePaths); + } + } + + filteredProjects = AllProjectList.Except(ignoreProjectPaths, new ObjectComparer((left, right) => left.Equals(right, StringComparison.OrdinalIgnoreCase))); + + return filteredProjects?.ToList(); + */ + } + + public List GetFilteredTestProjects() + { + IEnumerable filteredTestProjects = AllTestProjectList.Except(IgnoredProjectList, new ObjectComparer((left, right) => left.Equals(right, StringComparison.OrdinalIgnoreCase))); + return filteredTestProjects?.ToList(); + + /* + List ignoreProjects = new List(); + foreach(string iTP in IgnorePathTokenList) + { + var ignorePaths = from proj in AllTestProjectList where proj.Contains(iTP) select proj; + if(ignorePaths.Any()) + { + ignoreProjects.AddRange(ignorePaths); + } + } + + filteredTestProjects = AllTestProjectList.Except(ignoreProjects, new ObjectComparer((left, right) => left.Equals(right, StringComparison.OrdinalIgnoreCase))); + + return filteredTestProjects?.ToList(); + */ + } + + public List GetAllSDKProjects() + { + List filteredSDKProjects = GetFilteredProjects().Except(GetFilteredTestProjects(), new ObjectComparer((left, right) => left.Equals(right, StringComparison.OrdinalIgnoreCase)))?.ToList(); + return filteredSDKProjects; + } + + public List GetScopedSDKProjects(string scopePath) + { + List scopedProjects = new List(); + string searchProjInDirPath = Path.Combine(RootDirForSearch, scopePath); + if (Directory.Exists(searchProjInDirPath)) + { + scopedProjects = SearchProjects(searchProjInDirPath); + List testProjs = SearchTestProjects(searchProjInDirPath); + + var filteredProjs = scopedProjects.Except(testProjs, new ObjectComparer((left, right) => left.Equals(right, StringComparison.OrdinalIgnoreCase))); + filteredProjs = filteredProjs.Except(IgnoredProjectList, new ObjectComparer((left, right) => left.Equals(right, StringComparison.OrdinalIgnoreCase))); + + scopedProjects = filteredProjs.ToList(); + } + + return scopedProjects; + } + + public List GetScopedTestProjects(string scopePath) + { + List testScopedProjects = new List(); + + string searchDir = Path.Combine(RootDirForSearch, scopePath); + if (Directory.Exists(searchDir)) + { + testScopedProjects = SearchTestProjects(searchDir); + var filteredProjs = testScopedProjects.Except(IgnoredProjectList, new ObjectComparer((left, right) => left.Equals(right, StringComparison.OrdinalIgnoreCase))); + + testScopedProjects = filteredProjs.ToList(); + } + + return testScopedProjects; + } + + #region Search + private List SearchProjects(string searchDirPath) + { + List _allProjs = new List(); + foreach (string ext in ProjectExtensionList) + { + var searchedProjects = Directory.EnumerateFiles(searchDirPath, ext, SearchOption.AllDirectories); + if (searchedProjects.Any()) + { + _allProjs.AddRange(searchedProjects); + } + } + + return _allProjs; + } + + private List SearchTestProjects(string searchDirPath) + { + List _testProjs = new List(); + + foreach (string testToken in TestProjectTokenList) + { + var searchedTestProjects = Directory.EnumerateFiles(searchDirPath, testToken, SearchOption.AllDirectories); + if (searchedTestProjects.Any()) + { + _testProjs.AddRange(searchedTestProjects); + } + } + + return _testProjs; + } + #endregion + } +} \ No newline at end of file diff --git a/tools/Microsoft.WindowsAzure.Build.Tasks/Microsoft.WindowsAzure.Build.Tasks.sln b/tools/Microsoft.WindowsAzure.Build.Tasks/Microsoft.WindowsAzure.Build.Tasks.sln index 29940c6634fd3..3e2eb726f6756 100644 --- a/tools/Microsoft.WindowsAzure.Build.Tasks/Microsoft.WindowsAzure.Build.Tasks.sln +++ b/tools/Microsoft.WindowsAzure.Build.Tasks/Microsoft.WindowsAzure.Build.Tasks.sln @@ -3,24 +3,24 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.26403.7 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.WindowsAzure.Build.Tasks", "Build.Tasks\Microsoft.WindowsAzure.Build.Tasks.csproj", "{16D89061-2C1E-4E31-B16E-8A7B5B9FF51C}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Build.Tasks.Tests", "Build.Tasks.Tests\Build.Tasks.Tests.csproj", "{98611548-2FE4-43EA-A74E-806503DCE540}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.WindowsAzure.Build.Tasks", "Build.Tasks\Microsoft.WindowsAzure.Build.Tasks.csproj", "{F10AC5BE-B0B4-4667-BE48-6C5D69BF1327}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {16D89061-2C1E-4E31-B16E-8A7B5B9FF51C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {16D89061-2C1E-4E31-B16E-8A7B5B9FF51C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {16D89061-2C1E-4E31-B16E-8A7B5B9FF51C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {16D89061-2C1E-4E31-B16E-8A7B5B9FF51C}.Release|Any CPU.Build.0 = Release|Any CPU {98611548-2FE4-43EA-A74E-806503DCE540}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {98611548-2FE4-43EA-A74E-806503DCE540}.Debug|Any CPU.Build.0 = Debug|Any CPU {98611548-2FE4-43EA-A74E-806503DCE540}.Release|Any CPU.ActiveCfg = Release|Any CPU {98611548-2FE4-43EA-A74E-806503DCE540}.Release|Any CPU.Build.0 = Release|Any CPU + {F10AC5BE-B0B4-4667-BE48-6C5D69BF1327}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F10AC5BE-B0B4-4667-BE48-6C5D69BF1327}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F10AC5BE-B0B4-4667-BE48-6C5D69BF1327}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F10AC5BE-B0B4-4667-BE48-6C5D69BF1327}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/tools/buildTargets/additional.targets b/tools/buildTargets/additional.targets index 6e7f6e98449a1..707617774a573 100644 --- a/tools/buildTargets/additional.targets +++ b/tools/buildTargets/additional.targets @@ -172,4 +172,112 @@ Targets="PublishNetCorePackage" Condition=" %(NetCore_AutoRestLibraries.PackageName) != '' " /> + + + + + + %(net452SDKProj.RootDir)%(net452SDKProj.Directory) + + + + + + + \ No newline at end of file diff --git a/tools/buildTargets/common.targets b/tools/buildTargets/common.targets index 53706909c7e0d..c053d5a0a4c56 100644 --- a/tools/buildTargets/common.targets +++ b/tools/buildTargets/common.targets @@ -2,88 +2,81 @@ - - + net452 netstandard1.4 - + netcoreapp1.1 + + GetBuildEnv; BuildCiSign; BuildMsBuildTask; - CPP; - - - + CategorizeProjects; - - CPP; - GetScopedProjects; + CategorizeProjects; - - PreBuildStaticAnalysis; + + CategorizeProjects; RestoreLatestProjects; - BuildLatestProjects; - Package; - - - - CPP; - RestoreLatestProjects; - + - - CPP; + CategorizeProjects; CleanLatestProjects; CleanSDKPackageFiles - - - - PreBuildStaticAnalysis; - RestoreLatestProjects; - BuildLatestProjects; - Test - - - + PreBuildStaticAnalysis; RestoreLatestProjects; BuildLatestProjects; - Test; - PreSign; + + + + + $(BuildTraversedProjectsDependsOn); + Test + + + $(RunTestProjectsDependsOn); + RunSignTargets; Package; - + + $(RunTestProjectsDependsOn); + RunSignTargets; + Package + - PreBuildStaticAnalysis; - RestoreLatestProjects; - BuildLatestProjects; - Test; - PreSign; - Package; + $(PackageNugetDependsOn); PublishingNuget - DisplayHelp - - + + + + + + + + + + + Clean + Projects="@(SDKProject);@(SDKTestProject)" + Properties="PackageOutputPath=$(PackageOutputPath)" + BuildInParallel="$(BuildInParallel)" + ContinueOnError="ErrorAndStop" /> @@ -95,96 +88,98 @@ - + Restore - - + + - - + Projects="@(SDKProject);@(SDKTestProject)" + BuildInParallel="$(BuildInParallel)" + ContinueOnError="ErrorAndStop" /> - - + + Build - - - - - + + - - - - - - - + + + + + + + + + + + + + + - - - + ContinueOnError="true"> + + + + + + + + - + - - - - - - - + + - - - - - - - - - + + + + + - + - + - + - + IgnoreExitCode="true" /> + - + - + + + + + + + + + + - - - - - - - - - - - - - - + + - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - + + + - - \ No newline at end of file diff --git a/tools/buildTargets/common.tasks b/tools/buildTargets/common.tasks index 1576ced4c9388..c1c4c62b80176 100644 --- a/tools/buildTargets/common.tasks +++ b/tools/buildTargets/common.tasks @@ -1,20 +1,20 @@  - - - - - - - - - - - - - - - - + + $(LibraryToolsFolder)\net46 + + + + + + + + + + + + + + diff --git a/tools/buildTargets/signing.targets b/tools/buildTargets/signing.targets index 5d2d38c12c555..315822ca6627b 100644 --- a/tools/buildTargets/signing.targets +++ b/tools/buildTargets/signing.targets @@ -1,21 +1,24 @@ 31bf3856ad364e35 + @(ProjectToScanDirs) - - + + - + + + - + + + - + + + + WindowsSdkPath="$(WindowsSdkPath)" + Assembly="%(DelaySignedAssembliesToValidate.Identity)" + ExpectedTokenSignature="$(StrongNameToken)" + ExpectedDelaySigned="false" + ContinueOnError="false" + Condition="'$(CodeSign)' == 'true' and '@(DelaySignedAssembliesToValidate)' != ''"/> - - + + + - - + + @@ -53,14 +61,14 @@ - - + + - - - + + +