diff options
| -rw-r--r-- | projecttemplates/projecttemplates.proj | 17 | ||||
| -rw-r--r-- | tools/drop.proj | 30 |
2 files changed, 33 insertions, 14 deletions
diff --git a/projecttemplates/projecttemplates.proj b/projecttemplates/projecttemplates.proj index 3046553..27e366c 100644 --- a/projecttemplates/projecttemplates.proj +++ b/projecttemplates/projecttemplates.proj @@ -134,6 +134,19 @@ <TopLevelVS2010ProjectTemplates Include="@(ProjectTemplatesLayout)" Condition=" '%(Extension)' == '.vstemplate' and '%(RootDir)%(Directory)' == '$(ProjectTemplatesLayoutPath)' " /> <VS2010ProjectTemplateZipFiles Include="@(TopLevelVS2010ProjectTemplates->'%(RootDir)%(Directory)%(FileName).zip')" /> + + <TemplateProjectItemsForTransformLayoutFixups Include="@(TemplateProjectItemsForTransformLayout)" Condition=" '%(Extension)' == '.aspx' "> + <Pattern><%@ Register Assembly="DotNetOpenAuth[^"]+"</Pattern> + <Replacement><%@ Register Assembly="DotNetOpenAuth"</Replacement> + </TemplateProjectItemsForTransformLayoutFixups> + <TemplateProjectItemsForTransformLayoutFixups Include="@(TemplateProjectItemsForTransformLayout)" Condition=" '%(Extension)' == '.xaml' "> + <Pattern>xmlns\:(.+)assembly=DotNetOpenAuth([^;"]+)</Pattern> + <Replacement>xmlns:$1assembly=DotNetOpenAuth</Replacement> + </TemplateProjectItemsForTransformLayoutFixups> + <TemplateProjectItemsForTransformLayoutFixups Include="@(TemplateProjectItemsForTransformLayout)" Condition=" '%(Extension)' == '.config' "> + <Pattern>type="DotNetOpenAuth([^,]+), DotNetOpenAuth([^"]+)"</Pattern> + <Replacement>type="DotNetOpenAuth$1, DotNetOpenAuth"</Replacement> + </TemplateProjectItemsForTransformLayoutFixups> </ItemGroup> <Copy @@ -143,6 +156,10 @@ <CopyWithTokenSubstitution SourceFiles="@(TemplateProjectItemsForTransformSource)" DestinationFiles="@(TemplateProjectItemsForTransformLayout)" /> + <RegexFileReplace + Files="@(TemplateProjectItemsForTransformLayoutFixups)" + Pattern="%(Pattern)" + Replacement="%(Replacement)" /> <ItemGroup> <ProjectTemplateIntendedFiles Include=" diff --git a/tools/drop.proj b/tools/drop.proj index 69a636c..973540b 100644 --- a/tools/drop.proj +++ b/tools/drop.proj @@ -120,6 +120,19 @@ @(DropDocFiles); @(DropSpecsFiles) " /> + + <DropSamplesFilesFixups Include="@(DropSamplesFiles)" Condition=" '%(Extension)' == '.aspx' "> + <Pattern><%@ Register Assembly="DotNetOpenAuth[^"]+"</Pattern> + <Replacement><%@ Register Assembly="DotNetOpenAuth"</Replacement> + </DropSamplesFilesFixups> + <DropSamplesFilesFixups Include="@(DropSamplesFiles)" Condition=" '%(Extension)' == '.xaml' "> + <Pattern>xmlns\:(.+)assembly=DotNetOpenAuth([^;"]+)</Pattern> + <Replacement>xmlns:$1assembly=DotNetOpenAuth</Replacement> + </DropSamplesFilesFixups> + <DropSamplesFilesFixups Include="@(DropSamplesFiles)" Condition=" '%(Extension)' == '.config' "> + <Pattern>type="DotNetOpenAuth([^,]+), DotNetOpenAuth([^"]+)"</Pattern> + <Replacement>type="DotNetOpenAuth$1, DotNetOpenAuth"</Replacement> + </DropSamplesFilesFixups> </ItemGroup> <!-- clean up any previous drop with the same name so we don't aggregate files. --> @@ -137,20 +150,9 @@ <ChangeProjectReferenceToAssemblyReference Projects="@(SampleProjectTargets)" ProjectReferences="@(ProjectReferencesToRemove)" References="@(AssemblyReferencesToReplaceWith)" /> <RegexFileReplace - Files="@(DropSamplesFiles)" - Pattern='<%@ Register Assembly="DotNetOpenAuth[^"]+"' - Replacement='<%@ Register Assembly="DotNetOpenAuth"' - Condition=" '%(Extension)' == '.aspx' " /> - <RegexFileReplace - Files="@(DropSamplesFiles)" - Pattern='xmlns\:(.+)assembly=DotNetOpenAuth([^;"]+)' - Replacement='xmlns:$1assembly=DotNetOpenAuth' - Condition=" '%(Extension)' == '.xaml' " /> - <RegexFileReplace - Files="@(DropSamplesFiles)" - Pattern='type="DotNetOpenAuth([^,]+), DotNetOpenAuth([^"]+)"' - Replacement='type="DotNetOpenAuth$1, DotNetOpenAuth"' - Condition=" '%(Extension)' == '.config' " /> + Files="@(DropSamplesFilesFixups)" + Pattern="%(Pattern)" + Replacement="%(Replacement)" /> <DowngradeProjects Projects="@(SampleProjectTargets);@(SampleSolutionTargets)" DowngradeMvc2ToMvc1="$(DowngradeMvc2ToMvc1)" |