[Arcade] Removed redundant tags, tools (#43)

* Remove the redundant restore sources in Directory.Build.props

* Remove redundant IsVsixProject tag.

* Moving all the versions to Versions.props

* Removing the ZipItems utility and moving all the projects to use ZipDirectory task instead.
Note: Includes refactoring to make sure ZipDirectory task works.

* Removed redundant ProjectGuids.

* Updating the version for the Arcade SDK.

* Add UsingToolNetFrameworkReferenceAssemblies to Versions.props to resolved the build issue for net461 reference assemblies not found.

* Add missing files for removing the ProjectGuid.

* Updating the Version.Details.xml as well

* Adding back AllUsers property for installation in the vsixmanifest.

* Include the ProjectTemplates folder itself instead of using zip for vsix csprojs.

* Adding the version props for MicrosoftVisualStudioCoreUtilityVersion

Directory.Build.props

@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
-  <PropertyGroup>
-      <!-- <RestoreSources>$(RestoreSources);http://api.nuget.org/v3/index.json;</RestoreSources> -->
-
-      <!-- aspnetcore-dev feed for internal packages like Microsoft.Extensions.Logging.Testing -->
-      <RestoreSources>$(RestoreSources);https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json</RestoreSources>
-      <RestoreSources>$(RestoreSources);https://dotnet.myget.org/F/dotnet-core/api/v3/index.json</RestoreSources>
-  </PropertyGroup>
   <PropertyGroup Label="Warning Suppressions">
     <!--
       Suppress a warning about upcoming deprecation of PackageLicenseUrl. When embedding licenses are supported,

Templates/CSharp/Desktop/Desktop.xml

@@ -1,8 +0,0 @@
-<Zips>
-  <Zip>
-  <File TargetFileName="AssemblyInfo.cs">ProjectTemplates\CSharp\Test\AssemblyInfo.cs</File>
-  <File TargetFileName="MSTestV2Desktop.vstemplate">ProjectTemplates\CSharp\Test\MSTestV2Desktop.vstemplate</File>
-  <File TargetFileName="UnitTest1.cs">ProjectTemplates\CSharp\Test\UnitTest1.cs</File>
-  <File TargetFileName="UnitTestProject.csproj">ProjectTemplates\CSharp\Test\UnitTestProject.csproj</File>
-  </Zip>
-</Zips>

Templates/CSharp/Desktop/MSTestDesktopCSharp.csproj

@@ -1,4 +1,4 @@
-<Project  Sdk="Microsoft.NET.Sdk">
+<Project  Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net461</TargetFramework>
     <RootNamespace>MSTestDesktopCSharp</RootNamespace>
@@ -31,22 +31,9 @@
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>
-    <Content Include="Desktop.xml" />
-    <Content Include="ProjectTemplates\CSharp\Test\DesktopUnitTestTemplate.zip">
+    <Content Include="ProjectTemplates\**">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
   </ItemGroup>
-  <!--ItemGroup>
-     <VSTemplate Include="ProjectTemplates\CSharp\Test\MSTestV2Desktop.vstemplate">
-      <SubType>Designer</SubType>
-    </VSTemplate>
-  </ItemGroup-->
-  <!--Import Project="$(TestTemplatesRoot)scripts\build\TestTemplates.targets" /-->
-  <PropertyGroup>
-    <PreBuildEvent>
-      IF EXIST "$(MSBuildThisFileDirectory)ProjectTemplates\CSharp\Test\DesktopUnitTestTemplate.zip" DEL /q /s "$(MSBuildThisFileDirectory)ProjectTemplates\CSharp\Test\DesktopUnitTestTemplate.zip"
-      "$(RepoRoot)tools\ZipItems\ZipItems.exe" "$(MSBuildThisFileDirectory)Desktop.xml" "$(MSBuildThisFileDirectory)\" "$(MSBuildThisFileDirectory)ProjectTemplates\CSharp\Test\DesktopUnitTestTemplate.zip"
-    </PreBuildEvent>
-  </PropertyGroup>
-   <Import Project="$(RepoRoot)eng\Loc.targets" />
+  <Import Project="$(RepoRoot)eng\Loc.targets" />
 </Project>

Templates/CSharp/Desktop/source.extension.vsixmanifest

@@ -7,7 +7,7 @@
     <License>DesktopTemplateLicense.rtf</License>
     <PackageId>Microsoft.VisualStudio.Templates.CS.MSTestv2.Desktop.UnitTest</PackageId>
   </Metadata>
-  <Installation Experimental="true">
+  <Installation AllUsers="true" Experimental="true">
     <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[16.0]" />
     <InstallationTarget Version="[16.0]" Id="Microsoft.VisualStudio.Pro" />
     <InstallationTarget Version="[16.0]" Id="Microsoft.VisualStudio.Enterprise" />

Templates/CSharp/EdgeDriverTemplate/DotNetCore/EdgeDriverTemplateCore/EdgeDriver.xml

@@ -1,7 +0,0 @@
-<Zips>
-<Zip>
-    <File TargetFileName="EdgeDriverTemplate.vstemplate">ProjectTemplates\CSharp\Test\EdgeDriverTemplate.vstemplate</File>
-    <File TargetFileName="EdgeDriverTest.cs">ProjectTemplates\CSharp\Test\EdgeDriverTest.cs</File>
-    <File TargetFileName="EdgeDriverSample.csproj">ProjectTemplates\CSharp\Test\EdgeDriverSample.csproj</File>
-</Zip>
-</Zips>

Templates/CSharp/EdgeDriverTemplate/DotNetCore/EdgeDriverTemplateCore/EdgeDriverTemplateCore.csproj

@@ -10,7 +10,6 @@
     <!-- VS Insertion -->
     <VisualStudioInsertionComponent>Microsoft.VisualStudio.Templates.CS.EdgeDriverTestCore</VisualStudioInsertionComponent>
 
-    <IsVsixProject>true</IsVsixProject>
     <CreateVsixContainer>true</CreateVsixContainer>
     <DeployExtension>False</DeployExtension>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
@@ -21,29 +20,20 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <!--Reference Include="Microsoft.VisualStudio.CoreUtility">
-      <Private>False</Private>
-    </Reference-->
+    <PackageReference Include="Microsoft.VisualStudio.CoreUtility" Version="$(MicrosoftVisualStudioCoreUtilityVersion)"/>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="ProjectTemplates\CSharp\Test\EdgeDriverTemplate.zip">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <Content Include="ProjectTemplates\**">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
     <Content Include="EdgeDriver.xml" />
   </ItemGroup>
   <ItemGroup>
-    <VSTemplate Include="ProjectTemplates\CSharp\Test\EdgeDriverTemplate.vstemplate" />
+    <VSTemplate Include="ProjectTemplates\CSharp\Test\EdgeDriverTemplate\EdgeDriverTemplate.vstemplate" />
   </ItemGroup>
-  <PropertyGroup>
-    <PreBuildEvent>
-      IF EXIST "$(MSBuildThisFileDirectory)ProjectTemplates\CSharp\Test\EdgeDriverTemplate.zip" DEL /q /s "$(MSBuildThisFileDirectory)ProjectTemplates\CSharp\Test\EdgeDriverTemplate.zip"
-      "$(RepoRoot)tools\ZipItems\ZipItems.exe" "$(MSBuildThisFileDirectory)EdgeDriver.xml" "$(MSBuildThisFileDirectory)\" "$(MSBuildThisFileDirectory)ProjectTemplates\CSharp\Test\EdgeDriverTemplate.zip"
-    </PreBuildEvent>
-  </PropertyGroup>
-   <Import Project="$(RepoRoot)eng\Loc.targets" />
+  <Import Project="$(RepoRoot)eng\Loc.targets" />
 </Project>

Templates/CSharp/EdgeDriverTemplate/DotNetCore/EdgeDriverTemplateCore/source.extension.vsixmanifest

@@ -6,7 +6,7 @@
         <Description xml:space="preserve">Create an automatic UI test using Edge Driver.</Description>
         <PackageId>Microsoft.VisualStudio.Templates.CS.EdgeDriverTestCore</PackageId>
     </Metadata>
-    <Installation Experimental="true">
+    <Installation AllUsers="true" Experimental="true">
         <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[16.0, 17.0)" />
     </Installation>
     <Dependencies>

Templates/CSharp/EdgeDriverTemplate/DotNetFramwork/EdgeDriver.xml

@@ -1,8 +0,0 @@
-<Zips>
-<Zip>
-    <File TargetFileName="AssemblyInfo.cs">ProjectTemplates\CSharp\Test\AssemblyInfo.cs</File>
-    <File TargetFileName="EdgeDriverTemplate.vstemplate">ProjectTemplates\CSharp\Test\EdgeDriverTemplate.vstemplate</File>
-    <File TargetFileName="EdgeDriverTest.cs">ProjectTemplates\CSharp\Test\EdgeDriverTest.cs</File>
-    <File TargetFileName="EdgeDriverSample.csproj">ProjectTemplates\CSharp\Test\EdgeDriverSample.csproj</File>
-</Zip>
-</Zips>

Templates/CSharp/EdgeDriverTemplate/DotNetFramwork/EdgeDriverTemplate.csproj

@@ -10,7 +10,6 @@
     <!-- VS Insertion -->
     <VisualStudioInsertionComponent>Microsoft.VisualStudio.Templates.CS.EdgeDriverTest</VisualStudioInsertionComponent>
 
-    <IsVsixProject>true</IsVsixProject>
     <CreateVsixContainer>true</CreateVsixContainer>
     <DeployExtension>False</DeployExtension>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
@@ -25,8 +24,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="ProjectTemplates\CSharp\Test\EdgeDriverTemplate.zip">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <Content Include="ProjectTemplates\**">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
     <Content Include="EdgeDriver.xml">
@@ -42,18 +40,12 @@
     Therefore we can't sign it to let it be included in VS.-->
   </ItemGroup>
   <ItemGroup>
-    <VSTemplate Include="ProjectTemplates\CSharp\Test\EdgeDriverTemplate.vstemplate" />
+    <VSTemplate Include="ProjectTemplates\CSharp\Test\EdgeDriverTemplate\EdgeDriverTemplate.vstemplate" />
   </ItemGroup>
   <ItemGroup>
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
-  <PropertyGroup>
-    <PreBuildEvent>
-      IF EXIST "$(MSBuildThisFileDirectory)ProjectTemplates\CSharp\Test\EdgeDriverTemplate.zip" DEL /q /s "$(MSBuildThisFileDirectory)ProjectTemplates\CSharp\Test\EdgeDriverTemplate.zip"
-      "$(RepoRoot)tools\ZipItems\ZipItems.exe" "$(MSBuildThisFileDirectory)EdgeDriver.xml" "$(MSBuildThisFileDirectory)\" "$(MSBuildThisFileDirectory)ProjectTemplates\CSharp\Test\EdgeDriverTemplate.zip"
-    </PreBuildEvent>
-  </PropertyGroup>
-   <Import Project="$(RepoRoot)eng\Loc.targets" />
+  <Import Project="$(RepoRoot)eng\Loc.targets" />
 </Project>

Templates/CSharp/EdgeDriverTemplate/DotNetFramwork/source.extension.vsixmanifest

@@ -6,7 +6,7 @@
         <Description xml:space="preserve">Create an automatic UI test using Edge Driver.</Description>
         <PackageId>Microsoft.VisualStudio.Templates.CS.EdgeDriverTest</PackageId>
     </Metadata>
-    <Installation Experimental="true">
+    <Installation AllUsers="true" Experimental="true">
         <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[16.0, 17.0)" />
     </Installation>
     <Dependencies>

Templates/CSharp/UWP/MSTestUWPCSharp.csproj

@@ -10,7 +10,6 @@
     <!-- VS Insertion -->
     <VisualStudioInsertionComponent>Microsoft.VisualStudio.Templates.CS.MSTestv2.UWP.UnitTest</VisualStudioInsertionComponent>
 
-    <IsVsixProject>true</IsVsixProject>
     <CreateVsixContainer>true</CreateVsixContainer>
     <DeployExtension>False</DeployExtension>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
@@ -25,7 +24,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="ProjectTemplates\CSharp\Windows UAP\UWP.zip">
+    <Content Include="ProjectTemplates\**">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
     <Content Include="UWP.xml" />
@@ -39,11 +38,5 @@
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
-  <PropertyGroup>
-    <PreBuildEvent>
-      IF EXIST "$(MSBuildThisFileDirectory)ProjectTemplates\CSharp\Windows UAP\UWP.zip" DEL /q /s "$(MSBuildThisFileDirectory)ProjectTemplates\CSharp\Windows UAP\UWP.zip"
-      "$(RepoRoot)tools\ZipItems\ZipItems.exe" "$(MSBuildThisFileDirectory)UWP.xml" "$(MSBuildThisFileDirectory)\" "$(MSBuildThisFileDirectory)ProjectTemplates\CSharp\Windows UAP\UWP.zip"
-    </PreBuildEvent>
-  </PropertyGroup>
-   <Import Project="$(RepoRoot)eng\Loc.targets" />
+  <Import Project="$(RepoRoot)eng\Loc.targets" />
 </Project>

Templates/CSharp/UWP/UWP.xml

@@ -1,24 +0,0 @@
-<Zips>
-  <Zip>
-  <File TargetFileName="Assets\LockScreenLogo.scale-200.png">ProjectTemplates\CSharp\Windows UAP\Assets\LockScreenLogo.scale-200.png</File>
-  <File TargetFileName="Assets\SplashScreen.scale-200.png">ProjectTemplates\CSharp\Windows UAP\Assets\SplashScreen.scale-200.png</File>
-  <File TargetFileName="Assets\Square44x44Logo.scale-200.png">ProjectTemplates\CSharp\Windows UAP\Assets\Square44x44Logo.scale-200.png</File>
-  <File TargetFileName="Assets\Square44x44Logo.targetsize-24_altform-unplated.png">ProjectTemplates\CSharp\Windows UAP\Assets\Square44x44Logo.targetsize-24_altform-unplated.png</File>
-  <File TargetFileName="Assets\Square150x150Logo.scale-200.png">ProjectTemplates\CSharp\Windows UAP\Assets\Square150x150Logo.scale-200.png</File>
-  <File TargetFileName="Assets\StoreLogo.png">ProjectTemplates\CSharp\Windows UAP\Assets\StoreLogo.png</File>
-  <File TargetFileName="Assets\Wide310x150Logo.scale-200.png">ProjectTemplates\CSharp\Windows UAP\Assets\Wide310x150Logo.scale-200.png</File>
-
-  <File TargetFileName="Properties\AssemblyInfo.cs">ProjectTemplates\CSharp\Windows UAP\Properties\AssemblyInfo.cs</File>
-  <File TargetFileName="Properties\UnitTestApp.rd.xml">ProjectTemplates\CSharp\Windows UAP\Properties\UnitTestApp.rd.xml</File>
-
-  <File TargetFileName="__PreviewImage.png">ProjectTemplates\CSharp\Windows UAP\__PreviewImage.png</File>
-  <File TargetFileName="MSTestV2UWP.vstemplate">ProjectTemplates\CSharp\Windows UAP\MSTestV2UWP.vstemplate</File>
-  <File TargetFileName="Package.appxmanifest">ProjectTemplates\CSharp\Windows UAP\Package.appxmanifest</File>
-  <File TargetFileName="project.json">ProjectTemplates\CSharp\Windows UAP\project.json</File>
-  <File TargetFileName="UnitTest.cs">ProjectTemplates\CSharp\Windows UAP\UnitTest.cs</File>
-  <File TargetFileName="UnitTestApp.xaml">ProjectTemplates\CSharp\Windows UAP\UnitTestApp.xaml</File>
-  <File TargetFileName="UnitTestApp.xaml.cs">ProjectTemplates\CSharp\Windows UAP\UnitTestApp.xaml.cs</File>
-  <File TargetFileName="UnitTestApp1.csproj">ProjectTemplates\CSharp\Windows UAP\UnitTestApp1.csproj</File>
-  <File TargetFileName="UnitTestApp1_TemporaryKey.pfx">ProjectTemplates\CSharp\Windows UAP\UnitTestApp1_TemporaryKey.pfx</File>
-  </Zip>
-</Zips>

Templates/CSharp/UWP/source.extension.vsixmanifest

@@ -7,7 +7,7 @@
     <License>UniversalTemplateLicense.rtf</License>
     <PackageId>Microsoft.VisualStudio.Templates.CS.MSTestv2.UWP.UnitTest</PackageId>
   </Metadata>
-  <Installation Experimental="true">
+  <Installation AllUsers="true" Experimental="true">
     <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[16.0]" />
     <InstallationTarget Version="[16.0]" Id="Microsoft.VisualStudio.Pro" />
     <InstallationTarget Version="[16.0]" Id="Microsoft.VisualStudio.Enterprise" />

Templates/VisualBasic/Desktop/DesktopVB.xml

@@ -1,14 +0,0 @@
-<Zips>
-  <Zip>
-    <File TargetFileName="AssemblyInfo.vb">ProjectTemplates\VisualBasic\Test\AssemblyInfo.vb</File>
-    <File TargetFileName="Application.myapp">ProjectTemplates\VisualBasic\Test\Application.myapp</File>
-    <File TargetFileName="Application.Designer.vb">ProjectTemplates\VisualBasic\Test\Application.Designer.vb</File>
-    <File TargetFileName="Resources.resx">ProjectTemplates\VisualBasic\Test\Resources.resx</File>
-    <File TargetFileName="Resources.Designer.vb">ProjectTemplates\VisualBasic\Test\Resources.Designer.vb</File>
-    <File TargetFileName="Settings.settings">ProjectTemplates\VisualBasic\Test\Settings.settings</File>
-    <File TargetFileName="Settings.Designer.vb">ProjectTemplates\VisualBasic\Test\Settings.Designer.vb</File>
-    <File TargetFileName="UnitTest1.vb">ProjectTemplates\VisualBasic\Test\UnitTest1.vb</File>
-    <File TargetFileName="MSTestV2DesktopVB.vstemplate">ProjectTemplates\VisualBasic\Test\MSTestV2DesktopVB.vstemplate</File>
-    <File TargetFileName="UnitTestProject.vbproj">ProjectTemplates\VisualBasic\Test\UnitTestProject.vbproj</File>
-  </Zip>
-</Zips>

Templates/VisualBasic/Desktop/MSTestDesktopVB.csproj

@@ -10,7 +10,6 @@
     <!-- VS Insertion -->
     <!--VisualStudioInsertionComponent>Microsoft.VisualStudio.Templates.VB.MSTestv2.Desktop.UnitTest</VisualStudioInsertionComponent-->
 
-    <IsVsixProject>true</IsVsixProject>
     <CreateVsixContainer>true</CreateVsixContainer>
     <DeployExtension>False</DeployExtension>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
@@ -32,17 +31,9 @@
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>
-    <Content Include="DesktopVB.xml" />
-    <Content Include="ProjectTemplates\VisualBasic\Test\VBDesktopUnitTestTemplate.zip">
+    <Content Include="ProjectTemplates\**">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
   </ItemGroup>
-  
-  <PropertyGroup>
-    <PreBuildEvent>
-      IF EXIST "$(MSBuildThisFileDirectory)ProjectTemplates\VisualBasic\Test\VBDesktopUnitTestTemplate.zip" DEL /q /s "$(MSBuildThisFileDirectory)ProjectTemplates\VisualBasic\Test\VBDesktopUnitTestTemplate.zip"
-      "$(RepoRoot)tools\ZipItems\ZipItems.exe" "$(MSBuildThisFileDirectory)DesktopVB.xml" "$(MSBuildThisFileDirectory)\" "$(MSBuildThisFileDirectory)ProjectTemplates\VisualBasic\Test\VBDesktopUnitTestTemplate.zip"
-    </PreBuildEvent>
-  </PropertyGroup>
-   <Import Project="$(RepoRoot)eng\Loc.targets" />
+  <Import Project="$(RepoRoot)eng\Loc.targets" />
 </Project>

Templates/VisualBasic/Desktop/source.extension.vsixmanifest

@@ -7,7 +7,7 @@
     <License>DesktopTemplateLicense.rtf</License>
     <PackageId>Microsoft.VisualStudio.Templates.VB.MSTestv2.Desktop.UnitTest</PackageId>
   </Metadata>
-  <Installation Experimental="true">
+  <Installation AllUsers="true" Experimental="true">
     <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[16.0]" />
     <InstallationTarget Version="[16.0]" Id="Microsoft.VisualStudio.Pro" />
     <InstallationTarget Version="[16.0]" Id="Microsoft.VisualStudio.Enterprise" />

Templates/VisualBasic/UWP/MSTestUWPVB.csproj

@@ -10,7 +10,6 @@
     <!-- VS Insertion -->
     <VisualStudioInsertionComponent>Microsoft.VisualStudio.Templates.VB.MSTestv2.UWP.UnitTest</VisualStudioInsertionComponent>
 
-    <IsVsixProject>true</IsVsixProject>
     <CreateVsixContainer>true</CreateVsixContainer>
     <DeployExtension>False</DeployExtension>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
@@ -21,7 +20,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="ProjectTemplates\VisualBasic\Windows UAP\UWP_VB.zip">
+    <Content Include="ProjectTemplates\**">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
     <Content Include="UniversalTemplateLicense.rtf">
@@ -37,11 +36,5 @@
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
-  <PropertyGroup>
-    <PreBuildEvent>
-      IF EXIST "$(MSBuildThisFileDirectory)ProjectTemplates\VisualBasic\Windows UAP\UWP_VB.zip" DEL /q /s "$(MSBuildThisFileDirectory)ProjectTemplates\VisualBasic\Windows UAP\UWP_VB.zip"
-      "$(RepoRoot)tools\ZipItems\ZipItems.exe" "$(MSBuildThisFileDirectory)UWP_VB.xml" "$(MSBuildThisFileDirectory)\" "$(MSBuildThisFileDirectory)ProjectTemplates\VisualBasic\Windows UAP\UWP_VB.zip"
-    </PreBuildEvent>
-  </PropertyGroup>
    <Import Project="$(RepoRoot)eng\Loc.targets" />
 </Project>

Templates/VisualBasic/UWP/source.extension.vsixmanifest

@@ -7,7 +7,7 @@
     <License>UniversalTemplateLicense.rtf</License>
     <PackageId>Microsoft.VisualStudio.Templates.VB.MSTestv2.UWP.UnitTest</PackageId>
   </Metadata>
-  <Installation Experimental="true">
+  <Installation AllUsers="true" Experimental="true">
     <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[16.0]" />
     <InstallationTarget Version="[16.0]" Id="Microsoft.VisualStudio.Pro" />
     <InstallationTarget Version="[16.0]" Id="Microsoft.VisualStudio.Enterprise" />

WizardExtensions/MSTestv2IntelliTestExtension/MSTestv2IntelliTestExtension.csproj

@@ -1,6 +1,5 @@
 <Project  Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <ProjectGuid>{AAB9F3CF-72D5-419B-B31E-209388BF3E7C}</ProjectGuid>
     <OutputType>Library</OutputType>
     <RootNamespace>MSTestv2IntelliTestExtension</RootNamespace>
     <AssemblyName>MSTestv2IntelliTestExtension</AssemblyName>
@@ -15,6 +14,6 @@
     <Compile Include="MSTestv2TestFrameworkPackageAttribute.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Internal.IntelliTest" Version="15.0.0"/>
+    <PackageReference Include="Microsoft.Internal.IntelliTest" Version="$(MicrosoftInternalIntelliTestVersion)"/>
   </ItemGroup>
 </Project>

WizardExtensions/MSTestv2IntelliTestExtensionPackage/MSTestv2IntelliTestExtensionPackage.csproj

@@ -1,7 +1,6 @@
 <Project  Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net461</TargetFramework>
-    <ProjectGuid>{88308F8C-9B6A-4FC1-BA78-F7106987CE56}</ProjectGuid>
     <RootNamespace>MSTestv2IntelliTestExtensionPackage</RootNamespace>
     <AssemblyName>MSTestv2IntelliTestExtensionPackage</AssemblyName>
     <EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
@@ -30,7 +29,6 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MSTestv2IntelliTestExtension\MSTestv2IntelliTestExtension.csproj">
-      <Project>{aab9f3cf-72d5-419b-b31e-209388bf3e7c}</Project>
       <Name>MSTestv2IntelliTestExtension</Name>
       <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup</IncludeOutputGroupsInVSIX>
     </ProjectReference>

WizardExtensions/MSTestv2IntelliTestExtensionPackage/source.extension.vsixmanifest

@@ -7,7 +7,7 @@
     <License>IntelliTestExtensionLicense.rtf</License>
     <PackageId>Microsoft.VisualStudio.TestTools.MSTestV2.WizardExtension.IntelliTest</PackageId>
   </Metadata>
-  <Installation Experimental="true">
+  <Installation AllUsers="true" Experimental="true">
     <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[16.0]" />
     <InstallationTarget Version="[16.0]" Id="Microsoft.VisualStudio.Enterprise" />
     <InstallationTarget Version="[16.0]" Id="Microsoft.VisualStudio.Community" />

WizardExtensions/MSTestv2UnitTestExtension/MSTestv2UnitTestExtension.csproj

@@ -1,6 +1,5 @@
 <Project  Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <ProjectGuid>{25BFACE8-5009-498E-9B18-3E417C312F26}</ProjectGuid>
     <OutputType>Library</OutputType>
     <RootNamespace>MSTestv2UnitTestExtension</RootNamespace>
     <AssemblyName>MSTestv2UnitTestExtension</AssemblyName>
@@ -8,13 +7,13 @@
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Internal.CreateUnitTest" Version="15.0.0"/>
-    <PackageReference Include="NuGet.VisualStudio" Version="3.5.0"/>
-    <PackageReference Include="EnvDte" Version="8.0.2"/>
-    <PackageReference Include="EnvDte80" Version="8.0.2"/>
-    <PackageReference Include="VSLangProj" Version="7.0.3301.0"/>
-    <PackageReference Include="VSLangProj80" Version="8.0.50728"/>
-    <PackageReference Include="Microsoft.VisualStudio.ComponentModelHost" Version="16.0.342-g758a0a97e0"/>
+    <PackageReference Include="Microsoft.Internal.CreateUnitTest" Version="$(MicrosoftInternalCreateUnitTestVersion)"/>
+    <PackageReference Include="NuGet.VisualStudio" Version="$(NuGetVisualStudioVersion)"/>
+    <PackageReference Include="EnvDte" Version="$(EnvDteVersion)"/>
+    <PackageReference Include="EnvDte80" Version="$(EnvDte80Version)"/>
+    <PackageReference Include="VSLangProj" Version="$(VSLangProjVersion)"/>
+    <PackageReference Include="VSLangProj80" Version="$(VSLangProj80Version)"/>
+    <PackageReference Include="Microsoft.VisualStudio.ComponentModelHost" Version="$(MicrosoftVisualStudioComponentModelHostVersion)"/>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="envdte">

WizardExtensions/MSTestv2UnitTestExtensionPackage/MSTestv2UnitTestExtensionPackage.csproj

@@ -1,7 +1,6 @@
 <Project  Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net461</TargetFramework>
-    <ProjectGuid>{4348D191-1028-4031-8FCB-B0EF7329271D}</ProjectGuid>
     <RootNamespace>MSTestv2UnitTestExtensionPackage</RootNamespace>
     <AssemblyName>MSTestv2UnitTestExtensionPackage</AssemblyName>
     <EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
@@ -30,7 +29,6 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MSTestv2UnitTestExtension\MSTestv2UnitTestExtension.csproj">
-      <Project>{25bface8-5009-498e-9b18-3e417c312f26}</Project>
       <Name>MSTestv2UnitTestExtension</Name>
       <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup</IncludeOutputGroupsInVSIX>
     </ProjectReference>

WizardExtensions/MSTestv2UnitTestExtensionPackage/source.extension.vsixmanifest

@@ -7,7 +7,7 @@
     <License>CreateUnitTestExtensionLicense.rtf</License>
     <PackageId>Microsoft.VisualStudio.TestTools.MSTestV2.WizardExtension.UnitTest</PackageId>
   </Metadata>
-  <Installation Experimental="true">
+  <Installation AllUsers="true" Experimental="true">
     <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[16.0]" />
     <InstallationTarget Version="[16.0]" Id="Microsoft.VisualStudio.Enterprise" />
     <InstallationTarget Version="[16.0]" Id="Microsoft.VisualStudio.Community" />

eng/Version.Details.xml

@@ -2,7 +2,7 @@
 <Dependencies>
   <ProductDependencies></ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19051.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19060.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>812e1ecae150669e93d3305b103b27701dd697b8</Sha>
     </Dependency>

eng/Versions.props

@@ -2,14 +2,25 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!-- Opt out of certain Arcade features -->
   <PropertyGroup>
-    <UsingToolXliff>false</UsingToolXliff>
     <UsingToolVSSDK>true</UsingToolVSSDK>
+    <UsingToolNetFrameworkReferenceAssemblies>true</UsingToolNetFrameworkReferenceAssemblies>
   </PropertyGroup>
 
    <PropertyGroup>
     <VersionPrefix>1.0.2</VersionPrefix>
     <VsixVersionPrefix>16.0.28417</VsixVersionPrefix>
     <PreReleaseVersionLabel>beta4</PreReleaseVersionLabel>
+
+    <!-- Dependencies -->
+    <MicrosoftVisualStudioCoreUtilityVersion>15.0.26201</MicrosoftVisualStudioCoreUtilityVersion>
+    <MicrosoftInternalIntelliTestVersion>15.0.0</MicrosoftInternalIntelliTestVersion>
+    <MicrosoftInternalCreateUnitTestVersion>15.0.0</MicrosoftInternalCreateUnitTestVersion>
+    <NuGetVisualStudioVersion>3.5.0</NuGetVisualStudioVersion>
+    <EnvDteVersion>8.0.2</EnvDteVersion>
+    <EnvDte80Version>8.0.2</EnvDte80Version>
+    <VSLangProjVersion>7.0.3301.0</VSLangProjVersion>
+    <VSLangProj80Version>8.0.50728</VSLangProj80Version>
+    <MicrosoftVisualStudioComponentModelHostVersion>16.0.342-g758a0a97e0</MicrosoftVisualStudioComponentModelHostVersion>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -25,4 +36,4 @@
       https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json;
     </RestoreSources>
   </PropertyGroup>
-</Project>
+</Project>

global.json

@@ -6,6 +6,6 @@
     "dotnet": "2.1.300"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19051.1"
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19060.1"
   }
 }

