Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed for VS2010 and changed build script to call msbuild and copy th…

…e vsix out.
  • Loading branch information...
commit 2a05037bcf2956e2f3a02edc183ddbc18ba0c532 1 parent d89f409
@jonorossi authored
View
19 default.build
@@ -1,5 +1,7 @@
<?xml version="1.0" ?>
<project name="CVSI" default="release" xmlns="http://tempuri.org/nant-donotuse.xsd">
+ <property name="version" value="0.4.0" />
+
<!-- User targets -->
<target name="release" depends="clean, init, copy-dependencies, compile, build-setup" />
@@ -42,8 +44,8 @@
</references>
</csc>
- <!-- Castle.VisualStudio.NVelocityLanguageService.dll for Visual Studio 2005-->
- <csc target="library" output="build\bin\vs2005\Castle.VisualStudio.NVelocityLanguageService.dll"
+ <!-- Castle.VisualStudio.NVelocityLanguageService.dll for Visual Studio 2005 -->
+ <csc target="library" define="VS2005" output="build\bin\vs2005\Castle.VisualStudio.NVelocityLanguageService.dll"
keyfile="src\Castle.VisualStudio.NVelocityLanguageService\Castle.VisualStudio.NVelocityLanguageService.snk">
<sources>
<include name="src\Castle.VisualStudio.NVelocityLanguageService\**\*.cs" />
@@ -66,7 +68,7 @@
</references>
</csc>
- <!-- Castle.VisualStudio.NVelocityLanguageService.dll for Visual Studio 2008-->
+ <!-- Castle.VisualStudio.NVelocityLanguageService.dll for Visual Studio 2008 -->
<csc target="library" define="VS2008" output="build\bin\vs2008\Castle.VisualStudio.NVelocityLanguageService.dll"
keyfile="src\Castle.VisualStudio.NVelocityLanguageService\Castle.VisualStudio.NVelocityLanguageService.snk">
<sources>
@@ -92,6 +94,15 @@
<include name="lib\VS2008\Microsoft.VisualStudio.Shell.Interop.9.0.dll" />
</references>
</csc>
+
+ <!-- Everything for Visual Studio 2010 (because MSBuild builds the VSIX) -->
+ <exec program="C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe">
+ <arg value="src\CVSI-vs2010.sln" />
+ <arg value="/t:Rebuild" />
+ <arg value="/p:Configuration=Release" />
+ </exec>
+ <copy file="src\Castle.VisualStudio.NVelocityLanguageService\bin\Release\Castle.VisualStudio.NVelocityLanguageService.vsix"
+ tofile="build\setup\cvsi-${version}.vsix" />
</target>
<target name="build-setup">
@@ -111,7 +122,7 @@
<exec program="tools\WiX\bin\light.exe">
<!-- Set the output MSI -->
<arg value="-out" />
- <arg dir="build\setup\CVSI-0.3.2.msi" />
+ <arg dir="build\setup\cvsi-${version}.msi" />
<!-- Add WiX extension -->
<arg value="-ext" />
<arg file="tools\WiX\bin\WixUIExtension.dll" />
View
27 src/CVSI-vs2010.sln
@@ -15,17 +15,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Castle.VisualStudio.NVeloci
{6E419017-8FB9-4D6B-99EE-4B7502C234B0} = {6E419017-8FB9-4D6B-99EE-4B7502C234B0}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Castle.VisualStudio.NVelocityLanguageService.DebugWindow-vs2010", "Castle.VisualStudio.NVelocityLanguageService.DebugWindow\Castle.VisualStudio.NVelocityLanguageService.DebugWindow-vs2010.csproj", "{C0FEAF34-DF2E-47A7-BEFF-6C9B99501A0F}"
- ProjectSection(ProjectDependencies) = postProject
- {6E419017-8FB9-4D6B-99EE-4B7502C234B0} = {6E419017-8FB9-4D6B-99EE-4B7502C234B0}
- EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Castle.NVelocity-vs2010", "Castle.NVelocity\Castle.NVelocity-vs2010.csproj", "{6E419017-8FB9-4D6B-99EE-4B7502C234B0}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Castle.NVelocity.Demo-vs2010", "Castle.NVelocity.Demo\Castle.NVelocity.Demo-vs2010.csproj", "{7DD29533-E576-4A0C-BA0F-C026344E6AE0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Castle.NVelocity.Tests-vs2010", "Castle.NVelocity.Tests\Castle.NVelocity.Tests-vs2010.csproj", "{062FDFDB-0BAE-4E6C-84FB-72F774738CA6}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Castle.NVelocity-vs2010", "Castle.NVelocity\Castle.NVelocity-vs2010.csproj", "{6E419017-8FB9-4D6B-99EE-4B7502C234B0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Castle.VisualStudio.NVelocityLanguageService.DebugWindow-vs2010", "Castle.VisualStudio.NVelocityLanguageService.DebugWindow\Castle.VisualStudio.NVelocityLanguageService.DebugWindow-vs2010.csproj", "{C0FEAF34-DF2E-47A7-BEFF-6C9B99501A0F}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -44,14 +41,6 @@ Global
{2FEF9F9C-1180-4F6D-A609-C8CD529A1C5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2FEF9F9C-1180-4F6D-A609-C8CD529A1C5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2FEF9F9C-1180-4F6D-A609-C8CD529A1C5E}.Release|Any CPU.Build.0 = Release|Any CPU
- {C0FEAF34-DF2E-47A7-BEFF-6C9B99501A0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {C0FEAF34-DF2E-47A7-BEFF-6C9B99501A0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {C0FEAF34-DF2E-47A7-BEFF-6C9B99501A0F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {C0FEAF34-DF2E-47A7-BEFF-6C9B99501A0F}.Release|Any CPU.Build.0 = Release|Any CPU
- {6E419017-8FB9-4D6B-99EE-4B7502C234B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {6E419017-8FB9-4D6B-99EE-4B7502C234B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {6E419017-8FB9-4D6B-99EE-4B7502C234B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {6E419017-8FB9-4D6B-99EE-4B7502C234B0}.Release|Any CPU.Build.0 = Release|Any CPU
{7DD29533-E576-4A0C-BA0F-C026344E6AE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7DD29533-E576-4A0C-BA0F-C026344E6AE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7DD29533-E576-4A0C-BA0F-C026344E6AE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -60,6 +49,14 @@ Global
{062FDFDB-0BAE-4E6C-84FB-72F774738CA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{062FDFDB-0BAE-4E6C-84FB-72F774738CA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{062FDFDB-0BAE-4E6C-84FB-72F774738CA6}.Release|Any CPU.Build.0 = Release|Any CPU
+ {6E419017-8FB9-4D6B-99EE-4B7502C234B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6E419017-8FB9-4D6B-99EE-4B7502C234B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6E419017-8FB9-4D6B-99EE-4B7502C234B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {6E419017-8FB9-4D6B-99EE-4B7502C234B0}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C0FEAF34-DF2E-47A7-BEFF-6C9B99501A0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C0FEAF34-DF2E-47A7-BEFF-6C9B99501A0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C0FEAF34-DF2E-47A7-BEFF-6C9B99501A0F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C0FEAF34-DF2E-47A7-BEFF-6C9B99501A0F}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
View
4 src/Castle.VisualStudio.NVelocityLanguageService/Castle.VisualStudio.NVelocityLanguageService-vs2010.csproj
@@ -121,9 +121,9 @@
<Project>{1BF278D1-1FD8-4E26-9F93-777E5157A3A7}</Project>
<Name>Castle.VisualStudio.MonoRailIntelliSenseProvider-vs2008</Name>
</ProjectReference>
- <ProjectReference Include="..\Castle.VisualStudio.NVelocityLanguageService.DebugWindow\Castle.VisualStudio.NVelocityLanguageService.DebugWindow-vs2008.csproj">
+ <ProjectReference Include="..\Castle.VisualStudio.NVelocityLanguageService.DebugWindow\Castle.VisualStudio.NVelocityLanguageService.DebugWindow-vs2010.csproj">
<Project>{C0FEAF34-DF2E-47A7-BEFF-6C9B99501A0F}</Project>
- <Name>Castle.VisualStudio.NVelocityLanguageService.DebugWindow-vs2008</Name>
+ <Name>Castle.VisualStudio.NVelocityLanguageService.DebugWindow-vs2010</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
View
2  src/Castle.VisualStudio.NVelocityLanguageService/NVelocityPackage.cs
@@ -85,7 +85,7 @@ namespace Castle.VisualStudio.NVelocityLanguageService
#elif VS2008
[ProvideLoadKey("Standard", "0.3", "Castle Visual Studio Integration", "Jonathon Rossi", 2008)]
#else
- //TODO
+ // Visual Studio 2010 does not require a package load key
#endif
[Guid(NVelocityConstants.PackageGuidString)]
View
1  src/Castle.VisualStudio.NVelocityLanguageService/source.extension.vsixmanifest
@@ -6,6 +6,7 @@
<Version>0.4.0</Version>
<Description xml:space="preserve">Castle Visual Studio Integration</Description>
<Locale>1033</Locale>
+ <MoreInfoUrl>http://jonorossi.com/projects/cvsi/</MoreInfoUrl>
<InstalledByMsi>false</InstalledByMsi>
<SupportedProducts>
<VisualStudio Version="10.0">
Please sign in to comment.
Something went wrong with that request. Please try again.