Removed the .targets used for versioning from the project templates #

adalon · kzu · commit 1287448b248f · 2017-03-02T15:28:49.000-03:00
And also provide default value for PackageVersion in the EditMetadata dialog. NuGet/Home#4728
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
@@ -56,7 +56,6 @@
     <Compile Include="TemplateWizard.cs" />
     <None Include="NuGet.Packaging.VisualStudio.15.targets" />
     <None Include="Templates\Projects\CSharp\Package-Workaround\Package.nuproj" />
-    <None Include="Templates\Projects\CSharp\Package-Workaround\Package.targets" />
     <None Include="Templates\Projects\PortableClassLibrary\class1.cs" />
     <None Include="Templates\Projects\PortableClassLibrary\assemblyinfo.cs" />
     <Compile Include="ProjectSystem\ProjectProperties.cs" />
@@ -68,8 +67,6 @@
     <Compile Include="ProjectSystem\NuProjValidProjectReferenceChecker.cs" />
     <None Include="project.json" />
     <None Include="Templates\Projects\Nuget\Package\Package.nuproj" />
-    <None Include="Templates\Projects\Nuget\Package\Package.targets" />
-    <None Include="Templates\Projects\PortableClassLibrary\PortableClassLibrary.targets" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
diff --git a/src/VisualStudio/NuGet.Packaging.VisualStudio.15/Templates/Projects/CSharp/Package-Workaround/Package.nuproj b/src/VisualStudio/NuGet.Packaging.VisualStudio.15/Templates/Projects/CSharp/Package-Workaround/Package.nuproj
@@ -14,6 +14,7 @@
 	</ItemGroup>
 	<PropertyGroup Label="Configuration">
 		<PackageId>$safeprojectname$</PackageId>
+		<PackageVersion Condition="'$(PackageVersion)' == ''">1.0.0</PackageVersion>
 		<Title>$projectname$</Title>
 		<Authors>$username$</Authors>
 		<Owners>$username$</Owners>
@@ -28,9 +29,6 @@
 	<PropertyGroup Label="Globals">
 		<OutputPath>bin\$(Configuration)\</OutputPath>
 	</PropertyGroup>
-	<ItemGroup>
-		<None Include="$projectname$.targets" />
-	</ItemGroup>
 	<ItemGroup>
 		<None Include="Readme.txt">
 			<IncludeInPackage>true</IncludeInPackage>
@@ -39,5 +37,4 @@
 	</ItemGroup>
 	<Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
 	<Import Project="$(NuGetAuthoringPath)\NuGet.Packaging.Authoring.targets" Condition="Exists('$(NuGetAuthoringPath)\NuGet.Packaging.Authoring.targets')" />
-	<Import Project="$projectname$.targets" />
 </Project>
diff --git a/src/VisualStudio/NuGet.Packaging.VisualStudio.15/Templates/Projects/CSharp/Package-Workaround/Package.targets b/src/VisualStudio/NuGet.Packaging.VisualStudio.15/Templates/Projects/CSharp/Package-Workaround/Package.targets
diff --git a/src/VisualStudio/NuGet.Packaging.VisualStudio.15/Templates/Projects/CSharp/Package-Workaround/Package.vstemplate b/src/VisualStudio/NuGet.Packaging.VisualStudio.15/Templates/Projects/CSharp/Package-Workaround/Package.vstemplate
@@ -21,7 +21,6 @@
   <TemplateContent>
     <Project File="Package.nuproj" ReplaceParameters="true">
       <ProjectItem ReplaceParameters="true" OpenInEditor="true">Readme.txt</ProjectItem>
-      <ProjectItem TargetFileName="$projectname$.targets" ReplaceParameters="true">Package.targets</ProjectItem>
     </Project>
   </TemplateContent>
   <WizardExtension>
diff --git a/src/VisualStudio/NuGet.Packaging.VisualStudio.15/Templates/Projects/Nuget/Package/Package.nuproj b/src/VisualStudio/NuGet.Packaging.VisualStudio.15/Templates/Projects/Nuget/Package/Package.nuproj
@@ -14,6 +14,7 @@
 	</ItemGroup>
 	<PropertyGroup Label="Configuration">
 		<PackageId>$safeprojectname$</PackageId>
+		<PackageVersion Condition="'$(PackageVersion)' == ''">1.0.0</PackageVersion>
 		<Title>$projectname$</Title>
 		<Authors>$username$</Authors>
 		<Owners>$username$</Owners>
@@ -28,9 +29,6 @@
 	<PropertyGroup Label="Globals">
 		<OutputPath>bin\$(Configuration)\</OutputPath>
 	</PropertyGroup>
-	<ItemGroup>
-		<None Include="$projectname$.targets" />
-	</ItemGroup>
 	<ItemGroup>
 		<None Include="Readme.txt">
 			<IncludeInPackage>true</IncludeInPackage>
@@ -39,5 +37,4 @@
 	</ItemGroup>
 	<Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
 	<Import Project="$(NuGetAuthoringPath)\NuGet.Packaging.Authoring.targets" Condition="Exists('$(NuGetAuthoringPath)\NuGet.Packaging.Authoring.targets')" />
