Convert remaining modules to v2 modules

src/CBT.DotNetFx/CBT.DotNetFx.3.5.nuspec

@@ -7,13 +7,13 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Contains the reference assemblies for the .NET Framework $DisplayVersion$</description>
     <dependencies>
-      <dependency id="CBT.Microsoft.Common.targets" version="[1.0,)"/>
+      <dependency id="CBT.Microsoft.Common.targets" version="[2.0,)"/>
     </dependencies>
   </metadata>
 
   <files>
-    <file src="Before.Microsoft.Common-$DisplayName$.targets" target="CBT\Module\Before.Microsoft.Common.targets" />
-    <file src="$Root$\v3.5\**\*" target="CBT\Module\$DisplayName$\" />
-    <file src="$Root$\.NETFramework\v3.5\**\*" target="CBT\Module\$DisplayName$\" />
+    <file src="Before.Microsoft.Common-$DisplayName$.targets" target="build\Before.Microsoft.Common.targets" />
+    <file src="$Root$\v3.5\**\*" target="build\$DisplayName$\" />
+    <file src="$Root$\.NETFramework\v3.5\**\*" target="build\$DisplayName$\" />
   </files>
 </package>

src/CBT.DotNetFx/CBT.DotNetFx.nuspec

@@ -7,12 +7,12 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Contains the reference assemblies for the .NET Framework $DisplayVersion$</description>
     <dependencies>
-      <dependency id="CBT.Microsoft.Common.targets" version="[1.0,)"/>
+      <dependency id="CBT.Microsoft.Common.targets" version="[2.0,)"/>
     </dependencies>
   </metadata>
 
   <files>
-    <file src="Before.Microsoft.Common-$DisplayName$.targets" target="CBT\Module\Before.Microsoft.Common.targets" />
-    <file src="$Root$\**\*" target="CBT\Module\$DisplayName$\" />
+    <file src="Before.Microsoft.Common-$DisplayName$.targets" target="build\Before.Microsoft.Common.targets" />
+    <file src="$Root$\**\*" target="build\$DisplayName$\" />
   </files>
 </package>

src/CBT.DotNetFx/packall.cmd

@@ -1,7 +1,7 @@
 @ECHO OFF
 SETLOCAL ENABLEDELAYEDEXPANSION
 
