Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/dotnet/runtime.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/eng
diff options
context:
space:
mode:
authorViktor Hofer <viktor.hofer@microsoft.com>2019-03-03 20:55:25 +0300
committerGitHub <noreply@github.com>2019-03-03 20:55:25 +0300
commitf8a8530d0fab6b08254215ef2567f98de14db709 (patch)
treeb934e98f30da8bd5f6a4c79acfbd77a4e83ada38 /eng
parente4f010df08e3f831263d7ec9fd71d46c83e97882 (diff)
Project msbuild syntax cleanup (dotnet/corefx#35686)
* Remove license header from non-shipping files * Remove obsolete Project attributes * Remove xml header and remove DefaultTargets Commit migrated from https://github.com/dotnet/corefx/commit/c390ce7df50252e11f5d322276e9d19e046d1332
Diffstat (limited to 'eng')
-rw-r--r--eng/CodeAnalysis.targets1
-rw-r--r--eng/InternalTools.props2
-rw-r--r--eng/Packaging.props2
-rw-r--r--eng/ReferenceAssemblies.props3
-rw-r--r--eng/Resources.targets3
-rw-r--r--eng/blockReflectionAttribute.targets1
-rw-r--r--eng/codeOptimization.targets2
-rw-r--r--eng/configurations/archgroups.props3
-rw-r--r--eng/configurations/configurationgroups.props3
-rw-r--r--eng/configurations/osgroups.props3
-rw-r--r--eng/configurations/properties.props3
-rw-r--r--eng/configurations/targetgroups.props3
-rw-r--r--eng/depProj.targets1
-rw-r--r--eng/dependencies.props2
-rw-r--r--eng/dir.traversal.targets1
-rw-r--r--eng/disableUap.targets2
-rw-r--r--eng/illink.targets3
-rw-r--r--eng/referenceFromRuntime.targets3
-rw-r--r--eng/resolveContract.targets1
-rw-r--r--eng/versioning.targets2
20 files changed, 14 insertions, 30 deletions
diff --git a/eng/CodeAnalysis.targets b/eng/CodeAnalysis.targets
index 36578ba35af..8a585a4e926 100644
--- a/eng/CodeAnalysis.targets
+++ b/eng/CodeAnalysis.targets
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<!-- Need to keep in sync with Tools.props file. -->
diff --git a/eng/InternalTools.props b/eng/InternalTools.props
index 19f5746b2b0..db0a13dcae1 100644
--- a/eng/InternalTools.props
+++ b/eng/InternalTools.props
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
<Project>
<Import Project="dependencies.props" />
diff --git a/eng/Packaging.props b/eng/Packaging.props
index bfd2e0ed92e..9639db07c41 100644
--- a/eng/Packaging.props
+++ b/eng/Packaging.props
@@ -1,4 +1,4 @@
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
<PropertyGroup>
<PackageDescriptionFile>$(RepoRoot)pkg/descriptions.json</PackageDescriptionFile>
<PackageLicenseFile>$(RepoRoot)LICENSE.TXT</PackageLicenseFile>
diff --git a/eng/ReferenceAssemblies.props b/eng/ReferenceAssemblies.props
index a7c05d461c7..d1f1cfd6d65 100644
--- a/eng/ReferenceAssemblies.props
+++ b/eng/ReferenceAssemblies.props
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
<PropertyGroup>
<IsReferenceAssembly Condition="'$(IsReferenceAssembly)'=='' AND ($(MSBuildProjectFullPath.Contains('\ref\')) OR $(MSBuildProjectFullPath.Contains('/ref/')))">true</IsReferenceAssembly>
diff --git a/eng/Resources.targets b/eng/Resources.targets
index 297d028e11d..5df76a12cd6 100644
--- a/eng/Resources.targets
+++ b/eng/Resources.targets
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
<PropertyGroup>
<ResourcesSourceFileExtension Condition="'$(MSBuildProjectExtension)' == '.csproj'">.cs</ResourcesSourceFileExtension>
<ResourcesSourceFileExtension Condition="'$(MSBuildProjectExtension)' == '.vbproj'">.vb</ResourcesSourceFileExtension>
diff --git a/eng/blockReflectionAttribute.targets b/eng/blockReflectionAttribute.targets
index b42b0302016..761f637cf52 100644
--- a/eng/blockReflectionAttribute.targets
+++ b/eng/blockReflectionAttribute.targets
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
<Project>
<!--
Defining __BlockReflectionAttribute indicates that the .NET Native toolchain should remove the metadata for all non-public APIs.
diff --git a/eng/codeOptimization.targets b/eng/codeOptimization.targets
index 39bb002af4f..7c90deddadc 100644
--- a/eng/codeOptimization.targets
+++ b/eng/codeOptimization.targets
@@ -1,4 +1,4 @@
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
<PropertyGroup Condition="'$(ApplyPartialNgenOptimization)' == ''">
<ApplyPartialNgenOptimization Condition="'$(IsReferenceAssembly)' == 'true'">false</ApplyPartialNgenOptimization>
diff --git a/eng/configurations/archgroups.props b/eng/configurations/archgroups.props
index ea31c047079..0a1c73366ec 100644
--- a/eng/configurations/archgroups.props
+++ b/eng/configurations/archgroups.props
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
<ItemGroup>
<ArchGroups Include="x86" />
<ArchGroups Include="x64" />
diff --git a/eng/configurations/configurationgroups.props b/eng/configurations/configurationgroups.props
index 882c3586860..3cef5da5939 100644
--- a/eng/configurations/configurationgroups.props
+++ b/eng/configurations/configurationgroups.props
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
<ItemGroup>
<ConfigurationGroups Include="Debug" />
<ConfigurationGroups Include="Release" />
diff --git a/eng/configurations/osgroups.props b/eng/configurations/osgroups.props
index 55afc3c359d..7f2a49cdd02 100644
--- a/eng/configurations/osgroups.props
+++ b/eng/configurations/osgroups.props
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
<ItemGroup>
<OSGroups Include="Windows_NT">
<Imports>AnyOS</Imports>
diff --git a/eng/configurations/properties.props b/eng/configurations/properties.props
index 50cb3708e1a..0f7876d4b16 100644
--- a/eng/configurations/properties.props
+++ b/eng/configurations/properties.props
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
<Import Project="osgroups.props"/>
<Import Project="targetgroups.props"/>
<Import Project="configurationgroups.props"/>
diff --git a/eng/configurations/targetgroups.props b/eng/configurations/targetgroups.props
index 946a7babd46..bc9482979de 100644
--- a/eng/configurations/targetgroups.props
+++ b/eng/configurations/targetgroups.props
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
<ItemGroup>
<TargetGroups Include="netcore50">
<TargetFramework>netcore50</TargetFramework>
diff --git a/eng/depProj.targets b/eng/depProj.targets
index 65837dfc719..11b70d94076 100644
--- a/eng/depProj.targets
+++ b/eng/depProj.targets
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
<!--
***********************************************************************************************
depProj.targets
diff --git a/eng/dependencies.props b/eng/dependencies.props
index 25f9a57afa4..e4557e6fd04 100644
--- a/eng/dependencies.props
+++ b/eng/dependencies.props
@@ -1,4 +1,4 @@
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
<!-- Source of truth for dependency tooling: the commit hash of the dotnet/versions master branch as of the last auto-upgrade. -->
<!-- For detailed explanation of the reference versions see:
diff --git a/eng/dir.traversal.targets b/eng/dir.traversal.targets
index 0af9148603b..c9bbb50c019 100644
--- a/eng/dir.traversal.targets
+++ b/eng/dir.traversal.targets
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
<Project>
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
diff --git a/eng/disableUap.targets b/eng/disableUap.targets
index 1a2e0d8e44c..5e41100ef83 100644
--- a/eng/disableUap.targets
+++ b/eng/disableUap.targets
@@ -1,4 +1,4 @@
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
<Target Name="RemoveUapvNextContent"
Condition="'$(KeepUAPContent)' != 'true'"
DependsOnTargets="GetPackageReport"
diff --git a/eng/illink.targets b/eng/illink.targets
index cc9d02d6334..0953c64ce21 100644
--- a/eng/illink.targets
+++ b/eng/illink.targets
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
<PropertyGroup>
<TargetsTriggeredByCompilation Condition="'$(DesignTimeBuild)' != 'true'">
$(TargetsTriggeredByCompilation);
diff --git a/eng/referenceFromRuntime.targets b/eng/referenceFromRuntime.targets
index 2df3af10fae..e739943c31e 100644
--- a/eng/referenceFromRuntime.targets
+++ b/eng/referenceFromRuntime.targets
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
<Target Name="AddReferenceFromRuntimeForTests"
AfterTargets="ResolveAssemblyReferences"
Condition="'$(IsTestProject)'=='true' AND '@(ReferenceFromRuntime)' != ''">
diff --git a/eng/resolveContract.targets b/eng/resolveContract.targets
index eedc7f2f063..d550bca1920 100644
--- a/eng/resolveContract.targets
+++ b/eng/resolveContract.targets
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup Condition="'$(IsSourceProject)' == 'true'">
<ContractProject Condition="'$(ContractProject)' == ''">$(SourceDir)/$(MSBuildProjectName)/ref/$(MSBuildProjectName).csproj</ContractProject>
diff --git a/eng/versioning.targets b/eng/versioning.targets
index a95906c9e67..ec0ceab21c0 100644
--- a/eng/versioning.targets
+++ b/eng/versioning.targets
@@ -1,4 +1,4 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
<PropertyGroup>
<GenerateAssemblyInfo Condition="'$(GenerateAssemblyInfo)'==''">true</GenerateAssemblyInfo>
</PropertyGroup>