diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2012-06-20 22:10:34 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2012-06-20 22:10:34 -0700 |
| commit | 191a46b778536eb9ce26d2589039ddbb765ef5c6 (patch) | |
| tree | cbb1100d00b59366be1054749abc580206f7b064 /projecttemplates | |
| parent | 726d6d66e39a001c43cb29e3ad2861242679be2f (diff) | |
| parent | 9ba6f876e55dfb12126081c57ae146cbe09ede53 (diff) | |
| download | DotNetOpenAuth-191a46b778536eb9ce26d2589039ddbb765ef5c6.zip DotNetOpenAuth-191a46b778536eb9ce26d2589039ddbb765ef5c6.tar.gz DotNetOpenAuth-191a46b778536eb9ce26d2589039ddbb765ef5c6.tar.bz2 | |
Merge remote-tracking branch 'origin/v4.0' into v4.0
Diffstat (limited to 'projecttemplates')
| -rw-r--r-- | projecttemplates/MvcRelyingParty.vsixmanifest | 7 | ||||
| -rw-r--r-- | projecttemplates/WebFormsRelyingParty.vsixmanifest | 7 | ||||
| -rw-r--r-- | projecttemplates/projecttemplates.proj | 7 |
3 files changed, 16 insertions, 5 deletions
diff --git a/projecttemplates/MvcRelyingParty.vsixmanifest b/projecttemplates/MvcRelyingParty.vsixmanifest index 2788f1f..11cfbec 100644 --- a/projecttemplates/MvcRelyingParty.vsixmanifest +++ b/projecttemplates/MvcRelyingParty.vsixmanifest @@ -17,8 +17,13 @@ <Edition>Premium</Edition> <Edition>Ultimate</Edition> </VisualStudio> + <VisualStudio Version="11.0"> + <Edition>Pro</Edition> + <Edition>Premium</Edition> + <Edition>Ultimate</Edition> + </VisualStudio> </SupportedProducts> - <SupportedFrameworkRuntimeEdition MinVersion="3.5" MaxVersion="3.5" /> + <SupportedFrameworkRuntimeEdition MinVersion="3.5" MaxVersion="4.5" /> </Identifier> <References /> <Content> diff --git a/projecttemplates/WebFormsRelyingParty.vsixmanifest b/projecttemplates/WebFormsRelyingParty.vsixmanifest index 9ea643a..6d010c5 100644 --- a/projecttemplates/WebFormsRelyingParty.vsixmanifest +++ b/projecttemplates/WebFormsRelyingParty.vsixmanifest @@ -17,8 +17,13 @@ <Edition>Premium</Edition> <Edition>Ultimate</Edition> </VisualStudio> + <VisualStudio Version="11.0"> + <Edition>Pro</Edition> + <Edition>Premium</Edition> + <Edition>Ultimate</Edition> + </VisualStudio> </SupportedProducts> - <SupportedFrameworkRuntimeEdition MinVersion="3.5" MaxVersion="3.5" /> + <SupportedFrameworkRuntimeEdition MinVersion="3.5" MaxVersion="4.5" /> </Identifier> <References /> <Content> diff --git a/projecttemplates/projecttemplates.proj b/projecttemplates/projecttemplates.proj index 27e366c..c239293 100644 --- a/projecttemplates/projecttemplates.proj +++ b/projecttemplates/projecttemplates.proj @@ -42,6 +42,7 @@ <Output TaskParameter="TargetOutputs" ItemName="SignedProductAssemblies" /> </MSBuild> <ItemGroup> + <UnifiedSignedProductAssembly Include="@(SignedProductAssemblies)" Condition=" '%(SignedProductAssemblies.FileName)' == '$(ProductName)' " /> <TemplateProjects Include="**\*.csproj" Exclude="$(MSBuildThisFile)"> <AfterTokens>$safeprojectname$</AfterTokens> <!-- Projects can get changed after the transform+copy operation, so don't skip copying them. --> @@ -53,9 +54,9 @@ <TemplateProjectsLayout Include="@(TemplateProjects->'$(ProjectTemplatesLayoutPath)%(RecursiveDir)%(FileName)%(Extension)')"/> <!-- Add external libraries and their symbols --> - <ProjectTemplateLibraries Include="@(SignedProductAssemblies)" /> - <ProjectTemplateLibraries Include="@(SignedProductAssemblies->'%(SymbolPath)')" /> - <ProjectTemplateLibraries Include="$(OutputPath)$(ProductName).xml" /> + <ProjectTemplateLibraries Include="@(UnifiedSignedProductAssembly)" /> + <ProjectTemplateLibraries Include="@(UnifiedSignedProductAssembly->'%(SymbolPath)')" /> + <ProjectTemplateLibraries Include="$(ILMergeOutputAssemblyDirectory)$(ProductName).xml" /> <!-- ... and log4net --> <ProjectTemplateLibraries Include="$(ProjectRoot)lib\log4net.dll" /> <ProjectTemplateLibraries Include="$(ProjectRoot)lib\log4net.xml" /> |