Re-enable packaging (IronLanguages#1041)

slozier · web-flow · commit 59269e815a41 · 2020-11-19T16:50:40.000-05:00
* Re-enable packaging

* Don't specify Mono version on macos

* Update nuspec

* Dump msbuild version info

* Output msbuild version on make package
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -31,22 +31,20 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: '5.0.x'
-    - name: Set Mono Version
-      if: matrix.os == 'macos-latest'
-      run: echo ::add-path::/Library/Frameworks/Mono.framework/Versions/6.4.0/bin
     - name: Version Information
       run: |
         dotnet --info
+        try { msbuild -version } catch { }
         try { mono --version } catch { }
       shell: pwsh
     - name: Build
       run: pwsh make.ps1
-#    - name: Package
-#      run: pwsh make.ps1 package
-#    - uses: actions/upload-artifact@v2
-#      with:
-#        name: packages
-#        path: Package/Release/Packages
+    - name: Package
+      run: pwsh make.ps1 package
+    - uses: actions/upload-artifact@v2
+      with:
+        name: packages
+        path: Package/Release/Packages
     - name: Test (net46)
       run: ./make.ps1 -frameworks net46 test-all
       shell: pwsh
diff --git a/Build/steps.yml b/Build/steps.yml
@@ -99,9 +99,9 @@ steps:
       testRunTitle: ${{ parameters.os }}
     condition: succeededOrFailed()
 
-#  - powershell: ./make.ps1 package
-#    displayName: Package
-#    condition: succeededOrFailed()
+  - powershell: ./make.ps1 package
+    displayName: Package
+    condition: succeededOrFailed()
 
   - task: CopyFiles@2
     displayName: Copy NuGet and Zip Packages
diff --git a/Package/nuget/IronPython.StdLib.nuspec b/Package/nuget/IronPython.StdLib.nuspec
@@ -7,14 +7,14 @@
     <authors>IronPython Contributors,Python Contributors</authors>
     <owners>IronPython Community</owners>
     <projectUrl>http://ironpython.net</projectUrl>
-    <licenseUrl>http://docs.python.org/license.html</licenseUrl>
+    <license type="expression">PSF-2.0</license>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>The Python Standard Library, for use with IronPython.</description>
     <summary>The Python Standard Library, for use with IronPython.</summary>
     <language>en-US</language>
     <tags>ironpython python dynamic dlr standard library</tags>
     <dependencies>
-      <dependency id="IronPython" version="[3.4.0-alpha0,3.5)" />
+      <dependency id="IronPython" version="[3.4.0-alpha1,3.5)" />
     </dependencies>
     <contentFiles>
       <files include="**\*" buildAction="None" copyToOutput="true" />
diff --git a/Package/nuget/IronPython.nuspec b/Package/nuget/IronPython.nuspec
@@ -17,7 +17,7 @@
     <dependencies>
       <group targetFramework="net46">
         <dependency id="DynamicLanguageRuntime" version="1.3.0" />
-        <dependency id="System.Memory" version="4.5.3" />
+        <dependency id="System.Memory" version="4.5.4" />
       </group>
       <group targetFramework="netcoreapp2.1">
         <dependency id="DynamicLanguageRuntime" version="1.3.0" />
@@ -26,7 +26,7 @@
       </group>
       <group targetFramework="netstandard2.0">
         <dependency id="DynamicLanguageRuntime" version="1.3.0" />
-        <dependency id="System.Memory" version="4.5.3" />
+        <dependency id="System.Memory" version="4.5.4" />
         <dependency id="System.Text.Encoding.CodePages" version="4.6.0" />
         <dependency id="Microsoft.Win32.Registry" version="4.5.0" />
       </group>
diff --git a/make.ps1 b/make.ps1
@@ -60,6 +60,8 @@ function Main([String] $target, [String] $configuration) {
     }
 
     if (!$global:isUnix -And ($target -eq "Package")) {
+        msbuild -version
+        write-host ""
         msbuild Build.proj /m /t:$target /p:Configuration=$configuration /verbosity:minimal /nologo /p:Platform="Any CPU" /bl:build-$target-$configuration.binlog
     }
     else {

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,8 @@ function Main([String] $target, [String] $configuration) {`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`if (!$global:isUnix -And ($target -eq "Package")) {`
	`63`	`+ msbuild -version`
	`64`	`+ write-host ""`
`63`	`65`	`msbuild Build.proj /m /t:$target /p:Configuration=$configuration /verbosity:minimal /nologo /p:Platform="Any CPU" /bl:build-$target-$configuration.binlog`
`64`	`66`	`}`
`65`	`67`	`else {`