Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Build/steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Package/nuget/IronPython.StdLib.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
4 changes: 2 additions & 2 deletions Package/nuget/IronPython.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions make.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down