Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 1 addition & 26 deletions Build/Common.Build.CSharp.settings
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,10 @@
<Optimize>true</Optimize>
<DefineConstants>TRACE;$(DefineConstants)</DefineConstants>
</PropertyGroup>

<PropertyGroup>
<DefineConstants Condition="$(FeatureAzureRemoteDebug)">$(DefineConstants);FEATURE_AZURE_REMOTE_DEBUG</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition=" '$(VSTarget)' == '15.0' ">
<DefineConstants>$(DefineConstants);DEV15;DEV15_OR_LATER;DEV14_OR_LATER;DEV12_OR_LATER;DEV11_OR_LATER</DefineConstants>
<VSCTDefinitions>DEV15;DEV15_OR_LATER;DEV14_OR_LATER;DEV12_OR_LATER;DEV11_OR_LATER</VSCTDefinitions>
<DefineConstants>$(DefineConstants);DEV15;DEV15_OR_LATER;DEV14_OR_LATER;DEV12_OR_LATER;DEV11_OR_LATER</DefineConstants>
<MicrosoftBuildAssemblyVersion>15.0.0.0</MicrosoftBuildAssemblyVersion>
<MicrosoftBuildAssemblyVersionSuffix>Core</MicrosoftBuildAssemblyVersionSuffix>
</PropertyGroup>
Expand All @@ -47,27 +43,6 @@
<MicrosoftBuildAssemblyVersion>14.0.0.0</MicrosoftBuildAssemblyVersion>
<MicrosoftBuildAssemblyVersionSuffix>Core</MicrosoftBuildAssemblyVersionSuffix>
</PropertyGroup>

<PropertyGroup Condition=" '$(VSTarget)' == '12.0' ">
<DefineConstants>$(DefineConstants);DEV12;DEV12_OR_LATER;DEV11_OR_LATER</DefineConstants>
<VSCTDefinitions>DEV12;DEV12_OR_LATER;DEV11_OR_LATER</VSCTDefinitions>
<MicrosoftBuildAssemblyVersion>12.0.0.0</MicrosoftBuildAssemblyVersion>
<MicrosoftBuildAssemblyVersionSuffix>v12.0</MicrosoftBuildAssemblyVersionSuffix>
</PropertyGroup>

<PropertyGroup Condition=" '$(VSTarget)' == '11.0' ">
<DefineConstants>$(DefineConstants);DEV11;DEV11_OR_LATER</DefineConstants>
<VSCTDefinitions>DEV11;DEV11_OR_LATER</VSCTDefinitions>
<MicrosoftBuildAssemblyVersion>4.0.0.0</MicrosoftBuildAssemblyVersion>
<MicrosoftBuildAssemblyVersionSuffix>v4.0</MicrosoftBuildAssemblyVersionSuffix>
</PropertyGroup>

<PropertyGroup Condition=" '$(VSTarget)' == '10.0' ">
<DefineConstants>$(DefineConstants);DEV10</DefineConstants>
<VSCTDefinitions>DEV10</VSCTDefinitions>
<MicrosoftBuildAssemblyVersion>4.0.0.0</MicrosoftBuildAssemblyVersion>
<MicrosoftBuildAssemblyVersionSuffix>v4.0</MicrosoftBuildAssemblyVersionSuffix>
</PropertyGroup>

<PropertyGroup>
<SignManifests>false</SignManifests>
Expand Down
93 changes: 0 additions & 93 deletions Build/Common.Build.Cpp.settings

This file was deleted.

15 changes: 2 additions & 13 deletions Build/Common.Build.settings
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,9 @@

<CodeCoverageEnabled Condition="'$(CodeCoverageEnabled)'==''">true</CodeCoverageEnabled>

<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSTarget Condition="$(VSTarget)=='' and '$(VisualStudioVersion)'=='15.0'">15.0</VSTarget>
<VSTarget Condition="$(VSTarget)=='' and '$(VisualStudioVersion)'=='14.0'">14.0</VSTarget>
<VSTarget Condition="$(VSTarget)=='' and '$(VisualStudioVersion)'=='12.0'">12.0</VSTarget>
<VSTarget Condition="$(VSTarget)=='' and '$(VisualStudioVersion)'=='11.0'">11.0</VSTarget>
<VSTarget Condition="$(VSTarget)==''">10.0</VSTarget>
<VSTarget Condition="$(VSTarget)==''">14.0</VSTarget>
<BuildingInsideVisualStudio Condition="'$(BuildingInsideVisualStudio)' == ''">false</BuildingInsideVisualStudio>

<TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">v4.6</TargetFrameworkVersion>
Expand Down Expand Up @@ -89,7 +86,6 @@
</PropertyGroup>



<PropertyGroup>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
Expand All @@ -116,12 +112,6 @@
<VSMajorVersion>$([System.Double]::Parse($(VSTarget)))</VSMajorVersion>
<_VSUpdateVersion Condition="$(VSUpdateVersion)=='' and $(VisualStudioVersion)!='10.0'">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\DevDiv\vs\Servicing\$(VSTarget)\devenv', 'UpdateVersion', null, RegistryView.Registry32))</_VSUpdateVersion>
<VSUpdateVersion Condition="$(VSUpdateVersion)=='' and $(_VSUpdateVersion)!=''">$([System.Int32]::Parse($(_VSUpdateVersion.Substring($([MSBuild]::Add(1, $(_VSUpdateVersion.LastIndexOf(`.`))))))))</VSUpdateVersion>

<!-- Features default to true for release builds -->
<FeatureAzureRemoteDebug>$(ReleaseBuild)</FeatureAzureRemoteDebug>

<!-- Enable features based on VS versions -->
<FeatureAzureRemoteDebug Condition="$(VSMajorVersion) > 12 or ($(VSMajorVersion) == 12 and $(VSUpdateVersion) >= 30723)">true</FeatureAzureRemoteDebug>
</PropertyGroup>

<ItemDefinitionGroup>
Expand All @@ -143,7 +133,6 @@
</ItemDefinitionGroup>

<Import Project="$(TargetsPath)\Common.Build.CSharp.settings" Condition="'$(MSBuildProjectExtension)' == '.csproj' or '$(MSBuildProjectExtension)' == '.tmp_proj'" />
<Import Project="$(TargetsPath)\Common.Build.Cpp.settings" Condition="'$(MSBuildProjectExtension)' == '.vcxproj'" />
<Import Project="$(TargetsPath)\Common.Build.Wix.settings" Condition="'$(MSBuildProjectExtension)' == '.wixproj'" />
<Import Project="$(TargetsPath)\CodeCoverage.proj" />

Expand Down
23 changes: 0 additions & 23 deletions Build/default.12.0Exp.testsettings

This file was deleted.