diff --git a/.publish-nuget-package.cmd b/.rebuild-nuget-package.cmd similarity index 79% rename from .publish-nuget-package.cmd rename to .rebuild-nuget-package.cmd index 6fb57d1..9464385 100644 --- a/.publish-nuget-package.cmd +++ b/.rebuild-nuget-package.cmd @@ -13,8 +13,4 @@ dotnet build --force --no-incremental --configuration Release "./%SolutionName%. dotnet pack --no-build --configuration Release "./%SolutionName%.sln" || exit /b 1 -pushd "./%SolutionName%/bin/Release" -dotnet nuget push *.nupkg -s https://nuget.org || exit /b 1 -popd - pause \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index bd88025..6d6b32f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## v1.0.x - 2020.03.12 +- Update dependencies +- Use [SourceLink](https://github.com/dotnet/sourcelink) to help ReSharper decompiler show actual code. + ## v1.0.35 - 2019.11.07 - Make exception thrown in test method visible to user when exception also occurs in TearDown method (PR [#4](https://github.com/skbkontur/GroboContainer.NUnitExtensions/pull/4)). diff --git a/Directory.Build.props b/Directory.Build.props index 092f784..ca18689 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -4,16 +4,17 @@ full true - true + true $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb - + + \ No newline at end of file diff --git a/Directory.Build.targets b/Directory.Build.targets index d49f1c3..7e32a95 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -9,7 +9,6 @@ - $(AssemblyName) Andrew Kostousov NUnit extensions simplifying DI-container management in tests GroboContainer NUnit diff --git a/GroboContainer.NUnitExtensions.Tests/GroboContainer.NUnitExtensions.Tests.csproj b/GroboContainer.NUnitExtensions.Tests/GroboContainer.NUnitExtensions.Tests.csproj index 966b0d9..37fd6e5 100644 --- a/GroboContainer.NUnitExtensions.Tests/GroboContainer.NUnitExtensions.Tests.csproj +++ b/GroboContainer.NUnitExtensions.Tests/GroboContainer.NUnitExtensions.Tests.csproj @@ -2,14 +2,14 @@ false - net472;netcoreapp2.2 + net472;netcoreapp3.1 - - - - + + + + diff --git a/GroboContainer.NUnitExtensions/GroboContainer.NUnitExtensions.csproj b/GroboContainer.NUnitExtensions/GroboContainer.NUnitExtensions.csproj index 403c8ce..4cc586b 100644 --- a/GroboContainer.NUnitExtensions/GroboContainer.NUnitExtensions.csproj +++ b/GroboContainer.NUnitExtensions/GroboContainer.NUnitExtensions.csproj @@ -2,11 +2,12 @@ netstandard2.0 + GroboContainer.NUnitExtensions - + diff --git a/appveyor.yml b/appveyor.yml index 5eecba8..0b4e5fa 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,7 +4,7 @@ skip_commits: files: - '**/*.md' -image: Visual Studio 2017 +image: Visual Studio 2019 init: - cmd: git config --global core.autocrlf false @@ -15,7 +15,7 @@ init: { $env:SHOULD_PUBLISH_NUGET_PACKAGE = "true" Write-Host "Will publish nuget package for $tagName tag" -ForegroundColor "Green" - if ($tagName -match '^v\d+\.\d+-release$') # tag name matches 'vX.Y-release' + if ($tagName -match '^v\d+\.\d+-release') # tag name starts with 'vX.Y-release' (e.g. use 'v4.2-release.1' tag for the first patch for release v4.2) { $env:SHOULD_CREATE_RELEASE = "true" Write-Host "Will create release for $tagName tag" -ForegroundColor "Green" diff --git a/global.json b/global.json index a4a01b2..7c33201 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "2.2.100" + "version": "3.1.100" } } \ No newline at end of file