* update appveyor.yml to allow github release publication from 'vX.Y-…

…release.Z' tags * update deps
skbkontur · Mar 12, 2020 · 40b9302 · 40b9302
1 parent 5c1a6ce
commit 40b9302
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 16 deletions.
diff --git a/.publish-nuget-package.cmd → .rebuild-nuget-package.cmd b/.publish-nuget-package.cmd → .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
diff --git 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
@@ -4,16 +4,17 @@
   <PropertyGroup>
     <DebugType>full</DebugType>
     <DebugSymbols>true</DebugSymbols>
-    <EmbedAllSources>true</EmbedAllSources>
   </PropertyGroup>
 
   <!-- include pdbs into nuget package -->
   <PropertyGroup>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="2.3.138" PrivateAssets="All" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.1.68" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -9,7 +9,6 @@
 
   <Target Name="SetNuSpecProperties" BeforeTargets="GenerateNuspec" DependsOnTargets="GetBuildVersion">
     <PropertyGroup>
-      <PackageId>$(AssemblyName)</PackageId>
       <Authors>Andrew Kostousov</Authors>
       <PackageDescription>NUnit extensions simplifying DI-container management in tests</PackageDescription>
       <PackageTags>GroboContainer NUnit</PackageTags>

diff --git a/GroboContainer.NUnitExtensions.Tests/GroboContainer.NUnitExtensions.Tests.csproj b/GroboContainer.NUnitExtensions.Tests/GroboContainer.NUnitExtensions.Tests.csproj
@@ -2,14 +2,14 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net472;netcoreapp2.2</TargetFrameworks>
+    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="5.6.0" />
-    <PackageReference Include="JetBrains.Annotations" Version="2019.1.1" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
+    <PackageReference Include="FluentAssertions" Version="5.10.2" />
+    <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/GroboContainer.NUnitExtensions/GroboContainer.NUnitExtensions.csproj b/GroboContainer.NUnitExtensions/GroboContainer.NUnitExtensions.csproj
@@ -2,11 +2,12 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <PackageId>GroboContainer.NUnitExtensions</PackageId>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="GroboContainer" Version="1.2.45" />
-    <PackageReference Include="NUnit" Version="3.11.0" />
+    <PackageReference Include="NUnit" Version="3.12.0" />
   </ItemGroup>
 
 </Project>
diff --git 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
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "2.2.100"
+    "version": "3.1.100"
   }
 }