updated NuGet and use of license expression

Leszek-Kowalski · Oct 11, 2019 · 823a487 · 823a487
1 parent 49b1ea4
commit 823a487
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 17 deletions.
diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe
diff --git a/nuspecs/DryIoc.CommonServiceLocator.nuspec b/nuspecs/DryIoc.CommonServiceLocator.nuspec
@@ -6,7 +6,7 @@
         <authors>Maksim Volkau</authors>
         <copyright>Copyright © 2014-2019 Maksim Volkau</copyright>
         <projectUrl>https://github.com/dadhi/DryIoc</projectUrl>
-        <licenseUrl>https://github.com/dadhi/DryIoc/blob/master/LICENSE.txt</licenseUrl>
+        <license type="expression">MIT</license>
         <iconUrl>https://github.com/dadhi/DryIoc/blob/master/logo/logo128.png</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>Implementation of CommonServiceLocator for DryIoc container, see rationale at https://github.com/unitycontainer/commonservicelocator </description>

diff --git a/nuspecs/DryIoc.Internal.nuspec b/nuspecs/DryIoc.Internal.nuspec
@@ -6,7 +6,7 @@
         <authors>Maksim Volkau</authors>
         <copyright>Copyright © 2013-2019 Maksim Volkau</copyright>
         <projectUrl>https://github.com/dadhi/DryIoc</projectUrl>
-        <licenseUrl>https://github.com/dadhi/DryIoc/blob/master/LICENSE.txt</licenseUrl>
+        <license type="expression">MIT</license>
         <iconUrl>https://github.com/dadhi/DryIoc/blob/master/logo/logo128.png</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>DryIoc is fast, small, full-featured IoC Container for .NET</description>

diff --git a/nuspecs/DryIoc.MefAttributedModel.nuspec b/nuspecs/DryIoc.MefAttributedModel.nuspec
@@ -6,7 +6,7 @@
     <authors>Maksim Volkau</authors>
     <copyright>Copyright © 2013-2019 Maksim Volkau</copyright>
     <projectUrl>https://github.com/dadhi/DryIoc</projectUrl>
-    <licenseUrl>https://github.com/dadhi/DryIoc/blob/master/LICENSE.txt</licenseUrl>
+    <license type="expression">MIT</license>
     <iconUrl>https://github.com/dadhi/DryIoc/blob/master/logo/logo128.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>DryIoc.MefAttributedModel is DryIoc extension to support Microsoft Managed Extensibility Framework for DryIoc container</description>

diff --git a/nuspecs/DryIoc.Mvc.nuspec b/nuspecs/DryIoc.Mvc.nuspec
@@ -6,7 +6,7 @@
         <authors>Maksim Volkau</authors>
         <copyright>Copyright © 2013-2019 Maksim Volkau and Contributors</copyright>
         <projectUrl>https://github.com/dadhi/DryIoc</projectUrl>
-        <licenseUrl>https://github.com/dadhi/DryIoc/blob/master/LICENSE.txt</licenseUrl>
+        <license type="expression">MIT</license>
         <iconUrl>https://github.com/dadhi/DryIoc/blob/master/logo/logo128.png</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>DryIoc extension for ASP.NET MVC</description>

diff --git a/nuspecs/DryIoc.Owin.nuspec b/nuspecs/DryIoc.Owin.nuspec
@@ -6,7 +6,7 @@
         <authors>Maksim Volkau</authors>
         <copyright>Copyright © 2014-2019 Maksim Volkau</copyright>
         <projectUrl>https://github.com/dadhi/DryIoc</projectUrl>
-        <licenseUrl>https://github.com/dadhi/DryIoc/blob/master/LICENSE.txt</licenseUrl>
+        <license type="expression">MIT</license>
         <iconUrl>https://github.com/dadhi/DryIoc/blob/master/logo/logo128.png</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>DryIoc extension for OWIN</description>

diff --git a/nuspecs/DryIoc.SignalR.nuspec b/nuspecs/DryIoc.SignalR.nuspec
@@ -6,7 +6,7 @@
         <authors>Maksim Volkau</authors>
         <copyright>Copyright © 2016-2019 Maksim Volkau</copyright>
         <projectUrl>https://github.com/dadhi/DryIoc</projectUrl>
-        <licenseUrl>https://github.com/dadhi/DryIoc/blob/master/LICENSE.txt</licenseUrl>
+        <license type="expression">MIT</license>
         <iconUrl>https://github.com/dadhi/DryIoc/blob/master/logo/logo128.png</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>Source code for DryIoc integration with ASP.NET SignalR</description>

diff --git a/nuspecs/DryIoc.Web.nuspec b/nuspecs/DryIoc.Web.nuspec
@@ -6,7 +6,7 @@
         <authors>Maksim Volkau</authors>
         <copyright>Copyright © 2013-2019 Maksim Volkau</copyright>
         <projectUrl>https://github.com/dadhi/DryIoc</projectUrl>
-        <licenseUrl>https://github.com/dadhi/DryIoc/blob/master/LICENSE.txt</licenseUrl>
+        <license type="expression">MIT</license>
         <iconUrl>https://github.com/dadhi/DryIoc/blob/master/logo/logo128.png</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>DryIoc extension for ASP.NET providing Web Request Reuse</description>

