Merge pull request #247 from jthelin/Vsix-Templates-NuGet

VSIX Templates Updated to use NuGet packages
dotnet · Mar 20, 2015 · 31777ef · 31777ef
2 parents 7ccdc74 + 4976c71
commit 31777ef
Show file tree

Hide file tree

Showing 40 changed files with 148 additions and 507 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,9 @@
 
 # Orleans code-gen files
 orleans.codegen.cs
+orleans.codegen.fs
 orleans.codegen.vb
+src/SDK/VSIX/
 
 # User-specific files
 *.suo

diff --git a/src/OrleansVSTools/OrleansVSTools.sln b/src/OrleansVSTools/OrleansVSTools.sln
diff --git a/src/OrleansVSTools/OrleansVSTools/Guids.cs b/src/OrleansVSTools/OrleansVSTools/Guids.cs
@@ -29,9 +29,9 @@ namespace OrleansVSTools
 {
     static class GuidList
     {
-        public const string guidOrleansVSTools11PkgString = "462db41f-31a4-48f0-834c-1bdcc0578511";
-        public const string guidOrleansVSTools11CmdSetString = "e52a46d8-332c-4522-8ebc-ebc745a1e3ef";
+        public const string guidOrleansVSToolsPkgString = "462db41f-31a4-48f0-834c-1bdcc0578511";
+        public const string guidOrleansVSToolsCmdSetString = "e52a46d8-332c-4522-8ebc-ebc745a1e3ef";
 
-        public static readonly Guid guidOrleansVSTools11CmdSet = new Guid(guidOrleansVSTools11CmdSetString);
+        public static readonly Guid guidOrleansVSToolsCmdSet = new Guid(guidOrleansVSToolsCmdSetString);
     };
 }
diff --git a/src/OrleansVSTools/OrleansVSTools/OrleansVSTools.csproj b/src/OrleansVSTools/OrleansVSTools/OrleansVSTools.csproj
@@ -4,10 +4,6 @@
     <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <SccProjectName></SccProjectName>
-    <SccLocalPath></SccLocalPath>
-    <SccAuxPath></SccAuxPath>
-    <SccProvider></SccProvider>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -131,6 +127,10 @@
     </Compile>
     <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="OrleansVSToolsPackage.cs" />
+
+    <Compile Include="..\..\Build\GlobalAssemblyInfo.cs">
+      <Link>Properties\GlobalAssemblyInfo.cs</Link>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/OrleansVSTools/OrleansVSTools/OrleansVSToolsPackage.cs b/src/OrleansVSTools/OrleansVSTools/OrleansVSToolsPackage.cs
@@ -44,7 +44,7 @@ namespace OrleansVSTools
     // This attribute is used to register the information needed to show this package
     // in the Help/About dialog of Visual Studio.
     [InstalledProductRegistration("#110", "#112", "1.0", IconResourceID = 400)]