-	<Import Project="$projectname$.targets" />
 </Project>
diff --git a/src/VisualStudio/NuGet.Packaging.VisualStudio.15/Templates/Projects/Nuget/Package/Package.targets b/src/VisualStudio/NuGet.Packaging.VisualStudio.15/Templates/Projects/Nuget/Package/Package.targets
diff --git a/src/VisualStudio/NuGet.Packaging.VisualStudio.15/Templates/Projects/Nuget/Package/Package.vstemplate b/src/VisualStudio/NuGet.Packaging.VisualStudio.15/Templates/Projects/Nuget/Package/Package.vstemplate
@@ -18,7 +18,6 @@
   <TemplateContent>
     <Project File="Package.nuproj" ReplaceParameters="true">
       <ProjectItem ReplaceParameters="true" OpenInEditor="true">Readme.txt</ProjectItem> 
-      <ProjectItem TargetFileName="$projectname$.targets" ReplaceParameters="true">Package.targets</ProjectItem> 
     </Project>
   </TemplateContent>
   <WizardExtension>
diff --git a/src/VisualStudio/NuGet.Packaging.VisualStudio.15/Templates/Projects/PortableClassLibrary/PortableClassLibrary.csproj b/src/VisualStudio/NuGet.Packaging.VisualStudio.15/Templates/Projects/PortableClassLibrary/PortableClassLibrary.csproj
@@ -33,6 +33,7 @@
   </PropertyGroup>
   <PropertyGroup Label="Configuration">
     <PackageId>$safeprojectname$</PackageId>
+    <PackageVersion Condition="'$(PackageVersion)' == ''" >1.0.0</PackageVersion>
     <Title>$projectname$</Title>
     <Authors>$username$</Authors>
     <Owners>$username$</Owners>
@@ -48,11 +49,7 @@
     <Compile Include="Class1.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="$projectname$.targets" />
-  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <Import Project="$projectname$.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/VisualStudio/NuGet.Packaging.VisualStudio.15/Templates/Projects/PortableClassLibrary/PortableClassLibrary.targets b/src/VisualStudio/NuGet.Packaging.VisualStudio.15/Templates/Projects/PortableClassLibrary/PortableClassLibrary.targets
diff --git a/src/VisualStudio/NuGet.Packaging.VisualStudio.15/Templates/Projects/PortableClassLibrary/csPortableClassLibrary.vstemplate b/src/VisualStudio/NuGet.Packaging.VisualStudio.15/Templates/Projects/PortableClassLibrary/csPortableClassLibrary.vstemplate
@@ -16,7 +16,6 @@
     <Project File="PortableClassLibrary.csproj" ReplaceParameters="true">
       <ProjectItem ReplaceParameters="true" TargetFileName="Properties\AssemblyInfo.cs">AssemblyInfo.cs</ProjectItem>
       <ProjectItem ReplaceParameters="true" OpenInEditor="true">Class1.cs</ProjectItem>
-      <ProjectItem TargetFileName="$projectname$.targets" ReplaceParameters="true">PortableClassLibrary.targets</ProjectItem>
     </Project>
   </TemplateContent>
   <WizardExtension>
diff --git a/src/VisualStudio/NuGet.Packaging.VisualStudio/Commands/CreateNuGetPackageCommand.cs b/src/VisualStudio/NuGet.Packaging.VisualStudio/Commands/CreateNuGetPackageCommand.cs
@@ -53,6 +53,7 @@ protected override void Execute()
 				{
 					// Provide default values for required fields/properties
 					viewModel.PackageId = project.Name;
+					viewModel.PackageVersion = "1.0.0";
 					viewModel.Description = project.Name;
 					viewModel.Authors = "MyCompany";
 				}
diff --git a/src/VisualStudio/NuGet.Packaging.VisualStudio/Views/PackageMetadataView.xaml b/src/VisualStudio/NuGet.Packaging.VisualStudio/Views/PackageMetadataView.xaml
@@ -98,8 +98,6 @@
                 <Label Grid.Column="2" >Version:</Label>
                 <TextBox Grid.Column="3" 
                          Text="{Binding PackageVersion, ValidatesOnDataErrors=True, UpdateSourceTrigger=PropertyChanged}" />
-                <TextBlock Grid.Column="3" Text="from targets"  FontStyle="Italic" Opacity="0.5" IsHitTestVisible="False" Margin="5,5,0,0" 
-                           Visibility="{Binding PackageVersion, Converter={StaticResource ValueToVisibilityConverter}}" />
             </Grid>
 
             <Label Grid.Row="1">Title:</Label>
diff --git a/src/VisualStudio/NuGet.Packaging.VisualStudio/Views/PackageMetadataViewModel.cs b/src/VisualStudio/NuGet.Packaging.VisualStudio/Views/PackageMetadataViewModel.cs
@@ -84,6 +84,7 @@ public string Title
 			set { storage.SetPropertyValue(value); }
 		}
 
+		[Required]
 		public string PackageVersion
 		{
 			get { return storage.GetPropertyValue<string>(); }
