From 48def8030eb25fe6fe1c4f4f9e749ccbdd6e9be0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Foidl?= Date: Tue, 24 Sep 2019 14:04:59 +0200 Subject: [PATCH] Updates for v1.0.0 and .NET Core 3.0 (#76) * Updates for v1.0.0 and .NET Core 3.0 * PR Feedback [skip ci] --- .azure/pipelines/ci.yml | 6 +++--- .azure/pipelines/jobs/benchmarks.yml | 5 +++-- .azure/pipelines/jobs/build_and_test.yml | 24 +++++++----------------- .azure/pipelines/jobs/demo.yml | 5 +++-- Directory.Build.props | 8 ++++---- README.md | 4 ---- tests/Directory.Build.props | 2 +- 7 files changed, 21 insertions(+), 33 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index a36a664..2d634fb 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -4,7 +4,7 @@ variables: CI_BUILD_NUMBER: $(Build.BuildId) BRANCH_NAME: $(Build.SourceBranchName) TAG_NAME: $(Build.SourceBranchName) - SDK_VERSION: 3.0.100-preview6-012085 + SDK_VERSION: 3.x jobs: - template: jobs/build_and_test.yml @@ -48,13 +48,13 @@ jobs: echo "Nuget-Packed:" ls -la "NuGet-Packed" - if [[ "$TAG_NAME" =~ ^v([0-9])\.([0-9])\.([0-9])(-(preview-[0-9]+))$ ]]; then + if [[ "$TAG_NAME" =~ ^v([0-9]+)\.([0-9]+)\.([0-9]+)(-(preview-[0-9]+))$ ]]; then mkdir deploy_myget for package in NuGet-Packed/*.nupkg; do mv $package deploy_myget done - elif [[ "$TAG_NAME" =~ ^v([0-9])\.([0-9])\.([0-9])$ ]]; then + elif [[ "$TAG_NAME" =~ ^v([0-9]+)\.([0-9]+)\.([0-9]+)$ ]]; then mkdir deploy_nuget for package in NuGet-Packed/*.nupkg; do diff --git a/.azure/pipelines/jobs/benchmarks.yml b/.azure/pipelines/jobs/benchmarks.yml index a47f989..760c000 100644 --- a/.azure/pipelines/jobs/benchmarks.yml +++ b/.azure/pipelines/jobs/benchmarks.yml @@ -12,10 +12,11 @@ jobs: vmImage: ${{ parameters.vmImage }} timeoutInMinutes: 0 # 360 minutes steps: - - task: DotNetCoreInstaller@0 + - task: UseDotNet@2 + displayName: 'Use dotnet sdk 3.x' inputs: - packageType: sdk version: $(SDK_VERSION) + includePreviewVersions: true - bash: | chmod u+x *.sh diff --git a/.azure/pipelines/jobs/build_and_test.yml b/.azure/pipelines/jobs/build_and_test.yml index a2e74d2..2cf771c 100644 --- a/.azure/pipelines/jobs/build_and_test.yml +++ b/.azure/pipelines/jobs/build_and_test.yml @@ -14,26 +14,16 @@ jobs: release-build: BUILD_CONFIG: Release steps: - - task: DotNetCoreInstaller@0 + - task: UseDotNet@2 + displayName: 'Use dotnet sdk 3.x' inputs: - packageType: sdk version: $(SDK_VERSION) - condition: eq( variables['Agent.OS'], 'Windows_NT' ) + includePreviewVersions: true - - bash: | - curl -o dotnet-install.sh https://dot.net/v1/dotnet-install.sh - mkdir dotnet - chmod u+x ./dotnet-install.sh - ./dotnet-install.sh --install-dir $(pwd)/dotnet -v $SDK_VERSION - ./dotnet-install.sh --install-dir $(pwd)/dotnet -v 2.1.500 - rm $(pwd)/dotnet-install.sh - export PATH="$(pwd)/dotnet:$PATH" - - echo 'installed sdks:' - dotnet --list-sdks - echo "-------------------------------------------------" - displayName: 'installing .net core sdks' - condition: ne( variables['Agent.OS'], 'Windows_NT' ) + - task: UseDotNet@2 + displayName: 'Use dotnet sdk 2.1' + inputs: + version: 2.1.x - bash: | export PATH="$(pwd)/dotnet:$PATH" diff --git a/.azure/pipelines/jobs/demo.yml b/.azure/pipelines/jobs/demo.yml index 1e3dcfe..41ad160 100644 --- a/.azure/pipelines/jobs/demo.yml +++ b/.azure/pipelines/jobs/demo.yml @@ -10,10 +10,11 @@ jobs: pool: vmImage: ${{ parameters.vmImage }} steps: - - task: DotNetCoreInstaller@0 + - task: UseDotNet@2 + displayName: 'Use dotnet sdk 3.x' inputs: - packageType: sdk version: $(SDK_VERSION) + includePreviewVersions: true - bash: | cd demo/gfoidl.Base64.Demo diff --git a/Directory.Build.props b/Directory.Build.props index f36156a..0f76091 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,15 +1,15 @@  - 0 - 1 + 1 + 0 0 - 0 + 100 dev gfoidl Foidl Günther Base64 - Copyright © Foidl Günther 2018 + Copyright © Foidl Günther 2018-2019 $(VersionMajor).$(VersionMinor).$(VersionPatch) $(VersionMajor).$(VersionMinor).$(BuildNumber).$(VersionPatch) diff --git a/README.md b/README.md index eb2de26..13de2d8 100644 --- a/README.md +++ b/README.md @@ -2,10 +2,6 @@ | -- | -- | -- | -- | | [![Build Status](https://dev.azure.com/gh-gfoidl/github-Projects/_apis/build/status/github-Projects-CI)](https://dev.azure.com/gh-gfoidl/github-Projects/_build/latest?definitionId=5)| [![codecov](https://codecov.io/gh/gfoidl/Base64/branch/master/graph/badge.svg)](https://codecov.io/gh/gfoidl/Base64) | [![NuGet](https://img.shields.io/nuget/v/gfoidl.Base64.svg?style=flat-square)](https://www.nuget.org/packages/gfoidl.Base64/) | [![MyGet](https://img.shields.io/myget/gfoidl/v/gfoidl.Base64.svg?style=flat-square)](https://www.myget.org/feed/gfoidl/package/nuget/gfoidl.Base64) | -## Note - -This project is WIP, as hardware intrinsics in .NET Core are also WIP. - # gfoidl.Base64 A .NET library for base64 encoding / decoding, as well as base64Url support. diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index 1490f8f..5c40489 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -5,7 +5,7 @@ netcoreapp3.0;netcoreapp2.1 $(DeveloperBuildTestTfms) - $(StandardTestTfms);net472 + $(StandardTestTfms);net48