From 48950e8b918ea84e0e8fe4c45dea097869d70b9e Mon Sep 17 00:00:00 2001 From: filipw Date: Tue, 18 Dec 2018 14:34:50 +0100 Subject: [PATCH 1/3] use MIT --- src/Dotnet.Script.Core/Dotnet.Script.Core.csproj | 2 +- .../Dotnet.Script.DependencyModel.NuGet.csproj | 4 ++-- .../Dotnet.Script.DependencyModel.csproj | 4 ++-- src/Dotnet.Script/Dotnet.Script.csproj | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj index 29c69d77..b4f879be 100644 --- a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj +++ b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj @@ -10,7 +10,7 @@ script;csx;csharp;roslyn https://raw.githubusercontent.com/filipw/Strathweb.TypedRouting.AspNetCore/master/strathweb.png https://github.com/filipw/dotnet-script - https://github.com/filipw/dotnet-script/blob/master/LICENSE + MIT git https://github.com/filipw/dotnet-script.git false diff --git a/src/Dotnet.Script.DependencyModel.Nuget/Dotnet.Script.DependencyModel.NuGet.csproj b/src/Dotnet.Script.DependencyModel.Nuget/Dotnet.Script.DependencyModel.NuGet.csproj index 7ca2f163..76546602 100644 --- 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 @@ netstandard2.0 - https://github.com/filipw/dotnet-script/blob/master/LICENSE + MIT https://github.com/filipw/dotnet-script https://raw.githubusercontent.com/filipw/Strathweb.TypedRouting.AspNetCore/master/strathweb.png https://github.com/filipw/dotnet-script.git git script;csx;csharp;roslyn;nuget - 0.7.0 + 0.7.1 A MetadataReferenceResolver that allows inline nuget references to be specified in script(csx) files. dotnet-script dotnet-script diff --git a/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj b/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj index 106d1553..132854d2 100644 --- a/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj +++ b/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj @@ -5,13 +5,13 @@ dotnet-script dotnet-script Provides runtime and compilation dependency resolution for dotnet-script based scripts. - https://github.com/filipw/dotnet-script/blob/master/LICENSE + MIT https://github.com/filipw/dotnet-script https://raw.githubusercontent.com/filipw/Strathweb.TypedRouting.AspNetCore/master/strathweb.png https://github.com/filipw/dotnet-script.git git script;csx;csharp;roslyn;omnisharp - 0.8.0 + 0.9.0 latest diff --git a/src/Dotnet.Script/Dotnet.Script.csproj b/src/Dotnet.Script/Dotnet.Script.csproj index fa5f6d9a..031c65be 100644 --- a/src/Dotnet.Script/Dotnet.Script.csproj +++ b/src/Dotnet.Script/Dotnet.Script.csproj @@ -11,7 +11,7 @@ dotnet;cli;script;csx;csharp;roslyn https://raw.githubusercontent.com/filipw/Strathweb.TypedRouting.AspNetCore/master/strathweb.png https://github.com/filipw/dotnet-script - https://github.com/filipw/dotnet-script/blob/master/LICENSE + MIT git https://github.com/filipw/dotnet-script.git false From cc8b5500d790c33216a01f7d3a4507091c8d2387 Mon Sep 17 00:00:00 2001 From: filipw Date: Tue, 18 Dec 2018 14:56:54 +0100 Subject: [PATCH 2/3] fixed choco --- build/Choco.csx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Choco.csx b/build/Choco.csx index 7bab372f..895987b8 100644 --- a/build/Choco.csx +++ b/build/Choco.csx @@ -56,7 +56,7 @@ 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 licenseUrl = projectFile.Descendants("PackageLicenseExpression").SingleOrDefault()?.Value; var repositoryUrl = projectFile.Descendants("RepositoryUrl").SingleOrDefault()?.Value; var packageElement = new XElement("package"); From c80242888327095178bf4319f831c502c64e1ab7 Mon Sep 17 00:00:00 2001 From: Filip W Date: Tue, 18 Dec 2018 15:44:09 +0100 Subject: [PATCH 3/3] hardcode MIT license for choco --- build/Choco.csx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build/Choco.csx b/build/Choco.csx index 895987b8..4f63d5f8 100644 --- 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("PackageLicenseExpression").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); } -} \ No newline at end of file +}