projects
/
platform
/
upstream
/
coreclr.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5e6cefa
)
Convert SDK projects into non-SDK projects (#21369)
author
Aaron Robinson
<arobins@microsoft.com>
Wed, 5 Dec 2018 04:13:48 +0000
(20:13 -0800)
committer
GitHub
<noreply@github.com>
Wed, 5 Dec 2018 04:13:48 +0000
(20:13 -0800)
tests/src/baseservices/typeequivalence/contracts/TypeContracts.csproj
patch
|
blob
|
history
tests/src/baseservices/typeequivalence/impl/TypeImpl.csproj
patch
|
blob
|
history
tests/src/baseservices/typeequivalence/simple/Simple.csproj
patch
|
blob
|
history
diff --git
a/tests/src/baseservices/typeequivalence/contracts/TypeContracts.csproj
b/tests/src/baseservices/typeequivalence/contracts/TypeContracts.csproj
index
17df1f5
..
f68fd75
100644
(file)
--- a/
tests/src/baseservices/typeequivalence/contracts/TypeContracts.csproj
+++ b/
tests/src/baseservices/typeequivalence/contracts/TypeContracts.csproj
@@
-1,12
+1,20
@@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<Import Project="$([MSBuild]::GetPathOfFileAbove('TypeEquivalence.props', '$(MSBuildThisFileDirectory)../'))" />
<PropertyGroup>
<Import Project="$([MSBuild]::GetPathOfFileAbove('TypeEquivalence.props', '$(MSBuildThisFileDirectory)../'))" />
<PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProjectGuid>{96F0C27B-5EA5-4962-8CA9-D89868BBCB1B}</ProjectGuid>
+ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
</PropertyGroup>
<ItemGroup>
<OutputType>Library</OutputType>
</PropertyGroup>
<ItemGroup>
- <Compile Include="
**/*
.cs" />
+ <Compile Include="
Types
.cs" />
</ItemGroup>
</ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+
</Project>
\ No newline at end of file
</Project>
\ No newline at end of file
diff --git
a/tests/src/baseservices/typeequivalence/impl/TypeImpl.csproj
b/tests/src/baseservices/typeequivalence/impl/TypeImpl.csproj
index
b2f1ce1
..
22b1782
100644
(file)
--- a/
tests/src/baseservices/typeequivalence/impl/TypeImpl.csproj
+++ b/
tests/src/baseservices/typeequivalence/impl/TypeImpl.csproj
@@
-1,12
+1,18
@@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<Import Project="$([MSBuild]::GetPathOfFileAbove('TypeEquivalence.props', '$(MSBuildThisFileDirectory)../'))" />
<PropertyGroup>
<Import Project="$([MSBuild]::GetPathOfFileAbove('TypeEquivalence.props', '$(MSBuildThisFileDirectory)../'))" />
<PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProjectGuid>{AB991158-9DCA-4E17-9848-A6A574C68003}</ProjectGuid>
+ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
</PropertyGroup>
<ItemGroup>
<OutputType>Library</OutputType>
</PropertyGroup>
<ItemGroup>
- <Compile Include="
**/*
.cs" />
+ <Compile Include="
Impls
.cs" />
</ItemGroup>
<ItemGroup>
</ItemGroup>
<ItemGroup>
@@
-16,6
+22,7
@@
</ProjectReference>
</ItemGroup>
</ProjectReference>
</ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
<Import Project="$([MSBuild]::GetPathOfFileAbove('TypeEquivalence.targets', '$(MSBuildThisFileDirectory)../'))" />
</Project>
\ No newline at end of file
<Import Project="$([MSBuild]::GetPathOfFileAbove('TypeEquivalence.targets', '$(MSBuildThisFileDirectory)../'))" />
</Project>
\ No newline at end of file
diff --git
a/tests/src/baseservices/typeequivalence/simple/Simple.csproj
b/tests/src/baseservices/typeequivalence/simple/Simple.csproj
index
9934730
..
f6c341a
100644
(file)
--- a/
tests/src/baseservices/typeequivalence/simple/Simple.csproj
+++ b/
tests/src/baseservices/typeequivalence/simple/Simple.csproj
@@
-1,12
+1,18
@@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<Import Project="$([MSBuild]::GetPathOfFileAbove('TypeEquivalence.props', '$(MSBuildThisFileDirectory)../'))" />
<PropertyGroup>
<Import Project="$([MSBuild]::GetPathOfFileAbove('TypeEquivalence.props', '$(MSBuildThisFileDirectory)../'))" />
<PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProjectGuid>{486B2CA1-41A9-4552-A2CE-C691CC25DC2A}</ProjectGuid>
+ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Exe</OutputType>
</PropertyGroup>
<ItemGroup>
<OutputType>Exe</OutputType>
</PropertyGroup>
<ItemGroup>
- <Compile Include="
**/*
.cs" />
+ <Compile Include="
Simple
.cs" />
</ItemGroup>
<ItemGroup>
</ItemGroup>
<ItemGroup>
@@
-15,9
+21,10
@@
<EmbedTypes>true</EmbedTypes>
</ProjectReference>
<ProjectReference Include="../impl/TypeImpl.csproj"/>
<EmbedTypes>true</EmbedTypes>
</ProjectReference>
<ProjectReference Include="../impl/TypeImpl.csproj"/>
- <ProjectReference Include="
../../../
Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+ <ProjectReference Include="
$(SourceDir)
Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
</ItemGroup>
</ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
<Import Project="$([MSBuild]::GetPathOfFileAbove('TypeEquivalence.targets', '$(MSBuildThisFileDirectory)../'))" />
</Project>
\ No newline at end of file
<Import Project="$([MSBuild]::GetPathOfFileAbove('TypeEquivalence.targets', '$(MSBuildThisFileDirectory)../'))" />
</Project>
\ No newline at end of file