Fix building of tag versions (#111)

* Fix building of tag versions * Update .appveyor.yml * fix
jonnii · Nov 10, 2020 · a18c1f0 · a18c1f0
1 parent d9fabbc
commit a18c1f0
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 53 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -1,34 +1,21 @@
 skip_branch_with_pr: true
 
-# build cache to preserve files/folders between builds
-cache:
-  - '%LocalAppData%\NuGet\v3-cache'
-
-image: Visual Studio 2017
+image: Visual Studio 2019
 configuration: Release
 
-install:
-  - choco install gitversion.portable -pre -y
-  - cmd: dotnet restore src\SpeakEasy.sln
+before_build:
   - ps: gitversion /l console /output buildserver
 
-dotnet_csproj:
-  patch: true
-  file: 'src\**\*.csproj'
-  version: $(GitVersion_NuGetVersion)
-  package_version: $(GitVersion_NuGetVersion)
-  assembly_version: $(GitVersion_MajorMinorPatch)
-  file_version: $(GitVersion_MajorMinorPatch)
-  informational_version: $(GitVersion_MajorMinorPatch)
-
-build:
-  parallel: true
-  project: src\SpeakEasy.sln
-  publish_nuget: true
-  publish_nuget_symbols: true
+build_script:
+  - ps: dotnet restore src\SpeakEasy.sln
+  - ps: dotnet build src\SpeakEasy.sln --no-restore --configuration Release /p:Version=$env:GitVersion_SemVer /p:AssemblyVersion=$env:GitVersion_AssemblySemVer /p:FileVersion=$env:GitVersion_AssemblySemFileVer /p:InformationalVersion=$env:GitVersion_InformationalVersion
+  - ps: dotnet pack src\SpeakEasy.sln --configuration Release --no-restore --no-build --output artifacts /p:Version=$env:GitVersion_SemVer
 
 test_script:
-  - ps: .\build\run-tests.ps1
+  - ps: dotnet test src\SpeakEasy.sln
+
+artifacts:
+  - path: artifacts/*
 
 deploy:
   provider: NuGet
@@ -37,3 +24,4 @@ deploy:
     secure: oG6FNO1zPKE7PDFAlOw9AmsVV2ZxO3VIWorkUXD4oKALfTd+p8E1IYIf22ZyS3LU
   on:
     appveyor_repo_tag: true
+  artifact: /.*\.nupkg/
diff --git a/.gitignore b/.gitignore
@@ -46,6 +46,7 @@ _ReSharper*/
 
 #NuGet
 packages/
+artifacts/
 
 #ncrunch
 *ncrunch*

diff --git a/build/run-tests.ps1 b/build/run-tests.ps1
diff --git a/src/SpeakEasy.IntegrationTests/SpeakEasy.IntegrationTests.csproj b/src/SpeakEasy.IntegrationTests/SpeakEasy.IntegrationTests.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <VersionPrefix>2.0.0</VersionPrefix>
     <Authors>jonnii</Authors>
     <TargetFrameworks>netcoreapp2.1</TargetFrameworks>
     <AssemblyName>SpeakEasy.IntegrationTests</AssemblyName>
@@ -27,8 +26,6 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-
-    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
 
     <ProjectReference Include="..\SpeakEasy\SpeakEasy.csproj" />
   </ItemGroup>

diff --git a/src/SpeakEasy.Specifications/SpeakEasy.Specifications.csproj b/src/SpeakEasy.Specifications/SpeakEasy.Specifications.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <VersionPrefix>2.0.0</VersionPrefix>
     <Authors>jonnii</Authors>
     <TargetFrameworks>netcoreapp2.1</TargetFrameworks>
     <AssemblyName>SpeakEasy.Specifications</AssemblyName>
@@ -23,9 +22,4 @@
     <ProjectReference Include="..\SpeakEasy\SpeakEasy.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/SpeakEasy.sln b/src/SpeakEasy.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27004.2008
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30621.155
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SpeakEasy", "SpeakEasy\SpeakEasy.csproj", "{ACFAEFBE-EE50-459F-B7DF-8C30068626CF}"
 EndProject
@@ -15,7 +15,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{7044505B-5
 		..\GitVersion.yml = ..\GitVersion.yml
 		..\LICENSE.txt = ..\LICENSE.txt
 		..\README.md = ..\README.md
-		..\VERSION = ..\VERSION
 	EndProjectSection
 EndProject
 Global

diff --git a/src/SpeakEasy/SpeakEasy.csproj b/src/SpeakEasy/SpeakEasy.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <Description>SpeakEasy... making http easy!</Description>
     <AssemblyTitle>SpeakEasy</AssemblyTitle>
-    <VersionPrefix>1.0.0</VersionPrefix>
     <Authors>jonnii</Authors>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <AssemblyName>SpeakEasy</AssemblyName>