diff --git a/nuspecs/DryIoc.WebApi.Owin.nuspec b/nuspecs/DryIoc.WebApi.Owin.nuspec
@@ -6,7 +6,7 @@
         <authors>Maksim Volkau</authors>
         <copyright>Copyright © 2014-2019 Maksim Volkau</copyright>
         <projectUrl>https://github.com/dadhi/DryIoc</projectUrl>
-        <licenseUrl>https://github.com/dadhi/DryIoc/blob/master/LICENSE.txt</licenseUrl>
+        <license type="expression">MIT</license>
         <iconUrl>https://github.com/dadhi/DryIoc/blob/master/logo/logo128.png</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>DryIoc extension for ASP.NET WebAPI and OWIN</description>

diff --git a/nuspecs/DryIoc.WebApi.nuspec b/nuspecs/DryIoc.WebApi.nuspec
@@ -6,7 +6,7 @@
         <authors>Maksim Volkau</authors>
         <copyright>Copyright © 2013-2019 Maksim Volkau</copyright>
         <projectUrl>https://github.com/dadhi/DryIoc</projectUrl>
-        <licenseUrl>https://github.com/dadhi/DryIoc/blob/master/LICENSE.txt</licenseUrl>
+        <license type="expression">MIT</license>
         <iconUrl>https://github.com/dadhi/DryIoc/blob/master/logo/logo128.png</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>DryIoc extension for ASP.NET WebAPI</description>

diff --git a/nuspecs/DryIoc.nuspec b/nuspecs/DryIoc.nuspec
@@ -6,7 +6,7 @@
         <authors>Maksim Volkau</authors>
         <copyright>Copyright © 2013-2019 Maksim Volkau</copyright>
         <projectUrl>https://github.com/dadhi/DryIoc</projectUrl>
-        <licenseUrl>https://github.com/dadhi/DryIoc/blob/master/LICENSE.txt</licenseUrl>
+        <license type="expression">MIT</license>
         <iconUrl>https://github.com/dadhi/DryIoc/blob/master/logo/logo128.png</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>DryIoc is fast, small, full-featured IoC Container for .NET</description>
@@ -80,10 +80,6 @@
                 <dependency id="NETStandard.Library" version="1.6.1" />
                 <dependency id="System.Reflection.Emit.Lightweight" version="4.3.0" />
             </group>
-            <!-- matched to netstandard1.4 -->
-            <group targetFramework="xamarin.ios10">
-                <dependency id="System.Reflection.Emit.Lightweight" version="4.3.0" />
-            </group>
             <group targetFramework="netstandard2.0">
                 <dependency id="System.Reflection.Emit.Lightweight" version="4.3.0" />
             </group>
@@ -93,7 +89,7 @@
     </metadata>
     <files>
         <file src="..\LICENSE.txt" />
-        <file src="..\nuspecs\DryIoc.snk" />
+        <file src="..\DryIoc.snk" />
 
         <!--net35-->
         <file src="..\src\DryIoc\Container.cs" target="content\net35\DryIoc" />

diff --git a/nuspecs/DryIocAttributes.nuspec b/nuspecs/DryIocAttributes.nuspec
@@ -6,7 +6,7 @@
     <authors>Maksim Volkau</authors>
     <copyright>Copyright © 2013-2019 Maksim Volkau</copyright>
     <projectUrl>https://github.com/dadhi/DryIoc</projectUrl>
-    <licenseUrl>https://github.com/dadhi/DryIoc/blob/master/LICENSE.txt</licenseUrl>
+    <license type="expression">MIT</license>
     <iconUrl>https://github.com/dadhi/DryIoc/blob/master/logo/logo128.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Super-set of MEF attributes. In addition to Export/Import contains attributes to support modern IOC (DryIoc) features.</description>

diff --git a/nuspecs/DryIocZero.nuspec b/nuspecs/DryIocZero.nuspec
@@ -7,7 +7,7 @@
     <authors>Maksim Volkau</authors>
     <copyright>Copyright © 2016-2018 Maksim Volkau</copyright>
     <projectUrl>https://github.com/dadhi/DryIoc</projectUrl>
-    <licenseUrl>https://github.com/dadhi/DryIoc/blob/master/LICENSE.txt</licenseUrl>
+    <license type="expression">MIT</license>
     <iconUrl>https://github.com/dadhi/DryIoc/blob/master/logo/logo128.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Lightweight IoC Container based on service factory delegates generated at compile-time by DryIoc. Compile-time delegate generation minimizes run-time IoC setup time to Zero.</description>

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -5,6 +5,7 @@
     <PropertyGroup>
         <NeutralLanguage>en-US</NeutralLanguage>
         <PackageLicense>https://github.com/dadhi/DryIoc/blob/master/LICENSE.txt</PackageLicense>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
         <PackageProjectUrl>https://github.com/dadhi/DryIoc</PackageProjectUrl>
         <PackageIconUrl>https://github.com/dadhi/DryIoc/blob/master/logo/logo128.png</PackageIconUrl>