diff --git a/.nuget/packages.config b/.nuget/packages.config
index 1137507..96f56b2 100644
--- a/.nuget/packages.config
+++ b/.nuget/packages.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NuProj" version="0.11.14-beta" />
   <package id="vswhere" version="1.0.62" />
 </packages>
diff --git a/appveyor.yml b/appveyor.yml
index d2174e8..20b9097 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -22,9 +22,16 @@ notifications:
 cache:
   - packages -> **\packages.config
 
-before_build:
+install:
   - nuget restore
 
+build:
+  parallel: true
+  verbosity: detailed
+
+after_build:
+  - echo nuget pack -OutputDirectory "bin\$(configuration)" -Version $(GitBuildVersionSimple) -Properties "Configuration=$(configuration);CommitId=$(APPVEYOR_REPO_COMMIT)" pkg\vswhere\vswhere.nuspec
+
 test_script:
   - tools\test.cmd -v
 
diff --git a/inc/Common.Cpp.targets b/inc/Common.Cpp.targets
index f86966e..6d0b3f4 100644
--- a/inc/Common.Cpp.targets
+++ b/inc/Common.Cpp.targets
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <BuildDependsOn>
       GenerateVersionInfo;
+      SetCloudVersionVariables;
       $(BuildDependsOn)
     </BuildDependsOn>
   </PropertyGroup>
@@ -48,4 +49,8 @@
       <FileWrites Include="$(_VersionInfoFile)"/>
     </ItemGroup>
   </Target>
+  <Target Name="SetCloudVersionVariables" DependsOnTargets="GetBuildVersion">
+    <Exec Condition="'$(APPVEYOR)'=='True'" Command="appveyor SetVariable -Name GitBuildVersionSimple -Value &quot;$(BuildVersionSimple)&quot;"/>
+    <Message Condition="'$(SYSTEM_TEAMPROJECTID)'!=''" Text="##vso[task.setvariable variable=GitBuildVersionSimple;]$(BuildVersionSimple)"/>
+  </Target>
 </Project>
