diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cf44f3dc6..48a17912e 100644 --- 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 index 5854c2c61..7e160ddd4 100644 --- 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 index d9ac1ac7d..e1fa9b2ef 100644 --- a/Package/nuget/IronPython.StdLib.nuspec +++ b/Package/nuget/IronPython.StdLib.nuspec @@ -7,14 +7,14 @@ IronPython Contributors,Python Contributors IronPython Community http://ironpython.net - http://docs.python.org/license.html + PSF-2.0 false The Python Standard Library, for use with IronPython. The Python Standard Library, for use with IronPython. en-US ironpython python dynamic dlr standard library - + diff --git a/Package/nuget/IronPython.nuspec b/Package/nuget/IronPython.nuspec index 4a4aa1e3c..fd2f6bb15 100644 --- a/Package/nuget/IronPython.nuspec +++ b/Package/nuget/IronPython.nuspec @@ -17,7 +17,7 @@ - + @@ -26,7 +26,7 @@ - + diff --git a/make.ps1 b/make.ps1 index 70318a2ed..e23cbc5fc 100755 --- 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 {