mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #3492 from dotnet/toddmosc/serviceable-p2

Browse source 
Removing the nuspec schema change used for adding the serviceable tag.
This commit is contained in:
Rob Relyea 2016-06-10 10:04:16 -07:00 committed by GitHub
commit c39fbd37d3
2 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/dotnet/commands/dotnet-pack/NuGet/ManifestSchemaUtility.cs
View file

@ -41,19 +41,13 @@ namespace NuGet
/// </summary>
internal const string SchemaVersionV6 = "http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd";
/// <summary>
/// Added serviceble element under metadata.
/// </summary>
internal const string SchemaVersionV8 = "http://schemas.microsoft.com/packaging/2016/06/nuspec.xsd";
private static readonly string[] VersionToSchemaMappings = new[] {
SchemaVersionV1,
SchemaVersionV2,
SchemaVersionV3,
SchemaVersionV4,
SchemaVersionV5,
SchemaVersionV6,
SchemaVersionV8
SchemaVersionV6
};
public static int GetVersionFromNamespace(string @namespace)

7
src/dotnet/commands/dotnet-pack/NuGet/ManifestVersionUtility.cs
View file

@ -15,9 +15,6 @@ namespace NuGet
public const int TargetFrameworkSupportForDependencyContentsAndToolsVersion = 4;
public const int TargetFrameworkSupportForReferencesVersion = 5;
public const int XdtTransformationVersion = 6;
// Note that this version should change from 7 to 8 when the PackageType
// schema is merged into here
public const int ServiceableVersion = 7;
public static int GetManifestVersion(ManifestMetadata metadata)
{
@ -27,10 +24,6 @@ namespace NuGet
private static int GetMaxVersionFromMetadata(ManifestMetadata metadata)
{
// Important: always add newer version checks at the top
if (metadata.Serviceable)
{
return ServiceableVersion;
}
bool referencesHasTargetFramework =
metadata.PackageAssemblyReferences != null &&