|
| 1 | +From 8b9905c94d44c127d1c76ed614373feaf9f1d4c5 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Chris Rummel < [email protected]> |
| 3 | +Date: Thu, 7 Jun 2018 15:27:47 -0500 |
| 4 | +Subject: [PATCH] Add TargetingPack and enable net46 builds for source-build. |
| 5 | + |
| 6 | +--- |
| 7 | + NuGet.Config | 3 ++- |
| 8 | + build/common.project.props | 4 ++++ |
| 9 | + src/NuGet.Clients/NuGet.Credentials/NuGet.Credentials.csproj | 1 - |
| 10 | + src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj | 1 - |
| 11 | + src/NuGet.Core/NuGet.Build.Tasks/NuGet.Build.Tasks.csproj | 1 - |
| 12 | + src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj | 1 - |
| 13 | + src/NuGet.Core/NuGet.Commands/NuGet.Commands.csproj | 1 - |
| 14 | + src/NuGet.Core/NuGet.Common/NuGet.Common.csproj | 1 - |
| 15 | + src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj | 1 - |
| 16 | + .../NuGet.DependencyResolver.Core.csproj | 1 - |
| 17 | + src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj | 1 - |
| 18 | + src/NuGet.Core/NuGet.LibraryModel/NuGet.LibraryModel.csproj | 1 - |
| 19 | + src/NuGet.Core/NuGet.Packaging.Core/NuGet.Packaging.Core.csproj | 1 - |
| 20 | + src/NuGet.Core/NuGet.Packaging/NuGet.Packaging.csproj | 3 +-- |
| 21 | + src/NuGet.Core/NuGet.ProjectModel/NuGet.ProjectModel.csproj | 1 - |
| 22 | + src/NuGet.Core/NuGet.Protocol/NuGet.Protocol.csproj | 1 - |
| 23 | + src/NuGet.Core/NuGet.Resolver/NuGet.Resolver.csproj | 1 - |
| 24 | + src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj | 1 - |
| 25 | + 18 files changed, 7 insertions(+), 18 deletions(-) |
| 26 | + |
| 27 | +diff --git a/NuGet.Config b/NuGet.Config |
| 28 | +index 9b7d2ae0a..6d905970e 100644 |
| 29 | +--- a/NuGet.Config |
| 30 | ++++ b/NuGet.Config |
| 31 | +@@ -7,8 +7,9 @@ |
| 32 | + <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" /> |
| 33 | + <add key="dotnet-buildtools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" /> |
| 34 | + <add key="dotnet-roslyn" value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" /> |
| 35 | ++ <add key="roslyn-tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" /> |
| 36 | + </packageSources> |
| 37 | + <disabledPackageSources> |
| 38 | +- <clear /> |
| 39 | ++ <clear /> |
| 40 | + </disabledPackageSources> |
| 41 | + </configuration> |
| 42 | +diff --git a/build/common.project.props b/build/common.project.props |
| 43 | +index e77304739..6f812f744 100644 |
| 44 | +--- a/build/common.project.props |
| 45 | ++++ b/build/common.project.props |
| 46 | +@@ -271,4 +271,8 @@ |
| 47 | + <ApexProjects Include="$(RepositoryRootDirectory)test\NuGet.Tests.Apex\*\*.csproj" /> |
| 48 | + </ItemGroup> |
| 49 | + |
| 50 | ++ <ItemGroup> |
| 51 | ++ <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-alpha-003" /> |
| 52 | ++ </ItemGroup> |
| 53 | ++ |
| 54 | + </Project> |
| 55 | +diff --git a/src/NuGet.Clients/NuGet.Credentials/NuGet.Credentials.csproj b/src/NuGet.Clients/NuGet.Credentials/NuGet.Credentials.csproj |
| 56 | +index be318015b..71dea6403 100644 |
| 57 | +--- a/src/NuGet.Clients/NuGet.Credentials/NuGet.Credentials.csproj |
| 58 | ++++ b/src/NuGet.Clients/NuGet.Credentials/NuGet.Credentials.csproj |
| 59 | +@@ -4,7 +4,6 @@ |
| 60 | + |
| 61 | + <PropertyGroup> |
| 62 | + <TargetFrameworks>netstandard1.6;net46</TargetFrameworks> |
| 63 | +- <TargetFrameworks Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">netstandard1.6</TargetFrameworks> |
| 64 | + <TargetFramework /> |
| 65 | + <Shipping>true</Shipping> |
| 66 | + <PackProject>true</PackProject> |
| 67 | +diff --git a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj |
| 68 | +index 594a391d0..6c54f5ff2 100644 |
| 69 | +--- a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj |
| 70 | ++++ b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj |
| 71 | +@@ -4,7 +4,6 @@ |
| 72 | + |
| 73 | + <PropertyGroup> |
| 74 | + <TargetFrameworks>netstandard1.6;net46</TargetFrameworks> |
| 75 | +- <TargetFrameworks Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">netstandard1.6</TargetFrameworks> |
| 76 | + <NoWarn>$(NoWarn);CS1591</NoWarn> |
| 77 | + <AssemblyName>NuGet.Build.Tasks.Pack</AssemblyName> |
| 78 | + <RootNamespace>$(AssemblyName)</RootNamespace> |
| 79 | +diff --git a/src/NuGet.Core/NuGet.Build.Tasks/NuGet.Build.Tasks.csproj b/src/NuGet.Core/NuGet.Build.Tasks/NuGet.Build.Tasks.csproj |
| 80 | +index f2668829f..fd46961f9 100644 |
| 81 | +--- a/src/NuGet.Core/NuGet.Build.Tasks/NuGet.Build.Tasks.csproj |
| 82 | ++++ b/src/NuGet.Core/NuGet.Build.Tasks/NuGet.Build.Tasks.csproj |
| 83 | +@@ -4,7 +4,6 @@ |
| 84 | + |
| 85 | + <PropertyGroup> |
| 86 | + <TargetFrameworks>netstandard1.6;net46</TargetFrameworks> |
| 87 | +- <TargetFrameworks Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">netstandard1.6</TargetFrameworks> |
| 88 | + <TargetFramework/> |
| 89 | + <Shipping>true</Shipping> |
| 90 | + <IncludeInVSIX>true</IncludeInVSIX> |
| 91 | +diff --git a/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj b/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj |
| 92 | +index 6391a8c27..b4fdc4d59 100644 |
| 93 | +--- a/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj |
| 94 | ++++ b/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj |
| 95 | +@@ -5,7 +5,6 @@ |
| 96 | + <PropertyGroup> |
| 97 | + <Description>NuGet wrapper for dotnet.exe</Description> |
| 98 | + <TargetFrameworks>netcoreapp1.0;net46</TargetFrameworks> |
| 99 | +- <TargetFrameworks Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">netcoreapp1.0</TargetFrameworks> |
| 100 | + <RuntimeIdentifier Condition=" '$(TargetFramework)' == 'net46' ">win7-x86</RuntimeIdentifier> |
| 101 | + <NoWarn>$(NoWarn);CS1591;CS1701</NoWarn> |
| 102 | + <OutputType>Exe</OutputType> |
| 103 | +diff --git a/src/NuGet.Core/NuGet.Commands/NuGet.Commands.csproj b/src/NuGet.Core/NuGet.Commands/NuGet.Commands.csproj |
| 104 | +index 82731c899..076634be5 100644 |
| 105 | +--- a/src/NuGet.Core/NuGet.Commands/NuGet.Commands.csproj |
| 106 | ++++ b/src/NuGet.Core/NuGet.Commands/NuGet.Commands.csproj |
| 107 | +@@ -5,7 +5,6 @@ |
| 108 | + <PropertyGroup> |
| 109 | + <Description>Complete commands common to command-line and GUI NuGet clients</Description> |
| 110 | + <TargetFrameworks>netstandard1.6;net46</TargetFrameworks> |
| 111 | +- <TargetFrameworks Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">netstandard1.6</TargetFrameworks> |
| 112 | + <TargetFramework /> |
| 113 | + <NoWarn>$(NoWarn);CS1591;CS1574;CS1573;CS1584;CS1658</NoWarn> |
| 114 | + <NoWarn Condition="'$(TargetFramework)' == 'netstandard1.6'">$(NoWarn);CS1998</NoWarn> |
| 115 | +diff --git a/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj b/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj |
| 116 | +index fa9f2509b..3e70cdfaf 100644 |
| 117 | +--- a/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj |
| 118 | ++++ b/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj |
| 119 | +@@ -4,7 +4,6 @@ |
| 120 | + |
| 121 | + <PropertyGroup> |
| 122 | + <TargetFrameworks>netstandard1.6;net46</TargetFrameworks> |
| 123 | +- <TargetFrameworks Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">netstandard1.6</TargetFrameworks> |
| 124 | + <TargetFramework /> |
| 125 | + <NoWarn>$(NoWarn);CS1591;CS1574</NoWarn> |
| 126 | + <PackProject>true</PackProject> |
| 127 | +diff --git a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj |
| 128 | +index afc4c651d..b29b620bb 100644 |
| 129 | +--- a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj |
| 130 | ++++ b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj |
| 131 | +@@ -6,7 +6,6 @@ |
| 132 | + <Description>NuGet's client configuration settings implementation.</Description> |
| 133 | + <NoWarn>$(NoWarn);CS1591</NoWarn> |
| 134 | + <TargetFrameworks>netstandard1.6;net46</TargetFrameworks> |
| 135 | +- <TargetFrameworks Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">netstandard1.6</TargetFrameworks> |
| 136 | + <TargetFramework /> |
| 137 | + <PackProject>true</PackProject> |
| 138 | + <Shipping>true</Shipping> |
| 139 | +diff --git a/src/NuGet.Core/NuGet.DependencyResolver.Core/NuGet.DependencyResolver.Core.csproj b/src/NuGet.Core/NuGet.DependencyResolver.Core/NuGet.DependencyResolver.Core.csproj |
| 140 | +index 212b01511..e22711052 100644 |
| 141 | +--- a/src/NuGet.Core/NuGet.DependencyResolver.Core/NuGet.DependencyResolver.Core.csproj |
| 142 | ++++ b/src/NuGet.Core/NuGet.DependencyResolver.Core/NuGet.DependencyResolver.Core.csproj |
| 143 | +@@ -4,7 +4,6 @@ |
| 144 | + |
| 145 | + <PropertyGroup> |
| 146 | + <TargetFrameworks>netstandard1.6;net46</TargetFrameworks> |
| 147 | +- <TargetFrameworks Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">netstandard1.6</TargetFrameworks> |
| 148 | + <TargetFramework /> |
| 149 | + <NoWarn>$(NoWarn);CS1591;CS1574</NoWarn> |
| 150 | + <PackProject>true</PackProject> |
| 151 | +diff --git a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj |
| 152 | +index 65c15d4fb..ec76820e8 100644 |
| 153 | +--- a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj |
| 154 | ++++ b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj |
| 155 | +@@ -5,7 +5,6 @@ |
| 156 | + <PropertyGroup> |
| 157 | + <Description>The understanding of target frameworks for NuGet.Packaging</Description> |
| 158 | + <TargetFrameworks>netstandard1.6;net46;net40</TargetFrameworks> |
| 159 | +- <TargetFrameworks Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">netstandard1.6</TargetFrameworks> |
| 160 | + <TargetFramework /> |
| 161 | + <NoWarn>$(NoWarn);CS1591;CS1574;CS1573</NoWarn> |
| 162 | + <LangVersion>5</LangVersion> |
| 163 | +diff --git a/src/NuGet.Core/NuGet.LibraryModel/NuGet.LibraryModel.csproj b/src/NuGet.Core/NuGet.LibraryModel/NuGet.LibraryModel.csproj |
| 164 | +index b663de55b..430541f8c 100644 |
| 165 | +--- a/src/NuGet.Core/NuGet.LibraryModel/NuGet.LibraryModel.csproj |
| 166 | ++++ b/src/NuGet.Core/NuGet.LibraryModel/NuGet.LibraryModel.csproj |
| 167 | +@@ -4,7 +4,6 @@ |
| 168 | + |
| 169 | + <PropertyGroup> |
| 170 | + <TargetFrameworks>netstandard1.6;net46</TargetFrameworks> |
| 171 | +- <TargetFrameworks Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">netstandard1.6</TargetFrameworks> |
| 172 | + <TargetFramework /> |
| 173 | + <NoWarn>$(NoWarn);CS1591</NoWarn> |
| 174 | + <PackProject>true</PackProject> |
| 175 | +diff --git a/src/NuGet.Core/NuGet.Packaging.Core/NuGet.Packaging.Core.csproj b/src/NuGet.Core/NuGet.Packaging.Core/NuGet.Packaging.Core.csproj |
| 176 | +index 8b737e776..126c53666 100644 |
| 177 | +--- a/src/NuGet.Core/NuGet.Packaging.Core/NuGet.Packaging.Core.csproj |
| 178 | ++++ b/src/NuGet.Core/NuGet.Packaging.Core/NuGet.Packaging.Core.csproj |
| 179 | +@@ -5,7 +5,6 @@ |
| 180 | + <PropertyGroup> |
| 181 | + <Description>The core data structures for NuGet.Packaging</Description> |
| 182 | + <TargetFrameworks>netstandard1.6;net46</TargetFrameworks> |
| 183 | +- <TargetFrameworks Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">netstandard1.6</TargetFrameworks> |
| 184 | + <TargetFramework /> |
| 185 | + <NoWarn>$(NoWarn);CS1591</NoWarn> |
| 186 | + <PackProject>true</PackProject> |
| 187 | +diff --git a/src/NuGet.Core/NuGet.Packaging/NuGet.Packaging.csproj b/src/NuGet.Core/NuGet.Packaging/NuGet.Packaging.csproj |
| 188 | +index 6be3f658b..30e223c87 100644 |
| 189 | +--- a/src/NuGet.Core/NuGet.Packaging/NuGet.Packaging.csproj |
| 190 | ++++ b/src/NuGet.Core/NuGet.Packaging/NuGet.Packaging.csproj |
| 191 | +@@ -5,7 +5,6 @@ |
| 192 | + <PropertyGroup> |
| 193 | + <Description>NuGet's implementation for reading nupkg package and nuspec package specification files.</Description> |
| 194 | + <TargetFrameworks>netstandard1.6;net46</TargetFrameworks> |
| 195 | +- <TargetFrameworks Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">netstandard1.6</TargetFrameworks> |
| 196 | + <TargetFramework /> |
| 197 | + <NoWarn>$(NoWarn);CS1591;CS1574;CS1573;CS1572</NoWarn> |
| 198 | + <NoWarn Condition="'$(TargetFramework)' == 'netstandard1.6'">$(NoWarn);CS0414</NoWarn> |
| 199 | +@@ -86,4 +85,4 @@ |
| 200 | + |
| 201 | + <Import Project="$(BuildCommonDirectory)common.targets"/> |
| 202 | + <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" /> |
| 203 | +-</Project> |
| 204 | +\ No newline at end of file |
| 205 | ++</Project> |
| 206 | +diff --git a/src/NuGet.Core/NuGet.ProjectModel/NuGet.ProjectModel.csproj b/src/NuGet.Core/NuGet.ProjectModel/NuGet.ProjectModel.csproj |
| 207 | +index b8e950897..4b28c36d0 100644 |
| 208 | +--- a/src/NuGet.Core/NuGet.ProjectModel/NuGet.ProjectModel.csproj |
| 209 | ++++ b/src/NuGet.Core/NuGet.ProjectModel/NuGet.ProjectModel.csproj |
| 210 | +@@ -4,7 +4,6 @@ |
| 211 | + |
| 212 | + <PropertyGroup> |
| 213 | + <TargetFrameworks>netstandard1.6;net46</TargetFrameworks> |
| 214 | +- <TargetFrameworks Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">netstandard1.6</TargetFrameworks> |
| 215 | + <TargetFramework /> |
| 216 | + <NoWarn>$(NoWarn);CS1591;CS1573</NoWarn> |
| 217 | + <PackProject>true</PackProject> |
| 218 | +diff --git a/src/NuGet.Core/NuGet.Protocol/NuGet.Protocol.csproj b/src/NuGet.Core/NuGet.Protocol/NuGet.Protocol.csproj |
| 219 | +index 3f5eb9335..90df11544 100644 |
| 220 | +--- a/src/NuGet.Core/NuGet.Protocol/NuGet.Protocol.csproj |
| 221 | ++++ b/src/NuGet.Core/NuGet.Protocol/NuGet.Protocol.csproj |
| 222 | +@@ -4,7 +4,6 @@ |
| 223 | + |
| 224 | + <PropertyGroup> |
| 225 | + <TargetFrameworks>netstandard1.6;net46</TargetFrameworks> |
| 226 | +- <TargetFrameworks Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">netstandard1.6</TargetFrameworks> |
| 227 | + <TargetFramework /> |
| 228 | + <NoWarn>$(NoWarn);CS1591;CS1573;CS0012</NoWarn> |
| 229 | + <PackageTags>nuget protocol</PackageTags> |
| 230 | +diff --git a/src/NuGet.Core/NuGet.Resolver/NuGet.Resolver.csproj b/src/NuGet.Core/NuGet.Resolver/NuGet.Resolver.csproj |
| 231 | +index 9d14c11cc..a9c88818e 100644 |
| 232 | +--- a/src/NuGet.Core/NuGet.Resolver/NuGet.Resolver.csproj |
| 233 | ++++ b/src/NuGet.Core/NuGet.Resolver/NuGet.Resolver.csproj |
| 234 | +@@ -5,7 +5,6 @@ |
| 235 | + <PropertyGroup> |
| 236 | + <Description>NuGet's dependency resolver within the NuGet.Packaging package</Description> |
| 237 | + <TargetFrameworks>netstandard1.6;net46</TargetFrameworks> |
| 238 | +- <TargetFrameworks Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">netstandard1.6</TargetFrameworks> |
| 239 | + <TargetFramework /> |
| 240 | + <NoWarn>$(NoWarn);CS1591;CS1573</NoWarn> |
| 241 | + <PackProject>true</PackProject> |
| 242 | +diff --git a/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj b/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj |
| 243 | +index e39d6422a..5da35299d 100644 |
| 244 | +--- a/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj |
| 245 | ++++ b/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj |
| 246 | +@@ -4,7 +4,6 @@ |
| 247 | + |
| 248 | + <PropertyGroup> |
| 249 | + <TargetFrameworks>netstandard1.6;net46</TargetFrameworks> |
| 250 | +- <TargetFrameworks Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">netstandard1.6</TargetFrameworks> |
| 251 | + <TargetFramework /> |
| 252 | + <Description>NuGet's implementation of Semantic Versioning.</Description> |
| 253 | + <PackageTags>semver;semantic versioning</PackageTags> |
| 254 | +-- |
| 255 | +2.14.1 |
| 256 | + |
0 commit comments