Merge pull request #405 from filipw/feature/packagelicenseexpression

use <PackageLicenseExpression>MIT</PackageLicenseExpression>
dotnet-script · Dec 18, 2018 · cf01f70 · cf01f70
2 parents cbb9e86 + c802428
commit cf01f70
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/build/Choco.csx b/build/Choco.csx
@@ -56,7 +56,6 @@ public static class Choco
         var tags = projectFile.Descendants("PackageTags").SingleOrDefault()?.Value;
         var iconUrl = projectFile.Descendants("PackageIconUrl").SingleOrDefault()?.Value;   
         var projectUrl = projectFile.Descendants("PackageProjectUrl").SingleOrDefault()?.Value;  
-        var licenseUrl = projectFile.Descendants("PackageLicenseUrl").SingleOrDefault()?.Value;
         var repositoryUrl = projectFile.Descendants("RepositoryUrl").SingleOrDefault()?.Value;
 
         var packageElement = new XElement("package");
@@ -68,7 +67,7 @@ public static class Choco
         metadataElement.Add(new XElement("id", packageId.ToLower()));    
         metadataElement.Add(new XElement("version", version));                
         metadataElement.Add(new XElement("authors", authors));        
-        metadataElement.Add(new XElement("licenseUrl", licenseUrl));
+        metadataElement.Add(new XElement("licenseUrl", "https://licenses.nuget.org/MIT"));
         metadataElement.Add(new XElement("projectUrl", projectUrl));
         metadataElement.Add(new XElement("iconUrl", iconUrl));
         metadataElement.Add(new XElement("description", description));                
@@ -95,4 +94,4 @@ public static class Choco
         return new XElement("file", srcAttribute, targetAttribute);
     }
 
-}
+}
diff --git a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj
@@ -10,7 +10,7 @@
     <PackageTags>script;csx;csharp;roslyn</PackageTags>
     <PackageIconUrl>https://raw.githubusercontent.com/filipw/Strathweb.TypedRouting.AspNetCore/master/strathweb.png</PackageIconUrl>
     <PackageProjectUrl>https://github.com/filipw/dotnet-script</PackageProjectUrl>
-    <PackageLicenseUrl>https://github.com/filipw/dotnet-script/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/filipw/dotnet-script.git</RepositoryUrl>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>

diff --git a/src/Dotnet.Script.DependencyModel.Nuget/Dotnet.Script.DependencyModel.NuGet.csproj b/src/Dotnet.Script.DependencyModel.Nuget/Dotnet.Script.DependencyModel.NuGet.csproj
@@ -2,13 +2,13 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <PackageLicenseUrl>https://github.com/filipw/dotnet-script/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/filipw/dotnet-script</PackageProjectUrl>
     <PackageIconUrl>https://raw.githubusercontent.com/filipw/Strathweb.TypedRouting.AspNetCore/master/strathweb.png</PackageIconUrl>
     <RepositoryUrl>https://github.com/filipw/dotnet-script.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>script;csx;csharp;roslyn;nuget</PackageTags>
-    <Version>0.7.0</Version>
+    <Version>0.7.1</Version>
     <Description>A MetadataReferenceResolver that allows inline nuget references to be specified in script(csx) files.</Description>
     <Authors>dotnet-script</Authors>
     <Company>dotnet-script</Company>

diff --git a/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj b/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj
@@ -5,13 +5,13 @@
     <Authors>dotnet-script</Authors>
     <Company>dotnet-script</Company>
     <Description>Provides runtime and compilation dependency resolution for dotnet-script based scripts.</Description>
-    <PackageLicenseUrl>https://github.com/filipw/dotnet-script/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/filipw/dotnet-script</PackageProjectUrl>
     <PackageIconUrl>https://raw.githubusercontent.com/filipw/Strathweb.TypedRouting.AspNetCore/master/strathweb.png</PackageIconUrl>
     <RepositoryUrl>https://github.com/filipw/dotnet-script.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>script;csx;csharp;roslyn;omnisharp</PackageTags>
-    <Version>0.8.0</Version>
+    <Version>0.9.0</Version>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 

diff --git a/src/Dotnet.Script/Dotnet.Script.csproj b/src/Dotnet.Script/Dotnet.Script.csproj
@@ -11,7 +11,7 @@
         <PackageTags>dotnet;cli;script;csx;csharp;roslyn</PackageTags>
         <PackageIconUrl>https://raw.githubusercontent.com/filipw/Strathweb.TypedRouting.AspNetCore/master/strathweb.png</PackageIconUrl>
         <PackageProjectUrl>https://github.com/filipw/dotnet-script</PackageProjectUrl>
-        <PackageLicenseUrl>https://github.com/filipw/dotnet-script/blob/master/LICENSE</PackageLicenseUrl>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <RepositoryType>git</RepositoryType>
         <RepositoryUrl>https://github.com/filipw/dotnet-script.git</RepositoryUrl>
         <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>