diff --git a/pkg/vswhere/vswhere.nuproj b/pkg/vswhere/vswhere.nuproj
deleted file mode 100644
index 372d5ac..0000000
--- a/pkg/vswhere/vswhere.nuproj
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|AnyCPU">
-      <Configuration>Debug</Configuration>
-      <Platform>AnyCPU</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|AnyCPU">
-      <Configuration>Release</Configuration>
-      <Platform>AnyCPU</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\vswhere\vswhere.vcxproj">
-      <PackageDirectory>Tools</PackageDirectory>
-      <PackageOutputGroups>BuiltProjectOutputGroup;BuiltProjectOutputGroupDependencies;</PackageOutputGroups>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="..\..\LICENSE.txt">
-      <Link>tools\LICENSE.txt</Link>
-    </Content>
-    <None Include="packages.config" />
-    <Content Include="build\vswhere.props" />
-    <Content Include="tools\VERIFICATION.txt" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>87c09ce6-ba2d-4fc3-92e4-44253e87cb69</ProjectGuid>
-    <OutputPath>$(SolutionDir)bin\$(Configuration)\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <NuProjPath Condition="Exists('$(SolutionDir)packages\NuProj.0.11.14-beta\tools\')">$(SolutionDir)packages\NuProj.0.11.14-beta\tools\</NuProjPath>
-    <NuProjPath Condition=" '$(NuProjPath)' == '' ">$(MSBuildExtensionsPath)\NuProj\</NuProjPath>
-    <VersionDependsOn>$(VersionDependsOn);GetPackageVersion</VersionDependsOn>
-  </PropertyGroup>
-  <Import Project="$(NuProjPath)\NuProj.props" Condition="Exists('$(NuProjPath)\NuProj.props')" />
-  <PropertyGroup Label="Configuration">
-    <Id>vswhere</Id>
-    <Version>1.0.0</Version>
-    <Title>Visual Studio Locator</Title>
-    <Authors>Microsoft Corporation</Authors>
-    <Owners>Microsoft Corporation</Owners>
-    <Summary>Locate Visual Studio 2017 and newer installations </Summary>
-    <Description>Locate Visual Studio 2017 and newer installations </Description>
-    <ReleaseNotes>
-    </ReleaseNotes>
-    <ProjectUrl>https://github.com/Microsoft/vswhere</ProjectUrl>
-    <LicenseUrl>https://github.com/Microsoft/vswhere/raw/develop/LICENSE.txt</LicenseUrl>
-    <Copyright>Copyright (C) Microsoft Corporation. All rights reserved.</Copyright>
-    <Tags>vs vs2017 visualstudio</Tags>
-    <GenerateSymbolPackage>false</GenerateSymbolPackage>
-  </PropertyGroup>
-  <Target Name="GetPackageVersion" DependsOnTargets="GetBuildVersion">
-    <PropertyGroup>
-      <Version>$(BuildVersionSimple)</Version>
-    </PropertyGroup>
-  </Target>
-  <Import Project="$(NuProjPath)\NuProj.targets" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\packages\Nerdbank.GitVersioning.1.5.97\build\NerdBank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.1.5.97\build\NerdBank.GitVersioning.targets')" />
-  </ImportGroup>
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.1.5.97\build\NerdBank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.1.5.97\build\NerdBank.GitVersioning.targets'))" />
-  </Target>
-</Project>
\ No newline at end of file
diff --git a/pkg/vswhere/vswhere.nuspec b/pkg/vswhere/vswhere.nuspec
new file mode 100644
index 0000000..58d320f
--- /dev/null
+++ b/pkg/vswhere/vswhere.nuspec
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata>
+    <id>vswhere</id>
+    <version>$Version$</version>
+    <title>Visual Studio Locator</title>
+    <authors>Microsoft Corporation</authors>
+    <owners>Microsoft Corporation</owners>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <licenseUrl>https://github.com/Microsoft/vswhere/tree/$CommitId$/LICENSE.txt</licenseUrl>
+    <projectUrl>https://github.com/Microsoft/vswhere</projectUrl>
+    <description>Locate Visual Studio 2017 and newer installations</description>
+    <summary>Locate Visual Studio 2017 and newer installations</summary>
+    <copyright>Copyright (C) Microsoft Corporation. All rights reserved.</copyright>
+    <tags>vs vs2017 visualstudio</tags>
+    <developmentDependency>true</developmentDependency>
+    <!--packageSourceUrl>https://github.com/Microsoft/vswhere/tree/$CommitId$/pkg/vswhere</packageSourceUrl-->
+    <!--docsUrl>https://github.com/Microsoft/vswhere/wiki</docsUrl-->
+    <!--bugTrackerUrl>https://github.com/Microsoft/vswhere/issues</bugTrackerUrl-->
+    <!--projectSourceUrl>https://github.com/Microsoft/vswhere/tree/$CommitId$</projectSourceUrl-->
+  </metadata>
+  <files>
+    <file src="build\vswhere.props" target="build\"/>
+    <file src="..\..\bin\$Configuration$\vswhere.exe" target="tools\"/>
+    <file src="..\..\LICENSE.txt" target="tools\"/>
+    <file src="tools\VERIFICATION.txt" target="tools\"/>
+  </files>
+</package>
\ No newline at end of file
diff --git a/vswhere.sln b/vswhere.sln
index b02da29..8780fbc 100644
--- a/vswhere.sln
+++ b/vswhere.sln
@@ -19,10 +19,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pkg", "pkg", "{A2C0B2B6-0E25-4A8D-96F6-9F44C615AE00}"
-EndProject
-Project("{FF286327-C783-4F7A-AB73-9BCBAD0D4460}") = "vswhere", "pkg\vswhere\vswhere.nuproj", "{87C09CE6-BA2D-4FC3-92E4-44253E87CB69}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x86 = Debug|x86
@@ -41,10 +37,6 @@ Global
 		{4CCF39CB-4794-44E2-AA57-D215F13CF606}.Debug|x86.Build.0 = Debug|Win32
 		{4CCF39CB-4794-44E2-AA57-D215F13CF606}.Release|x86.ActiveCfg = Release|Win32
 		{4CCF39CB-4794-44E2-AA57-D215F13CF606}.Release|x86.Build.0 = Release|Win32
-		{87C09CE6-BA2D-4FC3-92E4-44253E87CB69}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{87C09CE6-BA2D-4FC3-92E4-44253E87CB69}.Debug|x86.Build.0 = Debug|Any CPU
-		{87C09CE6-BA2D-4FC3-92E4-44253E87CB69}.Release|x86.ActiveCfg = Release|Any CPU
-		{87C09CE6-BA2D-4FC3-92E4-44253E87CB69}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -53,6 +45,5 @@ Global
 		{210864F0-9A29-4479-B830-B802EE3F4D92} = {20C5861F-C1E5-4BFB-B082-209793FBDCA5}
 		{76268871-D5A5-46BD-9805-41DB1C3072D1} = {2F0C5F28-FD43-4045-85E8-BBD98B6B66B5}
 		{4CCF39CB-4794-44E2-AA57-D215F13CF606} = {20C5861F-C1E5-4BFB-B082-209793FBDCA5}
-		{87C09CE6-BA2D-4FC3-92E4-44253E87CB69} = {A2C0B2B6-0E25-4A8D-96F6-9F44C615AE00}
 	EndGlobalSection
 EndGlobal