[Feature] Use machine nuget key (#85)

* [Feature] Use machine nuget key * tidy * fix build * tidy
machine · Dec 30, 2018 · 7791803 · 7791803
1 parent d29ea0e
commit 7791803
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 64 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -0,0 +1,4 @@
+next-version: 2.8.0
+branches: {}
+ignore:
+  sha: []
diff --git a/Source/Machine.VSTestAdapter.Specs/Machine.VSTestAdapter.Specs.csproj b/Source/Machine.VSTestAdapter.Specs/Machine.VSTestAdapter.Specs.csproj
@@ -19,8 +19,4 @@
     <ProjectReference Include="..\Machine.VSTestAdapter\Machine.VSTestAdapter.csproj" />
     <ProjectReference Include="..\SampleSpecs\SampleSpecs.csproj" />
   </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
 </Project>
diff --git a/Source/Machine.VSTestAdapter/Machine.VSTestAdapter.csproj b/Source/Machine.VSTestAdapter/Machine.VSTestAdapter.csproj
@@ -28,22 +28,15 @@
 
   <ItemGroup>
     <PackageReference Include="Mono.Cecil" Version="[0.10-*, 0.11)" />
-    <PackageReference Include="Machine.Specifications" Version="[0.11.0, 1.0)">
-      <PrivateAssets>All</PrivateAssets>
-      <!-- Only a reference during build/dev time -->
-    </PackageReference>
+    <PackageReference Include="Machine.Specifications" Version="[0.11.0, 1.0)" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'==$(_TargetDotNetCore)">
-    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="[15.0.0,16)">
-      <PrivateAssets>All</PrivateAssets> <!-- Only a reference during build/dev time -->
-    </PackageReference>
+    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="[15.0.0,16)" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='$(_TargetDotNetFramework)'">
-    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="[11.0.0,16.0.0)">
-      <PrivateAssets>All</PrivateAssets> <!-- Only a reference during build/dev time -->
-    </PackageReference>
+    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="[11.0.0,16.0.0)" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,44 +1,34 @@
-environment:
-  nuget_version: '2.8.0'
-  assembly_version: '2.8.0'
-
-version: '$(nuget_version)+{build}'
-
-pull_requests:
-  do_not_increment_build_number: true
+image: Visual Studio 2017
 
 configuration: Release
-image: Visual Studio 2017
+
+install:
+  - choco install gitversion.portable -pre -y
 
 dotnet_csproj:
   patch: true
   file: '**\*.csproj'
-  version: '$(nuget_version)'
-  assembly_version: '$(assembly_version)'
+  version: $(GitVersion_NuGetVersion)
+  package_version: $(GitVersion_NuGetVersion)
+  assembly_version: $(GitVersion_MajorMinorPatch)
+  file_version: $(GitVersion_MajorMinorPatch)
+  informational_version: $(GitVersion_MajorMinorPatch)
+
+pull_requests:
+  do_not_increment_build_number: true
 
-before_build: dotnet restore
+before_build:
+  - cmd: dotnet restore
+  - ps: gitversion /l console /output buildserver
 
 build:
   publish_nuget: true
-  publish_nuget_symbols: true
-  verbosity: minimal  
 
 test_script: dotnet test -c %CONFIGURATION% Source\Machine.VSTestAdapter.Specs
 
 deploy:
-  - provider: GitHub
-    description: |
-      * Fix for out ot memory exceptions and tests not showing up
-
-    on:
-      appveyor_repo_tag: true
-
-    release: v$(nuget_version)
-    auth_token:
-      secure: VrF5TrpBRN0ims9nJC1LG32O6ga5hsRuGNSufEbatAiIWZ1z68iiCYKZtqnAaT9y
-
   - provider: NuGet
     api_key:
-      secure: R+qirYPrTX9IzJHpRLL6KAV1Lo+vlAnInf6ShiIB2rAGIP28ceJxRAh1jirHE/uD
+      secure: TL0dRg5VvDEghNB05X4nTEOECXqoNiuhVIhCFYrFg3pcaK8jNybRuruK8+S8KdJN
     on:
-      appveyor_repo_tag: true
+      appveyor_repo_tag: true