-    [Guid(GuidList.guidOrleansVSTools11PkgString)]
+    [Guid(GuidList.guidOrleansVSToolsPkgString)]
     public sealed class OrleansVSToolsPackage : Package
     {
         /// <summary>

diff --git a/src/OrleansVSTools/OrleansVSTools/Properties/AssemblyInfo.cs b/src/OrleansVSTools/OrleansVSTools/Properties/AssemblyInfo.cs
@@ -30,30 +30,8 @@ The above copyright notice and this permission notice shall be included in all c
 // 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("OrleansVSTools11")]
+[assembly: AssemblyTitle("OrleansVSTools")]
 [assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Cloud Computing Futures")]
-[assembly: AssemblyProduct("OrleansVSTools11")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]   
 [assembly: ComVisible(false)]     
 [assembly: CLSCompliant(false)]
 [assembly: NeutralResourcesLanguage("en-US")]
-
-// 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 Revision and Build Numbers 
-// by using the '*' as shown below:
-
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-
-[assembly: InternalsVisibleTo("OrleansVSTools11_IntegrationTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100eb81539dc2728946d4860bad0fbc91ea23d7a835e00547aa4e9a7abf185535b564d29dbe77915b779951fef2f4b1ab39cc3a246cf572c7b217b5c892835a687eb22638183d66930039ff9fa6e7e71cb880f854fb76b884dfc905bf1f3c623abad7d4732c1ce62efff937155e352170831239acbe103a41ed363a90001d3108ca")]
-
diff --git a/src/OrleansVSTools/OrleansVSTools/VSPackage.resx b/src/OrleansVSTools/OrleansVSTools/VSPackage.resx
@@ -129,7 +129,7 @@
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="110" xml:space="preserve">
-    <value>OrleansVSTools11</value>
+    <value>OrleansVSTools</value>
   </data>
   <data name="112" xml:space="preserve">
     <value>Orleans Tools for Visual Studio 2012</value>

diff --git a/src/OrleansVSTools/OrleansVSTools/source.extension.vsixmanifest b/src/OrleansVSTools/OrleansVSTools/source.extension.vsixmanifest
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="462db41f-31a4-48f0-834c-1bdcc0578511" Version="1.0.0" Language="en-US" Publisher="Microsoft" />
-    <DisplayName>OrleansVSTools11</DisplayName>
+    <Identity Id="462db41f-31a4-48f0-834c-1bdcc0578511" Version="1.0.5" Language="en-US" Publisher="Microsoft" />
+    <DisplayName>OrleansVSTools</DisplayName>
     <Description>Orleans Tools for Visual Studio 2012, 2013, 2015</Description>
-    <MoreInfo>http://toolbox/orleans</MoreInfo>
+    <MoreInfo>htts://github.com/dotnet/orleans/</MoreInfo>
     <License>License.txt</License>
     <Icon>Orleans.ico</Icon>
     <PreviewImage>orleans-poster.jpg</PreviewImage>
-    <Tags>MS Internal Only,Orleans,Cloud Computing,Actor Model,Actors,Distributed Systems</Tags>
+    <Tags>Orleans,Cloud-Computing,Actor-Model,Actors,Distributed-Systems,C#,VB,F#</Tags>
   </Metadata>
   <Installation AllUsers="false">
     <InstallationTarget Version="[11.0,15.0)" Id="Microsoft.VisualStudio.Premium" />

diff --git a/...OrleansVSTools/VSItemTemplateGrainImplementation/VSItemTemplateGrainImplementation.csproj b/...OrleansVSTools/VSItemTemplateGrainImplementation/VSItemTemplateGrainImplementation.csproj
@@ -22,10 +22,6 @@
     <CopyVsixManifestToOutput>false</CopyVsixManifestToOutput>
     <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
     <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
-    <SccProjectName></SccProjectName>
-    <SccLocalPath></SccLocalPath>
-    <SccAuxPath></SccAuxPath>
-    <SccProvider></SccProvider>
     <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

diff --git a/...ls/VSItemTemplateGrainImplementationFSharp/VSItemTemplateGrainImplementationFSharp.fsproj b/...ls/VSItemTemplateGrainImplementationFSharp/VSItemTemplateGrainImplementationFSharp.fsproj
@@ -23,16 +23,8 @@
     <CopyVsixManifestToOutput>false</CopyVsixManifestToOutput>
     <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
     <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
-    <SccProjectName></SccProjectName>
-    <SccProvider></SccProvider>
-    <SccAuxPath></SccAuxPath>
-    <SccLocalPath></SccLocalPath>
     <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
+    <TargetFSharpCoreVersion>4.3.0.0</TargetFSharpCoreVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -60,7 +52,19 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" Condition=" Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')" />
+  <Choose>
+    <When Condition="'$(VisualStudioVersion)' == '11.0'">
+      <PropertyGroup>
+        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+  <Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\VSSDK\Microsoft.VsSDK.targets" Condition="false" />
   <ItemGroup>
@@ -69,13 +73,13 @@
     <Content Include="Orleans.ico" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.VisualStudio.CoreUtility">
       <Private>False</Private>
     </Reference>
     <Reference Include="mscorlib" />
-    <Reference Include="FSharp.Core, Version=4.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Numerics" />

diff --git a/...ansVSTools/VSItemTemplateGrainImplementationVB/VSItemTemplateGrainImplementationVB.vbproj b/...ansVSTools/VSItemTemplateGrainImplementationVB/VSItemTemplateGrainImplementationVB.vbproj
@@ -4,15 +4,6 @@
     <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <SccProjectName></SccProjectName>
-    <SccLocalPath></SccLocalPath>
-    <SccAuxPath></SccAuxPath>
-    <SccProvider></SccProvider>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>

diff --git a/src/OrleansVSTools/VSItemTemplateGrainInterface/VSItemTemplateGrainInterface.csproj b/src/OrleansVSTools/VSItemTemplateGrainInterface/VSItemTemplateGrainInterface.csproj
@@ -22,10 +22,6 @@
     <CopyVsixManifestToOutput>false</CopyVsixManifestToOutput>
     <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
     <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
-    <SccProjectName></SccProjectName>
-    <SccLocalPath></SccLocalPath>
-    <SccAuxPath></SccAuxPath>
-    <SccProvider></SccProvider>
     <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

diff --git a/src/OrleansVSTools/VSItemTemplateGrainInterfaceVB/VSItemTemplateGrainInterfaceVB.vbproj b/src/OrleansVSTools/VSItemTemplateGrainInterfaceVB/VSItemTemplateGrainInterfaceVB.vbproj
@@ -4,15 +4,6 @@
     <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <SccProjectName></SccProjectName>
-    <SccLocalPath></SccLocalPath>
-    <SccAuxPath></SccAuxPath>
-    <SccProvider></SccProvider>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>

diff --git a/src/OrleansVSTools/VSItemTemplatePersistedGrain/Properties/AssemblyInfo.cs b/src/OrleansVSTools/VSItemTemplatePersistedGrain/Properties/AssemblyInfo.cs
diff --git a/src/OrleansVSTools/VSItemTemplatePersistedGrain/VSItemTemplatePersistedGrain.csproj b/src/OrleansVSTools/VSItemTemplatePersistedGrain/VSItemTemplatePersistedGrain.csproj
@@ -4,10 +4,6 @@
     <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <SccProjectName></SccProjectName>
-    <SccLocalPath></SccLocalPath>
-    <SccAuxPath></SccAuxPath>
-    <SccProvider></SccProvider>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -58,9 +54,6 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="GrainImplementationClassTemplate.cs" />
   </ItemGroup>

diff --git a/src/OrleansVSTools/VSItemTemplatePersistedGrainVB/VSItemTemplatePersistedGrainVB.vbproj b/src/OrleansVSTools/VSItemTemplatePersistedGrainVB/VSItemTemplatePersistedGrainVB.vbproj
@@ -4,15 +4,6 @@
     <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <SccProjectName></SccProjectName>
-    <SccLocalPath></SccLocalPath>
-    <SccAuxPath></SccAuxPath>
-    <SccProvider></SccProvider>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>

diff --git a/src/OrleansVSTools/VSProjectSiloHost/ProjectTemplate.csproj b/src/OrleansVSTools/VSProjectSiloHost/ProjectTemplate.csproj
@@ -40,14 +40,6 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="Orleans">
-      <HintPath>$(OrleansSDK)\Binaries\OrleansClient\Orleans.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="OrleansRuntime">
-      <HintPath>$(OrleansSDK)\Binaries\OrleansServer\OrleansRuntime.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />

diff --git a/src/OrleansVSTools/VSProjectSiloHost/VSProjectSiloHost.csproj b/src/OrleansVSTools/VSProjectSiloHost/VSProjectSiloHost.csproj
@@ -4,10 +4,6 @@
     <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <SccProjectName></SccProjectName>
-    <SccLocalPath></SccLocalPath>
-    <SccAuxPath></SccAuxPath>
-    <SccProvider></SccProvider>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject />
@@ -62,24 +58,20 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
     <None Include="OrleansHostWrapper.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="App.config" />
     <None Include="AssemblyInfo.cs" />
     <None Include="Program.cs" />
-    <None Include="ProjectTemplate.csproj">
-      <SubType>Designer</SubType>
-    </None>
+    <None Include="packages.config.txt" />
+    <None Include="ProjectTemplate.csproj" />
+    <None Include="DevTestServerConfiguration.xml" />
+    <None Include="DevTestClientConfiguration.xml" />
   </ItemGroup>
   <ItemGroup>
     <VSTemplate Include="VSProjectSiloHost.vstemplate" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="DevTestClientConfiguration.xml" />
     <Content Include="Orleans.ico" />
-    <Content Include="DevTestServerConfiguration.xml" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />

diff --git a/src/OrleansVSTools/VSProjectSiloHost/VSProjectSiloHost.vstemplate b/src/OrleansVSTools/VSProjectSiloHost/VSProjectSiloHost.vstemplate
@@ -7,7 +7,7 @@
     <ProjectType>CSharp</ProjectType>
     <RequiredFrameworkVersion>4.5</RequiredFrameworkVersion>
     <SortOrder>1000</SortOrder>
-    <TemplateID>ba427b09-614a-41ef-ac5e-49c47909f209</TemplateID>
+    <TemplateID>Orleans.Templates.Project.SiloHost.DevTest</TemplateID>
     <CreateNewFolder>true</CreateNewFolder>
     <DefaultName>SiloHost</DefaultName>
     <ProvideDefaultName>true</ProvideDefaultName>
@@ -20,6 +20,7 @@
       <ProjectItem ReplaceParameters="true" TargetFileName="DevTestServerConfiguration.xml">DevTestServerConfiguration.xml</ProjectItem>
       <ProjectItem ReplaceParameters="true" TargetFileName="OrleansHostWrapper.cs">OrleansHostWrapper.cs</ProjectItem>
       <ProjectItem ReplaceParameters="true" OpenInEditor="true">Program.cs</ProjectItem>
+      <ProjectItem ReplaceParameters="false" TargetFileName="packages.config">packages.config.txt</ProjectItem>
     </Project>
   </TemplateContent>
 </VSTemplate>