From 3d1abb0b8c4f2883f94a5f6ccb206cecb2aab964 Mon Sep 17 00:00:00 2001 From: "Raghu Shantha [MSFT]" Date: Mon, 11 Jul 2016 13:48:17 -0700 Subject: [PATCH 1/3] Exclude PackageSourceList from building on *nix platforms --- .../project.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Microsoft.PackageManagement.PackageSourceListProvider/project.json b/src/Microsoft.PackageManagement.PackageSourceListProvider/project.json index 133cd1131..394a244f2 100644 --- a/src/Microsoft.PackageManagement.PackageSourceListProvider/project.json +++ b/src/Microsoft.PackageManagement.PackageSourceListProvider/project.json @@ -10,7 +10,8 @@ "configurations": { "Linux": { "buildOptions": { - "define": ["LINUX"] + "define": [ "LINUX" ], + "exclude": [ "**/*" ] } } }, From 9121a807d509dc57392e9c805f8563c1c99ed46b Mon Sep 17 00:00:00 2001 From: "Raghu Shantha [MSFT]" Date: Mon, 11 Jul 2016 14:48:50 -0700 Subject: [PATCH 2/3] Add exclude attribute to correct location in project.json --- .../project.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Microsoft.PackageManagement.PackageSourceListProvider/project.json b/src/Microsoft.PackageManagement.PackageSourceListProvider/project.json index 394a244f2..7ec48b449 100644 --- a/src/Microsoft.PackageManagement.PackageSourceListProvider/project.json +++ b/src/Microsoft.PackageManagement.PackageSourceListProvider/project.json @@ -10,8 +10,7 @@ "configurations": { "Linux": { "buildOptions": { - "define": [ "LINUX" ], - "exclude": [ "**/*" ] + "define": [ "LINUX" ] } } }, @@ -61,7 +60,8 @@ "../Microsoft.PackageManagement/Providers/Inbox/Common/Extensions/*.cs", "../Microsoft.PackageManagement/Providers/Inbox/Common/Utility/*.cs", "../Microsoft.PackageManagement/Providers/Inbox/Common/Version/*.cs" - ] + ], + "exclude": [ "**/*" ] } }, "dependencies": { From eb4ddeee01e626b601575f0d14da56725cc18890 Mon Sep 17 00:00:00 2001 From: "Raghu Shantha [MSFT]" Date: Mon, 11 Jul 2016 16:03:59 -0700 Subject: [PATCH 3/3] Update sources instead of project.json --- .../Extensions/PackageListExtensions.cs | 6 +++++- .../PackageList/ExePackageInstaller.cs | 8 ++++++-- .../PackageList/NupkgInstaller.cs | 8 ++++++-- .../PackageList/PackageListParser.cs | 6 +++++- .../PackageList/PackageListProvider.cs | 8 ++++++-- .../PackageList/PackageListRequest.cs | 6 +++++- .../PackageList/PackageQuery.cs | 6 +++++- .../PackageList/PackageSource.cs | 6 +++++- .../PackageList/PowerShellArtifactInstaller.cs | 8 ++++++-- .../PackageList/ProgressTracker.cs | 6 +++++- .../PackageList/WebDownloader.cs | 6 +++++- .../PackageList/ZipPackageInstaller.cs | 8 ++++++-- .../Sdk/Constants.cs | 3 +++ .../project.json | 3 +-- 14 files changed, 69 insertions(+), 19 deletions(-) diff --git a/src/Microsoft.PackageManagement.PackageSourceListProvider/Extensions/PackageListExtensions.cs b/src/Microsoft.PackageManagement.PackageSourceListProvider/Extensions/PackageListExtensions.cs index f57e4ab32..d2cbc37cf 100644 --- a/src/Microsoft.PackageManagement.PackageSourceListProvider/Extensions/PackageListExtensions.cs +++ b/src/Microsoft.PackageManagement.PackageSourceListProvider/Extensions/PackageListExtensions.cs @@ -1,4 +1,6 @@ -// Copyright (c) .NET Foundation. All rights reserved. +#if !LINUX + +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -90,3 +92,5 @@ namespace Microsoft.PackageManagement.PackageSourceListProvider } } } + +#endif diff --git a/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/ExePackageInstaller.cs b/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/ExePackageInstaller.cs index ea8b9bcbf..48460ec70 100644 --- a/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/ExePackageInstaller.cs +++ b/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/ExePackageInstaller.cs @@ -1,4 +1,6 @@ -// +#if !LINUX + +// // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -591,4 +593,6 @@ namespace Microsoft.PackageManagement.PackageSourceListProvider // TODO do we need to support save-package for executable packages? } } -} \ No newline at end of file +} + +#endif \ No newline at end of file diff --git a/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/NupkgInstaller.cs b/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/NupkgInstaller.cs index 3e8bedeb6..1b550844f 100644 --- a/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/NupkgInstaller.cs +++ b/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/NupkgInstaller.cs @@ -1,4 +1,6 @@ -// +#if !LINUX + +// // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -232,4 +234,6 @@ namespace Microsoft.PackageManagement.PackageSourceListProvider } } } -} \ No newline at end of file +} + +#endif \ No newline at end of file diff --git a/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/PackageListParser.cs b/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/PackageListParser.cs index 55bbd187d..b929a70a1 100644 --- a/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/PackageListParser.cs +++ b/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/PackageListParser.cs @@ -1,4 +1,6 @@ -using System; +#if !LINUX + +using System; using System.Collections.Generic; using System.Linq; using System.IO; @@ -440,3 +442,5 @@ namespace Microsoft.PackageManagement.PackageSourceListProvider } } } + +#endif \ No newline at end of file diff --git a/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/PackageListProvider.cs b/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/PackageListProvider.cs index a2de03128..8d04c9c0b 100644 --- a/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/PackageListProvider.cs +++ b/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/PackageListProvider.cs @@ -1,4 +1,6 @@ -// +#if !LINUX + +// // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -868,4 +870,6 @@ namespace Microsoft.PackageManagement.PackageSourceListProvider } } -} \ No newline at end of file +} + +#endif \ No newline at end of file diff --git a/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/PackageListRequest.cs b/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/PackageListRequest.cs index df67630d9..8a204c0d0 100644 --- a/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/PackageListRequest.cs +++ b/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/PackageListRequest.cs @@ -1,3 +1,5 @@ +#if !LINUX + // // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the Apache License, Version 2.0 (the "License"); @@ -1070,4 +1072,6 @@ namespace Microsoft.PackageManagement.PackageSourceListProvider } } } -} \ No newline at end of file +} + +#endif \ No newline at end of file diff --git a/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/PackageQuery.cs b/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/PackageQuery.cs index 4a2a14c9f..4cffc3d70 100644 --- a/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/PackageQuery.cs +++ b/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/PackageQuery.cs @@ -1,4 +1,6 @@ -// +#if !LINUX + +// // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -152,3 +154,5 @@ namespace Microsoft.PackageManagement.PackageSourceListProvider } } } + +#endif \ No newline at end of file diff --git a/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/PackageSource.cs b/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/PackageSource.cs index 7e84a7278..7f8b9f861 100644 --- a/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/PackageSource.cs +++ b/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/PackageSource.cs @@ -1,4 +1,6 @@ -// +#if !LINUX + +// // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -41,3 +43,5 @@ namespace Microsoft.PackageManagement.PackageSourceListProvider } } } + +#endif \ No newline at end of file diff --git a/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/PowerShellArtifactInstaller.cs b/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/PowerShellArtifactInstaller.cs index 547d14c00..46566e5a9 100644 --- a/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/PowerShellArtifactInstaller.cs +++ b/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/PowerShellArtifactInstaller.cs @@ -1,4 +1,6 @@ -// +#if !LINUX + +// // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -197,4 +199,6 @@ namespace Microsoft.PackageManagement.PackageSourceListProvider } } -} \ No newline at end of file +} + +#endif \ No newline at end of file diff --git a/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/ProgressTracker.cs b/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/ProgressTracker.cs index 711ae473e..dd7b787ea 100644 --- a/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/ProgressTracker.cs +++ b/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/ProgressTracker.cs @@ -1,4 +1,6 @@ -// +#if !LINUX + +// // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -51,3 +53,5 @@ namespace Microsoft.PackageManagement.PackageSourceListProvider } } } + +#endif \ No newline at end of file diff --git a/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/WebDownloader.cs b/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/WebDownloader.cs index 4ab3332b6..dea74723e 100644 --- a/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/WebDownloader.cs +++ b/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/WebDownloader.cs @@ -1,4 +1,6 @@ -// +#if !LINUX + +// // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -238,3 +240,5 @@ namespace Microsoft.PackageManagement.PackageSourceListProvider } } } + +#endif diff --git a/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/ZipPackageInstaller.cs b/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/ZipPackageInstaller.cs index f81594518..8e4551ee7 100644 --- a/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/ZipPackageInstaller.cs +++ b/src/Microsoft.PackageManagement.PackageSourceListProvider/PackageList/ZipPackageInstaller.cs @@ -1,4 +1,6 @@ -// +#if !LINUX + +// // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -212,4 +214,6 @@ namespace Microsoft.PackageManagement.PackageSourceListProvider } } -} \ No newline at end of file +} + +#endif \ No newline at end of file diff --git a/src/Microsoft.PackageManagement.PackageSourceListProvider/Sdk/Constants.cs b/src/Microsoft.PackageManagement.PackageSourceListProvider/Sdk/Constants.cs index d59cb18bb..822b0dc17 100644 --- a/src/Microsoft.PackageManagement.PackageSourceListProvider/Sdk/Constants.cs +++ b/src/Microsoft.PackageManagement.PackageSourceListProvider/Sdk/Constants.cs @@ -1,3 +1,4 @@ +#if !LINUX namespace Microsoft.PackageManagement.PackageSourceListProvider { @@ -153,3 +154,5 @@ namespace Microsoft.PackageManagement.PackageSourceListProvider #endregion } } + +#endif \ No newline at end of file diff --git a/src/Microsoft.PackageManagement.PackageSourceListProvider/project.json b/src/Microsoft.PackageManagement.PackageSourceListProvider/project.json index 7ec48b449..ab13f8b91 100644 --- a/src/Microsoft.PackageManagement.PackageSourceListProvider/project.json +++ b/src/Microsoft.PackageManagement.PackageSourceListProvider/project.json @@ -60,8 +60,7 @@ "../Microsoft.PackageManagement/Providers/Inbox/Common/Extensions/*.cs", "../Microsoft.PackageManagement/Providers/Inbox/Common/Utility/*.cs", "../Microsoft.PackageManagement/Providers/Inbox/Common/Version/*.cs" - ], - "exclude": [ "**/*" ] + ] } }, "dependencies": {