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]
gfoidl · Sep 24, 2019 · 48def80 · 48def80
1 parent 4e0f68b
commit 48def80
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 33 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1,15 +1,15 @@
 <Project>
 
     <PropertyGroup>
-        <VersionMajor Condition="'$(VersionMajor)' == ''">0</VersionMajor>
-        <VersionMinor Condition="'$(VersionMinor)' == ''">1</VersionMinor>
+        <VersionMajor Condition="'$(VersionMajor)' == ''">1</VersionMajor>
+        <VersionMinor Condition="'$(VersionMinor)' == ''">0</VersionMinor>
         <VersionPatch Condition="'$(VersionPatch)' == ''">0</VersionPatch>
-        <BuildNumber Condition="'$(BuildNumber)' == ''">0</BuildNumber>
+        <BuildNumber Condition="'$(BuildNumber)' == ''">100</BuildNumber>
         <VersionSuffix Condition="'$(Configuration)' == 'Debug' and '$(VersionSuffix)' == ''">dev</VersionSuffix>
         <Authors>gfoidl</Authors>
         <Company>Foidl Günther</Company>
         <Product>Base64</Product>
-        <Copyright>Copyright © Foidl Günther 2018</Copyright>
+        <Copyright>Copyright © Foidl Günther 2018-2019</Copyright>
         <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
         <AssemblyVersion>$(VersionMajor).$(VersionMinor).$(BuildNumber).$(VersionPatch)</AssemblyVersion>
     </PropertyGroup>

diff --git 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
@@ -5,7 +5,7 @@
     <PropertyGroup>
         <DeveloperBuildTestTfms>netcoreapp3.0;netcoreapp2.1</DeveloperBuildTestTfms>
         <StandardTestTfms>$(DeveloperBuildTestTfms)</StandardTestTfms>
-        <StandardTestTfms Condition="'$(OS)' == 'Windows_NT'">$(StandardTestTfms);net472</StandardTestTfms>
+        <StandardTestTfms Condition="'$(OS)' == 'Windows_NT'">$(StandardTestTfms);net48</StandardTestTfms>
     </PropertyGroup>
 
     <PropertyGroup>