diff options
author | Eric Mellino <erme@microsoft.com> | 2016-11-30 05:01:35 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-30 05:01:35 +0300 |
commit | a9f6d7d749f9946cc6b10c50b54bcae0e43e859e (patch) | |
tree | c165cb32f64c2406296156b2ba2907028d5ea945 /src/System.Net.WebProxy | |
parent | c5262feeb7b4b34154b5b2c17005d4e8fd5ada9d (diff) |
[dev/eng] Overhaul ref and src project references, and start binplacing things (#14062)
* Used GenerateBuilds.ps1 script to generate the P2P references from the project.json files in ref
* Update refs to build with ProjectReference's instead of package references
This deletes all the ref\project.json files and instead adds ProjectReference
to other refs that are used to build.
There is only one exception which was System.Net.Http which needed a project.json
to get the net46 targeting pack otherwise everything else is P2P.
* Update Reflection.Emit contracts to support latest version of contracts
* Add depproj to get windows.winmd support when building refs
* Special handle System.Net.Http ref project to deal with net46 targeting pack
* Moved CLSCompliant to SecureString ctor instead of type
* Add P2P reference from S.IO -> S.R.Extensions
* Add additional ProjectReferences to more ref projects after master rebase
* Start binplacing ref assemblies and disable rest of build
* Simplify all ref projects to only build for netcoreapp (default target group)
* Only binplace netcoreapp refs
* Allow Reference's to be resolved from targeting pack directories
* Use GenerateBuilds.ps1 to convert src project.json refs to References
* Allow overriding stuff in Tools
* System.Runtime src project building against targeting pack
* Re-purpose GenerateBuilds.ps1 to re-write src references
* Only build csproj files in src.builds
* More custom stuff in GenerateBuilds.ps1
* Binplace all netstandard assemblies into netcoreapp as well.
* Add project.json to System.Collections.Immutable
* More custom generatebuilds.ps1 stuff
* Normalize csproj files before running GenerateBuilds.ps1
* Better match the replaced 'None Include="project.json"' line.
* Another missing project.json inclusion in csproj
* Remove ExcludeFromCodeCoverageAttribute from Immutable project
* Include another project.json
* Add some P2P references
* Add another project.json include
* Disable Http.Rtc project.
* Disable two more UWP projects and another P2P ref"
* More Cleanup
* Run GenerateBuilds.ps1 to re-write all nuget refs as <Reference>'s
* Binplace netstandard runtime assemblies to netcoreapp as well.
* Re-hook all src projects into build.proj
* Fix bin clashing caused by bad ProjectReference metadata
* Use 'copy' instead of 'cp' in init-tools.cmd. Add copying to init-tools.sh as well.
* Correct casing of windows.winmd in depproj
* Disable System.Memory.csproj outside of Windows
* Fix unix exclusion of System.Memory, and include vbproj files
* Fix VisualBasic compilation
* There was an extra definition of MemberTypes that was internal to the
assembly. It's now defined in System.Private.CoreLib, so I deleted the
extra here.
* There was an invalid call in Operators.vb that I fixed.
* Add additional project references and configuration fixes after rebase
* Fix build warnings in ref projects
* Fix build warnings in src projects
Diffstat (limited to 'src/System.Net.WebProxy')
-rw-r--r-- | src/System.Net.WebProxy/ref/System.Net.WebProxy.csproj | 13 | ||||
-rw-r--r-- | src/System.Net.WebProxy/ref/project.json | 11 | ||||
-rw-r--r-- | src/System.Net.WebProxy/src/System.Net.WebProxy.csproj | 11 | ||||
-rw-r--r-- | src/System.Net.WebProxy/src/project.json | 34 |
4 files changed, 14 insertions, 55 deletions
diff --git a/src/System.Net.WebProxy/ref/System.Net.WebProxy.csproj b/src/System.Net.WebProxy/ref/System.Net.WebProxy.csproj index 9f54f80054..3d4b79ab8c 100644 --- a/src/System.Net.WebProxy/ref/System.Net.WebProxy.csproj +++ b/src/System.Net.WebProxy/ref/System.Net.WebProxy.csproj @@ -1,17 +1,14 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.7_Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.7_Release|AnyCPU'" /> <ItemGroup> <Compile Include="System.Net.WebProxy.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Collections.NonGeneric\ref\System.Collections.NonGeneric.csproj" /> + <ProjectReference Include="..\..\System.Net.Primitives\ref\System.Net.Primitives.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Net.WebProxy/ref/project.json b/src/System.Net.WebProxy/ref/project.json deleted file mode 100644 index a53345fcda..0000000000 --- a/src/System.Net.WebProxy/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.Collections.NonGeneric": "4.4.0-beta-24721-02", - "System.Net.Primitives": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Runtime.Extensions": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Net.WebProxy/src/System.Net.WebProxy.csproj b/src/System.Net.WebProxy/src/System.Net.WebProxy.csproj index f8eb20df2f..4c55a2bf40 100644 --- a/src/System.Net.WebProxy/src/System.Net.WebProxy.csproj +++ b/src/System.Net.WebProxy/src/System.Net.WebProxy.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -20,7 +20,14 @@ <TargetingPackReference Include="System" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Net.Primitives" /> + <Reference Include="System.Text.RegularExpressions" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Net.NameResolution" /> + <Reference Include="System.Net.NetworkInformation" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Net.WebProxy/src/project.json b/src/System.Net.WebProxy/src/project.json deleted file mode 100644 index 26ab888075..0000000000 --- a/src/System.Net.WebProxy/src/project.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.4.0-beta-24721-02", - "System.Collections.NonGeneric": "4.4.0-beta-24721-02", - "System.Diagnostics.Debug": "4.4.0-beta-24721-02", - "System.Diagnostics.Tools": "4.4.0-beta-24721-02", - "System.Diagnostics.Tracing": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.Globalization": "4.4.0-beta-24721-02", - "System.Globalization.Extensions": "4.4.0-beta-24721-02", - "System.Net.NameResolution": "4.4.0-beta-24721-02", - "System.Net.NetworkInformation": "4.4.0-beta-24721-02", - "System.Net.Primitives": "4.4.0-beta-24721-02", - "System.Net.Requests": "4.4.0-beta-24721-02", - "System.Net.Sockets": "4.4.0-beta-24721-02", - "System.Resources.ResourceManager": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Runtime.Extensions": "4.4.0-beta-24721-02", - "System.Text.Encoding": "4.4.0-beta-24721-02", - "System.Text.RegularExpressions": "4.4.0-beta-24721-02", - "System.Threading": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -}
\ No newline at end of file |