More E2E test fixes (#6962)

Author: nkolev92

test/EndToEnd/ProjectTemplates/BuildIntegratedClassLibrary.zip/BuildIntegratedClassLibrary.csproj

@@ -13,6 +13,7 @@
 		<AssemblyName>$safeprojectname$</AssemblyName>
 		<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
 		<FileAlignment>512</FileAlignment>
+		<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
     <ResolveNuGetPackages>true</ResolveNuGetPackages>
     <PlatformTarget>AnyCPU</PlatformTarget>
 	</PropertyGroup>
@@ -48,7 +49,6 @@
 	<ItemGroup>
 		<Compile Include="Class1.cs" />
 		<Compile Include="Properties\AssemblyInfo.cs" />
-    <None Include="project.json" />
 	</ItemGroup>
 	<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

test/EndToEnd/ProjectTemplates/BuildIntegratedClassLibrary.zip/csClassLibrary.vstemplate

@@ -17,7 +17,6 @@
     <Project File="BuildIntegratedClassLibrary.csproj" ReplaceParameters="true">
       <ProjectItem ReplaceParameters="true" TargetFileName="Properties\AssemblyInfo.cs">AssemblyInfo.cs</ProjectItem>
       <ProjectItem ReplaceParameters="true">Class1.cs</ProjectItem>
-      <ProjectItem>project.json</ProjectItem>
     </Project>
   </TemplateContent>
 </VSTemplate>

test/EndToEnd/ProjectTemplates/BuildIntegratedClassLibrary.zip/project.json

@@ -43,9 +43,6 @@
     <Compile Include="Controller.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.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.

test/EndToEnd/ProjectTemplates/BuildIntegratedProj.zip/BuildIntegratedProj.csproj

@@ -1,7 +1,7 @@
 <VSTemplate Version="3.0.0" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005" Type="Project">
   <TemplateData>
     <Name>BuildIntegratedProj</Name>
-    <Description>A class library with project.json and netcore50 as the TxM</Description>
+    <Description>A PackageReference class library with</Description>
     <ProjectType>CSharp</ProjectType>
     <ProjectSubType>
     </ProjectSubType>
@@ -16,7 +16,6 @@
   <TemplateContent>
     <Project TargetFileName="BuildIntegratedProj.csproj" File="BuildIntegratedProj.csproj" ReplaceParameters="true">
       <ProjectItem ReplaceParameters="true" TargetFileName="Controller.cs">Controller.cs</ProjectItem>
-      <ProjectItem ReplaceParameters="false" TargetFileName="project.json">project.json</ProjectItem>
       <Folder Name="Properties" TargetFolderName="Properties">
         <ProjectItem ReplaceParameters="true" TargetFileName="AssemblyInfo.cs">AssemblyInfo.cs</ProjectItem>
       </Folder>

test/EndToEnd/ProjectTemplates/BuildIntegratedProj.zip/MyTemplate.vstemplate

@@ -27,7 +27,6 @@
       <ProjectItem ReplaceParameters="true" TargetFileName="MainPage.xaml">MainPage.xaml</ProjectItem>
       <ProjectItem ReplaceParameters="true" TargetFileName="MainPage.xaml.cs">MainPage.xaml.cs</ProjectItem>
       <ProjectItem ReplaceParameters="false" TargetFileName="Package.appxmanifest">Package.appxmanifest</ProjectItem>
-      <ProjectItem ReplaceParameters="false" TargetFileName="project.json">project.json</ProjectItem>
       <Folder Name="Properties" TargetFolderName="Properties">
         <ProjectItem ReplaceParameters="true" TargetFileName="AssemblyInfo.cs">AssemblyInfo.cs</ProjectItem>
         <ProjectItem ReplaceParameters="true" TargetFileName="Default.rd.xml">Default.rd.xml</ProjectItem>