-SET "NETFXTAG=-beta04"
+SET "NETFXTAG=-beta05"
 IF "%ProgramFiles(x86)%" NEQ "" (
 	SET "REFERENCEASSEMBLYROOT=%ProgramFiles(x86)%\Reference Assemblies"
 ) ELSE (

src/CBT.Microsoft.CSharp.targets/CBT.Microsoft.CSharp.targets.nuproj

@@ -11,10 +11,10 @@
     <None Include="version.json" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="CBT\Module\Build.props" />
-    <Content Include="CBT\Module\Extensions\After.Microsoft.CSharp.targets" />
-    <Content Include="CBT\Module\Extensions\Before.Microsoft.CSharp.targets" />
-    <Content Include="CBT\Module\module.config" />
+    <Content Include="build\CBT.Microsoft.CSharp.targets.props" />
+    <Content Include="build\CBT.After.Microsoft.CSharp.targets" />
+    <Content Include="build\CBT.Before.Microsoft.CSharp.targets" />
+    <Content Include="build\module.config" />
   </ItemGroup>
   <Import Project="$(NuProjPath)\NuProj.targets" Condition="Exists('$(NuProjPath)\NuProj.targets')" />
 </Project>

src/CBT.Microsoft.CSharp.targets/CBT/Module/Build.props → src/CBT.Microsoft.CSharp.targets/build/CBT.Microsoft.CSharp.targets.props

@@ -4,7 +4,7 @@
     <CBTSavedCustomBeforeMicrosoftCSharpTargets>$(CustomBeforeMicrosoftCSharpTargets)</CBTSavedCustomBeforeMicrosoftCSharpTargets>
     <CBTSavedCustomAfterMicrosoftCSharpTargets>$(CustomAfterMicrosoftCSharpTargets)</CBTSavedCustomAfterMicrosoftCSharpTargets>
 
-    <CustomBeforeMicrosoftCSharpTargets>$(MSBuildThisFileDirectory)\Extensions\Before.Microsoft.CSharp.targets</CustomBeforeMicrosoftCSharpTargets>
-    <CustomAfterMicrosoftCSharpTargets>$(MSBuildThisFileDirectory)\Extensions\After.Microsoft.CSharp.targets</CustomAfterMicrosoftCSharpTargets>
+    <CustomBeforeMicrosoftCSharpTargets>$(MSBuildThisFileDirectory)\CBT.Before.Microsoft.CSharp.targets</CustomBeforeMicrosoftCSharpTargets>
+    <CustomAfterMicrosoftCSharpTargets>$(MSBuildThisFileDirectory)\CBT.After.Microsoft.CSharp.targets</CustomAfterMicrosoftCSharpTargets>
   </PropertyGroup>
 </Project>

src/CBT.Microsoft.CSharp.targets/version.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "1.0-dev",
-  "buildNumberOffset": 1,
+  "version": "2.0-dev",
+  "buildNumberOffset": 0,
   "publicReleaseRefSpec": [
     "^refs/tags/CBT\\.Microsoft\\.Cpp\\.targets.*"
   ],

src/CBT.Microsoft.Cpp.targets/CBT.Microsoft.Cpp.targets.nuproj

@@ -11,10 +11,10 @@
     <None Include="version.json" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="CBT\Module\Build.props" />
-    <Content Include="CBT\Module\Extensions\After.Microsoft.Cpp.targets" />
-    <Content Include="CBT\Module\Extensions\Before.Microsoft.Cpp.targets" />
-    <Content Include="CBT\Module\module.config" />
+    <Content Include="build\CBT.Microsoft.Cpp.targets.props" />
+    <Content Include="build\CBT.After.Microsoft.Cpp.targets" />
+    <Content Include="build\CBT.Before.Microsoft.Cpp.targets" />
+    <Content Include="build\module.config" />
   </ItemGroup>
   <Import Project="$(NuProjPath)\NuProj.targets" Condition="Exists('$(NuProjPath)\NuProj.targets')" />
 </Project>

src/CBT.Microsoft.Cpp.targets/CBT/Module/Build.props → src/CBT.Microsoft.Cpp.targets/build/CBT.Microsoft.Cpp.targets.props

@@ -4,7 +4,7 @@
     <CBTSavedForceImportBeforeCppTargets>$(ForceImportBeforeCppTargets)</CBTSavedForceImportBeforeCppTargets>
     <CBTSavedForceImportAfterCppTargets>$(ForceImportAfterCppTargets)</CBTSavedForceImportAfterCppTargets>
 
-    <ForceImportBeforeCppTargets>$(MSBuildThisFileDirectory)\Extensions\Before.Microsoft.Cpp.targets</ForceImportBeforeCppTargets>
-    <ForceImportAfterCppTargets>$(MSBuildThisFileDirectory)\Extensions\After.Microsoft.Cpp.targets</ForceImportAfterCppTargets>
+    <ForceImportBeforeCppTargets>$(MSBuildThisFileDirectory)\CBT.Before.Microsoft.Cpp.targets</ForceImportBeforeCppTargets>
+    <ForceImportAfterCppTargets>$(MSBuildThisFileDirectory)\CBT.After.Microsoft.Cpp.targets</ForceImportAfterCppTargets>
   </PropertyGroup>
 </Project>

src/CBT.Microsoft.Cpp.targets/version.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "1.0-dev",
-  "buildNumberOffset": 1,
+  "version": "2.0-dev",
+  "buildNumberOffset": 0,
   "publicReleaseRefSpec": [
     "^refs/tags/CBT\\.Microsoft\\.Cpp\\.targets.*"
   ],

src/CBT.Microsoft.VisualBasic.targets/CBT.Microsoft.VisualBasic.targets.nuproj

@@ -11,10 +11,10 @@
     <None Include="version.json" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="CBT\Module\Build.props" />
-    <Content Include="CBT\Module\Extensions\After.Microsoft.VisualBasic.targets" />
-    <Content Include="CBT\Module\Extensions\Before.Microsoft.VisualBasic.targets" />
-    <Content Include="CBT\Module\module.config" />
+    <Content Include="build\CBT.Microsoft.VisualBasic.targets.props" />
+    <Content Include="build\CBT.After.Microsoft.VisualBasic.targets" />
+    <Content Include="build\CBT.Before.Microsoft.VisualBasic.targets" />
+    <Content Include="build\module.config" />
   </ItemGroup>
   <Import Project="$(NuProjPath)\NuProj.targets" Condition="Exists('$(NuProjPath)\NuProj.targets')" />
 </Project>

src/CBT.Microsoft.VisualBasic.targets/CBT/Module/Build.props → src/CBT.Microsoft.VisualBasic.targets/build/CBT.Microsoft.VisualBasic.targets.props

@@ -4,7 +4,7 @@
     <CBTSavedCustomBeforeMicrosoftVisualBasicTargets>$(CustomBeforeMicrosoftVisualBasicTargets)</CBTSavedCustomBeforeMicrosoftVisualBasicTargets>
     <CBTSavedCustomAfterMicrosoftVisualBasicTargets>$(CustomAfterMicrosoftVisualBasicTargets)</CBTSavedCustomAfterMicrosoftVisualBasicTargets>
 
-    <CustomBeforeMicrosoftVisualBasicTargets>$(MSBuildThisFileDirectory)\Extensions\Before.Microsoft.VisualBasic.targets</CustomBeforeMicrosoftVisualBasicTargets>
-    <CustomAfterMicrosoftVisualBasicTargets>$(MSBuildThisFileDirectory)\Extensions\After.Microsoft.VisualBasic.targets</CustomAfterMicrosoftVisualBasicTargets>
+    <CustomBeforeMicrosoftVisualBasicTargets>$(MSBuildThisFileDirectory)\CBT.Before.Microsoft.VisualBasic.targets</CustomBeforeMicrosoftVisualBasicTargets>
+    <CustomAfterMicrosoftVisualBasicTargets>$(MSBuildThisFileDirectory)\CBT.After.Microsoft.VisualBasic.targets</CustomAfterMicrosoftVisualBasicTargets>
   </PropertyGroup>
 </Project>

src/CBT.Microsoft.VisualBasic.targets/version.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "1.0-dev",
-  "buildNumberOffset": 1,
+  "version": "2.0-dev",
+  "buildNumberOffset": 0,
   "publicReleaseRefSpec": [
     "^refs/tags/CBT\\.Microsoft\\.VisualBasic\\.targets.*"
   ],

src/CBT.NuGet.GlobalRestore/CBT.NuGet.GlobalRestore.nuproj

@@ -11,10 +11,11 @@
   <Import Project="$(NuProjPath)\NuProj.props" Condition="Exists('$(NuProjPath)\NuProj.props')" />
   <ItemGroup>
     <Dependency Include="CBT.NuGet">
-      <Version>[1.0.97,)</Version>
+      <Version>[2.0.0,)</Version>
     </Dependency>
-    <Content Include="CBT\Module\Before.CBT.NuGet.PackageProperties.props" />
-    <Content Include="CBT\Module\After.Microsoft.Common.targets" />
+    <Content Include="build\Before.CBT.NuGet.PackageProperties.props" />
+    <Content Include="build\After.Microsoft.Common.targets" />
+    <Content Include="build\module.config" />
     <None Include="version.json" />
   </ItemGroup>
   <Import Project="$(NuProjPath)\NuProj.targets" Condition="Exists('$(NuProjPath)\NuProj.targets')" />

src/CBT.NuGet.GlobalRestore/build/module.config

@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+</configuration>

src/CBT.NuGet.GlobalRestore/version.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "1.0-dev",
-  "buildNumberOffset": 1,
+  "version": "2.0-dev",
+  "buildNumberOffset": 0,
   "publicReleaseRefSpec": [
     "^refs/tags/CBT\\.NuGet\\.GlobalRestore.*"
   ],

src/CBT.NuGet.Package/CBT.NuGet.Package.nuproj

@@ -14,23 +14,21 @@
 
   <ItemGroup>
     <ProjectReference Include="..\CBT.NuGet\CBT.NuGet.csproj">
-      <TargetDir>CBT\Module\</TargetDir>
+      <TargetDir>build\</TargetDir>
     </ProjectReference>
     <Dependency Include="CBT.Microsoft.Common.targets">
-      <Version>[1.0,)</Version>
+      <Version>[2.0,)</Version>
     </Dependency>
-    <Content Include="CBT\Module\After.Microsoft.Common.targets" />
-    <Content Include="CBT\Module\After.Traversal.targets" />
-    <Content Include="CBT\Module\module.config" />
-    <Content Include="CBT\Module\build.props" />
-    <Content Include="CBT\Module\CBT.NuGet.props" />
-    <Content Include="CBT\Module\CBT.NuGet.targets" />
-    <Content Include="CBT\Module\Microsoft.NuGet\Microsoft.Build.Tasks.Core.dll" />
-    <Content Include="CBT\Module\Microsoft.NuGet\Microsoft.Build.Utilities.Core.dll" />
-    <Content Include="CBT\Module\Microsoft.NuGet\Microsoft.NuGet.Build.Tasks.dll" />
-    <Content Include="CBT\Module\Microsoft.NuGet\Microsoft.NuGet.props" />
-    <Content Include="CBT\Module\Microsoft.NuGet\Microsoft.NuGet.targets" />
-    <Content Include="CBT\Module\Microsoft.NuGet\Newtonsoft.Json.dll" />
+    <Content Include="build\After.Microsoft.Common.targets" />
+    <Content Include="build\After.Traversal.targets" />
+    <Content Include="build\module.config" />
+    <Content Include="build\CBT.NuGet.props" />
+    <Content Include="build\Microsoft.NuGet\Microsoft.Build.Tasks.Core.dll" />
+    <Content Include="build\Microsoft.NuGet\Microsoft.Build.Utilities.Core.dll" />
+    <Content Include="build\Microsoft.NuGet\Microsoft.NuGet.Build.Tasks.dll" />
+    <Content Include="build\Microsoft.NuGet\Microsoft.NuGet.props" />
+    <Content Include="build\Microsoft.NuGet\Microsoft.NuGet.targets" />
+    <Content Include="build\Microsoft.NuGet\Newtonsoft.Json.dll" />
     <None Include="version.json" />
   </ItemGroup>
 

src/CBT.NuGet.Package/CBT/Module/CBT.NuGet.props → src/CBT.NuGet.Package/build/CBT.NuGet.props

@@ -123,4 +123,57 @@
   <Import Project="$(CBTModuleExtensionsPath)\After.$(MSBuildThisFile)" Condition=" '$(CBTModuleExtensionsPath)' != '' And Exists('$(CBTModuleExtensionsPath)\After.$(MSBuildThisFile)') " />
   <Import Project="$(CBTLocalBuildExtensionsPath)\After.$(MSBuildThisFile)" Condition=" '$(CBTLocalBuildExtensionsPath)' != '' And Exists('$(CBTLocalBuildExtensionsPath)\After.$(MSBuildThisFile)') " />
 
+
+  <UsingTask AssemblyFile="$(CBTNuGetTasksAssemblyPath)" TaskName="CBT.NuGet.Tasks.NuGetAdd" />
+  <UsingTask AssemblyFile="$(CBTNuGetTasksAssemblyPath)" TaskName="CBT.NuGet.Tasks.NuGetConfig" />
+  <UsingTask AssemblyFile="$(CBTNuGetTasksAssemblyPath)" TaskName="CBT.NuGet.Tasks.NuGetList" />
+  <UsingTask AssemblyFile="$(CBTNuGetTasksAssemblyPath)" TaskName="CBT.NuGet.Tasks.NuGetPack" />
+  <UsingTask AssemblyFile="$(CBTNuGetTasksAssemblyPath)" TaskName="CBT.NuGet.Tasks.NuGetPush" />
+  <UsingTask AssemblyFile="$(CBTNuGetTasksAssemblyPath)" TaskName="CBT.NuGet.Tasks.NuGetRestore" />
+  <UsingTask AssemblyFile="$(CBTNuGetTasksAssemblyPath)" TaskName="CBT.NuGet.Tasks.NuGetSetApiKey" />
+  <UsingTask AssemblyFile="$(CBTNuGetTasksAssemblyPath)" TaskName="CBT.NuGet.Tasks.TraversalNuGetRestore" />
+
+  <Target Name="RestoreNuGetPackages"
+    Condition=" '$(CBTEnablePackageRestore)' == 'true' And '$(BuildingInsideVisualStudio)' != 'true' "
+    DependsOnTargets="_CheckForCBTNuGetPackagesRestoredMarker;$(RestoreNuGetPackagesDependsOn)"
+    Inputs="$(CBTNuGetAllProjects);$(CBTNuGetRestoreFile)"
+    Outputs="$(CBTNuGetPackagesRestoredMarker)">
+
+    <NuGetRestore
+      File="$(CBTNuGetRestoreFile)"
+      RequireConsent="$(CBTNuGetRestoreRequireConsent)"
+      PackagesDirectory="$(CBTNuGetRestorePackagesDirectory)"
+      SolutionDirectory="$(NuGetRestoreSolutionDirectory)"
+      MsBuildVersion="$(NuGetMsBuildVersion)"
+      DisableParallelProcessing="$(CBTNuGetDisableParallelProcessing)"
+      FallbackSource="$(NuGetFallbackSource)"
+      NoCache="$(CBTNuGetNoCache)"
+      PackageSaveMode="$(NuGetPackageSaveMode)"
+      Source="$(NuGetSource)"
+      ConfigFile="$(NuGetConfigFile)"
+      NonInteractive="$(CBTNuGetNonInteractive)"
+      Verbosity="$(NuGetVerbosity)"
+      Timeout="$(CBTNuGetTimeout)"
+      ToolPath="$(CBTNuGetPath)"
+      />
+
+    <MakeDir Directories="$([System.IO.Path]::GetDirectoryName($(CBTNuGetPackagesRestoredMarker)))" Condition=" '$(CBTEnableNuGetPackageRestoreOptimization)' != 'false' " />
+
+    <Touch AlwaysCreate="true" ForceTouch="true" Files="$(CBTNuGetPackagesRestoredMarker)" Condition=" '$(CBTEnableNuGetPackageRestoreOptimization)' != 'false' " />
+
+    <CallTarget Targets="_CheckForCBTNuGetPackagesRestoredMarker" />
+
+    <PropertyGroup Condition=" '$(CBTNuGetGeneratePackageProperties)' == 'true' And '$(IsRestoreOnly)' == 'true' ">
+      <CBTNuGetPackagePropertiesCreated>$(CBTNuGetTasksAssemblyPath.GetType().Assembly.GetType('System.AppDomain').GetProperty('CurrentDomain').GetValue(null).CreateInstanceFromAndUnwrap($(CBTNuGetTasksAssemblyPath), 'CBT.NuGet.Tasks.GenerateNuGetProperties').Execute($(CBTNuGetRestoreFile), $(CBTNuGetAllProjects.Split(';')), $(CBTNuGetPackagePropertyFile), $(CBTNuGetPackagePropertyVersionNamePrefix), $(CBTNuGetPackagePropertyPathNamePrefix), $(CBTNuGetPackagePropertyPathValuePrefix)))"</CBTNuGetPackagePropertiesCreated>
+    </PropertyGroup>
+
+  </Target>
+
+  <Target Name="_CheckForCBTNuGetPackagesRestoredMarker">
+
+    <ItemGroup>
+      <FileWrites Include="$(CBTNuGetPackagesRestoredMarker)" Condition=" '$(CBTEnableNuGetPackageRestoreOptimization)' != 'false' And Exists('$(CBTNuGetPackagesRestoredMarker)') " />
+    </ItemGroup>
+
+  </Target>
 </Project>

src/CBT.NuGet.Package/version.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "1.0-dev",
-  "buildNumberOffset": 7,
+  "version": "2.0-dev",
+  "buildNumberOffset": 0,
   "publicReleaseRefSpec": [
     "^refs/tags/CBT\\.NuGet.*"
   ],

src/CBT.Traversal/CBT.Traversal.nuproj

@@ -9,12 +9,12 @@
   <Import Project="$(NuProjPath)\NuProj.props" Condition="Exists('$(NuProjPath)\NuProj.props')" />
   <ItemGroup>
     <Dependency Include="CBT.Microsoft.Common.targets">
-      <Version>[1.0,)</Version>
+      <Version>[2.0,)</Version>
     </Dependency>
-    <Content Include="CBT\Module\After.Microsoft.Common.targets" />
-    <Content Include="CBT\Module\Build.props" />
-    <Content Include="CBT\Module\module.config" />
-    <Content Include="CBT\Module\Traversal.targets" />
+    <Content Include="build\After.Microsoft.Common.targets" />
+    <Content Include="build\CBT.Traversal.props" />
+    <Content Include="build\module.config" />
+    <Content Include="build\Traversal.targets" />
     <None Include="version.json" />
   </ItemGroup>
   <Import Project="$(NuProjPath)\NuProj.targets" Condition="Exists('$(NuProjPath)\NuProj.targets')" />

src/CBT.Traversal/version.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "1.0-dev",
-  "buildNumberOffset": 1,
+  "version": "2.0-dev",
+  "buildNumberOffset": 0,
   "publicReleaseRefSpec": [
     "^refs/tags/CBT\\.Traversal.*"
   ],