diff --git a/GitInfo.txt b/GitInfo.txt
index b4f09dd..28af839 100644
--- a/GitInfo.txt
+++ b/GitInfo.txt
@@ -1 +1 @@
-0.2.0-dev
\ No newline at end of file
+0.2.5
\ No newline at end of file
diff --git a/build.cmd b/build.cmd
index 0299cd8..e37071a 100644
--- a/build.cmd
+++ b/build.cmd
@@ -59,7 +59,7 @@ if %MSBuildMajorVersion% LSS 15 (
:: Ensure developer command prompt variables are set
if "%VisualStudioVersion%" == "" (
- for /f "delims=" %%i in ('msbuild build.props -nologo /t:GetVsInstallRoot') do set "VsInstallRoot=%%i" & goto :VsInstallRootDone
+ for /f "delims=" %%i in ('msbuild build.props /nologo /v:m /t:GetVsInstallRoot') do set "VsInstallRoot=%%i" & goto :VsInstallRootDone
:VsInstallRootDone
for /f "tokens=* delims= " %%i in ("%VsInstallRoot%") do set "VsInstallRoot=%%i"
set "DeveloperCommandPrompt=%VsInstallRoot%\Common7\Tools\VsDevCmd.bat"
diff --git a/build.proj b/build.proj
index d184305..2154f83 100644
--- a/build.proj
+++ b/build.proj
@@ -31,8 +31,7 @@
-
-
+
@@ -48,7 +47,7 @@
-
+
@@ -139,20 +138,12 @@
-
-
- 1
- 0
- 0
-
-
-
-
+
\ No newline at end of file
diff --git a/msbuild.rsp b/msbuild.rsp
deleted file mode 100644
index 2dd6fb5..0000000
--- a/msbuild.rsp
+++ /dev/null
@@ -1,3 +0,0 @@
-/consoleloggerparameters:Verbosity=minimal
-/fileLogger
-/fileloggerparameters:LogFile=msbuild.log;verbosity=detailed
diff --git a/src/Build/NuGet.Build.Packaging.Tasks.Shared.targets b/src/Build/NuGet.Build.Packaging.Tasks.Shared.targets
index cc4bf66..999fd2d 100644
--- a/src/Build/NuGet.Build.Packaging.Tasks.Shared.targets
+++ b/src/Build/NuGet.Build.Packaging.Tasks.Shared.targets
@@ -15,6 +15,4 @@
$(MSBuildAllProjects);$(MSBuildThisFileFullPath)
true
-
-
-
+
\ No newline at end of file
diff --git a/src/Build/NuGet.Build.Packaging.Tasks/NuGet.Build.Packaging.Tasks.csproj b/src/Build/NuGet.Build.Packaging.Tasks/NuGet.Build.Packaging.Tasks.csproj
index 1172957..e35818e 100644
--- a/src/Build/NuGet.Build.Packaging.Tasks/NuGet.Build.Packaging.Tasks.csproj
+++ b/src/Build/NuGet.Build.Packaging.Tasks/NuGet.Build.Packaging.Tasks.csproj
@@ -6,7 +6,6 @@
NO-SDK-PACK
-
diff --git a/src/Build/NuGet.Build.Packaging.Tasks/NuGet.Build.Packaging.Tasks.targets b/src/Build/NuGet.Build.Packaging.Tasks/NuGet.Build.Packaging.Tasks.targets
index e084a93..22e2a16 100644
--- a/src/Build/NuGet.Build.Packaging.Tasks/NuGet.Build.Packaging.Tasks.targets
+++ b/src/Build/NuGet.Build.Packaging.Tasks/NuGet.Build.Packaging.Tasks.targets
@@ -12,8 +12,8 @@
- $(MSBuildAllProjects);$(MSBuildThisFileFullPath)
-
+ $(MSBuildAllProjects);$(MSBuildThisFileFullPath)
+
NuGet.Build.Packaging
NuGetizer-3000
NuGetizer-3000
diff --git a/src/Build/NuGet.Build.Packaging.Tests/NuGet.Build.Packaging.Tests.csproj b/src/Build/NuGet.Build.Packaging.Tests/NuGet.Build.Packaging.Tests.csproj
index 3f95151..537319c 100644
--- a/src/Build/NuGet.Build.Packaging.Tests/NuGet.Build.Packaging.Tests.csproj
+++ b/src/Build/NuGet.Build.Packaging.Tests/NuGet.Build.Packaging.Tests.csproj
@@ -13,7 +13,6 @@
-
diff --git a/src/Build/NuGet.Build.Packaging.Tests/Scenarios/Scenario.props b/src/Build/NuGet.Build.Packaging.Tests/Scenarios/Scenario.props
index c80f47f..85c1645 100644
--- a/src/Build/NuGet.Build.Packaging.Tests/Scenarios/Scenario.props
+++ b/src/Build/NuGet.Build.Packaging.Tests/Scenarios/Scenario.props
@@ -28,14 +28,13 @@
false
-
-
1
None
+
+ false
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
new file mode 100644
index 0000000..d7eaa61
--- /dev/null
+++ b/src/Directory.Build.targets
@@ -0,0 +1,74 @@
+
+
+
+
+ true
+ true
+
+ Microsoft
+ Microsoft NuGet Packaging
+ Copyright © 2016
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $([MSBuild]::Add('$(GitCommits)', '1'))
+
+
+
+
+
+
+
+
+ $(GitSemVerDashLabel)-pr$(BUILD_SOURCEBRANCH.Substring(10).TrimEnd('/merge'))
+ $(GitSemVerDashLabel)-pr$(APPVEYOR_PULL_REQUEST_NUMBER)
+
+
+ <_IndexOfBranchSlash>$(GitBranch.LastIndexOf('/'))
+ <_IndexOfBranchSubstring>$([MSBuild]::Add('$(_IndexOfBranchSlash)', '1'))
+ <_GitBranch Condition="'$(_IndexOfBranchSlash)' != '0'">$(GitBranch.Substring($(_IndexOfBranchSubstring)))
+ <_GitBranch Condition="'$(_IndexOfBranchSlash)' == '0'">$(GitBranch)
+
+
+ -$(_GitBranch)
+ $(_GitBranch).
+ $(SemVerMetadata)sha.$(GitCommit)
+
+
+ $(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch)$(GitSemVerDashLabel).$(GitCommits)+$(SemVerMetadata)
+
+ $(GitSemVerMajor).$(GitSemVerMinor).$(GitSemVerPatch)+$(SemVerMetadata)
+ $(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch)
+ $(GitSemVerMajor).$(GitSemVerMinor).$(GitSemVerPatch)
+ $(PackageVersion)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/NuGet.Build.Packaging.Shared.props b/src/NuGet.Build.Packaging.Shared.props
index 8aefbd7..0455cbd 100644
--- a/src/NuGet.Build.Packaging.Shared.props
+++ b/src/NuGet.Build.Packaging.Shared.props
@@ -1,7 +1,7 @@
-
+
false
false
@@ -10,7 +10,7 @@
AnyCPU
$(MSBuildProjectName)
NuGet.Build.Packaging
-
+
bin\$(Configuration)\
Library
Properties
@@ -46,11 +46,11 @@
-
+
- $(MSBuildAllProjects);$(MSBuildThisFileFullPath)
+ $(MSBuildAllProjects);$(MSBuildThisFileFullPath)
true
diff --git a/src/NuGet.Build.Packaging.Shared.targets b/src/NuGet.Build.Packaging.Shared.targets
index 019608f..16884df 100644
--- a/src/NuGet.Build.Packaging.Shared.targets
+++ b/src/NuGet.Build.Packaging.Shared.targets
@@ -10,9 +10,7 @@
- $(MSBuildAllProjects);$(MSBuildThisFileFullPath)
+ $(MSBuildAllProjects);$(MSBuildThisFileFullPath)
true
-
-
diff --git a/src/PackageVersion.targets b/src/PackageVersion.targets
deleted file mode 100644
index 374da48..0000000
--- a/src/PackageVersion.targets
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
- $(MSBuildAllProjects);$(MSBuildThisFileFullPath)
-
- true
-
- GetPackageVersion;
- $(BuildDependsOn)
-
-
-
-
-
-
-
- -pr$(BUILD_SOURCEBRANCH.Substring(10).TrimEnd('/merge'))
- -pr$(APPVEYOR_PULL_REQUEST_NUMBER)
-
-
- $(GitSemVerMajor).$(GitSemVerMinor).$(GitSemVerPatch)
-
- $(GitSemVerMajor).$(GitSemVerMinor).$(GitBaseVersionPatch)$(GitSemVerDashLabel)-build$(GitCommits.PadLeft(4, '0'))
-
-
-
-
- true
-
-
\ No newline at end of file
diff --git a/src/VisualStudio/NuGet.Packaging.VisualStudio.15/NuGet.Packaging.VisualStudio.15.csproj b/src/VisualStudio/NuGet.Packaging.VisualStudio.15/NuGet.Packaging.VisualStudio.15.csproj
index 84b6dbc..fa17573 100644
--- a/src/VisualStudio/NuGet.Packaging.VisualStudio.15/NuGet.Packaging.VisualStudio.15.csproj
+++ b/src/VisualStudio/NuGet.Packaging.VisualStudio.15/NuGet.Packaging.VisualStudio.15.csproj
@@ -47,7 +47,6 @@
-
diff --git a/src/VisualStudio/NuGet.Packaging.VisualStudio.Shared.targets b/src/VisualStudio/NuGet.Packaging.VisualStudio.Shared.targets
index 8d1a5b1..795ea43 100644
--- a/src/VisualStudio/NuGet.Packaging.VisualStudio.Shared.targets
+++ b/src/VisualStudio/NuGet.Packaging.VisualStudio.Shared.targets
@@ -43,7 +43,7 @@
<_NuGetizerPackage Include="$(Out)\*.nupkg" />
@@ -76,7 +76,7 @@
PrepareForBuild;
CopyOutOfDateSmartTemplateContent;
- GetPackageVersion;
+ SetVersion;
FindTemplates;
UpdateTemplatePackages
diff --git a/src/VisualStudio/NuGet.Packaging.VisualStudio/NuGet.Packaging.VisualStudio.csproj b/src/VisualStudio/NuGet.Packaging.VisualStudio/NuGet.Packaging.VisualStudio.csproj
index 23e2e21..91c6267 100644
--- a/src/VisualStudio/NuGet.Packaging.VisualStudio/NuGet.Packaging.VisualStudio.csproj
+++ b/src/VisualStudio/NuGet.Packaging.VisualStudio/NuGet.Packaging.VisualStudio.csproj
@@ -29,7 +29,6 @@
-