diff options
author | Andrew Arnott <andrewarnott@gmail.com> | 2012-12-29 09:16:20 -0800 |
---|---|---|
committer | Andrew Arnott <andrewarnott@gmail.com> | 2012-12-29 09:16:20 -0800 |
commit | 0f17e9f146fc326e7326babbf1f509c97853bcf1 (patch) | |
tree | ee4b4bb107eece1503e7b8cb43b7603a77c167e1 | |
parent | 251fee71aff7c9bec7dde226907be0075ad6a5f6 (diff) | |
download | DotNetOpenAuth-0f17e9f146fc326e7326babbf1f509c97853bcf1.zip DotNetOpenAuth-0f17e9f146fc326e7326babbf1f509c97853bcf1.tar.gz DotNetOpenAuth-0f17e9f146fc326e7326babbf1f509c97853bcf1.tar.bz2 |
Fixed up doc building for .NET 4.5 targeting.
17 files changed, 85 insertions, 45 deletions
diff --git a/tools/Documentation.targets b/tools/Documentation.targets index 688e146..d40c17e 100644 --- a/tools/Documentation.targets +++ b/tools/Documentation.targets @@ -1,6 +1,7 @@ <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <NetfxVer>2.0</NetfxVer> + <NetfxVer>4.5</NetfxVer> + <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <ProjectRoot Condition="'$(ProjectRoot)' == ''">$(MSBuildProjectDirectory)\..\..\</ProjectRoot> <OutputAssembly>DotNetOpenAuth</OutputAssembly> @@ -9,11 +10,15 @@ <DocumentationFile>$(ILMergeOutputXmlDocs)</DocumentationFile> </PropertyGroup> - <ItemGroup> - <MRefDependencies Include="$(ProjectRoot)lib\log4net.dll" /> - <MRefDependencies Include="$(ProjectRoot)lib\System.Web.Mvc.dll" /> - </ItemGroup> - <Import Project="$(ProjectRoot)Tools\sandcastle.targets" /> + <Target Name="CollectMRefDependencies"> + <MSBuild + Projects="$(ProjectRoot)src\DotNetOpenAuth.Core\DotNetOpenAuth.Core.csproj" + Targets="ResolveAssemblyReferences" + BuildInParallel="$(BuildInParallel)"> + <Output TaskParameter="TargetOutputs" ItemName="MRefDependencies" /> + </MSBuild> + </Target> + </Project> diff --git a/tools/Sandcastle/Source/BuildAssembler/BuildAssembler/BuildAssembler.csproj b/tools/Sandcastle/Source/BuildAssembler/BuildAssembler/BuildAssembler.csproj index 0ceafb8..0beff0d 100644 --- a/tools/Sandcastle/Source/BuildAssembler/BuildAssembler/BuildAssembler.csproj +++ b/tools/Sandcastle/Source/BuildAssembler/BuildAssembler/BuildAssembler.csproj @@ -1,4 +1,5 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -9,6 +10,7 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>BuildAssembler</RootNamespace> <AssemblyName>BuildAssembler</AssemblyName> + <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <SccProjectName> </SccProjectName> <SccLocalPath> @@ -21,7 +23,7 @@ <AssemblyOriginatorKeyFile>../../../key.snk</AssemblyOriginatorKeyFile> <FileUpgradeFlags> </FileUpgradeFlags> - <OldToolsVersion>2.0</OldToolsVersion> + <OldToolsVersion>3.5</OldToolsVersion> <UpgradeBackupLocation> </UpgradeBackupLocation> </PropertyGroup> diff --git a/tools/Sandcastle/Source/BuildAssembler/BuildAssembler/BuildAssemblerConsole.csproj b/tools/Sandcastle/Source/BuildAssembler/BuildAssembler/BuildAssemblerConsole.csproj index 7086f62..908426e 100644 --- a/tools/Sandcastle/Source/BuildAssembler/BuildAssembler/BuildAssemblerConsole.csproj +++ b/tools/Sandcastle/Source/BuildAssembler/BuildAssembler/BuildAssemblerConsole.csproj @@ -1,4 +1,5 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -9,10 +10,16 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>BuildAssemblerConsole</RootNamespace> <AssemblyName>BuildAssembler</AssemblyName> + <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <SccProjectName>SAK</SccProjectName> <SccLocalPath>SAK</SccLocalPath> <SccAuxPath>SAK</SccAuxPath> <SccProvider>SAK</SccProvider> + <FileUpgradeFlags> + </FileUpgradeFlags> + <UpgradeBackupLocation> + </UpgradeBackupLocation> + <OldToolsVersion>2.0</OldToolsVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> diff --git a/tools/Sandcastle/Source/BuildAssembler/BuildAssemblerLibrary/BuildAssemblerLibrary.csproj b/tools/Sandcastle/Source/BuildAssembler/BuildAssemblerLibrary/BuildAssemblerLibrary.csproj index c7acabd..1afb7af 100644 --- a/tools/Sandcastle/Source/BuildAssembler/BuildAssemblerLibrary/BuildAssemblerLibrary.csproj +++ b/tools/Sandcastle/Source/BuildAssembler/BuildAssemblerLibrary/BuildAssemblerLibrary.csproj @@ -1,4 +1,5 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -9,6 +10,7 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>BuildAssemblerLibrary</RootNamespace> <AssemblyName>BuildAssemblerLibrary</AssemblyName> + <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <SccProjectName> </SccProjectName> <SccLocalPath> @@ -21,7 +23,7 @@ <AssemblyOriginatorKeyFile>../../../key.snk</AssemblyOriginatorKeyFile> <FileUpgradeFlags> </FileUpgradeFlags> - <OldToolsVersion>2.0</OldToolsVersion> + <OldToolsVersion>3.5</OldToolsVersion> <UpgradeBackupLocation> </UpgradeBackupLocation> </PropertyGroup> diff --git a/tools/Sandcastle/Source/BuildAssembler/BuildComponents/BuildComponents.csproj b/tools/Sandcastle/Source/BuildAssembler/BuildComponents/BuildComponents.csproj index e844ba6..7c1bbeb 100644 --- a/tools/Sandcastle/Source/BuildAssembler/BuildComponents/BuildComponents.csproj +++ b/tools/Sandcastle/Source/BuildAssembler/BuildComponents/BuildComponents.csproj @@ -1,4 +1,5 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -9,6 +10,7 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>BuildComponents</RootNamespace> <AssemblyName>BuildComponents</AssemblyName> + <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <SccProjectName> </SccProjectName> <SccLocalPath> @@ -21,7 +23,7 @@ <AssemblyOriginatorKeyFile>../../../key.snk</AssemblyOriginatorKeyFile> <FileUpgradeFlags> </FileUpgradeFlags> - <OldToolsVersion>2.0</OldToolsVersion> + <OldToolsVersion>3.5</OldToolsVersion> <UpgradeBackupLocation> </UpgradeBackupLocation> <IsWebBootstrapper>false</IsWebBootstrapper> diff --git a/tools/Sandcastle/Source/BuildAssembler/CopyComponents/CopyComponents.csproj b/tools/Sandcastle/Source/BuildAssembler/CopyComponents/CopyComponents.csproj index 7cf0bb0..1f2ed2b 100644 --- a/tools/Sandcastle/Source/BuildAssembler/CopyComponents/CopyComponents.csproj +++ b/tools/Sandcastle/Source/BuildAssembler/CopyComponents/CopyComponents.csproj @@ -1,4 +1,5 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -9,6 +10,7 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>CopyComponents</RootNamespace> <AssemblyName>CopyComponents</AssemblyName> + <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <SccProjectName> </SccProjectName> <SccLocalPath> @@ -22,7 +24,7 @@ </AssemblyOriginatorKeyFile> <FileUpgradeFlags> </FileUpgradeFlags> - <OldToolsVersion>2.0</OldToolsVersion> + <OldToolsVersion>3.5</OldToolsVersion> <UpgradeBackupLocation> </UpgradeBackupLocation> </PropertyGroup> diff --git a/tools/Sandcastle/Source/BuildAssembler/SyntaxComponents/SyntaxComponents.csproj b/tools/Sandcastle/Source/BuildAssembler/SyntaxComponents/SyntaxComponents.csproj index e6d8ad0..66fbb3a 100644 --- a/tools/Sandcastle/Source/BuildAssembler/SyntaxComponents/SyntaxComponents.csproj +++ b/tools/Sandcastle/Source/BuildAssembler/SyntaxComponents/SyntaxComponents.csproj @@ -1,4 +1,5 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -9,6 +10,7 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>SyntaxComponents</RootNamespace> <AssemblyName>SyntaxComponents</AssemblyName> + <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <SccProjectName> </SccProjectName> <SccLocalPath> @@ -21,7 +23,7 @@ <AssemblyOriginatorKeyFile>../../../key.snk</AssemblyOriginatorKeyFile> <FileUpgradeFlags> </FileUpgradeFlags> - <OldToolsVersion>2.0</OldToolsVersion> + <OldToolsVersion>3.5</OldToolsVersion> <UpgradeBackupLocation> </UpgradeBackupLocation> </PropertyGroup> diff --git a/tools/Sandcastle/Source/CCI/CCI.csproj b/tools/Sandcastle/Source/CCI/CCI.csproj index ee69cae..97b7bb5 100644 --- a/tools/Sandcastle/Source/CCI/CCI.csproj +++ b/tools/Sandcastle/Source/CCI/CCI.csproj @@ -1,4 +1,5 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -9,6 +10,7 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>CCI</RootNamespace> <AssemblyName>CCI</AssemblyName> + <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <SccProjectName> </SccProjectName> <SccLocalPath> @@ -21,7 +23,7 @@ <AssemblyOriginatorKeyFile>../../key.snk</AssemblyOriginatorKeyFile> <FileUpgradeFlags> </FileUpgradeFlags> - <OldToolsVersion>2.0</OldToolsVersion> + <OldToolsVersion>3.5</OldToolsVersion> <UpgradeBackupLocation> </UpgradeBackupLocation> </PropertyGroup> diff --git a/tools/Sandcastle/Source/ChmBuilder/ChmBuilder.csproj b/tools/Sandcastle/Source/ChmBuilder/ChmBuilder.csproj index 8ee8adf..1c0cfaa 100644 --- a/tools/Sandcastle/Source/ChmBuilder/ChmBuilder.csproj +++ b/tools/Sandcastle/Source/ChmBuilder/ChmBuilder.csproj @@ -1,4 +1,5 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -9,6 +10,7 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>ChmBuilder</RootNamespace> <AssemblyName>ChmBuilder</AssemblyName> + <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <SccProjectName> </SccProjectName> <SccLocalPath> @@ -19,7 +21,7 @@ </SccProvider> <FileUpgradeFlags> </FileUpgradeFlags> - <OldToolsVersion>2.0</OldToolsVersion> + <OldToolsVersion>3.5</OldToolsVersion> <UpgradeBackupLocation> </UpgradeBackupLocation> </PropertyGroup> diff --git a/tools/Sandcastle/Source/CommandLine/CommandLine.csproj b/tools/Sandcastle/Source/CommandLine/CommandLine.csproj index 84d6af1..24e13da 100644 --- a/tools/Sandcastle/Source/CommandLine/CommandLine.csproj +++ b/tools/Sandcastle/Source/CommandLine/CommandLine.csproj @@ -1,4 +1,5 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -9,6 +10,7 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>CommandLine</RootNamespace> <AssemblyName>CommandLine</AssemblyName> + <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <SignAssembly>false</SignAssembly> <AssemblyOriginatorKeyFile>../../key.snk</AssemblyOriginatorKeyFile> <SccProjectName> @@ -21,7 +23,7 @@ </SccProvider> <FileUpgradeFlags> </FileUpgradeFlags> - <OldToolsVersion>2.0</OldToolsVersion> + <OldToolsVersion>3.5</OldToolsVersion> <UpgradeBackupLocation> </UpgradeBackupLocation> </PropertyGroup> diff --git a/tools/Sandcastle/Source/DBCSFix/DBCSFix.csproj b/tools/Sandcastle/Source/DBCSFix/DBCSFix.csproj index 26b7d78..3932c27 100644 --- a/tools/Sandcastle/Source/DBCSFix/DBCSFix.csproj +++ b/tools/Sandcastle/Source/DBCSFix/DBCSFix.csproj @@ -1,4 +1,5 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -9,6 +10,7 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>DBCSFix</RootNamespace> <AssemblyName>DBCSFix</AssemblyName> + <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <SccProjectName> </SccProjectName> <SccLocalPath> @@ -19,7 +21,7 @@ </SccProvider> <FileUpgradeFlags> </FileUpgradeFlags> - <OldToolsVersion>2.0</OldToolsVersion> + <OldToolsVersion>3.5</OldToolsVersion> <UpgradeBackupLocation> </UpgradeBackupLocation> </PropertyGroup> @@ -73,11 +75,11 @@ </ProjectReference> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> - <!-- Copy the output assemblies to a common binaries directory (ProductionTools). --> - <Target Name="AfterBuild"> - <CreateItem Include="$(OutputPath)\$(AssemblyName).*"> - <Output TaskParameter="Include" ItemName="ProductionFiles" /> - </CreateItem> - <Copy SourceFiles="@(ProductionFiles)" DestinationFolder="..\..\ProductionTools" /> - </Target> + <!-- Copy the output assemblies to a common binaries directory (ProductionTools). --> + <Target Name="AfterBuild"> + <CreateItem Include="$(OutputPath)\$(AssemblyName).*"> + <Output TaskParameter="Include" ItemName="ProductionFiles" /> + </CreateItem> + <Copy SourceFiles="@(ProductionFiles)" DestinationFolder="..\..\ProductionTools" /> + </Target> </Project>
\ No newline at end of file diff --git a/tools/Sandcastle/Source/DBCSFix/Properties/Settings.Designer.cs b/tools/Sandcastle/Source/DBCSFix/Properties/Settings.Designer.cs index 2a727ca..a7a89ed 100644 --- a/tools/Sandcastle/Source/DBCSFix/Properties/Settings.Designer.cs +++ b/tools/Sandcastle/Source/DBCSFix/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // <auto-generated> // This code was generated by a tool. -// Runtime Version:2.0.50727.1433 +// Runtime Version:4.0.30319.18010 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -12,7 +12,7 @@ namespace DBCSFix.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/tools/Sandcastle/Source/MRefBuilder/MRefBuilder.csproj b/tools/Sandcastle/Source/MRefBuilder/MRefBuilder.csproj index b62e525..dd8aa32 100644 --- a/tools/Sandcastle/Source/MRefBuilder/MRefBuilder.csproj +++ b/tools/Sandcastle/Source/MRefBuilder/MRefBuilder.csproj @@ -1,4 +1,5 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -9,6 +10,7 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>MrefBuilder</RootNamespace> <AssemblyName>MrefBuilder</AssemblyName> + <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <SccProjectName> </SccProjectName> <SccLocalPath> @@ -21,7 +23,7 @@ <AssemblyOriginatorKeyFile>../../key.snk</AssemblyOriginatorKeyFile> <FileUpgradeFlags> </FileUpgradeFlags> - <OldToolsVersion>2.0</OldToolsVersion> + <OldToolsVersion>3.5</OldToolsVersion> <UpgradeBackupLocation> </UpgradeBackupLocation> </PropertyGroup> diff --git a/tools/Sandcastle/Source/Reflection/Reflection.csproj b/tools/Sandcastle/Source/Reflection/Reflection.csproj index 9a88afa..7614c65 100644 --- a/tools/Sandcastle/Source/Reflection/Reflection.csproj +++ b/tools/Sandcastle/Source/Reflection/Reflection.csproj @@ -1,4 +1,5 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -9,6 +10,7 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>Reflection</RootNamespace> <AssemblyName>Reflection</AssemblyName> + <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <SccProjectName> </SccProjectName> <SccLocalPath> @@ -21,7 +23,7 @@ <AssemblyOriginatorKeyFile>../../key.snk</AssemblyOriginatorKeyFile> <FileUpgradeFlags> </FileUpgradeFlags> - <OldToolsVersion>2.0</OldToolsVersion> + <OldToolsVersion>3.5</OldToolsVersion> <UpgradeBackupLocation> </UpgradeBackupLocation> </PropertyGroup> diff --git a/tools/Sandcastle/Source/XmlCat/MergeXml.csproj b/tools/Sandcastle/Source/XmlCat/MergeXml.csproj index ba9d6d2..5cb6f0c 100644 --- a/tools/Sandcastle/Source/XmlCat/MergeXml.csproj +++ b/tools/Sandcastle/Source/XmlCat/MergeXml.csproj @@ -1,4 +1,5 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -9,6 +10,7 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>MergeXml</RootNamespace> <AssemblyName>MergeXml</AssemblyName> + <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <SccProjectName> </SccProjectName> <SccLocalPath> @@ -19,7 +21,7 @@ </SccProvider> <FileUpgradeFlags> </FileUpgradeFlags> - <OldToolsVersion>2.0</OldToolsVersion> + <OldToolsVersion>3.5</OldToolsVersion> <UpgradeBackupLocation> </UpgradeBackupLocation> </PropertyGroup> diff --git a/tools/Sandcastle/Source/XslTransform/XslTransform.csproj b/tools/Sandcastle/Source/XslTransform/XslTransform.csproj index 8d2e420..e23c4f7 100644 --- a/tools/Sandcastle/Source/XslTransform/XslTransform.csproj +++ b/tools/Sandcastle/Source/XslTransform/XslTransform.csproj @@ -1,4 +1,5 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -9,6 +10,7 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>XslTransform</RootNamespace> <AssemblyName>XslTransform</AssemblyName> + <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <SccProjectName> </SccProjectName> <SccLocalPath> @@ -21,7 +23,7 @@ <AssemblyOriginatorKeyFile>../../key.snk</AssemblyOriginatorKeyFile> <FileUpgradeFlags> </FileUpgradeFlags> - <OldToolsVersion>2.0</OldToolsVersion> + <OldToolsVersion>3.5</OldToolsVersion> <UpgradeBackupLocation> </UpgradeBackupLocation> </PropertyGroup> diff --git a/tools/sandcastle.targets b/tools/sandcastle.targets index 106f408..be792bc 100644 --- a/tools/sandcastle.targets +++ b/tools/sandcastle.targets @@ -5,7 +5,7 @@ <PresentationStyle Condition="'$(PresentationStyle)' == ''">vs2005</PresentationStyle> <!-- Environment --> <ProjectRoot Condition="'$(ProjectRoot)' == ''">$(MSBuildProjectDirectory)\..\..\</ProjectRoot> - <Framework>$(WINDIR)\Microsoft.NET\Framework\v2.0.50727</Framework> + <Framework>$(WINDIR)\Microsoft.NET\Framework\v4.0.30319</Framework> <DxRoot>$(ProjectRoot)tools\Sandcastle\</DxRoot> <ProductionTools>$(DxRoot)ProductionTools\</ProductionTools> <ProductionTransforms>$(DxRoot)ProductionTransforms\</ProductionTransforms> @@ -35,7 +35,7 @@ </PropertyGroup> <ItemGroup> - <AssemblyFolders Include="$(WINDIR)\Microsoft.NET\Framework\v2.0.50727\*.dll"/> + <AssemblyFolders Include="$(WINDIR)\Microsoft.NET\Framework\v2.0.50727\*.dll" Condition="$(NetfxVer)<4.0"/> <AssemblyFolders Include="$(WINDIR)\Microsoft.NET\Framework\v3.0\**\*.dll" Condition="$(NetfxVer)>2.0"/> <AssemblyFolders Include="$(ProgramFiles)\Reference Assemblies\Microsoft\Framework\v3.0\*.dll" Condition="$(NetfxVer)>2.0"/> <AssemblyFolders Include="$(WINDIR)\Microsoft.NET\Framework\v3.5\**\*.dll" Condition="$(NetfxVer)>3.0"/> @@ -118,8 +118,10 @@ <MakeDir Directories="$(DocOutputApiPath)html;$(DocOutputApiPath)media;$(DocOutputApiPath)intellisense"/> </Target> + <Target Name="CollectMRefDependencies" /> + <Target Name="ReflectionBase" Inputs="$(OutputAssemblyFile)" Outputs="$(ReflectionBaseFile)" - DependsOnTargets="SetEnvironmentVars;CreateIntermediatePath;ProductionTools"> + DependsOnTargets="CollectMRefDependencies;SetEnvironmentVars;CreateIntermediatePath;ProductionTools"> <ItemGroup> <MRefDependenciesSwitch Include="@(MRefDependencies->'/dep:"%(Identity)"')" /> </ItemGroup> |