diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 41a7922..0776b1d 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -19,11 +19,6 @@ jobs: timeoutInMinutes: 360 steps: - - script: | - rm -rf /opt/ghc - df -h - displayName: Manage disk space - # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index a192c0b..d66c7d1 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -5,7 +5,7 @@ jobs: - job: win pool: - vmImage: windows-2019 + vmImage: windows-2022 strategy: matrix: win_64_: @@ -36,7 +36,7 @@ jobs: - script: | call activate base - mamba.exe install "python=3.9" conda-build conda pip boa conda-forge-ci-setup=3 "py-lief<0.12" -c conda-forge --strict-channel-priority --yes + mamba.exe install "python=3.10" conda-build conda pip boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes displayName: Install conda-build - script: set PYTHONUNBUFFERED=1 @@ -60,7 +60,10 @@ jobs: if EXIST LICENSE.txt ( copy LICENSE.txt "recipe\\recipe-scripts-license.txt" ) - conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables + if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" + ) + conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% displayName: Build recipe env: PYTHONUNBUFFERED: 1 diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index a0e5357..087fe38 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -7,11 +7,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libcurl: -- '7' +- '8' target_platform: - linux-64 zlib: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index b6a4969..baf097a 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -11,11 +11,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libcurl: -- '7' +- '8' target_platform: - linux-aarch64 zlib: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 5a36916..f5d277e 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -7,9 +7,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' libcurl: -- '7' +- '8' macos_machine: - x86_64-apple-darwin13.4.0 target_platform: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 1e1bbac..64b29dd 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -7,9 +7,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' libcurl: -- '7' +- '8' macos_machine: - arm64-apple-darwin20.0.0 target_platform: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 84431a6..a6b09f6 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -33,9 +33,9 @@ CONDARC mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index b3abaeb..3969edf 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -24,9 +24,9 @@ source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 @@ -55,11 +55,6 @@ source run_conda_forge_build_setup echo -e "\n\nMaking the build clobber file" make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml -if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then - EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" -fi - - if [[ -f LICENSE.txt ]]; then cp LICENSE.txt "recipe/recipe-scripts-license.txt" fi @@ -75,6 +70,11 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else + + if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" + fi + conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml diff --git a/README.md b/README.md index dbda14e..0a04178 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,62 @@ +About dotnet-feedstock +====================== + +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/dotnet-feedstock/blob/main/LICENSE.txt) + + About dotnet -============ +------------ + +Home: https://github.com/dotnet/core + +Package license: MIT + +Summary: .NET Core is a free and open-source managed computer software +framework for the Windows, Linux, and macOS operating systems. + + +About dotnet-runtime +-------------------- Home: https://github.com/dotnet/runtime Package license: MIT -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/dotnet-feedstock/blob/main/LICENSE.txt) +Summary: .NET Core is a free and open-source managed computer software +framework for the Windows, Linux, and macOS operating systems. + + +About dotnet-aspnetcore +----------------------- + +Home: https://github.com/dotnet/aspnetcore + +Package license: MIT + +Summary: .NET Core is a free and open-source managed computer software +framework for the Windows, Linux, and macOS operating systems. + +.NET Core is a free and open-source managed computer software +framework for the Windows, Linux, and macOS operating systems. + + +About dotnet-sdk +---------------- + +Home: https://github.com/dotnet/sdk + +Package license: MIT + +Summary: .NET Core is a free and open-source managed computer software +framework for the Windows, Linux, and macOS operating systems. + + +About dotnet-desktop +-------------------- + +Home: https://github.com/dotnet/desktop + +Package license: MIT Summary: .NET Core is a free and open-source managed computer software framework for the Windows, Linux, and macOS operating systems. diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f515850..904d00b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,10 +1,10 @@ -{% set sdk_version = "7.0.102" %} -{% set runtime_version = "7.0.2" %} -{% set sha256 = "3e19e27c3a82fbd2f8513c8f2ada3f7e1fc64fe266125c8ce5b7b1ce7db7676e" %} # [aarch64] -{% set sha256 = "28b4d4821bca2c5b12d69e6a4509f2b975b479546d88d714dfe5ebccc3d8e30f" %} # [linux] -{% set sha256 = "f4b342fb61075a9dedc9acb7d6efe482a22bbfe409b1f49604134c6fdbb3a1e7" %} # [arm64] -{% set sha256 = "aa80daf5d3c03cf6242d51e367993b5451b9444d6973653d1a4cec59f71f975c" %} # [osx] -{% set sha256 = "50e8800a0c282a367c9936cd311769d4ce5a721a56833f82943d9d11c084adbb" %} # [win] +{% set sdk_version = "7.0.400" %} +{% set runtime_version = "7.0.10" %} +{% set sha256 = "8ec9e3baf3af62a2c79c8dc6e6c4b542e2b4e85b6596beb317a80d7d914a00ca" %} # [aarch64] +{% set sha256 = "35b5df21e609e4fb8cfe331999d32dc636e7ef5fc712c8e2694318e826a81746" %} # [linux] +{% set sha256 = "04ed7db1fe7da99eb88c8e6496714991ee63effc4eaaa7c4aad33b9a36fdc77c" %} # [arm64] +{% set sha256 = "6d67846aaaef7f1e49bb80f4e737828ad16527397bd78fdd9cfc978afbb31052" %} # [osx] +{% set sha256 = "5fe7fcde845c91bdfc29b2347b5e697defa8106313fe1d3ff32b9463f2cc3bc2" %} # [win] {% set platform = "linux-arm64" %} # [aarch64] {% set platform = "linux-x64" %} # [linux] {% set platform = "osx-arm64" %} # [arm64]