tools/ZipItems/App.config

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
-    </startup>
-</configuration>

tools/ZipItems/Program.cs

@@ -1,59 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.IO.Compression;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml;
-
-namespace ZipItems
-{
-    class Program
-    {
-        public static XmlReaderSettings ReaderSettings
-        {
-            get
-            {
-                var settings = new XmlReaderSettings();
-                settings.IgnoreComments = true;
-                settings.IgnoreWhitespace = true;
-                return settings;
-            }
-        }
-        static void Main(string[] args)
-        {
-            XmlReader reader = XmlReader.Create(args[0], ReaderSettings);
-            reader.Read();
-            reader.Read();
-            reader.Read();
-
-            string baseDirectory = args[1];
-            ZipArchive zip = ZipFile.Open(args[2], ZipArchiveMode.Create);
-
-            while (reader.NodeType == XmlNodeType.Element)
-            {
-                string elementName = reader.Name.ToUpperInvariant();
-                switch (elementName)
-                {
-                    case "FILE":
-                        {
-                            string targetFilename = reader.GetAttribute("TargetFileName");
-                            string sourceFilePath = reader.ReadInnerXml();
-                            string sourceFile = Path.Combine(baseDirectory, sourceFilePath);
-                            zip.CreateEntryFromFile(sourceFile, targetFilename, CompressionLevel.Optimal);
-                        }
-                        break;
-                    default:
-                        reader.Skip();
-                        break;
-
-                }
-            }
-            zip.Dispose();
-        }
-    }
-}

tools/ZipItems/Properties/AssemblyInfo.cs

@@ -1,39 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("ZipItems")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ZipItems")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("ac37d6d0-dad4-4eb5-a5f2-4c68b608ae3f")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

tools/ZipItems/ZipItems.csproj

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{AC37D6D0-DAD4-4EB5-A5F2-4C68B608AE3F}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ZipItems</RootNamespace>
-    <AssemblyName>ZipItems</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>.\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.IO.Compression.FileSystem" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>