diff options
619 files changed, 2772 insertions, 7277 deletions
diff --git a/GenerateBuilds.ps1 b/GenerateBuilds.ps1 index 079dae055e..8bcab0ef8f 100644 --- a/GenerateBuilds.ps1 +++ b/GenerateBuilds.ps1 @@ -12,6 +12,7 @@ $footer = @" <Import Project="`$([MSBuild]::GetDirectoryNameOfFileAbove(`$(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> </Project> + "@ function WriteBuilds($allConfigs, $srcDir, $projName) @@ -184,39 +185,73 @@ function GetConfigurations($projs, $srcDir, $projName) } $srcDirs = dir .\src\*\src +$layoutDir = "D:\corefx-packages-backup\packages\Debug\layout\runtimes\win7-x64\lib\netcoreapp1.1" foreach($srcDir in $srcDirs) { - #$srcDir.FullName - $projs = dir $srcDir -r -i *.*proj - - if($projs.Count -eq 0) { Write-Host "Skipping $srcDir because it has no csproj files."; continue; } - - $projName = $srcDir.Parent.Name; - - $allSrcConfigs = GetConfigurations $projs $srcDir $projName - $defaultConfig = GetDefaultConfiguration $allSrcConfigs $projName - - $testsDir = $srcDir.Parent.FullName + "\tests"; - if (Test-Path $testsDir) + $projName = $srcDir.Parent.Name + $pjOrig = "$srcDir\project.json" + $pj = "$layoutDir\$projName.deps" + $plj = "$srcDir\project.lock.json" + $proj = "$srcDir\$projName.csproj" + Write-Host "Looking at $pj" + if (Test-Path $pj) { - $testProjs = dir $testsDir -r -i *.csproj - - if ($defaultConfig.os -eq "Windows_NT") + $deps = new-object System.Collections.ArrayList + $pjc = gc $pj; + foreach ($line in $pjc) { - #$testProjs | % { WriteDefaultConfiguration $defaultConfig $_ $(gc $_) } + if ($line -match "\`"`(?<dep>.*`)\`": \`"\d") + { + $item = $matches["dep"]; + if ($item -eq "Microsoft.TargetingPack.Private.CoreCLR") + { + $deps.Add("System.Private.CoreLib") | out-null + } + elseif ($item -eq "Microsoft.TargetingPack.NETFramework.v4.6") + { + } + elseif ($item -eq "Microsoft.TargetingPack.NETFramework.v4.6.1") + { + } + elseif ($item -eq "Microsoft.TargetingPack.NETFramework.v4.6.2") + { + } + elseif ($item -eq "Microsoft.TargetingPack.Private.NETNative") + { + } + elseif ($item -eq "Microsoft.NETCore.Platforms") + { + } + else + { + $deps.Add($item) | out-null + } + } } - } - #$testConfigs = GetConfigurations $testProjs $testsDir $projName - WriteBuilds $allSrcConfigs $srcDir $projName + $pjOrigC = gc $pjOrig; + foreach ($line in $pjOrigC) + { + if ($line -match "\`"`(?<dep>.*`)\`": \`"\d") + { + $item = $matches["dep"]; + if ($item -eq "System.Diagnostics.Contracts") + { + $deps.Add($item) | out-null + } + elseif ($item -eq "System.Diagnostics.Tools") + { + $deps.Add($item) | out-null + } + } + } - $bfs = dir $srcDir -r -i *.builds + $projc = gc $proj; + $projc2 = $projc | % { if ($_ -match "None Include=`"project.json`"") { $($deps | % { " <Reference Include=`"$_`" />" }) } else { $_ } } + $projc2 | sc $proj - if ($bfs.Count -ne 1) - { - $projName + " contains " + $bfs.Count + " builds files!"; + del $pjOrig + #del $plj } } - - diff --git a/Tools-Override/FrameworkTargeting.targets b/Tools-Override/FrameworkTargeting.targets new file mode 100644 index 0000000000..a4595401d6 --- /dev/null +++ b/Tools-Override/FrameworkTargeting.targets @@ -0,0 +1,167 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + + <PropertyGroup Condition=" '$(TargetFrameworkIdentifier)' == '' + and '$(TargetFrameworkVersion)' == '' + and '$(TargetFrameworkProfile)' == '' "> + <TargetingDefaultPlatform>true</TargetingDefaultPlatform> + </PropertyGroup> + + <PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == ''"> + <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier> + </PropertyGroup> + + <!-- + Limit the assembly resolution to just explicit locations. + Don't search anything machine-wide or build-order dependent. + <PropertyGroup> + <AssemblySearchPaths>{HintPathFromItem};{RawFileName}</AssemblySearchPaths> + </PropertyGroup> + --> + + <!-- + When targeting an explicit platform other than the default, + also allow the target framework directory. + --> + <PropertyGroup Condition="'$(TargetingDefaultPlatform)' != 'true'"> + <AssemblySearchPaths>$(AssemblySearchPaths);{TargetFrameworkDirectory}</AssemblySearchPaths> + </PropertyGroup> + + <!-- Setup the default target for projects not already explicitly targeting another platform --> + <PropertyGroup Condition="'$(TargetingDefaultPlatform)' == 'true'"> + <!-- Setting a default portable profile, although nothing should resolve from there as we want to use the pacakge refs --> + <TargetPlatformIdentifier>Portable</TargetPlatformIdentifier> + <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier> + <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> + <TargetFrameworkProfile>Profile7</TargetFrameworkProfile> + <TargetFrameworkMonikerDisplayName>.NET Portable Subset</TargetFrameworkMonikerDisplayName> + <ImplicitlyExpandTargetFramework>false</ImplicitlyExpandTargetFramework> + <!-- Disable RAR complaining about us referencing higher .NET Portable libraries as we aren't a traditional portable library --> + <ResolveAssemblyReferenceIgnoreTargetFrameworkAttributeVersionMismatch>true</ResolveAssemblyReferenceIgnoreTargetFrameworkAttributeVersionMismatch> + <NuGetTargetMoniker Condition="'$(NuGetTargetMoniker)' == ''">.NETCoreApp,Version=v1.0</NuGetTargetMoniker> + </PropertyGroup> + + <!-- Need to add references to the mscorlib design-time facade for some old-style portable dependencies like xunit --> + <Target Name="AddDesignTimeFacadeReferences" + Condition="'$(TargetingDefaultPlatform)' == 'true' AND '$(IsReferenceAssembly)' != 'true' AND '$(ExcludeMscorlibFacade)' != 'true'" + BeforeTargets="ResolveReferences" + DependsOnTargets="GetReferenceAssemblyPaths" + > + <PropertyGroup> + <_resolvedMscorlib Condition="'%(ReferencePath.FileName)' == 'mscorlib'">true</_resolvedMscorlib> + </PropertyGroup> + + <ItemGroup> + <PossibleTargetFrameworks Include="$(_TargetFrameworkDirectories)" /> + <ReferencePath Include="%(PossibleTargetFrameworks.Identity)mscorlib.dll" + Condition="'$(_resolvedMscorlib)' != 'true' and '%(PossibleTargetFrameworks.Identity)' != '' and Exists('%(PossibleTargetFrameworks.Identity)mscorlib.dll')" /> + </ItemGroup> + </Target> + + <Import Project="depProj.targets" + Condition="'$(MSBuildProjectExtension)' == '.depproj'" /> + + <Import Project="IL.targets" + Condition="'$(MSBuildProjectExtension)' == '.ilproj' AND '$(SkipImportILTargets)'!='true'" /> + + <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" + Condition="'$(TargetFrameworkIdentifier)' == '.NETPortable' and '$(MSBuildProjectExtension)' == '.csproj'" /> + + <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" + Condition="'$(TargetFrameworkIdentifier)' != '.NETPortable' and '$(MSBuildProjectExtension)' == '.csproj'" /> + + <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.VisualBasic.targets" + Condition="'$(TargetFrameworkIdentifier)' == '.NETPortable' and '$(MSBuildProjectExtension)' == '.vbproj'" /> + + <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" + Condition="'$(TargetFrameworkIdentifier)' != '.NETPortable' and '$(MSBuildProjectExtension)' == '.vbproj'" /> + + <PropertyGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework' and '$(OutputType)' == 'exe'"> + <!-- RAR thinks all EXEs require binding redirects. That's not the case for CoreCLR --> + <AutoUnifyAssemblyReferences>true</AutoUnifyAssemblyReferences> + <GenerateBindingRedirectsOutputType>false</GenerateBindingRedirectsOutputType> + </PropertyGroup> + + <!-- We need to point $(FrameworkPathOverride) to the directory that contains explicitly referenced System.Runtime.dll, if any. + Otherwise, if $(FrameworkPathOverride)\System.Runtime.dll is not the same file as the one referenced explicitly, + VS2013 VB compiler would load it and then it would complain about ambiguous type declarations. + --> + <PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.vbproj'"> + <CoreCompileDependsOn>$(CoreCompileDependsOn);OverrideFrameworkPathForVisualBasic</CoreCompileDependsOn> + </PropertyGroup> + + <Target Name="OverrideFrameworkPathForVisualBasic" AfterTargets="ResolveAssemblyReferences" Condition="'$(MSBuildProjectExtension)' == '.vbproj'"> + <ItemGroup> + <FrameworkPathOverrideCandidate Include="%(ReferencePath.RootDir)%(ReferencePath.Directory)" + Condition="'%(ReferencePath.Filename)%(ReferencePath.Extension)' == 'System.Runtime.dll'"> + </FrameworkPathOverrideCandidate> + </ItemGroup> + + <PropertyGroup Condition="'@(FrameworkPathOverrideCandidate->Count())' == '1'"> + <FrameworkPathOverride>@(FrameworkPathOverrideCandidate)</FrameworkPathOverride> + </PropertyGroup> + </Target> + + <!-- + Cross Platform MSBuild has some logic to replace \ with / when invoking commands to fix up path differences between Windows and + *NIX. The define command line argument syntax for VB requires that we both surround some items with quotes and escape the quotes with + backslashes. However, due to the above MSBuild logic, this causes an invalid command line to be generated when running on *NIX. + + Microsoft/msbuild#422 tracks an actual fix in MSBuild, but for now we work around the issue by using a custom task that + transforms the set of defines we are going to use into a response file we can pass along to the Vbc task along with an + empty set of defines. + --> + <UsingTask TaskName="WriteVisualBasicDefineResponseFile" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll" /> + + <Target Name="ConvertDefinesToResonseFile" BeforeTargets="CoreCompile" Condition="'$(MSBuildProjectExtension)' == '.vbproj'"> + <WriteVisualBasicDefineResponseFile DefineConstants="$(FinalDefineConstants)" + File="$(IntermediateOutputPath)/defines.rsp" /> + <PropertyGroup> + <CompilerResponseFile>$(IntermediateOutputPath)/defines.rsp;$(CompilerResponseFile)</CompilerResponseFile> + <FinalDefineConstants></FinalDefineConstants> + </PropertyGroup> + </Target> + + <Target Name="ConvertCommonMetadataToAdditionalProperties" BeforeTargets="AssignProjectConfiguration"> + <!-- list each append as a seperate item to force re-evaluation of AdditionalProperties metadata --> + <ItemGroup> + <ProjectReference> + <UndefineProperties Condition="'$(ConfigurationGroup)' != ''">%(ProjectReference.UndefineProperties);Configuration</UndefineProperties> + </ProjectReference> + + <!-- Set some basic configuration properties and pass them along to ProjectReference's --> + <ProjectReference> + <OSGroup Condition="'%(ProjectReference.OSGroup)'=='' and '$(OSGroup)'!='' and '$(OSGroup)'!='AnyOS'">$(OSGroup)</OSGroup> + </ProjectReference> + <ProjectReference> + <TargetGroup Condition="'%(ProjectReference.TargetGroup)'=='' and '$(TargetGroup)'!=''">$(TargetGroup)</TargetGroup> + </ProjectReference> + + <!-- Configuration property shortcuts --> + <ProjectReference> + <AdditionalProperties Condition="'%(ProjectReference.TargetGroup)'!=''">TargetGroup=%(ProjectReference.TargetGroup);%(ProjectReference.AdditionalProperties)</AdditionalProperties> + </ProjectReference> + <ProjectReference> + <AdditionalProperties Condition="'%(ProjectReference.OSGroup)'!=''">OSGroup=%(ProjectReference.OSGroup);%(ProjectReference.AdditionalProperties)</AdditionalProperties> + </ProjectReference> + <ProjectReference> + <AdditionalProperties Condition="'$(ConfigurationGroup)' != ''">ConfigurationGroup=$(ConfigurationGroup);%(ProjectReference.AdditionalProperties)</AdditionalProperties> + </ProjectReference> + + <!-- Packaging property shortcuts --> + <ProjectReference> + <AdditionalProperties Condition="'%(ProjectReference.PackageTargetFramework)' != ''">PackageTargetFramework=%(ProjectReference.PackageTargetFramework);%(ProjectReference.AdditionalProperties)</AdditionalProperties> + </ProjectReference> + <ProjectReference> + <AdditionalProperties Condition="'%(ProjectReference.PackageTargetPath)' != ''">PackageTargetPath=%(ProjectReference.PackageTargetPath);%(ProjectReference.AdditionalProperties)</AdditionalProperties> + </ProjectReference> + <ProjectReference> + <AdditionalProperties Condition="'%(ProjectReference.PackageTargetRuntime)' != ''">PackageTargetRuntime=%(ProjectReference.PackageTargetRuntime);%(ProjectReference.AdditionalProperties)</AdditionalProperties> + </ProjectReference> + <ProjectReference> + <AdditionalProperties Condition="'%(ProjectReference.Platform)' != ''">Platform=%(ProjectReference.Platform);%(ProjectReference.AdditionalProperties)</AdditionalProperties> + </ProjectReference> + </ItemGroup> + </Target> + +</Project> diff --git a/binplace.targets b/binplace.targets new file mode 100644 index 0000000000..a8c4c64c21 --- /dev/null +++ b/binplace.targets @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" InitialTargets="CheckForBuildTools" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + + <PropertyGroup> + <IsRuntimeAssembly Condition="'$(IsRuntimeAssembly)'=='' AND '$(IsReferenceAssembly)' != 'true'">true</IsRuntimeAssembly> + <BinPlaceStuffDependsOn Condition="'$(IsReferenceAssembly)' == 'true'">$(BinPlaceStuffDependsOn);BinPlaceReferenceAssembly</BinPlaceStuffDependsOn> + <BinPlaceStuffDependsOn Condition="'$(IsRuntimeAssembly)' == 'true'">$(BinPlaceStuffDependsOn);BinPlaceRuntimeAssembly</BinPlaceStuffDependsOn> + </PropertyGroup> + + <Target Name="BinPlaceStuff" DependsOnTargets="$(BinPlaceStuffDependsOn)" AfterTargets="CopyFilesToOutputDirectory"> + <Message Importance="low" Text="IsRuntimeAssembly: $(IsRuntimeAssembly)" /> + <Message Importance="low" Text="IsReferenceAssembly: $(IsReferenceAssembly)" /> + </Target> + + <Target Name="BinPlaceReferenceAssembly" DependsOnTargets="GetTargetingPackDir"> + <Message Importance="low" Text="TargetingPackDir: @(TargetingPackDir)" /> + <Copy Condition="'@(TargetingPackDir)' != ''" SourceFiles="$(TargetPath)" DestinationFolder="%(TargetingPackDir.Identity)" /> + </Target> + + <Target Name="BinPlaceRuntimeAssembly" DependsOnTargets="GetRuntimeDir"> + <Copy Condition="'@(RuntimeDir)' != ''" SourceFiles="$(TargetPath)" DestinationFolder="%(RuntimeDir.Identity)" /> + </Target> + + <Target Name="GetTargetingPackDir"> + <ItemGroup> + <TargetingPackDir Condition="'$(NuGetTargetMoniker)' == '' Or $(NuGetTargetMoniker.Contains('NETCoreApp'))" Include="$(BinDir)netcoreapp\TargetingPack" /> + <TargetingPackDir Condition="'$(NuGetTargetMoniker)' == '' Or $(NuGetTargetMoniker.Contains('NETStandard'))" Include="$(BinDir)netstandard\TargetingPack" /> + <TargetingPackDir Condition="'$(NuGetTargetMoniker)' == '' Or $(NuGetTargetMoniker.Contains('NETStandard'))" Include="$(BinDir)netcoreapp\TargetingPack" /> + </ItemGroup> + <Error Condition="'@(TargetingPackDir)' == ''" Text="No targeting pack directory could be determined for NuGetTargetMoniker:$(NuGetTargetMoniker)" /> + <Message Text="Got TargetingPackDir:@(TargetingPackDir) from NuGetTargetMoniker:$(NuGetTargetMoniker)" Importance="Low" /> + </Target> + + <Target Name="GetRuntimeDir"> + <ItemGroup> + <RuntimeDir Condition="'$(NuGetTargetMoniker)' == '' Or $(NuGetTargetMoniker.Contains('NETCoreApp'))" Include="$(BinDir)netcoreapp\Runtime" /> + <RuntimeDir Condition="'$(NuGetTargetMoniker)' == '' Or $(NuGetTargetMoniker.Contains('NETStandard'))" Include="$(BinDir)netstandard\Runtime" /> + <RuntimeDir Condition="'$(NuGetTargetMoniker)' == '' Or $(NuGetTargetMoniker.Contains('NETStandard'))" Include="$(BinDir)netcoreapp\Runtime" /> + </ItemGroup> + <Error Condition="'@(RuntimeDir)' == ''" Text="No Runtime directory could be determined for NuGetTargetMoniker:$(NuGetTargetMoniker)" /> + <Message Text="Got RuntimeDir:@(RuntimeDir) from NuGetTargetMoniker:$(NuGetTargetMoniker)" Importance="Low" /> + </Target> +</Project> diff --git a/build.proj b/build.proj index 3c8afeb525..1507347f11 100644 --- a/build.proj +++ b/build.proj @@ -38,10 +38,11 @@ <FilterToOSGroup Condition="'$(_OriginalOSGroup)' == ''">$(OSEnvironment)</FilterToOSGroup> <InputOSGroup>$(InputOSGroup)</InputOSGroup> </Project> + <!-- <Project Include="src\tests.builds" Condition="$(BuildTests)=='true'"> <InputOSGroup>$(InputOSGroup)</InputOSGroup> </Project> - <!-- signing must happen before packaging --> + <!- signing must happen before packaging -!> <Project Include="src\sign.builds" /> <Project Include="src\packages.builds" Condition="'$(BuildPackages)'=='true'"> <InputOSGroup>$(InputOSGroup)</InputOSGroup> @@ -50,9 +51,10 @@ <InputOSGroup>$(InputOSGroup)</InputOSGroup> </Project> <Project Include="src\post.builds"> - <!-- For the root traversal default filter the OSGroup to the OSEnvironment which is the OS we are running on --> + <!- For the root traversal default filter the OSGroup to the OSEnvironment which is the OS we are running on -!> <FilterToOSGroup Condition="'$(_OriginalOSGroup)' == ''">$(OSEnvironment)</FilterToOSGroup> </Project> + --> </ItemGroup> <Import Project="dir.targets" /> @@ -64,6 +64,8 @@ <!-- Import Build tools common props file where repo-independent properties are found --> <Import Project="$(ToolsDir)Build.Common.props" Condition="Exists('$(ToolsDir)Build.Common.props')" /> + <Import Project="$(MSBuildThisFileDirectory)targetingpacks.props" /> + <!-- Enable the analyzers for this repo --> <PropertyGroup> <EnableDotnetAnalyzers Condition="'$(EnableDotnetAnalyzers)'==''">true</EnableDotnetAnalyzers> diff --git a/dir.targets b/dir.targets index 5347839f31..1e0f2d2a4a 100644 --- a/dir.targets +++ b/dir.targets @@ -51,6 +51,8 @@ <!-- permit a wrapping build system to contribute targets to this build --> <Import Condition="Exists('$(MSBuildThisFileDirectory)..\open.targets')" Project="$(MSBuildThisFileDirectory)..\open.targets" /> + <Import Project="$(MSBuildThisFileDirectory)binplace.targets" /> + <PropertyGroup> <!-- We don't use any of MSBuild's resolution logic for resolving the framework, so just set these two properties to any folder that exists to skip the GenerateReferenceAssemblyPaths task (not target) and to prevent it from outputting a warning (MSB3644). --> diff --git a/init-tools.cmd b/init-tools.cmd index c0bf6707c9..063ce1963c 100644 --- a/init-tools.cmd +++ b/init-tools.cmd @@ -77,6 +77,9 @@ if %UPDATE_CLI_ERRORLEVEL% GTR 1 ( exit /b %UPDATE_CLI_ERRORLEVEL% ) +echo Copying supplemental overrides from Tools-Override. +copy %~dp0Tools-Override\* %~dp0Tools + :: Create sempahore file echo Done initializing tools. echo Init-Tools.cmd completed for BuildTools Version: %BUILDTOOLS_VERSION% > "%BUILD_TOOLS_SEMAPHORE%" diff --git a/init-tools.sh b/init-tools.sh index cc8a5d8600..600bbdd8c0 100755 --- a/init-tools.sh +++ b/init-tools.sh @@ -161,6 +161,9 @@ if [ ! -e $__INIT_TOOLS_DONE_MARKER ]; then fi fi + echo Copying supplemental overrides from Tools-Override. + cp $__scriptpath/Tools-Override/* $__scriptpath/Tools + touch $__INIT_TOOLS_DONE_MARKER echo "Done initializing tools." diff --git a/src/Microsoft.CSharp/ref/Microsoft.CSharp.csproj b/src/Microsoft.CSharp/ref/Microsoft.CSharp.csproj index a74a8df4d4..ccb67c5614 100644 --- a/src/Microsoft.CSharp/ref/Microsoft.CSharp.csproj +++ b/src/Microsoft.CSharp/ref/Microsoft.CSharp.csproj @@ -1,16 +1,13 @@ -<?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> - <AssemblyVersion>4.0.0.0</AssemblyVersion> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="Microsoft.CSharp.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Dynamic.Runtime\ref\System.Dynamic.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Linq.Expressions\ref\System.Linq.Expressions.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/Microsoft.CSharp/ref/project.json b/src/Microsoft.CSharp/ref/project.json deleted file mode 100644 index bb7964d1ac..0000000000 --- a/src/Microsoft.CSharp/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Dynamic.Runtime": "4.4.0-beta-24721-02", - "System.Linq.Expressions": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/Microsoft.CSharp/src/Microsoft.CSharp.csproj b/src/Microsoft.CSharp/src/Microsoft.CSharp.csproj index fbabd92291..ed719f418f 100644 --- a/src/Microsoft.CSharp/src/Microsoft.CSharp.csproj +++ b/src/Microsoft.CSharp/src/Microsoft.CSharp.csproj @@ -1,4 +1,4 @@ -<?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> @@ -217,7 +217,17 @@ <EmbeddedResource Include="Resources\$(AssemblyName).rd.xml" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Linq.Expressions" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Linq" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.ObjectModel" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/Microsoft.CSharp/src/project.json b/src/Microsoft.CSharp/src/project.json deleted file mode 100644 index 6373b80b88..0000000000 --- a/src/Microsoft.CSharp/src/project.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "dependencies": { - "System.Collections": "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.Dynamic.Runtime": "4.4.0-beta-24721-02", - "System.Globalization": "4.4.0-beta-24721-02", - "System.Linq": "4.4.0-beta-24721-02", - "System.Linq.Expressions": "4.4.0-beta-24721-02", - "System.ObjectModel": "4.4.0-beta-24721-02", - "System.Reflection": "4.4.0-beta-24721-02", - "System.Reflection.Extensions": "4.4.0-beta-24721-02", - "System.Reflection.Primitives": "4.4.0-beta-24721-02", - "System.Reflection.TypeExtensions": "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.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Threading": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Runtime.Serialization.Primitives/ref/4.1.1/System.Runtime.Serialization.Primitives.depproj b/src/Microsoft.TargetingPack.Private.CoreCLR/ref/Microsoft.TargetingPack.Private.CoreCLR.depproj index 82d89b846b..39b1a43ac9 100644 --- a/src/System.Runtime.Serialization.Primitives/ref/4.1.1/System.Runtime.Serialization.Primitives.depproj +++ b/src/Microsoft.TargetingPack.Private.CoreCLR/ref/Microsoft.TargetingPack.Private.CoreCLR.depproj @@ -2,12 +2,11 @@ <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <AssemblyVersion>4.1.1.0</AssemblyVersion> - <OutputType>Library</OutputType> - <PackageTargetFramework>netstandard1.3</PackageTargetFramework> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> + <AssemblyName>System.Private.CoreLib</AssemblyName> + <NuGetTargetMoniker>.NETCoreApp,Version=v1.1</NuGetTargetMoniker> </PropertyGroup> <ItemGroup> + <TargetingPackReference Include="System.Private.CoreLib" /> <None Include="project.json" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> diff --git a/src/System.Collections/ref/project.json b/src/Microsoft.TargetingPack.Private.CoreCLR/ref/project.json index e29be91bbd..9f1eb5d2fb 100644 --- a/src/System.Collections/ref/project.json +++ b/src/Microsoft.TargetingPack.Private.CoreCLR/ref/project.json @@ -1,9 +1,8 @@ { "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02" + "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24728-02" }, "frameworks": { - "netstandard1.7": {}, "netcoreapp1.1": {} } } diff --git a/src/System.IO.Compression/ref/4.1.0/System.IO.Compression.depproj b/src/Microsoft.TargetingPack.Private.WinRT/ref/Microsoft.TargetingPack.Private.WinRT.depproj index 4e2e5fed79..5f01d724a0 100644 --- a/src/System.IO.Compression/ref/4.1.0/System.IO.Compression.depproj +++ b/src/Microsoft.TargetingPack.Private.WinRT/ref/Microsoft.TargetingPack.Private.WinRT.depproj @@ -2,13 +2,12 @@ <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <AssemblyVersion>4.1.0.0</AssemblyVersion> - <OutputType>Library</OutputType> - <PackageTargetFramework>netstandard1.3</PackageTargetFramework> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> + <AssemblyName>Windows</AssemblyName> + <TargetExt>.winmd</TargetExt> + <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker> </PropertyGroup> <ItemGroup> <None Include="project.json" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.ComponentModel/ref/project.json b/src/Microsoft.TargetingPack.Private.WinRT/ref/project.json index e6c2196e0e..1c4ed39edf 100644 --- a/src/System.ComponentModel/ref/project.json +++ b/src/Microsoft.TargetingPack.Private.WinRT/ref/project.json @@ -1,8 +1,8 @@ { "dependencies": { - "System.Runtime": "4.3.0" + "Microsoft.TargetingPack.Private.WinRT": "1.0.3" }, "frameworks": { "netstandard1.0": {} } -}
\ No newline at end of file +} diff --git a/src/Microsoft.VisualBasic/ref/Microsoft.VisualBasic.csproj b/src/Microsoft.VisualBasic/ref/Microsoft.VisualBasic.csproj index f9d677da8d..51df31f1ef 100644 --- a/src/Microsoft.VisualBasic/ref/Microsoft.VisualBasic.csproj +++ b/src/Microsoft.VisualBasic/ref/Microsoft.VisualBasic.csproj @@ -1,21 +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> <AssemblyVersion>10.0.0.0</AssemblyVersion> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.1</NuGetTargetMoniker> - <!-- Xamarin frameworks claim to support PCL profiles which include this assembly, - but do not include this assembly in the targeting pack. - This causes NuGet to give them the placeholder from the portable-* folder. - Instead give them this assembly. --> - <PackageTargetFramework>netstandard1.1;MonoAndroid10;MonoTouch10;xamarinios10;xamarintvos10;xamarinwatchos10</PackageTargetFramework> </PropertyGroup> <ItemGroup> <Compile Include="Microsoft.VisualBasic.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/Microsoft.VisualBasic/ref/project.json b/src/Microsoft.VisualBasic/ref/project.json deleted file mode 100644 index e9ce2da7f5..0000000000 --- a/src/Microsoft.VisualBasic/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.3.0" - }, - "frameworks": { - "netstandard1.1": {} - } -}
\ No newline at end of file diff --git a/src/Microsoft.VisualBasic/src/Microsoft.VisualBasic.vbproj b/src/Microsoft.VisualBasic/src/Microsoft.VisualBasic.vbproj index 0109345ecb..3d0e72fee0 100644 --- a/src/Microsoft.VisualBasic/src/Microsoft.VisualBasic.vbproj +++ b/src/Microsoft.VisualBasic/src/Microsoft.VisualBasic.vbproj @@ -48,7 +48,22 @@ <Compile Include="Microsoft\VisualBasic\Strings.vb" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Reflection" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Globalization" /> + <Reference Include="System.Dynamic.Runtime" /> + <Reference Include="System.Linq.Expressions" /> + <Reference Include="System.Reflection.TypeExtensions" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.ObjectModel" /> + <Reference Include="System.Reflection.Primitives" /> + <Reference Include="System.Linq" /> + <Reference Include="System.Reflection.Extensions" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/Operators.vb b/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/Operators.vb index 0817447733..4ecdc3086c 100644 --- a/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/Operators.vb +++ b/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/Operators.vb @@ -2772,7 +2772,7 @@ Namespace Microsoft.VisualBasic.CompilerServices Case TypeCode.DateTime * s_TCMAX + TypeCode.Empty - Return AddString(CStr(Convert.ToDateTime(Nothing)), CStr(CDate(left))) + Return AddString(CStr(CDate(Nothing)), CStr(CDate(left))) Case TypeCode.DateTime * s_TCMAX + TypeCode.DateTime Return AddString(CStr(Convert.ToDateTime(left)), CStr(Convert.ToDateTime(right))) diff --git a/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/Utils.vb b/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/Utils.vb index 8c79a06f2c..d2cde00a7e 100644 --- a/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/Utils.vb +++ b/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/Utils.vb @@ -56,19 +56,6 @@ Namespace Global.Microsoft.VisualBasic.CompilerServices Friend Module ReflectionExtensions - Public Enum MemberTypes - ' The following are the known classes which extend MemberInfo - Constructor = &H1 - [Event] = &H2 - Field = &H4 - Method = &H8 - [Property] = &H10 - TypeInfo = &H20 - Custom = &H40 - NestedType = &H80 - All = Constructor Or [Event] Or Field Or Method Or [Property] Or TypeInfo Or NestedType - End Enum - <System.Runtime.CompilerServices.ExtensionAttribute()> Public Function MemberType(ByVal memberInfo As MemberInfo) As MemberTypes If TypeOf memberInfo Is ConstructorInfo Then diff --git a/src/Microsoft.VisualBasic/src/project.json b/src/Microsoft.VisualBasic/src/project.json deleted file mode 100644 index 1f68060b9e..0000000000 --- a/src/Microsoft.VisualBasic/src/project.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Dynamic.Runtime": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Linq": "4.3.0", - "System.Linq.Expressions": "4.3.0", - "System.ObjectModel": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" - }, - "frameworks": { - "netstandard1.3": {} - } -}
\ No newline at end of file diff --git a/src/Microsoft.Win32.Primitives/ref/Microsoft.Win32.Primitives.csproj b/src/Microsoft.Win32.Primitives/ref/Microsoft.Win32.Primitives.csproj index 5c077b8098..f7e77bb04f 100644 --- a/src/Microsoft.Win32.Primitives/ref/Microsoft.Win32.Primitives.csproj +++ b/src/Microsoft.Win32.Primitives/ref/Microsoft.Win32.Primitives.csproj @@ -1,17 +1,11 @@ -<?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> - <!-- copy to uap10.1 until nuget makes the change to map that to ns1.7 --> - <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.7;uap10.1</PackageTargetFramework> - </PropertyGroup> <ItemGroup> <Compile Include="Microsoft.Win32.Primitives.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/Microsoft.Win32.Primitives/ref/project.json b/src/Microsoft.Win32.Primitives/ref/project.json deleted file mode 100644 index 11f44fb8b7..0000000000 --- a/src/Microsoft.Win32.Primitives/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj b/src/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj index f9b874367a..3adad11a94 100644 --- a/src/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj +++ b/src/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj @@ -1,4 +1,4 @@ -<?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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'=='' AND '$(TargetGroup)' == ''">Windows_Debug</Configuration> @@ -47,7 +47,8 @@ <TargetingPackReference Include="System" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Runtime.InteropServices" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/Microsoft.Win32.Primitives/src/project.json b/src/Microsoft.Win32.Primitives/src/project.json deleted file mode 100644 index 61e8df8be1..0000000000 --- a/src/Microsoft.Win32.Primitives/src/project.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "frameworks": { - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - }, - "netstandard1.7": { - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices": "4.4.0-beta-24721-02" - } - } - } -} diff --git a/src/Microsoft.Win32.Registry.AccessControl/ref/Microsoft.Win32.Registry.AccessControl.csproj b/src/Microsoft.Win32.Registry.AccessControl/ref/Microsoft.Win32.Registry.AccessControl.csproj index f9ae70e1cc..1e0738f899 100644 --- a/src/Microsoft.Win32.Registry.AccessControl/ref/Microsoft.Win32.Registry.AccessControl.csproj +++ b/src/Microsoft.Win32.Registry.AccessControl/ref/Microsoft.Win32.Registry.AccessControl.csproj @@ -1,15 +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.3</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="Microsoft.Win32.Registry.AccessControl.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj" /> + <ProjectReference Include="..\..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/Microsoft.Win32.Registry.AccessControl/ref/project.json b/src/Microsoft.Win32.Registry.AccessControl/ref/project.json deleted file mode 100644 index 332a0c6912..0000000000 --- a/src/Microsoft.Win32.Registry.AccessControl/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "Microsoft.Win32.Registry": "4.3.0", - "System.Runtime": "4.3.0", - "System.Security.AccessControl": "4.3.0", - "System.Security.Principal.Windows": "4.3.0" - }, - "frameworks": { - "netstandard1.3": {} - } -}
\ No newline at end of file diff --git a/src/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj b/src/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj index 4846d304e4..04c9136c3c 100644 --- a/src/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj +++ b/src/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj @@ -1,4 +1,4 @@ -<?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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> @@ -28,7 +28,12 @@ <TargetingPackReference Include="mscorlib" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Security.AccessControl" /> + <Reference Include="System.Security.Principal.Windows" /> + <Reference Include="Microsoft.Win32.Registry" /> + <Reference Include="System.Runtime.Handles" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/Microsoft.Win32.Registry.AccessControl/src/project.json b/src/Microsoft.Win32.Registry.AccessControl/src/project.json deleted file mode 100644 index c585911031..0000000000 --- a/src/Microsoft.Win32.Registry.AccessControl/src/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "frameworks": { - "netstandard1.3": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.Win32.Registry": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.AccessControl": "4.3.0", - "System.Security.Principal.Windows": "4.3.0" - } - }, - "net46": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -}
\ No newline at end of file diff --git a/src/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj b/src/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj index 2130ae9909..9f2e564a79 100644 --- a/src/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj +++ b/src/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj @@ -1,18 +1,12 @@ -<?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> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="Microsoft.Win32.Registry.cs" /> - <!--Technically this contract only depends on surface area from System.Runtime.Handles, - but we pull in the old version of System.Runtime.InteropServices since it will be needed - by the implementation and is "more portable" today since it exists on all platforms. --> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Handles\ref\System.Runtime.Handles.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/Microsoft.Win32.Registry/ref/project.json b/src/Microsoft.Win32.Registry/ref/project.json deleted file mode 100644 index f913ef267f..0000000000 --- a/src/Microsoft.Win32.Registry/ref/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Runtime.Handles": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj b/src/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj index 0fbded8dc6..6ca6d689e4 100644 --- a/src/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj +++ b/src/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj @@ -1,4 +1,4 @@ -<?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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> @@ -98,7 +98,12 @@ <TargetingPackReference Include="mscorlib" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/Microsoft.Win32.Registry/src/project.json b/src/Microsoft.Win32.Registry/src/project.json deleted file mode 100644 index f3ba3978d8..0000000000 --- a/src/Microsoft.Win32.Registry/src/project.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "frameworks": { - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - }, - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "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.Globalization": "4.4.0-beta-24721-02", - "System.IO": "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.Runtime.Handles": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02" - } - } - } -}
\ No newline at end of file diff --git a/src/System.AppContext/ref/System.AppContext.csproj b/src/System.AppContext/ref/System.AppContext.csproj index ec42291f95..8b51d5ad91 100644 --- a/src/System.AppContext/ref/System.AppContext.csproj +++ b/src/System.AppContext/ref/System.AppContext.csproj @@ -1,19 +1,15 @@ -<?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> <ItemGroup> <Compile Include="System.AppContext.Forwards.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <ItemGroup> <!-- Temporary till we publish System.Runtime updated package --> <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.AppContext/ref/project.json b/src/System.AppContext/ref/project.json deleted file mode 100644 index f9114842e3..0000000000 --- a/src/System.AppContext/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.3.0" - }, - "frameworks": { - "netstandard1.7": {} - } -}
\ No newline at end of file diff --git a/src/System.AppContext/src/System.AppContext.csproj b/src/System.AppContext/src/System.AppContext.csproj index 463e1bc105..2172ead3bf 100644 --- a/src/System.AppContext/src/System.AppContext.csproj +++ b/src/System.AppContext/src/System.AppContext.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> @@ -26,7 +26,7 @@ <TargetingPackReference Include="System.Private.CoreLib" Condition="'$(TargetGroup)' != 'net463'" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Private.CoreLib" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.AppContext/src/project.json b/src/System.AppContext/src/project.json deleted file mode 100644 index 7b4c31a2d0..0000000000 --- a/src/System.AppContext/src/project.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24728-02" - } - }, - "netcore50": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24728-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.Buffers/ref/System.Buffers.csproj b/src/System.Buffers/ref/System.Buffers.csproj index a95a4e62ec..729dbb282a 100644 --- a/src/System.Buffers/ref/System.Buffers.csproj +++ b/src/System.Buffers/ref/System.Buffers.csproj @@ -1,9 +1,7 @@ -<?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> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.1</NuGetTargetMoniker> <ProjectGuid>{11AE73F7-3532-47B9-8FF6-B4F22D76456C}</ProjectGuid> <UseOpenKey Condition="'$(UseOpenKey)'==''">true</UseOpenKey> </PropertyGroup> @@ -11,7 +9,7 @@ <Compile Include="System.Buffers.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Buffers/ref/project.json b/src/System.Buffers/ref/project.json deleted file mode 100644 index 65d59ac807..0000000000 --- a/src/System.Buffers/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.1": {} - } -} diff --git a/src/System.Buffers/src/System.Buffers.csproj b/src/System.Buffers/src/System.Buffers.csproj index 80fb3ccb9c..491f5bfba2 100644 --- a/src/System.Buffers/src/System.Buffers.csproj +++ b/src/System.Buffers/src/System.Buffers.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> @@ -23,7 +23,7 @@ <TargetingPackReference Include="System.Private.CoreLib" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Private.CoreLib" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Buffers/src/project.json b/src/System.Buffers/src/project.json deleted file mode 100644 index 5f56995fe9..0000000000 --- a/src/System.Buffers/src/project.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "frameworks": { - "netstandard1.1": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "netcoreapp1.1": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24728-02" - } - } - } -} diff --git a/src/System.CodeDom/ref/System.CodeDom.csproj b/src/System.CodeDom/ref/System.CodeDom.csproj index 6ab4cad6cb..23dbaab984 100644 --- a/src/System.CodeDom/ref/System.CodeDom.csproj +++ b/src/System.CodeDom/ref/System.CodeDom.csproj @@ -1,17 +1,19 @@ -<?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.CodeDom.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Collections.Specialized\ref\System.Collections.Specialized.csproj" /> + <ProjectReference Include="..\..\System.ComponentModel.TypeConverter\ref\System.ComponentModel.TypeConverter.csproj" /> + <ProjectReference Include="..\..\System.Collections.NonGeneric\ref\System.Collections.NonGeneric.csproj" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> + <ProjectReference Include="..\..\System.Reflection\ref\System.Reflection.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" /> + <ProjectReference Include="..\..\System.Security.Permissions\ref\System.Security.Permissions.csproj" /> + <ProjectReference Include="..\..\System.Text.Encoding\ref\System.Text.Encoding.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.CodeDom/ref/project.json b/src/System.CodeDom/ref/project.json deleted file mode 100644 index d2dbb99a4e..0000000000 --- a/src/System.CodeDom/ref/project.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "dependencies": { - "System.Collections.Specialized": "4.4.0-beta-24721-02", - "System.ComponentModel.TypeConverter": "4.4.0-beta-24721-02", - "System.Collections.NonGeneric": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.Reflection": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Runtime.Extensions": "4.4.0-beta-24721-02", - "System.Security.Permissions": "4.4.0-beta-24721-02", - "System.Text.Encoding": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.CodeDom/src/System.CodeDom.csproj b/src/System.CodeDom/src/System.CodeDom.csproj index de0d8731b2..528f926e85 100644 --- a/src/System.CodeDom/src/System.CodeDom.csproj +++ b/src/System.CodeDom/src/System.CodeDom.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> @@ -134,7 +134,20 @@ <TargetingPackReference Include="System" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Collections.NonGeneric" /> + <Reference Include="System.Collections.Specialized" /> + <Reference Include="System.ComponentModel.TypeConverter" /> + <Reference Include="System.Security.Permissions" /> + <Reference Include="System.Diagnostics.Process" /> + <Reference Include="System.Threading" /> + <Reference Include="System.IO.FileSystem" /> + <Reference Include="System.ComponentModel.Primitives" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.CodeDom/src/project.json b/src/System.CodeDom/src/project.json deleted file mode 100644 index 655270b42e..0000000000 --- a/src/System.CodeDom/src/project.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.4.0-beta-24721-02", - "System.Collections.Specialized": "4.4.0-beta-24721-02", - "System.Collections.NonGeneric": "4.4.0-beta-24721-02", - "System.ComponentModel.TypeConverter": "4.4.0-beta-24721-02", - "System.Diagnostics.Debug": "4.4.0-beta-24721-02", - "System.Diagnostics.Process": "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.IO.FileSystem": "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.Primitives": "4.4.0-beta-24721-02", - "System.Reflection": "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.Security.Permissions": "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 diff --git a/src/System.Collections.Concurrent/ref/System.Collections.Concurrent.csproj b/src/System.Collections.Concurrent/ref/System.Collections.Concurrent.csproj index 810558a7d3..b5beb722a9 100644 --- a/src/System.Collections.Concurrent/ref/System.Collections.Concurrent.csproj +++ b/src/System.Collections.Concurrent/ref/System.Collections.Concurrent.csproj @@ -1,16 +1,12 @@ -<?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> - <AssemblyVersion>4.0.10.0</AssemblyVersion> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="System.Collections.Concurrent.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Collections.Concurrent/ref/project.json b/src/System.Collections.Concurrent/ref/project.json deleted file mode 100644 index c40cf6c058..0000000000 --- a/src/System.Collections.Concurrent/ref/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.3.0", - "System.Threading.Tasks": "4.3.0" - }, - "frameworks": { - "netstandard1.3": {} - } -}
\ No newline at end of file diff --git a/src/System.Collections.Concurrent/src/System.Collections.Concurrent.csproj b/src/System.Collections.Concurrent/src/System.Collections.Concurrent.csproj index d9a57c9345..2a31c37184 100644 --- a/src/System.Collections.Concurrent/src/System.Collections.Concurrent.csproj +++ b/src/System.Collections.Concurrent/src/System.Collections.Concurrent.csproj @@ -1,4 +1,4 @@ -<?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> @@ -32,7 +32,16 @@ <TargetingPackReference Include="System" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Threading.Tasks" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Diagnostics.Tracing" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Collections.Concurrent/src/project.json b/src/System.Collections.Concurrent/src/project.json deleted file mode 100644 index 8baa2e3c63..0000000000 --- a/src/System.Collections.Concurrent/src/project.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24721-02", - "System.Collections": "4.4.0-beta-24721-02", - "System.Diagnostics.Contracts": "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.Globalization": "4.4.0-beta-24721-02", - "System.Reflection": "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.Threading": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02" - } - }, - "net46": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Collections.Immutable/src/System.Collections.Immutable.csproj b/src/System.Collections.Immutable/src/System.Collections.Immutable.csproj index 675581c91f..b4039fb717 100644 --- a/src/System.Collections.Immutable/src/System.Collections.Immutable.csproj +++ b/src/System.Collections.Immutable/src/System.Collections.Immutable.csproj @@ -1,4 +1,4 @@ -<?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> @@ -90,15 +90,23 @@ <Compile Include="System\Linq\ImmutableArrayExtensions.cs" /> <Compile Include="Validation\Requires.cs" /> <Compile Include="Validation\ValidatedNotNullAttribute.cs" /> - <Compile Include="$(CommonPath)\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs"> - <Link>Common\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs</Link> - </Compile> <Compile Include="$(CommonPath)\System\Runtime\Versioning\NonVersionableAttribute.cs"> <Link>Common\System\Runtime\Versioning\NonVersionableAttribute.cs</Link> </Compile> </ItemGroup> <ItemGroup> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Linq" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Globalization" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Tools" /> <None Include="Interfaces.cd" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Collections.Immutable/src/project.json b/src/System.Collections.Immutable/src/project.json deleted file mode 100644 index 1c7e9bfb10..0000000000 --- a/src/System.Collections.Immutable/src/project.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Contracts": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Linq": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - }, - "frameworks": { - "netstandard1.0": {} - } -}
\ No newline at end of file diff --git a/src/System.Collections.NonGeneric/ref/System.Collections.NonGeneric.csproj b/src/System.Collections.NonGeneric/ref/System.Collections.NonGeneric.csproj index 62f401d3e4..68f469d1cd 100644 --- a/src/System.Collections.NonGeneric/ref/System.Collections.NonGeneric.csproj +++ b/src/System.Collections.NonGeneric/ref/System.Collections.NonGeneric.csproj @@ -1,17 +1,13 @@ -<?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> <ItemGroup> <Compile Include="System.Collections.NonGeneric.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> - <!-- ToDo: Remove this P2P reference once packages are updated --> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" /> + <ProjectReference Include="..\..\System.Globalization\ref\System.Globalization.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Collections.NonGeneric/ref/project.json b/src/System.Collections.NonGeneric/ref/project.json deleted file mode 100644 index 8da3f82f25..0000000000 --- a/src/System.Collections.NonGeneric/ref/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Globalization": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj b/src/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj index 34aa263271..ab93fb3a7b 100644 --- a/src/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj +++ b/src/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj @@ -1,4 +1,4 @@ -<?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> @@ -37,7 +37,13 @@ <TargetingPackReference Include="mscorlib" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Collections.NonGeneric/src/project.json b/src/System.Collections.NonGeneric/src/project.json deleted file mode 100644 index 753baa44ae..0000000000 --- a/src/System.Collections.NonGeneric/src/project.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Diagnostics.Contracts": "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.Globalization": "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.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 diff --git a/src/System.Collections.Specialized/ref/System.Collections.Specialized.csproj b/src/System.Collections.Specialized/ref/System.Collections.Specialized.csproj index 5206adf697..4255e9f2d7 100644 --- a/src/System.Collections.Specialized/ref/System.Collections.Specialized.csproj +++ b/src/System.Collections.Specialized/ref/System.Collections.Specialized.csproj @@ -1,15 +1,13 @@ -<?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> <ItemGroup> <Compile Include="System.Collections.Specialized.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" /> + <ProjectReference Include="..\..\System.Collections.NonGeneric\ref\System.Collections.NonGeneric.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Collections.Specialized/ref/project.json b/src/System.Collections.Specialized/ref/project.json deleted file mode 100644 index a9af0c01e8..0000000000 --- a/src/System.Collections.Specialized/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Runtime.Extensions": "4.4.0-beta-24721-02", - "System.Collections.NonGeneric": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Collections.Specialized/src/System.Collections.Specialized.csproj b/src/System.Collections.Specialized/src/System.Collections.Specialized.csproj index 847fbf5fe7..1c8d8b5b9a 100644 --- a/src/System.Collections.Specialized/src/System.Collections.Specialized.csproj +++ b/src/System.Collections.Specialized/src/System.Collections.Specialized.csproj @@ -1,4 +1,4 @@ -<?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> @@ -34,7 +34,14 @@ <TargetingPackReference Include="System" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Collections.NonGeneric" /> + <Reference Include="System.Globalization.Extensions" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Collections.Specialized/src/project.json b/src/System.Collections.Specialized/src/project.json deleted file mode 100644 index 7909d59b8e..0000000000 --- a/src/System.Collections.Specialized/src/project.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "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.Globalization": "4.4.0-beta-24721-02", - "System.Globalization.Extensions": "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.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 diff --git a/src/System.Collections/ref/System.Collections.csproj b/src/System.Collections/ref/System.Collections.csproj index edc718f1c6..32548c0833 100644 --- a/src/System.Collections/ref/System.Collections.csproj +++ b/src/System.Collections/ref/System.Collections.csproj @@ -2,17 +2,13 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <AssemblyVersion>4.1.0.0</AssemblyVersion> - <OutputType>Library</OutputType> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETCoreApp,Version=v1.1</NuGetTargetMoniker> <DefineConstants Condition="'$(TargetGroup)' == ''">$(DefineConstants);netcoreapp11</DefineConstants> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard1.7'">netstandard1.7;uap10.1</PackageTargetFramework> </PropertyGroup> <ItemGroup> <Compile Include="System.Collections.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Collections/src/System.Collections.csproj b/src/System.Collections/src/System.Collections.csproj index 0aee6c2957..81de5a68e2 100644 --- a/src/System.Collections/src/System.Collections.csproj +++ b/src/System.Collections/src/System.Collections.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> @@ -31,7 +31,6 @@ </ProjectReference> <ProjectReference Include="..\..\System.Diagnostics.Debug\src\System.Diagnostics.Debug.csproj"> <UndefineProperties>%(ProjectReference.UndefineProperties);TargetGroup</UndefineProperties> - <OSGroup>$(InputOSGroup)</OSGroup> </ProjectReference> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == 'uap101aot'"> @@ -84,7 +83,7 @@ <TargetingPackReference Include="System.Private.CoreLib" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Private.CoreLib" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Collections/src/project.json b/src/System.Collections/src/project.json deleted file mode 100644 index c97410a2cb..0000000000 --- a/src/System.Collections/src/project.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24728-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - }, - "uap10.1": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24728-00" - } - } - } -} diff --git a/src/System.ComponentModel.Annotations/ref/System.ComponentModel.Annotations.csproj b/src/System.ComponentModel.Annotations/ref/System.ComponentModel.Annotations.csproj index c64ee5fad8..daa3fcfd7b 100644 --- a/src/System.ComponentModel.Annotations/ref/System.ComponentModel.Annotations.csproj +++ b/src/System.ComponentModel.Annotations/ref/System.ComponentModel.Annotations.csproj @@ -1,15 +1,12 @@ -<?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> <ItemGroup> <Compile Include="System.ComponentModel.Annotations.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.ComponentModel\ref\System.ComponentModel.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.ComponentModel.Annotations/ref/project.json b/src/System.ComponentModel.Annotations/ref/project.json deleted file mode 100644 index 7bec9d70b1..0000000000 --- a/src/System.ComponentModel.Annotations/ref/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.ComponentModel": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.ComponentModel.Annotations/src/System.ComponentModel.Annotations.csproj b/src/System.ComponentModel.Annotations/src/System.ComponentModel.Annotations.csproj index cd676cdae9..c5e815e1d7 100644 --- a/src/System.ComponentModel.Annotations/src/System.ComponentModel.Annotations.csproj +++ b/src/System.ComponentModel.Annotations/src/System.ComponentModel.Annotations.csproj @@ -1,4 +1,4 @@ -<?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> @@ -66,7 +66,17 @@ <TargetingPackReference Include="System.ComponentModel.DataAnnotations" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Text.RegularExpressions" /> + <Reference Include="System.Collections" /> + <Reference Include="System.ComponentModel" /> + <Reference Include="System.Linq" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.ComponentModel.Annotations/src/project.json b/src/System.ComponentModel.Annotations/src/project.json deleted file mode 100644 index 42f3dbc6e4..0000000000 --- a/src/System.ComponentModel.Annotations/src/project.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "System.Collections": "4.4.0-beta-24721-02", - "System.ComponentModel": "4.4.0-beta-24721-02", - "System.Diagnostics.Contracts": "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.Globalization": "4.4.0-beta-24721-02", - "System.Linq": "4.4.0-beta-24721-02", - "System.Reflection": "4.4.0-beta-24721-02", - "System.Reflection.Extensions": "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.RegularExpressions": "4.4.0-beta-24721-02", - "System.Threading": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.1": "1.0.1" - } - } - } -} diff --git a/src/System.ComponentModel.EventBasedAsync/ref/System.ComponentModel.EventBasedAsync.csproj b/src/System.ComponentModel.EventBasedAsync/ref/System.ComponentModel.EventBasedAsync.csproj index 1716265397..f61a3fbfe7 100644 --- a/src/System.ComponentModel.EventBasedAsync/ref/System.ComponentModel.EventBasedAsync.csproj +++ b/src/System.ComponentModel.EventBasedAsync/ref/System.ComponentModel.EventBasedAsync.csproj @@ -1,15 +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> <ItemGroup> <Compile Include="System.ComponentModel.EventBasedAsync.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.ComponentModel.Primitives\ref\System.ComponentModel.Primitives.csproj" /> + <ProjectReference Include="..\..\System.ComponentModel\ref\System.ComponentModel.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Threading\ref\System.Threading.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.ComponentModel.EventBasedAsync/ref/project.json b/src/System.ComponentModel.EventBasedAsync/ref/project.json deleted file mode 100644 index f29a490cae..0000000000 --- a/src/System.ComponentModel.EventBasedAsync/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.ComponentModel.Primitives": "4.4.0-beta-24721-02", - "System.ComponentModel": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Threading": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.ComponentModel.EventBasedAsync/src/System.ComponentModel.EventBasedAsync.csproj b/src/System.ComponentModel.EventBasedAsync/src/System.ComponentModel.EventBasedAsync.csproj index 69c70a42db..1ec5889c9c 100644 --- a/src/System.ComponentModel.EventBasedAsync/src/System.ComponentModel.EventBasedAsync.csproj +++ b/src/System.ComponentModel.EventBasedAsync/src/System.ComponentModel.EventBasedAsync.csproj @@ -1,4 +1,4 @@ -<?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> @@ -27,7 +27,14 @@ <TargetingPackReference Include="System" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Threading" /> + <Reference Include="System.ComponentModel.Primitives" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.ComponentModel" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.ComponentModel.EventBasedAsync/src/project.json b/src/System.ComponentModel.EventBasedAsync/src/project.json deleted file mode 100644 index 9c729f46fb..0000000000 --- a/src/System.ComponentModel.EventBasedAsync/src/project.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.ComponentModel.Primitives": "4.4.0-beta-24721-02", - "System.ComponentModel": "4.4.0-beta-24721-02", - "System.Diagnostics.Contracts": "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.Resources.ResourceManager": "4.4.0-beta-24721-02", - "System.Runtime": "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.2": "1.0.1" - } - } - } -}
\ No newline at end of file diff --git a/src/System.ComponentModel.Primitives/ref/System.ComponentModel.Primitives.csproj b/src/System.ComponentModel.Primitives/ref/System.ComponentModel.Primitives.csproj index 36028cd581..4eae778a3d 100644 --- a/src/System.ComponentModel.Primitives/ref/System.ComponentModel.Primitives.csproj +++ b/src/System.ComponentModel.Primitives/ref/System.ComponentModel.Primitives.csproj @@ -1,15 +1,13 @@ -<?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> <ItemGroup> <Compile Include="System.ComponentModel.Primitives.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Collections.NonGeneric\ref\System.Collections.NonGeneric.csproj" /> + <ProjectReference Include="..\..\System.ComponentModel\ref\System.ComponentModel.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.ComponentModel.Primitives/ref/project.json b/src/System.ComponentModel.Primitives/ref/project.json deleted file mode 100644 index 030badee49..0000000000 --- a/src/System.ComponentModel.Primitives/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Collections.NonGeneric": "4.4.0-beta-24721-02", - "System.ComponentModel": "4.4.0-beta-24721-02" - } - } - } -} diff --git a/src/System.ComponentModel.Primitives/src/System.ComponentModel.Primitives.csproj b/src/System.ComponentModel.Primitives/src/System.ComponentModel.Primitives.csproj index 0573dc72b3..78e148c484 100644 --- a/src/System.ComponentModel.Primitives/src/System.ComponentModel.Primitives.csproj +++ b/src/System.ComponentModel.Primitives/src/System.ComponentModel.Primitives.csproj @@ -1,4 +1,4 @@ -<?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> @@ -46,7 +46,12 @@ <TargetingPackReference Include="System" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Collections.NonGeneric" /> + <Reference Include="System.ComponentModel" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Threading" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.ComponentModel.Primitives/src/project.json b/src/System.ComponentModel.Primitives/src/project.json deleted file mode 100644 index cd8fba3b53..0000000000 --- a/src/System.ComponentModel.Primitives/src/project.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "System.Collections.NonGeneric": "4.4.0-beta-24721-02", - "System.ComponentModel": "4.4.0-beta-24721-02", - "System.Resources.ResourceManager": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Threading": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.csproj b/src/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.csproj index 0972efe7f1..5a950152b0 100644 --- a/src/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.csproj +++ b/src/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.csproj @@ -1,16 +1,20 @@ -<?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> <ItemGroup> <Compile Include="System.ComponentModel.cs" /> <Compile Include="System.ComponentModel.TypeConverter.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Collections.NonGeneric\ref\System.Collections.NonGeneric.csproj" /> + <ProjectReference Include="..\..\System.ComponentModel\ref\System.ComponentModel.csproj" /> + <ProjectReference Include="..\..\System.Drawing.Primitives\ref\System.Drawing.Primitives.csproj" /> + <ProjectReference Include="..\..\System.ComponentModel.Primitives\ref\System.ComponentModel.Primitives.csproj" /> + <ProjectReference Include="..\..\System.Resources.ResourceManager\ref\System.Resources.ResourceManager.csproj" /> + <ProjectReference Include="..\..\System.Resources.Writer\ref\System.Resources.Writer.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" /> + <ProjectReference Include="..\..\System.Security.Permissions\ref\System.Security.Permissions.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> diff --git a/src/System.ComponentModel.TypeConverter/ref/project.json b/src/System.ComponentModel.TypeConverter/ref/project.json deleted file mode 100644 index e24303456f..0000000000 --- a/src/System.ComponentModel.TypeConverter/ref/project.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "dependencies": { - "System.Collections.NonGeneric": "4.4.0-beta-24721-02", - "System.ComponentModel": "4.4.0-beta-24721-02", - "System.Drawing.Primitives": "4.4.0-beta-24721-02", - "System.ComponentModel.Primitives": "4.4.0-beta-24721-02", - "System.Resources.ResourceManager": "4.4.0-beta-24721-02", - "System.Resources.Writer": "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.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj b/src/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj index 70ea97e559..11e1df2784 100644 --- a/src/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj +++ b/src/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj @@ -256,7 +256,32 @@ <TargetingPackReference Include="System.Drawing" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.ComponentModel.Primitives" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Drawing.Primitives" /> + <Reference Include="System.Threading.Timer" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.ComponentModel" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.ObjectModel" /> + <Reference Include="System.Collections.Specialized" /> + <Reference Include="System.Security.Permissions" /> + <Reference Include="System.Diagnostics.TraceSource" /> + <Reference Include="System.Collections.NonGeneric" /> + <Reference Include="System.Net.WebClient" /> + <Reference Include="System.Net.Security" /> + <Reference Include="System.Runtime.Serialization.Formatters" /> + <Reference Include="System.Resources.Writer" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Linq" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.IO.FileSystem" /> + <Reference Include="System.Text.RegularExpressions" /> + <Reference Include="System.Net.Primitives" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.ComponentModel.TypeConverter/src/project.json b/src/System.ComponentModel.TypeConverter/src/project.json deleted file mode 100644 index 2b1aedee05..0000000000 --- a/src/System.ComponentModel.TypeConverter/src/project.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "System.Collections": "4.4.0-beta-24721-02", - "System.Collections.NonGeneric": "4.4.0-beta-24721-02", - "System.Collections.Specialized": "4.4.0-beta-24721-02", - "System.ComponentModel": "4.4.0-beta-24721-02", - "System.ComponentModel.EventBasedAsync": "4.4.0-beta-24721-02", - "System.ComponentModel.Primitives": "4.4.0-beta-24721-02", - "System.Diagnostics.Contracts": "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.TraceSource": "4.4.0-beta-24721-02", - "System.Drawing.Primitives": "4.4.0-beta-24721-02", - "System.Globalization": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.IO.FileSystem": "4.4.0-beta-24721-02", - "System.Linq": "4.4.0-beta-24721-02", - "System.Net.WebClient": "4.4.0-beta-24721-02", - "System.ObjectModel": "4.3.0", - "System.Reflection": "4.4.0-beta-24721-02", - "System.Reflection.Extensions": "4.4.0-beta-24721-02", - "System.Reflection.TypeExtensions": "4.4.0-beta-24721-02", - "System.Resources.ResourceManager": "4.4.0-beta-24721-02", - "System.Resources.Writer": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Runtime.Extensions": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Runtime.Serialization.Formatters": "4.4.0-beta-24721-02", - "System.Runtime.Serialization.Primitives": "4.4.0-beta-24721-02", - "System.Security.Permissions": "4.4.0-beta-24721-02", - "System.Text.RegularExpressions": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02", - "System.Threading.Timer": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -}
\ No newline at end of file diff --git a/src/System.ComponentModel/ref/System.ComponentModel.csproj b/src/System.ComponentModel/ref/System.ComponentModel.csproj index 67b70b48c6..facd34b330 100644 --- a/src/System.ComponentModel/ref/System.ComponentModel.csproj +++ b/src/System.ComponentModel/ref/System.ComponentModel.csproj @@ -1,16 +1,11 @@ -<?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> - <AssemblyVersion>4.0.0.0</AssemblyVersion> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="System.ComponentModel.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.ComponentModel/src/System.ComponentModel.csproj b/src/System.ComponentModel/src/System.ComponentModel.csproj index 95d0e4cc5f..4d38aa7516 100644 --- a/src/System.ComponentModel/src/System.ComponentModel.csproj +++ b/src/System.ComponentModel/src/System.ComponentModel.csproj @@ -1,4 +1,4 @@ -<?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> @@ -27,7 +27,7 @@ <TargetingPackReference Include="System" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.ComponentModel/src/project.json b/src/System.ComponentModel/src/project.json deleted file mode 100644 index 25a2d5e99b..0000000000 --- a/src/System.ComponentModel/src/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "frameworks": { - "netstandard1.3": { - "dependencies": { - "System.Runtime": "4.3.0" - } - }, - "net46": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -}
\ No newline at end of file diff --git a/src/System.Composition.AttributedModel/src/System.Composition.AttributedModel.csproj b/src/System.Composition.AttributedModel/src/System.Composition.AttributedModel.csproj index 91aa67425b..49fd9ff89e 100644 --- a/src/System.Composition.AttributedModel/src/System.Composition.AttributedModel.csproj +++ b/src/System.Composition.AttributedModel/src/System.Composition.AttributedModel.csproj @@ -1,4 +1,4 @@ -<?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> @@ -25,5 +25,11 @@ <Compile Include="System\Composition\SharedAttribute.cs" /> <Compile Include="System\Composition\SharingBoundaryAttribute.cs" /> </ItemGroup> + <ItemGroup> + <Reference Include="System.Runtime" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Reflection" /> + <Reference Include="System.Diagnostics.Tools" /> + </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Composition.AttributedModel/src/project.json b/src/System.Composition.AttributedModel/src/project.json deleted file mode 100644 index 5b87b9aff0..0000000000 --- a/src/System.Composition.AttributedModel/src/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Reflection": "4.3.0" - }, - "frameworks": { - "netstandard1.0": {} - } -}
\ No newline at end of file diff --git a/src/System.Composition.Convention/src/System.Composition.Convention.csproj b/src/System.Composition.Convention/src/System.Composition.Convention.csproj index 3f2dad1d5c..5b8ca701f4 100644 --- a/src/System.Composition.Convention/src/System.Composition.Convention.csproj +++ b/src/System.Composition.Convention/src/System.Composition.Convention.csproj @@ -1,4 +1,4 @@ -<?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> @@ -61,5 +61,20 @@ <Name>System.Composition.AttributedModel</Name> </ProjectReference> </ItemGroup> + <ItemGroup> + <Reference Include="System.Runtime" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Reflection" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Linq.Expressions" /> + <Reference Include="System.Diagnostics.Tools" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Globalization" /> + <Reference Include="System.Linq" /> + <Reference Include="System.Reflection.Extensions" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Tools" /> + </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Composition.Convention/src/System/Composition/Convention/PartConventionBuilder.cs b/src/System.Composition.Convention/src/System/Composition/Convention/PartConventionBuilder.cs index 02914e355f..aefe7355a6 100644 --- a/src/System.Composition.Convention/src/System/Composition/Convention/PartConventionBuilder.cs +++ b/src/System.Composition.Convention/src/System/Composition/Convention/PartConventionBuilder.cs @@ -541,7 +541,7 @@ namespace System.Composition.Convention foreach (var ci in constructors) { // We have a constructor configuration we must log a warning then not bother with ConstructorAttributes - IEnumerable<Attribute> attributes = ci.GetCustomAttributes(typeof(ImportingConstructorAttribute), false); + IEnumerable<Attribute> attributes = Attribute.GetCustomAttributes(ci, typeof(ImportingConstructorAttribute), false); if (attributes.Count() != 0) { CompositionTrace.Registration_ConstructorConventionOverridden(type); diff --git a/src/System.Composition.Convention/src/project.json b/src/System.Composition.Convention/src/project.json deleted file mode 100644 index a92bd50731..0000000000 --- a/src/System.Composition.Convention/src/project.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Contracts": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Globalization": "4.3.0", - "System.Linq": "4.3.0", - "System.Linq.Expressions": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Threading": "4.3.0" - }, - "frameworks": { - "netstandard1.0": {} - } -}
\ No newline at end of file diff --git a/src/System.Composition.Hosting/src/System.Composition.Hosting.csproj b/src/System.Composition.Hosting/src/System.Composition.Hosting.csproj index fe044f9c9f..af128bb246 100644 --- a/src/System.Composition.Hosting/src/System.Composition.Hosting.csproj +++ b/src/System.Composition.Hosting/src/System.Composition.Hosting.csproj @@ -1,4 +1,4 @@ -<?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> @@ -81,5 +81,21 @@ <CustomToolNamespace>System.Composition.Hosting.Properties</CustomToolNamespace> </EmbeddedResource> </ItemGroup> + <ItemGroup> + <Reference Include="System.Runtime" /> + <Reference Include="System.Reflection" /> + <Reference Include="System.Linq.Expressions" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Diagnostics.Tools" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Globalization" /> + <Reference Include="System.Linq" /> + <Reference Include="System.Reflection.Extensions" /> + <Reference Include="System.Threading" /> + <Reference Include="System.ObjectModel" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Tools" /> + </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Composition.Hosting/src/project.json b/src/System.Composition.Hosting/src/project.json deleted file mode 100644 index ccdc6cfcd0..0000000000 --- a/src/System.Composition.Hosting/src/project.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Contracts": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Globalization": "4.3.0", - "System.Linq": "4.3.0", - "System.Linq.Expressions": "4.3.0", - "System.ObjectModel": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Threading": "4.3.0" - }, - "frameworks": { - "netstandard1.0": {} - } -}
\ No newline at end of file diff --git a/src/System.Composition.Runtime/src/System.Composition.Runtime.csproj b/src/System.Composition.Runtime/src/System.Composition.Runtime.csproj index 1ea9ba74b2..cd4d653796 100644 --- a/src/System.Composition.Runtime/src/System.Composition.Runtime.csproj +++ b/src/System.Composition.Runtime/src/System.Composition.Runtime.csproj @@ -1,4 +1,4 @@ -<?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> @@ -30,5 +30,16 @@ <Compile Include="System\Composition\Hosting\Core\CompositionContract.cs" /> <Compile Include="System\Composition\Runtime\Util\Formatters.cs" /> </ItemGroup> + <ItemGroup> + <Reference Include="System.Runtime" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Diagnostics.Tools" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Globalization" /> + <Reference Include="System.Linq" /> + <Reference Include="System.Reflection" /> + <Reference Include="System.Diagnostics.Tools" /> + </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Composition.Runtime/src/project.json b/src/System.Composition.Runtime/src/project.json deleted file mode 100644 index b2a78a4930..0000000000 --- a/src/System.Composition.Runtime/src/project.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Globalization": "4.3.0", - "System.Linq": "4.3.0", - "System.Reflection": "4.3.0", - "System.Resources.ResourceManager": "4.3.0" - }, - "frameworks": { - "netstandard1.0": {} - } -}
\ No newline at end of file diff --git a/src/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj b/src/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj index 588c6aed36..b460efa13a 100644 --- a/src/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj +++ b/src/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj @@ -1,4 +1,4 @@ -<?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> @@ -64,5 +64,19 @@ <LastGenOutput>Resources.Designer.cs</LastGenOutput> </EmbeddedResource> </ItemGroup> + <ItemGroup> + <Reference Include="System.Runtime" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Reflection" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Linq.Expressions" /> + <Reference Include="System.Diagnostics.Tools" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Globalization" /> + <Reference Include="System.Reflection.Extensions" /> + <Reference Include="System.Linq" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Diagnostics.Tools" /> + </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Composition.TypedParts/src/System/Composition/TypedParts/Util/DirectAttributeContext.cs b/src/System.Composition.TypedParts/src/System/Composition/TypedParts/Util/DirectAttributeContext.cs index 5a1f5494bf..70b26521a4 100644 --- a/src/System.Composition.TypedParts/src/System/Composition/TypedParts/Util/DirectAttributeContext.cs +++ b/src/System.Composition.TypedParts/src/System/Composition/TypedParts/Util/DirectAttributeContext.cs @@ -19,14 +19,14 @@ namespace System.Composition.TypedParts.Util if (!(member is TypeInfo) && member.DeclaringType != reflectedType) return EmptyArray<Attribute>.Value; - return member.GetCustomAttributes(false); + return Attribute.GetCustomAttributes(member, false); } public override IEnumerable<Attribute> GetCustomAttributes(Type reflectedType, Reflection.ParameterInfo parameter) { if (reflectedType == null) throw new ArgumentNullException(nameof(reflectedType)); if (parameter == null) throw new ArgumentNullException(nameof(parameter)); - return parameter.GetCustomAttributes(false); + return Attribute.GetCustomAttributes(parameter, false); } } } diff --git a/src/System.Composition.TypedParts/src/project.json b/src/System.Composition.TypedParts/src/project.json deleted file mode 100644 index 046353e0a4..0000000000 --- a/src/System.Composition.TypedParts/src/project.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Globalization": "4.3.0", - "System.Linq": "4.3.0", - "System.Linq.Expressions": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Threading": "4.3.0", - "System.Runtime.Extensions": "4.3.0" - }, - "frameworks": { - "netstandard1.0": {} - } -}
\ No newline at end of file diff --git a/src/System.Console/ref/System.Console.csproj b/src/System.Console/ref/System.Console.csproj index b303c49f61..169444ee03 100644 --- a/src/System.Console/ref/System.Console.csproj +++ b/src/System.Console/ref/System.Console.csproj @@ -1,15 +1,14 @@ -<?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> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="System.Console.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> + <ProjectReference Include="..\..\System.Text.Encoding\ref\System.Text.Encoding.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Console/ref/project.json b/src/System.Console/ref/project.json deleted file mode 100644 index 7b195f2836..0000000000 --- a/src/System.Console/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.3.0", - "System.IO": "4.3.0", - "System.Text.Encoding": "4.3.0" - }, - "frameworks": { - "netstandard1.7": {} - } -}
\ No newline at end of file diff --git a/src/System.Console/src/System.Console.csproj b/src/System.Console/src/System.Console.csproj index bed59fa8a6..ef05e1609e 100644 --- a/src/System.Console/src/System.Console.csproj +++ b/src/System.Console/src/System.Console.csproj @@ -1,4 +1,4 @@ -<?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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'=='' AND ('$(TargetGroup)' == '' OR '$(TargetGroup)' == 'netstandard1.3')">Windows_Debug</Configuration> @@ -256,13 +256,16 @@ <TargetingPackReference Include="mscorlib" /> </ItemGroup> <ItemGroup> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.Runtime\pkg\System.Runtime.pkgproj" /> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.IO\pkg\System.IO.pkgproj" /> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.IO.FileSystem.Primitives\pkg\System.IO.FileSystem.Primitives.pkgproj" /> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Text.Encoding.Extensions" /> + <Reference Include="System.Threading.Tasks" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Console/src/project.json b/src/System.Console/src/project.json deleted file mode 100644 index 7a6403f134..0000000000 --- a/src/System.Console/src/project.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.4.0-beta-24721-02", - "System.Diagnostics.Contracts": "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.IO": "4.4.0-beta-24721-02", - "System.IO.FileSystem.Primitives": "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.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Text.Encoding": "4.4.0-beta-24721-02", - "System.Text.Encoding.Extensions": "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 diff --git a/src/System.Data.Common/ref/System.Data.Common.csproj b/src/System.Data.Common/ref/System.Data.Common.csproj index b05e44c1df..bedf62dfdd 100644 --- a/src/System.Data.Common/ref/System.Data.Common.csproj +++ b/src/System.Data.Common/ref/System.Data.Common.csproj @@ -1,15 +1,20 @@ -<?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> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="System.Data.Common.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Collections.NonGeneric\ref\System.Collections.NonGeneric.csproj" /> + <ProjectReference Include="..\..\System.ComponentModel\ref\System.ComponentModel.csproj" /> + <ProjectReference Include="..\..\System.ComponentModel.Primitives\ref\System.ComponentModel.Primitives.csproj" /> + <ProjectReference Include="..\..\System.ComponentModel.TypeConverter\ref\System.ComponentModel.TypeConverter.csproj" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> + <ProjectReference Include="..\..\System.ObjectModel\ref\System.ObjectModel.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" /> + <ProjectReference Include="..\..\System.Transactions\ref\System.Transactions.csproj" /> + <ProjectReference Include="..\..\System.Xml.ReaderWriter\ref\System.Xml.ReaderWriter.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Data.Common/ref/project.json b/src/System.Data.Common/ref/project.json deleted file mode 100644 index 7aa09b0509..0000000000 --- a/src/System.Data.Common/ref/project.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "dependencies": { - "System.Collections.NonGeneric": "4.4.0-beta-24721-02", - "System.ComponentModel": "4.4.0-beta-24721-02", - "System.ComponentModel.Primitives": "4.4.0-beta-24721-02", - "System.ComponentModel.TypeConverter": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.ObjectModel": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Runtime.Extensions": "4.4.0-beta-24721-02", - "System.Transactions": "4.4.0-beta-24721-02", - "System.Xml.ReaderWriter": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Data.Common/src/System.Data.Common.csproj b/src/System.Data.Common/src/System.Data.Common.csproj index 178e502ce2..100c9700c0 100644 --- a/src/System.Data.Common/src/System.Data.Common.csproj +++ b/src/System.Data.Common/src/System.Data.Common.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> @@ -272,10 +272,34 @@ <Compile Include="System\Data\Common\DbDataReaderExtensions.Facade.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Xml.ReaderWriter" /> + <Reference Include="System.ObjectModel" /> + <Reference Include="System.ComponentModel.TypeConverter" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Collections.NonGeneric" /> + <Reference Include="System.ComponentModel.Primitives" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Runtime.Numerics" /> + <Reference Include="System.ComponentModel" /> + <Reference Include="System.Xml.XmlSerializer" /> + <Reference Include="System.Runtime.Serialization.Formatters" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Diagnostics.Tracing" /> + <Reference Include="System.Text.Encoding.Extensions" /> + <Reference Include="System.Diagnostics.TraceSource" /> + <Reference Include="System.Collections.Concurrent" /> + <Reference Include="System.Text.RegularExpressions" /> + <Reference Include="System.Transactions" /> + <Reference Include="System.Threading.Thread" /> + <Reference Include="System.Linq" /> + <Reference Include="System.Linq.Expressions" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == ''"> <EmbeddedResource Include="Resources\$(AssemblyName).rd.xml" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Data.Common/src/project.json b/src/System.Data.Common/src/project.json deleted file mode 100644 index be54f6b7b6..0000000000 --- a/src/System.Data.Common/src/project.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.4.0-beta-24721-02", - "System.Collections.Concurrent": "4.4.0-beta-24721-02", - "System.Collections.NonGeneric": "4.4.0-beta-24721-02", - "System.ComponentModel": "4.4.0-beta-24721-02", - "System.ComponentModel.Primitives": "4.4.0-beta-24721-02", - "System.ComponentModel.TypeConverter": "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.TraceSource": "4.4.0-beta-24721-02", - "System.Diagnostics.Tracing": "4.4.0-beta-24721-02", - "System.Dynamic.Runtime": "4.4.0-beta-24721-02", - "System.Globalization": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.IO.FileSystem": "4.4.0-beta-24721-02", - "System.Linq": "4.4.0-beta-24721-02", - "System.ObjectModel": "4.4.0-beta-24721-02", - "System.Reflection": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Runtime.Extensions": "4.4.0-beta-24721-02", - "System.Runtime.Numerics": "4.4.0-beta-24721-02", - "System.Runtime.Serialization.Formatters": "4.4.0-beta-24721-02", - "System.Text.Encoding": "4.4.0-beta-24721-02", - "System.Text.Encoding.Extensions": "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.Thread": "4.4.0-beta-24721-02", - "System.Transactions": "4.4.0-beta-24721-02", - "System.Xml.ReaderWriter": "4.4.0-beta-24721-02", - "System.Xml.XmlSerializer": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -}
\ No newline at end of file diff --git a/src/System.Data.SqlClient/ref/System.Data.SqlClient.csproj b/src/System.Data.SqlClient/ref/System.Data.SqlClient.csproj index ac56526fec..15af2484d5 100644 --- a/src/System.Data.SqlClient/ref/System.Data.SqlClient.csproj +++ b/src/System.Data.SqlClient/ref/System.Data.SqlClient.csproj @@ -1,19 +1,23 @@ -<?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> <ItemGroup> <Compile Include="System.Data.SqlClient.cs" /> <Compile Include="System.Data.SqlClient.Manual.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.ComponentModel.Primitives\ref\System.ComponentModel.Primitives.csproj" /> + <ProjectReference Include="..\..\System.ComponentModel.TypeConverter\ref\System.ComponentModel.TypeConverter.csproj" /> + <ProjectReference Include="..\..\System.Data.Common\ref\System.Data.Common.csproj" /> + <ProjectReference Include="..\..\System.Globalization\ref\System.Globalization.csproj" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" /> + <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> + <ProjectReference Include="..\..\System.Xml.ReaderWriter\ref\System.Xml.ReaderWriter.csproj" /> </ItemGroup> <ItemGroup> <ProjectReference Include="..\..\System.Data.Common\ref\System.Data.Common.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Data.SqlClient/ref/project.json b/src/System.Data.SqlClient/ref/project.json deleted file mode 100644 index 65f8bf867c..0000000000 --- a/src/System.Data.SqlClient/ref/project.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "dependencies": { - "System.ComponentModel.Primitives": "4.4.0-beta-24721-02", - "System.ComponentModel.TypeConverter": "4.4.0-beta-24721-02", - "System.Data.Common": "4.4.0-beta-24721-02", - "System.Globalization": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Runtime.Extensions": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02", - "System.Xml.ReaderWriter": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj b/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj index 4b27ecdf76..f5b932a78c 100644 --- a/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj +++ b/src/System.Data.SqlClient/src/System.Data.SqlClient.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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> @@ -164,8 +164,33 @@ <TargetingPackReference Include="System.Data" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Collections.Concurrent" /> + <Reference Include="System.Xml.ReaderWriter" /> + <Reference Include="System.Data.Common" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Threading.Tasks" /> + <Reference Include="System.Threading.Timer" /> + <Reference Include="System.Threading.ThreadPool" /> + <Reference Include="System.Threading.Thread" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Security.Principal.Windows" /> + <Reference Include="System.Text.RegularExpressions" /> + <Reference Include="System.Diagnostics.DiagnosticSource" /> + <Reference Include="System.Text.Encoding.Extensions" /> + <Reference Include="System.Text.Encoding.CodePages" /> + <Reference Include="System.Runtime.InteropServices.RuntimeInformation" /> + <Reference Include="System.ComponentModel.Primitives" /> + <Reference Include="System.Linq" /> + <Reference Include="Microsoft.Win32.Primitives" /> + <Reference Include="System.Security.Claims" /> + <Reference Include="System.Security.Principal" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <Import Project=".\GenerateThisAssemblyCs.targets" Condition="'$(IsPartialFacadeAssembly)' != 'true'" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Data.SqlClient/src/project.json b/src/System.Data.SqlClient/src/project.json deleted file mode 100644 index cbca367ba9..0000000000 --- a/src/System.Data.SqlClient/src/project.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.Win32.Primitives": "4.4.0-beta-24721-02", - "System.Collections": "4.4.0-beta-24721-02", - "System.Collections.Concurrent": "4.4.0-beta-24721-02", - "System.ComponentModel.Primitives": "4.4.0-beta-24721-02", - "System.ComponentModel.TypeConverter": "4.4.0-beta-24721-02", - "System.Data.Common": "4.4.0-beta-24721-02", - "System.Diagnostics.Debug": "4.4.0-beta-24721-02", - "System.Diagnostics.DiagnosticSource": "4.4.0-beta-24721-02", - "System.Diagnostics.Tools": "4.4.0-beta-24721-02", - "System.Globalization": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.IO.Pipes": "4.4.0-beta-24721-02", - "System.Linq": "4.4.0-beta-24721-02", - "System.Net.NameResolution": "4.4.0-beta-24721-02", - "System.Net.Primitives": "4.4.0-beta-24721-02", - "System.Net.Security": "4.4.0-beta-24721-02", - "System.Net.Sockets": "4.4.0-beta-24721-02", - "System.Reflection": "4.4.0-beta-24721-02", - "System.Reflection.TypeExtensions": "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.Runtime.Handles": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-beta-24721-02", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24721-02", - "System.Security.Principal": "4.4.0-beta-24721-02", - "System.Security.Principal.Windows": "4.4.0-beta-24721-02", - "System.Text.Encoding": "4.4.0-beta-24721-02", - "System.Text.Encoding.CodePages": "4.4.0-beta-24721-02", - "System.Text.Encoding.Extensions": "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", - "System.Threading.Thread": "4.4.0-beta-24721-02", - "System.Threading.ThreadPool": "4.4.0-beta-24721-02", - "System.Threading.Timer": "4.4.0-beta-24721-02", - "System.Xml.ReaderWriter": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - }, - "dependencies": {} -}
\ No newline at end of file diff --git a/src/System.Diagnostics.Contracts/ref/System.Diagnostics.Contracts.csproj b/src/System.Diagnostics.Contracts/ref/System.Diagnostics.Contracts.csproj index cc3ee90962..031315f69e 100644 --- a/src/System.Diagnostics.Contracts/ref/System.Diagnostics.Contracts.csproj +++ b/src/System.Diagnostics.Contracts/ref/System.Diagnostics.Contracts.csproj @@ -1,16 +1,11 @@ -<?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> - <AssemblyVersion>4.0.0.0</AssemblyVersion> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="System.Diagnostics.Contracts.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Diagnostics.Contracts/ref/project.json b/src/System.Diagnostics.Contracts/ref/project.json deleted file mode 100644 index e6c2196e0e..0000000000 --- a/src/System.Diagnostics.Contracts/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.3.0" - }, - "frameworks": { - "netstandard1.0": {} - } -}
\ No newline at end of file diff --git a/src/System.Diagnostics.Contracts/src/System.Diagnostics.Contracts.csproj b/src/System.Diagnostics.Contracts/src/System.Diagnostics.Contracts.csproj index 65f31b3089..7e2af22085 100644 --- a/src/System.Diagnostics.Contracts/src/System.Diagnostics.Contracts.csproj +++ b/src/System.Diagnostics.Contracts/src/System.Diagnostics.Contracts.csproj @@ -1,4 +1,4 @@ -<?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> @@ -16,7 +16,7 @@ <TargetingPackReference Include="System.Private.CoreLib" Condition="'$(TargetGroup)' != 'net46'" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Private.CoreLib" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Diagnostics.Contracts/src/project.json b/src/System.Diagnostics.Contracts/src/project.json deleted file mode 100644 index 978b08023c..0000000000 --- a/src/System.Diagnostics.Contracts/src/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "frameworks": { - "netstandard1.0": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24728-02" - } - }, - "netcore50": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24728-00" - } - } - } -} diff --git a/src/System.Diagnostics.Debug/ref/System.Diagnostics.Debug.csproj b/src/System.Diagnostics.Debug/ref/System.Diagnostics.Debug.csproj index fb434ca993..212acb98bf 100644 --- a/src/System.Diagnostics.Debug/ref/System.Diagnostics.Debug.csproj +++ b/src/System.Diagnostics.Debug/ref/System.Diagnostics.Debug.csproj @@ -1,15 +1,11 @@ -<?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> <ItemGroup> <Compile Include="System.Diagnostics.Debug.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Diagnostics.Debug/ref/project.json b/src/System.Diagnostics.Debug/ref/project.json deleted file mode 100644 index f9114842e3..0000000000 --- a/src/System.Diagnostics.Debug/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.3.0" - }, - "frameworks": { - "netstandard1.7": {} - } -}
\ No newline at end of file diff --git a/src/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj b/src/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj index d00de58f52..8f985f4439 100644 --- a/src/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj +++ b/src/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj @@ -1,4 +1,4 @@ -<?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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> @@ -93,7 +93,7 @@ <TargetingPackReference Include="System.Private.CoreLib" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Private.CoreLib" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Diagnostics.Debug/src/project.json b/src/System.Diagnostics.Debug/src/project.json deleted file mode 100644 index c4ac1854eb..0000000000 --- a/src/System.Diagnostics.Debug/src/project.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24728-02" - } - }, - "netcore50": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24728-00" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj b/src/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj index ec3b1770fb..d487bc5070 100644 --- a/src/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj +++ b/src/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj @@ -1,16 +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.0</NuGetTargetMoniker> <UseOpenKey Condition="'$(UseOpenKey)'==''">true</UseOpenKey> </PropertyGroup> <ItemGroup> <Compile Include="System.Diagnostics.DiagnosticSource.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Diagnostics.DiagnosticSource/ref/project.json b/src/System.Diagnostics.DiagnosticSource/ref/project.json deleted file mode 100644 index e6c2196e0e..0000000000 --- a/src/System.Diagnostics.DiagnosticSource/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.3.0" - }, - "frameworks": { - "netstandard1.0": {} - } -}
\ No newline at end of file diff --git a/src/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj b/src/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj index e611384d8d..96e17090c9 100644 --- a/src/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj +++ b/src/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj @@ -1,4 +1,4 @@ -<?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> @@ -34,7 +34,12 @@ </ItemGroup> <ItemGroup> <None Include="DiagnosticSourceUsersGuide.md" /> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Diagnostics.Tracing" /> + <Reference Include="System.Reflection" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Threading" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Diagnostics.DiagnosticSource/src/project.json b/src/System.Diagnostics.DiagnosticSource/src/project.json deleted file mode 100644 index b90239d01f..0000000000 --- a/src/System.Diagnostics.DiagnosticSource/src/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0", - "System.Reflection": "4.3.0", - "System.Collections": "4.3.0" - }, - "frameworks": { - "netstandard1.3": { - "dependencies": { - "System.Diagnostics.Tracing": "4.3.0" - } - }, - "netstandard1.1": { - "dependencies": { - "System.Diagnostics.Tracing": "4.3.0" - } - } - } -}
\ No newline at end of file diff --git a/src/System.Diagnostics.FileVersionInfo/ref/System.Diagnostics.FileVersionInfo.csproj b/src/System.Diagnostics.FileVersionInfo/ref/System.Diagnostics.FileVersionInfo.csproj index 4cd1327521..635be84c42 100644 --- a/src/System.Diagnostics.FileVersionInfo/ref/System.Diagnostics.FileVersionInfo.csproj +++ b/src/System.Diagnostics.FileVersionInfo/ref/System.Diagnostics.FileVersionInfo.csproj @@ -1,15 +1,11 @@ -<?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.3</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="System.Diagnostics.FileVersionInfo.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Diagnostics.FileVersionInfo/ref/project.json b/src/System.Diagnostics.FileVersionInfo/ref/project.json deleted file mode 100644 index 63a27a29be..0000000000 --- a/src/System.Diagnostics.FileVersionInfo/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.3.0" - }, - "frameworks": { - "netstandard1.3": {} - } -}
\ No newline at end of file diff --git a/src/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj b/src/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj index d750ad0478..02b1b3be11 100644 --- a/src/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj +++ b/src/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> @@ -56,7 +56,12 @@ <TargetingPackReference Include="System" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.IO.FileSystem" /> + <Reference Include="System.Globalization" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Diagnostics.Tools" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Diagnostics.FileVersionInfo/src/project.json b/src/System.Diagnostics.FileVersionInfo/src/project.json deleted file mode 100644 index d08f706d33..0000000000 --- a/src/System.Diagnostics.FileVersionInfo/src/project.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "frameworks": { - "netstandard1.3": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Reflection.Metadata": "1.4.1", - "System.Runtime": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "netcore50": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Diagnostics.Tools": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.ObjectModel": "4.3.0", - "System.Reflection.Metadata": "1.4.1", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.WindowsRuntime": "4.3.0" - } - }, - "net46": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -}
\ No newline at end of file diff --git a/src/System.Diagnostics.PerformanceCounter/ref/System.Diagnostics.PerformanceCounter.csproj b/src/System.Diagnostics.PerformanceCounter/ref/System.Diagnostics.PerformanceCounter.csproj index 41dc6ce88a..ab87307efe 100644 --- a/src/System.Diagnostics.PerformanceCounter/ref/System.Diagnostics.PerformanceCounter.csproj +++ b/src/System.Diagnostics.PerformanceCounter/ref/System.Diagnostics.PerformanceCounter.csproj @@ -1,15 +1,11 @@ -<?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.0</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="System.Diagnostics.PerformanceCounter.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Diagnostics.PerformanceCounter/ref/project.json b/src/System.Diagnostics.PerformanceCounter/ref/project.json deleted file mode 100644 index e6c2196e0e..0000000000 --- a/src/System.Diagnostics.PerformanceCounter/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.3.0" - }, - "frameworks": { - "netstandard1.0": {} - } -}
\ No newline at end of file diff --git a/src/System.Diagnostics.Process/ref/System.Diagnostics.Process.csproj b/src/System.Diagnostics.Process/ref/System.Diagnostics.Process.csproj index 85cbfbc2a8..730e3da36c 100644 --- a/src/System.Diagnostics.Process/ref/System.Diagnostics.Process.csproj +++ b/src/System.Diagnostics.Process/ref/System.Diagnostics.Process.csproj @@ -1,17 +1,22 @@ -<?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> - <!-- requires 5.5 since we needed surface area in Desktop 4.6.1 to support --> - <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="System.Diagnostics.Process.cs" /> <Compile Include="System.Diagnostics.Process.Manual.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.ComponentModel.Primitives\ref\System.ComponentModel.Primitives.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Handles\ref\System.Runtime.Handles.csproj" /> + <ProjectReference Include="..\..\System.Runtime.InteropServices\ref\System.Runtime.InteropServices.csproj" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> + <ProjectReference Include="..\..\System.Text.Encoding\ref\System.Text.Encoding.csproj" /> + <ProjectReference Include="..\..\System.Collections\ref\System.Collections.csproj" /> + <ProjectReference Include="..\..\System.Collections.NonGeneric\ref\System.Collections.NonGeneric.csproj" /> + <ProjectReference Include="..\..\System.Collections.Specialized\ref\System.Collections.Specialized.csproj" /> + <ProjectReference Include="..\..\System.Diagnostics.FileVersionInfo\ref\System.Diagnostics.FileVersionInfo.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Diagnostics.Process/ref/project.json b/src/System.Diagnostics.Process/ref/project.json deleted file mode 100644 index 26f6f46e9d..0000000000 --- a/src/System.Diagnostics.Process/ref/project.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "dependencies": { - "System.ComponentModel.Primitives": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Runtime.Extensions": "4.4.0-beta-24721-02", - "System.Runtime.Handles": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.Text.Encoding": "4.4.0-beta-24721-02", - "System.Collections": "4.4.0-beta-24721-02", - "System.Collections.NonGeneric": "4.4.0-beta-24721-02", - "System.Collections.Specialized": "4.4.0-beta-24721-02", - "System.Diagnostics.FileVersionInfo": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj b/src/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj index cf6551389e..a456de3610 100644 --- a/src/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj +++ b/src/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj @@ -1,4 +1,4 @@ -<?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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> @@ -360,7 +360,27 @@ <TargetingPackReference Include="System" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Collections.Specialized" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Threading.Tasks" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Threading.ThreadPool" /> + <Reference Include="System.ComponentModel.Primitives" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Diagnostics.FileVersionInfo" /> + <Reference Include="System.Collections.NonGeneric" /> + <Reference Include="Microsoft.Win32.Registry" /> + <Reference Include="System.Text.Encoding.Extensions" /> + <Reference Include="System.Threading" /> + <Reference Include="Microsoft.Win32.Primitives" /> + <Reference Include="System.IO.FileSystem" /> + <Reference Include="System.ComponentModel.TypeConverter" /> + <Reference Include="System.Threading.Thread" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Diagnostics.Process/src/project.json b/src/System.Diagnostics.Process/src/project.json deleted file mode 100644 index 2c8cb22e83..0000000000 --- a/src/System.Diagnostics.Process/src/project.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Runtime.Extensions": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Runtime.Handles": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.ComponentModel.Primitives": "4.4.0-beta-24721-02", - "System.IO.FileSystem": "4.4.0-beta-24721-02", - "System.Text.Encoding": "4.4.0-beta-24721-02", - "System.Diagnostics.FileVersionInfo": "4.4.0-beta-24721-02", - "System.Text.Encoding.Extensions": "4.4.0-beta-24721-02", - "System.Threading": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02", - "System.Threading.Thread": "4.4.0-beta-24721-02", - "System.Threading.ThreadPool": "4.4.0-beta-24721-02", - "System.Resources.ResourceManager": "4.4.0-beta-24721-02", - "System.Globalization": "4.4.0-beta-24721-02", - "System.Diagnostics.Contracts": "4.4.0-beta-24721-02", - "System.Diagnostics.Tools": "4.4.0-beta-24721-02", - "System.Diagnostics.Debug": "4.4.0-beta-24721-02", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24721-02", - "System.Collections": "4.4.0-beta-24721-02", - "System.Collections.Specialized": "4.4.0-beta-24721-02", - "Microsoft.Win32.Primitives": "4.4.0-beta-24721-02", - "System.ComponentModel.TypeConverter": "4.4.0-beta-24721-02", - "Microsoft.Win32.Registry": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.Diagnostics.StackTrace/ref/System.Diagnostics.StackTrace.csproj b/src/System.Diagnostics.StackTrace/ref/System.Diagnostics.StackTrace.csproj index cca9e8de7d..0c2f59d72e 100644 --- a/src/System.Diagnostics.StackTrace/ref/System.Diagnostics.StackTrace.csproj +++ b/src/System.Diagnostics.StackTrace/ref/System.Diagnostics.StackTrace.csproj @@ -1,16 +1,13 @@ -<?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 Condition="'$(TargetGroup)'==''">.NETStandard,Version=v1.7</NuGetTargetMoniker> - <PackageTargetFramework Condition="'$(TargetGroup)'==''">netstandard1.7;uap10.1</PackageTargetFramework> - </PropertyGroup> <ItemGroup> <Compile Include="System.Diagnostics.StackTrace.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" /> + <ProjectReference Include="..\..\System.Reflection\ref\System.Reflection.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Diagnostics.StackTrace/ref/project.json b/src/System.Diagnostics.StackTrace/ref/project.json deleted file mode 100644 index 5e6a9c92e3..0000000000 --- a/src/System.Diagnostics.StackTrace/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Runtime.Extensions": "4.4.0-beta-24721-02", - "System.Reflection": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj b/src/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj index 886947db68..66f4d71ede 100644 --- a/src/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj +++ b/src/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.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> @@ -46,8 +46,14 @@ <ItemGroup Condition="'$(TargetGroup)' == ''"> <Compile Include="System\Diagnostics\StackTraceSymbols.CoreCLR.cs" /> <ProjectReference Include="..\..\System.Collections\src\System.Collections.csproj" /> + <ProjectReference Include="..\..\System.Diagnostics.Debug\src\System.Diagnostics.Debug.csproj" /> <ProjectReference Include="..\..\System.IO\src\System.IO.csproj" /> + <ProjectReference Include="..\..\System.IO.FileSystem\src\System.IO.FileSystem.csproj" /> <ProjectReference Include="..\..\System.Runtime\src\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Extensions\src\System.Runtime.Extensions.csproj"> + </ProjectReference> + <ProjectReference Include="..\..\System.Reflection.Metadata\src\System.Reflection.Metadata.csproj" /> + <ProjectReference Include="..\..\System.Collections.Immutable\src\System.Collections.Immutable.csproj" /> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)'!='uap101aot'"> <Compile Include="System\Diagnostics\StackFrameExtensions.CoreCLR.cs" /> @@ -59,7 +65,7 @@ <Compile Include="System\Diagnostics\SymbolStore\ISymbolDocumentWriter.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Private.CoreLib" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Diagnostics.StackTrace/src/project.json b/src/System.Diagnostics.StackTrace/src/project.json deleted file mode 100644 index 86f1247fa1..0000000000 --- a/src/System.Diagnostics.StackTrace/src/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24728-02", - "System.IO.FileSystem": "4.4.0-beta-24721-02", - "System.Reflection.Metadata": "1.5.0-beta-24721-02" - } - }, - "uap10.1": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24728-00" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.Diagnostics.TextWriterTraceListener/ref/System.Diagnostics.TextWriterTraceListener.csproj b/src/System.Diagnostics.TextWriterTraceListener/ref/System.Diagnostics.TextWriterTraceListener.csproj index f31c0fb006..4bd4825a8b 100644 --- a/src/System.Diagnostics.TextWriterTraceListener/ref/System.Diagnostics.TextWriterTraceListener.csproj +++ b/src/System.Diagnostics.TextWriterTraceListener/ref/System.Diagnostics.TextWriterTraceListener.csproj @@ -1,15 +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> <ItemGroup> <Compile Include="System.Diagnostics.TextWriterTraceListener.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Diagnostics.TraceSource\ref\System.Diagnostics.TraceSource.csproj" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.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>
\ No newline at end of file +</Project> diff --git a/src/System.Diagnostics.TextWriterTraceListener/ref/project.json b/src/System.Diagnostics.TextWriterTraceListener/ref/project.json deleted file mode 100644 index a706988b3c..0000000000 --- a/src/System.Diagnostics.TextWriterTraceListener/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.Diagnostics.TraceSource": "4.4.0-beta-24721-02", - "System.IO": "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.Diagnostics.TextWriterTraceListener/src/System.Diagnostics.TextWriterTraceListener.csproj b/src/System.Diagnostics.TextWriterTraceListener/src/System.Diagnostics.TextWriterTraceListener.csproj index 7a39d67291..ec7fc9f5ae 100644 --- a/src/System.Diagnostics.TextWriterTraceListener/src/System.Diagnostics.TextWriterTraceListener.csproj +++ b/src/System.Diagnostics.TextWriterTraceListener/src/System.Diagnostics.TextWriterTraceListener.csproj @@ -1,4 +1,4 @@ -<?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> @@ -22,7 +22,12 @@ <TargetingPackReference Include="System" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Diagnostics.TraceSource" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Diagnostics.TextWriterTraceListener/src/project.json b/src/System.Diagnostics.TextWriterTraceListener/src/project.json deleted file mode 100644 index b59e9b616f..0000000000 --- a/src/System.Diagnostics.TextWriterTraceListener/src/project.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Diagnostics.Tools": "4.4.0-beta-24721-02", - "System.Diagnostics.TraceSource": "4.4.0-beta-24721-02", - "System.Globalization": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.Resources.ResourceManager": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Threading": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02", - "System.Runtime.Extensions": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -}
\ No newline at end of file diff --git a/src/System.Diagnostics.Tools/ref/System.Diagnostics.Tools.csproj b/src/System.Diagnostics.Tools/ref/System.Diagnostics.Tools.csproj index abc0e88268..389cc55ce7 100644 --- a/src/System.Diagnostics.Tools/ref/System.Diagnostics.Tools.csproj +++ b/src/System.Diagnostics.Tools/ref/System.Diagnostics.Tools.csproj @@ -1,15 +1,11 @@ -<?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> <ItemGroup> <Compile Include="System.Diagnostics.Tools.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Diagnostics.Tools/ref/project.json b/src/System.Diagnostics.Tools/ref/project.json deleted file mode 100644 index f9114842e3..0000000000 --- a/src/System.Diagnostics.Tools/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.3.0" - }, - "frameworks": { - "netstandard1.7": {} - } -}
\ No newline at end of file diff --git a/src/System.Diagnostics.Tools/src/System.Diagnostics.Tools.csproj b/src/System.Diagnostics.Tools/src/System.Diagnostics.Tools.csproj index b826e1c95d..01042fdfd5 100644 --- a/src/System.Diagnostics.Tools/src/System.Diagnostics.Tools.csproj +++ b/src/System.Diagnostics.Tools/src/System.Diagnostics.Tools.csproj @@ -1,4 +1,4 @@ -<?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> @@ -26,7 +26,7 @@ <Compile Include="System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Private.CoreLib" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Diagnostics.Tools/src/project.json b/src/System.Diagnostics.Tools/src/project.json deleted file mode 100644 index 8b642f3fbd..0000000000 --- a/src/System.Diagnostics.Tools/src/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24728-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Diagnostics.TraceSource/ref/System.Diagnostics.TraceSource.csproj b/src/System.Diagnostics.TraceSource/ref/System.Diagnostics.TraceSource.csproj index bcfc5230fd..abc4e0556f 100644 --- a/src/System.Diagnostics.TraceSource/ref/System.Diagnostics.TraceSource.csproj +++ b/src/System.Diagnostics.TraceSource/ref/System.Diagnostics.TraceSource.csproj @@ -1,16 +1,13 @@ -<?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> - <PackageTargetFramework Condition="'$(TargetGroup)'==''">netstandard1.7;uap10.1</PackageTargetFramework> - </PropertyGroup> <ItemGroup> <Compile Include="System.Diagnostics.TraceSource.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Collections.NonGeneric\ref\System.Collections.NonGeneric.csproj" /> + <ProjectReference Include="..\..\System.Collections.Specialized\ref\System.Collections.Specialized.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Diagnostics.TraceSource/ref/project.json b/src/System.Diagnostics.TraceSource/ref/project.json deleted file mode 100644 index 9b35086303..0000000000 --- a/src/System.Diagnostics.TraceSource/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Collections.NonGeneric": "4.4.0-beta-24721-02", - "System.Collections.Specialized": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj b/src/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj index 7cc88c9d15..beaeef837a 100644 --- a/src/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj +++ b/src/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj @@ -1,4 +1,4 @@ -<?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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> @@ -67,7 +67,16 @@ <TargetingPackReference Include="System" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Collections.NonGeneric" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Collections.Specialized" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Diagnostics.TraceSource/src/project.json b/src/System.Diagnostics.TraceSource/src/project.json deleted file mode 100644 index 9d863bce41..0000000000 --- a/src/System.Diagnostics.TraceSource/src/project.json +++ /dev/null @@ -1,27 +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.Collections.Specialized": "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.Globalization": "4.4.0-beta-24721-02", - "System.Resources.ResourceManager": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Reflection": "4.4.0-beta-24721-02", - "System.Runtime.Extensions": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices": "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.2": "1.0.1" - } - } - } -}
\ No newline at end of file diff --git a/src/System.Diagnostics.Tracing/ref/System.Diagnostics.Tracing.csproj b/src/System.Diagnostics.Tracing/ref/System.Diagnostics.Tracing.csproj index c325e72128..30f1c6ecb1 100644 --- a/src/System.Diagnostics.Tracing/ref/System.Diagnostics.Tracing.csproj +++ b/src/System.Diagnostics.Tracing/ref/System.Diagnostics.Tracing.csproj @@ -1,16 +1,14 @@ -<?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> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <ItemGroup> <Compile Include="System.Diagnostics.Tracing.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Diagnostics.Tracing/ref/project.json b/src/System.Diagnostics.Tracing/ref/project.json deleted file mode 100644 index 11f44fb8b7..0000000000 --- a/src/System.Diagnostics.Tracing/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Diagnostics.Tracing/src/System.Diagnostics.Tracing.csproj b/src/System.Diagnostics.Tracing/src/System.Diagnostics.Tracing.csproj index e3e0160dd4..bc8e6bc963 100644 --- a/src/System.Diagnostics.Tracing/src/System.Diagnostics.Tracing.csproj +++ b/src/System.Diagnostics.Tracing/src/System.Diagnostics.Tracing.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> @@ -105,7 +105,9 @@ <TargetingPackReference Include="System.Private.CoreLib" Condition="'$(TargetGroup)' != 'net463'" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Private.CoreLib" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Diagnostics.Tracing/src/project.json b/src/System.Diagnostics.Tracing/src/project.json deleted file mode 100644 index 56785d2eef..0000000000 --- a/src/System.Diagnostics.Tracing/src/project.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24728-02" - } - }, - "netcore50": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Contracts": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Globalization": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.Drawing.Primitives/ref/System.Drawing.Primitives.csproj b/src/System.Drawing.Primitives/ref/System.Drawing.Primitives.csproj index 897ad625b1..ee7e21ad11 100644 --- a/src/System.Drawing.Primitives/ref/System.Drawing.Primitives.csproj +++ b/src/System.Drawing.Primitives/ref/System.Drawing.Primitives.csproj @@ -1,15 +1,11 @@ -<?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> <ItemGroup> <Compile Include="System.Drawing.Primitives.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Drawing.Primitives/ref/project.json b/src/System.Drawing.Primitives/ref/project.json deleted file mode 100644 index 11f44fb8b7..0000000000 --- a/src/System.Drawing.Primitives/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj b/src/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj index 17f597a10b..707dbde332 100644 --- a/src/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj +++ b/src/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj @@ -1,4 +1,4 @@ -<?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> @@ -16,7 +16,13 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> <Compile Include="System\Drawing\Point.cs" /> diff --git a/src/System.Drawing.Primitives/src/project.json b/src/System.Drawing.Primitives/src/project.json deleted file mode 100644 index 61696a750b..0000000000 --- a/src/System.Drawing.Primitives/src/project.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Contracts": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Reflection": "4.4.0-beta-24721-02", - "System.Reflection.Primitives": "4.4.0-beta-24721-02", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0", - "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 diff --git a/src/System.Dynamic.Runtime/ref/System.Dynamic.Runtime.csproj b/src/System.Dynamic.Runtime/ref/System.Dynamic.Runtime.csproj index fbe50b4a94..f6a271ea71 100644 --- a/src/System.Dynamic.Runtime/ref/System.Dynamic.Runtime.csproj +++ b/src/System.Dynamic.Runtime/ref/System.Dynamic.Runtime.csproj @@ -1,15 +1,13 @@ -<?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> <ItemGroup> <Compile Include="System.Dynamic.Runtime.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.ObjectModel\ref\System.ObjectModel.csproj" /> + <ProjectReference Include="..\..\System.Linq.Expressions\ref\System.Linq.Expressions.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Dynamic.Runtime/ref/project.json b/src/System.Dynamic.Runtime/ref/project.json deleted file mode 100644 index 32ba8e3008..0000000000 --- a/src/System.Dynamic.Runtime/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.ObjectModel": "4.4.0-beta-24721-02", - "System.Linq.Expressions": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Dynamic.Runtime/src/System.Dynamic.Runtime.csproj b/src/System.Dynamic.Runtime/src/System.Dynamic.Runtime.csproj index 8557ca993b..8b94b6f582 100644 --- a/src/System.Dynamic.Runtime/src/System.Dynamic.Runtime.csproj +++ b/src/System.Dynamic.Runtime/src/System.Dynamic.Runtime.csproj @@ -1,4 +1,4 @@ -<?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> @@ -14,7 +14,8 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Linq.Expressions" /> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == 'net463'"> <TargetingPackReference Include="mscorlib" /> diff --git a/src/System.Dynamic.Runtime/src/project.json b/src/System.Dynamic.Runtime/src/project.json deleted file mode 100644 index 31ea57e850..0000000000 --- a/src/System.Dynamic.Runtime/src/project.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.ObjectModel": "4.4.0-beta-24721-02", - "System.Linq.Expressions": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Globalization.Calendars/ref/System.Globalization.Calendars.csproj b/src/System.Globalization.Calendars/ref/System.Globalization.Calendars.csproj index c2f4354d8e..68736474c3 100644 --- a/src/System.Globalization.Calendars/ref/System.Globalization.Calendars.csproj +++ b/src/System.Globalization.Calendars/ref/System.Globalization.Calendars.csproj @@ -1,19 +1,12 @@ -<?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> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="System.Globalization.Calendars.Forwards.cs" /> </ItemGroup> <ItemGroup> - <!-- Temporary till we publish System.Runtime updated package --> + <ProjectReference Include="..\..\System.Globalization\ref\System.Globalization.csproj" /> <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> - </ItemGroup> - <ItemGroup> - <None Include="project.json" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Globalization.Calendars/ref/project.json b/src/System.Globalization.Calendars/ref/project.json deleted file mode 100644 index 70e0be5554..0000000000 --- a/src/System.Globalization.Calendars/ref/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "System.Globalization": "4.3.0", - "System.Runtime": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -}
\ No newline at end of file diff --git a/src/System.Globalization.Calendars/src/System.Globalization.Calendars.csproj b/src/System.Globalization.Calendars/src/System.Globalization.Calendars.csproj index f60029928e..5caf3d4f4a 100644 --- a/src/System.Globalization.Calendars/src/System.Globalization.Calendars.csproj +++ b/src/System.Globalization.Calendars/src/System.Globalization.Calendars.csproj @@ -1,4 +1,4 @@ -<?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> @@ -16,7 +16,7 @@ <TargetingPackReference Include="System.Private.CoreLib" Condition="'$(TargetGroup)' != 'net463'" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Private.CoreLib" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Globalization.Calendars/src/project.json b/src/System.Globalization.Calendars/src/project.json deleted file mode 100644 index 8b642f3fbd..0000000000 --- a/src/System.Globalization.Calendars/src/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24728-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Globalization.Extensions/ref/System.Globalization.Extensions.csproj b/src/System.Globalization.Extensions/ref/System.Globalization.Extensions.csproj index 338ffe0168..c49bef8f71 100644 --- a/src/System.Globalization.Extensions/ref/System.Globalization.Extensions.csproj +++ b/src/System.Globalization.Extensions/ref/System.Globalization.Extensions.csproj @@ -1,21 +1,17 @@ -<?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> - <!-- copy to uap10.1 until nuget makes the change to map that to ns1.7 --> - <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.7;uap10.1</PackageTargetFramework> - </PropertyGroup> <ItemGroup> <Compile Include="System.Globalization.Extensions.Forwards.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" /> + <ProjectReference Include="..\..\System.Globalization\ref\System.Globalization.csproj" /> </ItemGroup> <ItemGroup> <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>
\ No newline at end of file +</Project> diff --git a/src/System.Globalization.Extensions/ref/project.json b/src/System.Globalization.Extensions/ref/project.json deleted file mode 100644 index b7a6f090eb..0000000000 --- a/src/System.Globalization.Extensions/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Runtime.Extensions": "4.4.0-beta-24721-02", - "System.Globalization": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj b/src/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj index 1aaa040fc1..5dfd5ca203 100644 --- a/src/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj +++ b/src/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj @@ -1,4 +1,4 @@ -<?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> @@ -14,8 +14,10 @@ <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> </PropertyGroup> <!-- Help VS understand available configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> <ItemGroup Condition="'$(TargetGroup)'=='net463'"> @@ -23,11 +25,13 @@ <TargetingPackReference Include="System" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\System.Runtime\pkg\System.Runtime.pkgproj" /> - <ProjectReference Include="..\..\System.Runtime.Extensions\pkg\System.Runtime.Extensions.pkgproj" /> - </ItemGroup> - <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Globalization.Extensions/src/project.json b/src/System.Globalization.Extensions/src/project.json deleted file mode 100644 index a841be13d4..0000000000 --- a/src/System.Globalization.Extensions/src/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "System.Diagnostics.Contracts": "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.Globalization": "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.Runtime.InteropServices": "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" - } - } - } -} diff --git a/src/System.Globalization/ref/System.Globalization.csproj b/src/System.Globalization/ref/System.Globalization.csproj index 5cc2afcb67..ef1223d59f 100644 --- a/src/System.Globalization/ref/System.Globalization.csproj +++ b/src/System.Globalization/ref/System.Globalization.csproj @@ -1,20 +1,11 @@ -<?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> - <PackageTargetFramework>netstandard1.7;uap10.1</PackageTargetFramework> - </PropertyGroup> - <ItemGroup> - <!-- Temporary till we publish System.Runtime updated package --> - <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> - </ItemGroup> <ItemGroup> <Compile Include="System.Globalization.Forwards.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Globalization/ref/project.json b/src/System.Globalization/ref/project.json deleted file mode 100644 index 11f44fb8b7..0000000000 --- a/src/System.Globalization/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Globalization/src/System.Globalization.csproj b/src/System.Globalization/src/System.Globalization.csproj index 35a07fbbcd..e97982d315 100644 --- a/src/System.Globalization/src/System.Globalization.csproj +++ b/src/System.Globalization/src/System.Globalization.csproj @@ -1,4 +1,4 @@ -<?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> @@ -19,7 +19,7 @@ <TargetingPackReference Include="System.Private.CoreLib" Condition="'$(TargetGroup)' != 'net463'" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Private.CoreLib" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Globalization/src/project.json b/src/System.Globalization/src/project.json deleted file mode 100644 index 33cd5e7d4c..0000000000 --- a/src/System.Globalization/src/project.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24728-02" - } - }, - "uap10.1": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24728-00" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.IO.Compression.ZipFile/ref/System.IO.Compression.ZipFile.csproj b/src/System.IO.Compression.ZipFile/ref/System.IO.Compression.ZipFile.csproj index 73880fe238..360c821172 100644 --- a/src/System.IO.Compression.ZipFile/ref/System.IO.Compression.ZipFile.csproj +++ b/src/System.IO.Compression.ZipFile/ref/System.IO.Compression.ZipFile.csproj @@ -1,16 +1,17 @@ -<?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> <UseECMAKey Condition="'$(UseECMAKey)' == ''">true</UseECMAKey> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> </PropertyGroup> <ItemGroup> <Compile Include="System.IO.Compression.ZipFile.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> + <ProjectReference Include="..\..\System.IO.Compression\ref\System.IO.Compression.csproj" /> + <ProjectReference Include="..\..\System.Text.Encoding\ref\System.Text.Encoding.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.IO.Compression.ZipFile/ref/project.json b/src/System.IO.Compression.ZipFile/ref/project.json deleted file mode 100644 index 8164b6f501..0000000000 --- a/src/System.IO.Compression.ZipFile/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.3.0", - "System.IO": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.Text.Encoding": "4.3.0" - }, - "frameworks": { - "netstandard1.3": {} - } -}
\ No newline at end of file diff --git a/src/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.csproj b/src/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.csproj index ee1b6f30ec..fe225e66b7 100644 --- a/src/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.csproj +++ b/src/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.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> @@ -26,7 +26,18 @@ <TargetingPackReference Include="System.IO.Compression.FileSystem" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.IO.FileSystem" /> + <Reference Include="System.IO.Compression" /> + <Reference Include="System.Text.Encoding" /> + <Reference Include="System.IO.FileSystem.Primitives" /> + <Reference Include="System.IO" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Buffers" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.IO.Compression.ZipFile/src/project.json b/src/System.IO.Compression.ZipFile/src/project.json deleted file mode 100644 index 50428e59b0..0000000000 --- a/src/System.IO.Compression.ZipFile/src/project.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "frameworks": { - "netstandard1.3": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Buffers": "4.3.0", - "System.Diagnostics.Contracts": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.IO": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Text.Encoding": "4.3.0" - } - }, - "net46": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -}
\ No newline at end of file diff --git a/src/System.IO.Compression/ref/4.1.0/project.json b/src/System.IO.Compression/ref/4.1.0/project.json deleted file mode 100644 index 9178939155..0000000000 --- a/src/System.IO.Compression/ref/4.1.0/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.IO.Compression": "4.3.0" - }, - "frameworks": { - "netstandard1.3": {} - } -}
\ No newline at end of file diff --git a/src/System.IO.Compression/ref/System.IO.Compression.csproj b/src/System.IO.Compression/ref/System.IO.Compression.csproj index 911c485abf..fd48b4b531 100644 --- a/src/System.IO.Compression/ref/System.IO.Compression.csproj +++ b/src/System.IO.Compression/ref/System.IO.Compression.csproj @@ -1,16 +1,17 @@ -<?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> <UseECMAKey>true</UseECMAKey> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <ItemGroup> <Compile Include="System.IO.Compression.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> + <ProjectReference Include="..\..\System.Text.Encoding\ref\System.Text.Encoding.csproj" /> + <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.IO.Compression/ref/project.json b/src/System.IO.Compression/ref/project.json deleted file mode 100644 index 2d8b7f677e..0000000000 --- a/src/System.IO.Compression/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.Text.Encoding": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.IO.Compression/src/System.IO.Compression.csproj b/src/System.IO.Compression/src/System.IO.Compression.csproj index 490a21617b..8d4574e76f 100644 --- a/src/System.IO.Compression/src/System.IO.Compression.csproj +++ b/src/System.IO.Compression/src/System.IO.Compression.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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> @@ -120,7 +120,21 @@ <TargetingPackReference Include="System.Runtime" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Threading.Tasks" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Buffers" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Tools" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Tools" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.IO.Compression/src/project.json b/src/System.IO.Compression/src/project.json deleted file mode 100644 index 236b2cc485..0000000000 --- a/src/System.IO.Compression/src/project.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "frameworks": { - "netstandard1.6": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Buffers": "4.3.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Contracts": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.IO": "4.4.0-beta-24721-02", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24721-02", - "System.Buffers": "4.3.0", - "System.Collections": "4.4.0-beta-24721-02", - "System.Diagnostics.Contracts": "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.IO": "4.4.0-beta-24721-02", - "System.Resources.ResourceManager": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Text.Encoding": "4.4.0-beta-24721-02", - "System.Runtime.Extensions": "4.4.0-beta-24721-02", - "System.Runtime.Handles": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Threading": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02" - } - }, - "netstandard1.3": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Buffers": "4.3.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Contracts": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "net46": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -}
\ No newline at end of file diff --git a/src/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj b/src/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj index 5a1934a83f..b79d22d017 100644 --- a/src/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj +++ b/src/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj @@ -1,15 +1,16 @@ -<?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.3</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="System.IO.FileSystem.AccessControl.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> + <ProjectReference Include="..\..\System.IO.FileSystem\ref\System.IO.FileSystem.csproj" /> + <ProjectReference Include="..\..\System.IO.FileSystem.Primitives\ref\System.IO.FileSystem.Primitives.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj" /> + <ProjectReference Include="..\..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.IO.FileSystem.AccessControl/ref/project.json b/src/System.IO.FileSystem.AccessControl/ref/project.json deleted file mode 100644 index a9c9e49440..0000000000 --- a/src/System.IO.FileSystem.AccessControl/ref/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "dependencies": { - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Security.AccessControl": "4.3.0", - "System.Security.Principal.Windows": "4.3.0" - }, - "frameworks": { - "netstandard1.3": {} - } -}
\ No newline at end of file diff --git a/src/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj b/src/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj index 2809a800ba..09488967d3 100644 --- a/src/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj +++ b/src/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.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"> <PropertyGroup> <OSGroup Condition="'$(OSGroup)' == ''">Windows_NT</OSGroup> @@ -32,5 +32,16 @@ <TargetingPackReference Include="mscorlib" /> <Compile Include="System\IO\FileSystemAclExtensions.net46.cs" /> </ItemGroup> + <ItemGroup> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.IO.FileSystem" /> + <Reference Include="System.Security.AccessControl" /> + <Reference Include="System.Security.Principal.Windows" /> + <Reference Include="System.Runtime.Handles" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Diagnostics.Contracts" /> + </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.IO.FileSystem.AccessControl/src/project.json b/src/System.IO.FileSystem.AccessControl/src/project.json deleted file mode 100644 index 10c9fe1755..0000000000 --- a/src/System.IO.FileSystem.AccessControl/src/project.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "frameworks": { - "netstandard1.3": { - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Contracts": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.AccessControl": "4.3.0", - "System.Security.Principal": "4.3.0", - "System.Security.Principal.Windows": "4.3.0" - } - }, - "net46": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -}
\ No newline at end of file diff --git a/src/System.IO.FileSystem.DriveInfo/ref/System.IO.FileSystem.DriveInfo.csproj b/src/System.IO.FileSystem.DriveInfo/ref/System.IO.FileSystem.DriveInfo.csproj index 21e44fabcd..ef3586a78d 100644 --- a/src/System.IO.FileSystem.DriveInfo/ref/System.IO.FileSystem.DriveInfo.csproj +++ b/src/System.IO.FileSystem.DriveInfo/ref/System.IO.FileSystem.DriveInfo.csproj @@ -1,15 +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> <ItemGroup> <Compile Include="System.IO.FileSystem.DriveInfo.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> + <ProjectReference Include="..\..\System.IO.FileSystem.Primitives\ref\System.IO.FileSystem.Primitives.csproj" /> + <ProjectReference Include="..\..\System.IO.FileSystem\ref\System.IO.FileSystem.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.IO.FileSystem.DriveInfo/ref/project.json b/src/System.IO.FileSystem.DriveInfo/ref/project.json deleted file mode 100644 index ca634e806e..0000000000 --- a/src/System.IO.FileSystem.DriveInfo/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24721-02", - "System.IO.FileSystem": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj b/src/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj index 387d40e53c..dec9eaa092 100644 --- a/src/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj +++ b/src/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj @@ -1,4 +1,4 @@ -<?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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> @@ -107,7 +107,15 @@ <TargetingPackReference Include="mscorlib" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.IO.FileSystem" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Threading.Tasks" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.IO.FileSystem.DriveInfo/src/project.json b/src/System.IO.FileSystem.DriveInfo/src/project.json deleted file mode 100644 index 2b7ff7317e..0000000000 --- a/src/System.IO.FileSystem.DriveInfo/src/project.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "System.Collections": "4.4.0-beta-24721-02", - "System.Diagnostics.Contracts": "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.IO": "4.4.0-beta-24721-02", - "System.IO.FileSystem": "4.4.0-beta-24721-02", - "System.IO.FileSystem.Primitives": "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.Runtime.InteropServices": "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" - } - } - } -} diff --git a/src/System.IO.FileSystem.Primitives/ref/System.IO.FileSystem.Primitives.csproj b/src/System.IO.FileSystem.Primitives/ref/System.IO.FileSystem.Primitives.csproj index 00ec92907c..fe9f9314f8 100644 --- a/src/System.IO.FileSystem.Primitives/ref/System.IO.FileSystem.Primitives.csproj +++ b/src/System.IO.FileSystem.Primitives/ref/System.IO.FileSystem.Primitives.csproj @@ -1,17 +1,11 @@ -<?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> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="System.IO.FileSystem.Primitives.cs" /> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.IO.FileSystem.Primitives/ref/project.json b/src/System.IO.FileSystem.Primitives/ref/project.json deleted file mode 100644 index 11f44fb8b7..0000000000 --- a/src/System.IO.FileSystem.Primitives/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.IO.FileSystem.Primitives/src/System.IO.FileSystem.Primitives.csproj b/src/System.IO.FileSystem.Primitives/src/System.IO.FileSystem.Primitives.csproj index 1e44b294f6..3d86d41c9c 100644 --- a/src/System.IO.FileSystem.Primitives/src/System.IO.FileSystem.Primitives.csproj +++ b/src/System.IO.FileSystem.Primitives/src/System.IO.FileSystem.Primitives.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> @@ -11,15 +11,11 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.7_Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' == ''"> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.Runtime\pkg\System.Runtime.pkgproj" /> - </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == 'net463'"> <TargetingPackReference Include="mscorlib" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.IO.FileSystem.Primitives/src/project.json b/src/System.IO.FileSystem.Primitives/src/project.json deleted file mode 100644 index f3df51085a..0000000000 --- a/src/System.IO.FileSystem.Primitives/src/project.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Runtime.Extensions": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.IO.FileSystem.Watcher/ref/System.IO.FileSystem.Watcher.csproj b/src/System.IO.FileSystem.Watcher/ref/System.IO.FileSystem.Watcher.csproj index 53f2f7d8a0..494e5671cf 100644 --- a/src/System.IO.FileSystem.Watcher/ref/System.IO.FileSystem.Watcher.csproj +++ b/src/System.IO.FileSystem.Watcher/ref/System.IO.FileSystem.Watcher.csproj @@ -1,15 +1,13 @@ -<?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> <ItemGroup> <Compile Include="System.IO.FileSystem.Watcher.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.ComponentModel.Primitives\ref\System.ComponentModel.Primitives.csproj" /> + <ProjectReference Include="..\..\System.ComponentModel.TypeConverter\ref\System.ComponentModel.TypeConverter.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.IO.FileSystem.Watcher/ref/project.json b/src/System.IO.FileSystem.Watcher/ref/project.json deleted file mode 100644 index 48193dc45d..0000000000 --- a/src/System.IO.FileSystem.Watcher/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.ComponentModel.Primitives": "4.4.0-beta-24721-02", - "System.ComponentModel.TypeConverter": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj b/src/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj index 6672167568..e33ffbb021 100644 --- a/src/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj +++ b/src/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> @@ -131,7 +131,20 @@ <TargetingPackReference Include="System" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Threading.Overlapped" /> + <Reference Include="System.ComponentModel.Primitives" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Threading.Tasks" /> + <Reference Include="System.IO.FileSystem" /> + <Reference Include="System.Threading" /> + <Reference Include="Microsoft.Win32.Primitives" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.ComponentModel" /> + <Reference Include="System.ComponentModel.TypeConverter" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.IO.FileSystem.Watcher/src/project.json b/src/System.IO.FileSystem.Watcher/src/project.json deleted file mode 100644 index ca1d8f6cda..0000000000 --- a/src/System.IO.FileSystem.Watcher/src/project.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.Win32.Primitives": "4.4.0-beta-24721-02", - "System.Collections": "4.4.0-beta-24721-02", - "System.ComponentModel.Primitives": "4.4.0-beta-24721-02", - "System.ComponentModel.TypeConverter": "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.IO": "4.4.0-beta-24721-02", - "System.IO.FileSystem": "4.4.0-beta-24721-02", - "System.IO.FileSystem.Primitives": "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.Runtime.Handles": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Threading": "4.4.0-beta-24721-02", - "System.Threading.Overlapped": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02", - "System.Threading.Thread": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -}
\ No newline at end of file diff --git a/src/System.IO.FileSystem/ref/System.IO.FileSystem.csproj b/src/System.IO.FileSystem/ref/System.IO.FileSystem.csproj index 3770bdd6e0..949503ef1f 100644 --- a/src/System.IO.FileSystem/ref/System.IO.FileSystem.csproj +++ b/src/System.IO.FileSystem/ref/System.IO.FileSystem.csproj @@ -1,23 +1,17 @@ -<?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> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="System.IO.FileSystem.cs" /> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> + </ItemGroup> + <ItemGroup> <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" /> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> + <ProjectReference Include="..\..\System.Runtime.Handles\ref\System.Runtime.Handles.csproj" /> <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> <ProjectReference Include="..\..\System.IO.FileSystem.Primitives\ref\System.IO.FileSystem.Primitives.csproj" /> - </ItemGroup> - <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Text.Encoding\ref\System.Text.Encoding.csproj" /> + <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.IO.FileSystem/ref/project.json b/src/System.IO.FileSystem/ref/project.json deleted file mode 100644 index 9537de8171..0000000000 --- a/src/System.IO.FileSystem/ref/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Runtime.Handles": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24721-02", - "System.Text.Encoding": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.IO.FileSystem/src/System.IO.FileSystem.csproj b/src/System.IO.FileSystem/src/System.IO.FileSystem.csproj index de90389d5a..68b58f956d 100644 --- a/src/System.IO.FileSystem/src/System.IO.FileSystem.csproj +++ b/src/System.IO.FileSystem/src/System.IO.FileSystem.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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'=='' AND '$(TargetGroup)' == ''">Windows_Debug</Configuration> @@ -20,10 +20,6 @@ <PropertyGroup Condition="'$(TargetsUnix)' == 'true'"> <NoWarn>$(NoWarn);414</NoWarn> </PropertyGroup> - <PropertyGroup Condition="'$(TargetsWindows)' == 'true' AND '$(TargetGroup)' == ''"> - <ProjectJson>win/project.json</ProjectJson> - <ProjectLockJson>win/project.lock.json</ProjectLockJson> - </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Release|AnyCPU'" /> @@ -384,15 +380,16 @@ <TargetingPackReference Include="mscorlib" /> </ItemGroup> <ItemGroup> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.IO\pkg\System.IO.pkgproj" /> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.Runtime\pkg\System.Runtime.pkgproj" /> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.Runtime.Extensions\pkg\System.Runtime.Extensions.pkgproj" /> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.IO.FileSystem.Primitives\pkg\System.IO.FileSystem.Primitives.pkgproj" /> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Threading.Overlapped" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Threading.Tasks" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.IO.FileSystem/src/netcore50/project.json b/src/System.IO.FileSystem/src/netcore50/project.json deleted file mode 100644 index bff1922f14..0000000000 --- a/src/System.IO.FileSystem/src/netcore50/project.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Buffers": "4.3.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Contracts": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.ObjectModel": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.WindowsRuntime": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Overlapped": "4.3.0", - "System.Threading.Tasks": "4.3.0" - }, - "frameworks": { - "netcore50": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24728-00", - "Microsoft.TargetingPack.Private.WinRT": "1.0.3", - "System.Globalization": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime.WindowsRuntime": "4.3.0" - } - } - } -} diff --git a/src/System.IO.FileSystem/src/project.json b/src/System.IO.FileSystem/src/project.json deleted file mode 100644 index 1d968e9b55..0000000000 --- a/src/System.IO.FileSystem/src/project.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Buffers": "4.3.0", - "System.Collections": "4.4.0-beta-24721-02", - "System.Diagnostics.Contracts": "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.IO": "4.4.0-beta-24721-02", - "System.IO.FileSystem.Primitives": "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.Runtime.Handles": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Text.Encoding": "4.4.0-beta-24721-02", - "System.Text.Encoding.Extensions": "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.2": "1.0.1" - } - } - } -}
\ No newline at end of file diff --git a/src/System.IO.FileSystem/src/win/project.json b/src/System.IO.FileSystem/src/win/project.json deleted file mode 100644 index 1f3567088d..0000000000 --- a/src/System.IO.FileSystem/src/win/project.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.4.0-beta-24721-02", - "System.Buffers": "4.4.0-beta-24721-02", - "System.Diagnostics.Contracts": "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.IO": "4.4.0-beta-24721-02", - "System.IO.FileSystem.Primitives": "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.Runtime.Handles": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Text.Encoding": "4.4.0-beta-24721-02", - "System.Text.Encoding.Extensions": "4.4.0-beta-24721-02", - "System.Threading": "4.4.0-beta-24721-02", - "System.Threading.Overlapped": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {}, - "netstandard1.3": {} - } -}
\ No newline at end of file diff --git a/src/System.IO.IsolatedStorage/ref/System.IO.IsolatedStorage.csproj b/src/System.IO.IsolatedStorage/ref/System.IO.IsolatedStorage.csproj index 2a119cb4e4..458229792e 100644 --- a/src/System.IO.IsolatedStorage/ref/System.IO.IsolatedStorage.csproj +++ b/src/System.IO.IsolatedStorage/ref/System.IO.IsolatedStorage.csproj @@ -1,28 +1,20 @@ -<?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> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> - <ProjectGuid>{27225772-FE8B-49D7-8E58-29242D536130}</ProjectGuid> - <PackageTargetFramework>netstandard1.7;uap10.1</PackageTargetFramework> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)' == 'Release'"> - <OutputPath>bin\Release\</OutputPath> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)' == 'Windows_Debug'"> - <OutputPath>bin\Windows_Debug\</OutputPath> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)' == 'Windows_Release'"> - <OutputPath>bin\Windows_Release\</OutputPath> - </PropertyGroup> <ItemGroup> <Compile Include="System.IO.IsolatedStorage.cs" /> </ItemGroup> <ItemGroup> - <None Include="4.0\project.json" /> - <None Include="4.0\System.IO.IsolatedStorage.depproj" /> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> + <ProjectReference Include="..\..\System.IO.FileSystem\ref\System.IO.FileSystem.csproj" /> + <ProjectReference Include="..\..\System.IO.FileSystem.Primitives\ref\System.IO.FileSystem.Primitives.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> + <ProjectReference Include="..\..\System.IO.FileSystem\ref\System.IO.FileSystem.csproj" /> + <ProjectReference Include="..\..\System.IO.FileSystem.Primitives\ref\System.IO.FileSystem.Primitives.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.IO.IsolatedStorage/ref/project.json b/src/System.IO.IsolatedStorage/ref/project.json deleted file mode 100644 index 182f990ffe..0000000000 --- a/src/System.IO.IsolatedStorage/ref/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "System.IO": "4.4.0-beta-24721-02", - "System.IO.FileSystem": "4.4.0-beta-24721-02", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj b/src/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj index 8032a0efa6..1f59e8b2cf 100644 --- a/src/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj +++ b/src/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'=='' and '$(TargetGroup)' == ''"> @@ -47,11 +47,24 @@ <TargetingPackReference Include="mscorlib" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Security.Cryptography.Algorithms" /> + <Reference Include="System.IO.FileSystem" /> + <Reference Include="System.IO.FileSystem.AccessControl" /> + <Reference Include="System.Linq" /> + <Reference Include="System.Security.Cryptography.Primitives" /> + <Reference Include="System.Runtime.InteropServices.RuntimeInformation" /> + <Reference Include="System.Security.AccessControl" /> + <Reference Include="System.Security.Principal.Windows" /> + <Reference Include="System.Diagnostics.Tools" /> <None Include="System.IO.IsolatedStorage.builds" /> </ItemGroup> <ItemGroup> <None Include="ApiCompatBaseline.txt" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.IO.IsolatedStorage/src/project.json b/src/System.IO.IsolatedStorage/src/project.json deleted file mode 100644 index f4cca83a49..0000000000 --- a/src/System.IO.IsolatedStorage/src/project.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "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.IO": "4.4.0-beta-24721-02", - "System.IO.FileSystem": "4.4.0-beta-24721-02", - "System.IO.FileSystem.AccessControl": "4.4.0-beta-24721-02", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24721-02", - "System.ObjectModel": "4.4.0-beta-24721-02", - "System.Linq": "4.4.0-beta-24721-02", - "System.Reflection": "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.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-beta-24721-02", - "System.Security.Cryptography.Algorithms": "4.4.0-beta-24721-02", - "System.Threading": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02" - } - }, - "uap10.1": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24728-00", - "Microsoft.TargetingPack.Private.WinRT": "1.0.3", - "System.Collections": "4.3.0", - "System.IO": "4.4.0-beta-24721-02", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.ObjectModel": "4.3.0", - "System.Linq": "4.3.0", - "System.Reflection": "4.4.0-beta-24721-02", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Runtime.Extensions": "4.4.0-beta-24721-02", - "System.Runtime.WindowsRuntime": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.4.0-beta-24721-02", - "System.Threading": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.3.0" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.IO.MemoryMappedFiles/ref/System.IO.MemoryMappedFiles.csproj b/src/System.IO.MemoryMappedFiles/ref/System.IO.MemoryMappedFiles.csproj index facef16407..138a8b18e7 100644 --- a/src/System.IO.MemoryMappedFiles/ref/System.IO.MemoryMappedFiles.csproj +++ b/src/System.IO.MemoryMappedFiles/ref/System.IO.MemoryMappedFiles.csproj @@ -1,15 +1,17 @@ -<?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> <ItemGroup> <Compile Include="System.IO.MemoryMappedFiles.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> + <ProjectReference Include="..\..\System.IO.FileSystem.Primitives\ref\System.IO.FileSystem.Primitives.csproj" /> + <ProjectReference Include="..\..\System.IO.FileSystem\ref\System.IO.FileSystem.csproj" /> + <ProjectReference Include="..\..\System.IO.UnmanagedMemoryStream\ref\System.IO.UnmanagedMemoryStream.csproj" /> + <ProjectReference Include="..\..\System.Runtime.InteropServices\ref\System.Runtime.InteropServices.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Handles\ref\System.Runtime.Handles.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.IO.MemoryMappedFiles/ref/project.json b/src/System.IO.MemoryMappedFiles/ref/project.json deleted file mode 100644 index 60e080c89e..0000000000 --- a/src/System.IO.MemoryMappedFiles/ref/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "dependencies": { - "System.IO": "4.4.0-beta-24721-02", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24721-02", - "System.IO.FileSystem": "4.4.0-beta-24721-02", - "System.IO.UnmanagedMemoryStream": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Runtime.Handles": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj b/src/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj index d726292fdd..65bbbfc99b 100644 --- a/src/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj +++ b/src/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> @@ -193,7 +193,15 @@ <TargetingPackReference Include="System.Core" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Threading.Tasks" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.IO.FileSystem" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.IO.MemoryMappedFiles/src/project.json b/src/System.IO.MemoryMappedFiles/src/project.json deleted file mode 100644 index b9751ab12d..0000000000 --- a/src/System.IO.MemoryMappedFiles/src/project.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Diagnostics.Debug": "4.4.0-beta-24721-02", - "System.Diagnostics.Tools": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.IO.FileSystem": "4.4.0-beta-24721-02", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24721-02", - "System.IO.UnmanagedMemoryStream": "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.Runtime.Handles": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices": "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.2": "1.0.1" - } - } - } -}
\ No newline at end of file diff --git a/src/System.IO.Packaging/ref/System.IO.Packaging.csproj b/src/System.IO.Packaging/ref/System.IO.Packaging.csproj index d5b9af1069..3acede6833 100644 --- a/src/System.IO.Packaging/ref/System.IO.Packaging.csproj +++ b/src/System.IO.Packaging/ref/System.IO.Packaging.csproj @@ -1,15 +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.3</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="System.IO.Packaging.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Collections\ref\System.Collections.csproj" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> + <ProjectReference Include="..\..\System.IO.FileSystem.Primitives\ref\System.IO.FileSystem.Primitives.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.IO.Packaging/ref/project.json b/src/System.IO.Packaging/ref/project.json deleted file mode 100644 index f0a4715718..0000000000 --- a/src/System.IO.Packaging/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.Collections": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - }, - "frameworks": { - "netstandard1.3": {} - } -}
\ No newline at end of file diff --git a/src/System.IO.Packaging/src/System.IO.Packaging.csproj b/src/System.IO.Packaging/src/System.IO.Packaging.csproj index 3274462331..116c44a91a 100644 --- a/src/System.IO.Packaging/src/System.IO.Packaging.csproj +++ b/src/System.IO.Packaging/src/System.IO.Packaging.csproj @@ -1,4 +1,4 @@ -<?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> @@ -15,7 +15,18 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Release|AnyCPU'" /> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Collections" /> + <Reference Include="System.IO" /> + <Reference Include="System.Xml.ReaderWriter" /> + <Reference Include="System.IO.FileSystem.Primitives" /> + <Reference Include="System.IO.FileSystem" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.IO.Compression" /> + <Reference Include="System.Text.Encoding" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Globalization" /> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)'==''"> <Compile Include="System\IO\Packaging\CompressionOption.cs" /> @@ -50,4 +61,4 @@ <TargetingPackReference Include="WindowsBase" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.IO.Packaging/src/project.json b/src/System.IO.Packaging/src/project.json deleted file mode 100644 index 69c92d0834..0000000000 --- a/src/System.IO.Packaging/src/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "frameworks": { - "netstandard1.3": { - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0" - } - }, - "net46": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -}
\ No newline at end of file diff --git a/src/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.csproj b/src/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.csproj index d9a92d34d7..db47a219ee 100644 --- a/src/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.csproj +++ b/src/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.csproj @@ -1,15 +1,16 @@ -<?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.3</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="System.IO.Pipes.AccessControl.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.IO.Pipes\ref\System.IO.Pipes.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Handles\ref\System.Runtime.Handles.csproj" /> + <ProjectReference Include="..\..\System.Runtime.InteropServices\ref\System.Runtime.InteropServices.csproj" /> + <ProjectReference Include="..\..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj" /> + <ProjectReference Include="..\..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.IO.Pipes.AccessControl/ref/project.json b/src/System.IO.Pipes.AccessControl/ref/project.json deleted file mode 100644 index 8d7b23bf71..0000000000 --- a/src/System.IO.Pipes.AccessControl/ref/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "dependencies": { - "System.IO.Pipes": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.AccessControl": "4.3.0", - "System.Security.Principal.Windows": "4.3.0" - }, - "frameworks": { - "netstandard1.3": {} - } -}
\ No newline at end of file diff --git a/src/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj b/src/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj index 04156949f8..b3562e27fe 100644 --- a/src/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj +++ b/src/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'=='' AND '$(TargetGroup)' == ''">Windows_Debug</Configuration> @@ -30,7 +30,12 @@ <Compile Include="System\IO\PipesAclExtensions.net46.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Security.AccessControl" /> + <Reference Include="System.IO.Pipes" /> + <Reference Include="System.Security.Principal.Windows" /> + <Reference Include="System.Runtime.Handles" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.IO.Pipes.AccessControl/src/project.json b/src/System.IO.Pipes.AccessControl/src/project.json deleted file mode 100644 index 0e8334f947..0000000000 --- a/src/System.IO.Pipes.AccessControl/src/project.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "frameworks": { - "netstandard1.3": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.IO.Pipes": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Security.AccessControl": "4.3.0", - "System.Security.Principal.Windows": "4.3.0" - } - }, - "net46": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -}
\ No newline at end of file diff --git a/src/System.IO.Pipes/ref/System.IO.Pipes.csproj b/src/System.IO.Pipes/ref/System.IO.Pipes.csproj index 46997c419b..0cb825bf3f 100644 --- a/src/System.IO.Pipes/ref/System.IO.Pipes.csproj +++ b/src/System.IO.Pipes/ref/System.IO.Pipes.csproj @@ -1,16 +1,16 @@ -<?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> <ItemGroup> <Compile Include="System.IO.Pipes.cs" /> <Compile Include="System.IO.Pipes.Manual.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Handles\ref\System.Runtime.Handles.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Security.Principal\ref\System.Security.Principal.csproj" /> + <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.IO.Pipes/ref/project.json b/src/System.IO.Pipes/ref/project.json deleted file mode 100644 index e1d46dffe9..0000000000 --- a/src/System.IO.Pipes/ref/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "System.IO": "4.4.0-beta-24721-02", - "System.Runtime.Handles": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Security.Principal": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.IO.Pipes/src/System.IO.Pipes.csproj b/src/System.IO.Pipes/src/System.IO.Pipes.csproj index fea322e90d..a497c6c838 100644 --- a/src/System.IO.Pipes/src/System.IO.Pipes.csproj +++ b/src/System.IO.Pipes/src/System.IO.Pipes.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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> @@ -247,7 +247,17 @@ <TargetingPackReference Include="System.Core" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Threading.Overlapped" /> + <Reference Include="System.Security.Principal" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Threading.Tasks" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.IO.Pipes/src/project.json b/src/System.IO.Pipes/src/project.json deleted file mode 100644 index dc54fcd5e4..0000000000 --- a/src/System.IO.Pipes/src/project.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.Win32.Primitives": "4.4.0-beta-24721-02", - "System.Buffers": "4.4.0-beta-24721-02", - "System.Diagnostics.Contracts": "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.IO": "4.4.0-beta-24721-02", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24721-02", - "System.Net.Primitives": "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.Runtime.Handles": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Security.Principal": "4.4.0-beta-24721-02", - "System.Security.Permissions": "4.4.0-beta-24721-02", - "System.Threading": "4.4.0-beta-24721-02", - "System.Threading.Overlapped": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -}
\ No newline at end of file diff --git a/src/System.IO.UnmanagedMemoryStream/ref/System.IO.UnmanagedMemoryStream.csproj b/src/System.IO.UnmanagedMemoryStream/ref/System.IO.UnmanagedMemoryStream.csproj index f9b6793f9e..2c4999b05c 100644 --- a/src/System.IO.UnmanagedMemoryStream/ref/System.IO.UnmanagedMemoryStream.csproj +++ b/src/System.IO.UnmanagedMemoryStream/ref/System.IO.UnmanagedMemoryStream.csproj @@ -1,16 +1,15 @@ -<?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> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <ItemGroup> <Compile Include="System.IO.UnmanagedMemoryStream.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime.InteropServices\ref\System.Runtime.InteropServices.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.IO.UnmanagedMemoryStream/ref/project.json b/src/System.IO.UnmanagedMemoryStream/ref/project.json deleted file mode 100644 index d4acb6dda4..0000000000 --- a/src/System.IO.UnmanagedMemoryStream/ref/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "System.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.IO.UnmanagedMemoryStream/src/System.IO.UnmanagedMemoryStream.csproj b/src/System.IO.UnmanagedMemoryStream/src/System.IO.UnmanagedMemoryStream.csproj index 553b8363ff..1c26ba9664 100644 --- a/src/System.IO.UnmanagedMemoryStream/src/System.IO.UnmanagedMemoryStream.csproj +++ b/src/System.IO.UnmanagedMemoryStream/src/System.IO.UnmanagedMemoryStream.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> @@ -19,7 +19,7 @@ <TargetingPackReference Include="mscorlib" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Private.CoreLib" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.IO.UnmanagedMemoryStream/src/project.json b/src/System.IO.UnmanagedMemoryStream/src/project.json deleted file mode 100644 index 8b642f3fbd..0000000000 --- a/src/System.IO.UnmanagedMemoryStream/src/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24728-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.IO/ref/System.IO.csproj b/src/System.IO/ref/System.IO.csproj index 09a2972c44..b05e5599c5 100644 --- a/src/System.IO/ref/System.IO.csproj +++ b/src/System.IO/ref/System.IO.csproj @@ -1,21 +1,16 @@ -<?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 Condition="'$(TargetGroup)' == ''">.NETCoreApp,Version=v1.1</NuGetTargetMoniker> - <PackageTargetFramework Condition="'$(TargetGroup)'=='netstandard1.7'">netstandard1.7;uap10.1</PackageTargetFramework> <DefineConstants Condition="'$(TargetGroup)' == ''">$(DefineConstants);netcoreapp11</DefineConstants> </PropertyGroup> <ItemGroup> <Compile Include="System.IO.Manual.cs" /> </ItemGroup> <ItemGroup> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" /> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Text.Encoding\ref\System.Text.Encoding.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.IO/ref/project.json b/src/System.IO/ref/project.json deleted file mode 100644 index 5d73e29955..0000000000 --- a/src/System.IO/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Text.Encoding": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {}, - "netcoreapp1.1": {} - } -} diff --git a/src/System.IO/src/System.IO.csproj b/src/System.IO/src/System.IO.csproj index cdc6f616a0..2ceb447328 100644 --- a/src/System.IO/src/System.IO.csproj +++ b/src/System.IO/src/System.IO.csproj @@ -1,18 +1,22 @@ -<?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> <AssemblyName>System.IO</AssemblyName> <ProjectGuid>{07390899-C8F6-4e83-A3A9-6867B8CB46A0}</ProjectGuid> + <AssemblyVersion Condition="'$(TargetGroup)' == 'net462'">4.1.0.0</AssemblyVersion> + <ContractProject Condition="'$(AssemblyVersion)' == '4.1.0.0'">..\ref\4.1\System.IO.depproj</ContractProject> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.7;uap10.1</PackageTargetFramework> <DefineConstants Condition="'$(TargetGroup)'==''">$(DefineConstants);netstandard17</DefineConstants> - <NoWarn Condition="'$(TargetGroup)' != 'net463'">CS0436</NoWarn> + <NoWarn Condition="'$(TargetGroup)' != 'net462' and '$(TargetGroup)' != 'net463'">CS0436</NoWarn> </PropertyGroup> <!-- Default configurations to help VS understand the options --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net462_Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net462_Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap101aot_Debug|AnyCPU'" /> @@ -25,18 +29,13 @@ <TargetGroup>netstandard1.7</TargetGroup> </ContractProject> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.Runtime\pkg\System.Runtime.pkgproj" /> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.Runtime.Extensions\pkg\System.Runtime.Extensions.pkgproj" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == 'net463'"> + <ItemGroup Condition="'$(TargetGroup)' == 'net462' or '$(TargetGroup)' == 'net463'"> <TargetingPackReference Include="mscorlib" /> <TargetingPackReference Include="System" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Runtime.Extensions" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.IO/src/project.json b/src/System.IO/src/project.json deleted file mode 100644 index 951d58d045..0000000000 --- a/src/System.IO/src/project.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - }, - "uap10.1": { - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02" - } - } - } -} diff --git a/src/System.Json/src/System.Json.csproj b/src/System.Json/src/System.Json.csproj index 3565cc6cf5..c2a63347b8 100644 --- a/src/System.Json/src/System.Json.csproj +++ b/src/System.Json/src/System.Json.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> @@ -24,7 +24,15 @@ <Compile Include="System\Json\JavaScriptReader.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.IO" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Linq" /> + <Reference Include="System.Globalization" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Text.Encoding" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Json/src/project.json b/src/System.Json/src/project.json deleted file mode 100644 index d56fc02746..0000000000 --- a/src/System.Json/src/project.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "frameworks": { - "netstandard1.0": { - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.IO": "4.3.0", - "System.Linq": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0" - } - } - } -}
\ No newline at end of file diff --git a/src/System.Linq.Expressions/ref/System.Linq.Expressions.csproj b/src/System.Linq.Expressions/ref/System.Linq.Expressions.csproj index 44023a1a76..d74a38084e 100644 --- a/src/System.Linq.Expressions/ref/System.Linq.Expressions.csproj +++ b/src/System.Linq.Expressions/ref/System.Linq.Expressions.csproj @@ -1,15 +1,12 @@ -<?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> <ItemGroup> <Compile Include="System.Linq.Expressions.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.ObjectModel\ref\System.ObjectModel.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Linq.Expressions/ref/project.json b/src/System.Linq.Expressions/ref/project.json deleted file mode 100644 index 4555256a7a..0000000000 --- a/src/System.Linq.Expressions/ref/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.ObjectModel": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Linq.Expressions/src/System.Linq.Expressions.csproj b/src/System.Linq.Expressions/src/System.Linq.Expressions.csproj index 4d91cd2465..9fd0bc58ea 100644 --- a/src/System.Linq.Expressions/src/System.Linq.Expressions.csproj +++ b/src/System.Linq.Expressions/src/System.Linq.Expressions.csproj @@ -1,4 +1,4 @@ -<?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> @@ -159,7 +159,23 @@ <Compile Include="System\Runtime\CompilerServices\RuntimeOps.RuntimeVariables.cs" /> <Compile Include="System\Runtime\CompilerServices\RuntimeOps.MergedRuntimeVariables.cs" /> <Compile Include="System\Runtime\CompilerServices\ReadOnlyCollectionBuilder.cs" /> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Reflection.Emit.ILGeneration" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Diagnostics.Tools" /> + <Reference Include="System.Reflection.Emit" /> + <Reference Include="System.ObjectModel" /> + <Reference Include="System.Reflection.Primitives" /> + <Reference Include="System.Reflection.Emit.Lightweight" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Linq" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Tools" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)'==''"> <Compile Include="System\Linq\Expressions\DynamicExpressionVisitor.cs" /> @@ -306,4 +322,4 @@ <TargetingPackReference Include="System.Core" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/ILGen.cs b/src/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/ILGen.cs index ee8b932ff4..4d40b6f26a 100644 --- a/src/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/ILGen.cs +++ b/src/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/ILGen.cs @@ -617,7 +617,7 @@ namespace System.Linq.Expressions.Compiler internal static bool ShouldLdtoken(Type t) { - return t.GetTypeInfo() is TypeBuilder || t.IsGenericParameter || t.GetTypeInfo().IsVisible; + return t is TypeBuilder || t.IsGenericParameter || t.GetTypeInfo().IsVisible; } internal static bool ShouldLdtoken(MethodBase mb) diff --git a/src/System.Linq.Expressions/src/project.json b/src/System.Linq.Expressions/src/project.json deleted file mode 100644 index 235680f430..0000000000 --- a/src/System.Linq.Expressions/src/project.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "frameworks": { - "netstandard1.6": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Contracts": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Linq": "4.3.0", - "System.ObjectModel": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24721-02", - "System.Collections": "4.4.0-beta-24721-02", - "System.Diagnostics.Contracts": "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.Globalization": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.Linq": "4.4.0-beta-24721-02", - "System.ObjectModel": "4.4.0-beta-24721-02", - "System.Reflection": "4.4.0-beta-24721-02", - "System.Reflection.Emit": "4.4.0-beta-24721-02", - "System.Reflection.Emit.ILGeneration": "4.4.0-beta-24721-02", - "System.Reflection.Emit.Lightweight": "4.4.0-beta-24721-02", - "System.Reflection.Extensions": "4.4.0-beta-24721-02", - "System.Reflection.Primitives": "4.4.0-beta-24721-02", - "System.Reflection.TypeExtensions": "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.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 diff --git a/src/System.Linq.Parallel/ref/System.Linq.Parallel.csproj b/src/System.Linq.Parallel/ref/System.Linq.Parallel.csproj index 84c0f43ef7..145f350afd 100644 --- a/src/System.Linq.Parallel/ref/System.Linq.Parallel.csproj +++ b/src/System.Linq.Parallel/ref/System.Linq.Parallel.csproj @@ -1,16 +1,15 @@ -<?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> - <AssemblyVersion>4.0.0.0</AssemblyVersion> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.1</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="System.Linq.Parallel.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Collections.Concurrent\ref\System.Collections.Concurrent.csproj" /> + <ProjectReference Include="..\..\System.Linq\ref\System.Linq.csproj" /> + <ProjectReference Include="..\..\System.Collections\ref\System.Collections.csproj" /> + <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Linq.Parallel/ref/project.json b/src/System.Linq.Parallel/ref/project.json deleted file mode 100644 index 511d28f393..0000000000 --- a/src/System.Linq.Parallel/ref/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Linq": "4.3.0", - "System.Collections": "4.3.0", - "System.Threading.Tasks": "4.3.0" - }, - "frameworks": { - "netstandard1.1": {} - } -}
\ No newline at end of file diff --git a/src/System.Linq.Parallel/src/System.Linq.Parallel.csproj b/src/System.Linq.Parallel/src/System.Linq.Parallel.csproj index a896cd5cc7..a2644ab25b 100644 --- a/src/System.Linq.Parallel/src/System.Linq.Parallel.csproj +++ b/src/System.Linq.Parallel/src/System.Linq.Parallel.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> @@ -160,7 +160,18 @@ <TargetingPackReference Include="System.Core" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Linq" /> + <Reference Include="System.Collections.Concurrent" /> + <Reference Include="System.Threading.Tasks" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Diagnostics.Tracing" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Linq.Parallel/src/project.json b/src/System.Linq.Parallel/src/project.json deleted file mode 100644 index 53a173f0b8..0000000000 --- a/src/System.Linq.Parallel/src/project.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "frameworks": { - "netstandard1.3": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Diagnostics.Contracts": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Linq": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "net46": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -}
\ No newline at end of file diff --git a/src/System.Linq.Queryable/ref/System.Linq.Queryable.csproj b/src/System.Linq.Queryable/ref/System.Linq.Queryable.csproj index fba5674d0f..5f458637c2 100644 --- a/src/System.Linq.Queryable/ref/System.Linq.Queryable.csproj +++ b/src/System.Linq.Queryable/ref/System.Linq.Queryable.csproj @@ -1,16 +1,13 @@ -<?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> - <AssemblyVersion>4.0.0.0</AssemblyVersion> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="System.Linq.Queryable.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Linq.Expressions\ref\System.Linq.Expressions.csproj" /> + <ProjectReference Include="..\..\System.Linq\ref\System.Linq.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Linq.Queryable/ref/project.json b/src/System.Linq.Queryable/ref/project.json deleted file mode 100644 index 020a75260a..0000000000 --- a/src/System.Linq.Queryable/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Linq.Expressions": "4.4.0-beta-24721-02", - "System.Linq": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Linq.Queryable/src/System.Linq.Queryable.csproj b/src/System.Linq.Queryable/src/System.Linq.Queryable.csproj index 0ed5b7e1af..7355b666d1 100644 --- a/src/System.Linq.Queryable/src/System.Linq.Queryable.csproj +++ b/src/System.Linq.Queryable/src/System.Linq.Queryable.csproj @@ -1,4 +1,4 @@ -<?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> @@ -29,7 +29,12 @@ <TargetingPackReference Include="System.Core" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Linq.Expressions" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Linq" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Linq.Queryable/src/project.json b/src/System.Linq.Queryable/src/project.json deleted file mode 100644 index 7cbc584492..0000000000 --- a/src/System.Linq.Queryable/src/project.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24721-02", - "System.Collections": "4.4.0-beta-24721-02", - "System.Diagnostics.Debug": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.Linq": "4.4.0-beta-24721-02", - "System.Linq.Expressions": "4.4.0-beta-24721-02", - "System.Reflection": "4.4.0-beta-24721-02", - "System.Reflection.Extensions": "4.4.0-beta-24721-02", - "System.Resources.ResourceManager": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Linq/ref/System.Linq.csproj b/src/System.Linq/ref/System.Linq.csproj index 33ceccf614..d15cf15906 100644 --- a/src/System.Linq/ref/System.Linq.csproj +++ b/src/System.Linq/ref/System.Linq.csproj @@ -1,17 +1,12 @@ -<?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> - <AssemblyVersion>4.2.0.0</AssemblyVersion> - <NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker> - <DefineConstants Condition="'$(TargetGroup)' == 'netcoreapp1.1'">$(DefineConstants);netcoreapp11</DefineConstants> - </PropertyGroup> <ItemGroup> <Compile Include="System.Linq.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Collections\ref\System.Collections.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Linq/ref/project.json b/src/System.Linq/ref/project.json deleted file mode 100644 index 4a94eef890..0000000000 --- a/src/System.Linq/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.3.0", - "System.Collections": "4.3.0" - }, - "frameworks": { - "netstandard1.6": {}, - "netcoreapp1.1": {} - } -} diff --git a/src/System.Linq/src/System.Linq.csproj b/src/System.Linq/src/System.Linq.csproj index 9dccbabf12..cfc0dad373 100644 --- a/src/System.Linq/src/System.Linq.csproj +++ b/src/System.Linq/src/System.Linq.csproj @@ -1,4 +1,4 @@ -<?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> @@ -89,7 +89,11 @@ <Folder Include="Resources\" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Runtime.Extensions" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Linq/src/project.json b/src/System.Linq/src/project.json deleted file mode 100644 index a75a911eda..0000000000 --- a/src/System.Linq/src/project.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "frameworks": { - "netstandard1.6": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.1": "1.0.1" - } - } - } -}
\ No newline at end of file diff --git a/src/System.Memory/ref/System.Memory.csproj b/src/System.Memory/ref/System.Memory.csproj index f1256bbb32..a3dffbfeb5 100644 --- a/src/System.Memory/ref/System.Memory.csproj +++ b/src/System.Memory/ref/System.Memory.csproj @@ -1,19 +1,16 @@ -<?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> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <OutputType>Library</OutputType> <CLSCompliant>false</CLSCompliant> - <AssemblyVersion>4.0.0.0</AssemblyVersion> - <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker> <ProjectGuid>{0EF9D369-7097-44F9-BEBA-C32AF5EB4756}</ProjectGuid> </PropertyGroup> <ItemGroup> <Compile Include="System.Memory.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Memory/ref/project.json b/src/System.Memory/ref/project.json deleted file mode 100644 index f06432e44d..0000000000 --- a/src/System.Memory/ref/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Runtime": "4.3.0" - }, - "frameworks": { - "netstandard1.0": {} - } -}
\ No newline at end of file diff --git a/src/System.Memory/src/System.Memory.csproj b/src/System.Memory/src/System.Memory.csproj index f313640b44..c013c2a7b5 100644 --- a/src/System.Memory/src/System.Memory.csproj +++ b/src/System.Memory/src/System.Memory.csproj @@ -1,4 +1,4 @@ -<?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> @@ -26,7 +26,11 @@ <TargetingPackReference Include="System.Private.CoreLib" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Reflection" /> + <Reference Include="System.Diagnostics.Debug" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Memory/src/project.json b/src/System.Memory/src/project.json deleted file mode 100644 index 374d416777..0000000000 --- a/src/System.Memory/src/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Reflection": "4.3.0", - "System.Runtime.CompilerServices.Unsafe": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.0": {} - } -}
\ No newline at end of file diff --git a/src/System.Net.Http.Rtc/ref/System.Net.Http.Rtc.csproj b/src/System.Net.Http.Rtc/ref/System.Net.Http.Rtc.csproj index 621fc26509..99ff7e09b7 100644 --- a/src/System.Net.Http.Rtc/ref/System.Net.Http.Rtc.csproj +++ b/src/System.Net.Http.Rtc/ref/System.Net.Http.Rtc.csproj @@ -1,15 +1,13 @@ -<?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.1</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="System.Net.Http.Rtc.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Net.Primitives\ref\System.Net.Primitives.csproj" /> + <ProjectReference Include="..\..\System.Net.Http\ref\System.Net.Http.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Net.Http.Rtc/ref/project.json b/src/System.Net.Http.Rtc/ref/project.json deleted file mode 100644 index bbd2bf5bb6..0000000000 --- a/src/System.Net.Http.Rtc/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Net.Http": "4.3.0" - }, - "frameworks": { - "netstandard1.1": {} - } -}
\ No newline at end of file diff --git a/src/System.Net.Http.Rtc/src/System.Net.Http.Rtc.csproj b/src/System.Net.Http.Rtc/src/System.Net.Http.Rtc.csproj.disabled index 0f19c4a7d4..0f19c4a7d4 100644 --- a/src/System.Net.Http.Rtc/src/System.Net.Http.Rtc.csproj +++ b/src/System.Net.Http.Rtc/src/System.Net.Http.Rtc.csproj.disabled diff --git a/src/System.Net.Http.WinHttpHandler/ref/System.Net.Http.WinHttpHandler.csproj b/src/System.Net.Http.WinHttpHandler/ref/System.Net.Http.WinHttpHandler.csproj index ffb90c4a0f..5f1380ee9b 100644 --- a/src/System.Net.Http.WinHttpHandler/ref/System.Net.Http.WinHttpHandler.csproj +++ b/src/System.Net.Http.WinHttpHandler/ref/System.Net.Http.WinHttpHandler.csproj @@ -1,15 +1,15 @@ -<?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.3</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="System.Net.Http.WinHttpHandler.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Net.Http\ref\System.Net.Http.csproj" /> + <ProjectReference Include="..\..\System.Net.Primitives\ref\System.Net.Primitives.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Security.Cryptography.X509Certificates\ref\System.Security.Cryptography.X509Certificates.csproj" /> + <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Net.Http.WinHttpHandler/ref/project.json b/src/System.Net.Http.WinHttpHandler/ref/project.json deleted file mode 100644 index fb93148896..0000000000 --- a/src/System.Net.Http.WinHttpHandler/ref/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "System.Net.Http": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Threading.Tasks": "4.3.0" - }, - "frameworks": { - "netstandard1.3": {} - } -}
\ No newline at end of file diff --git a/src/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj b/src/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj index a10831430b..168d8eb2f6 100644 --- a/src/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj +++ b/src/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj @@ -1,4 +1,4 @@ -<?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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> @@ -37,7 +37,25 @@ </Compile> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Collections.NonGeneric" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Security.Cryptography.X509Certificates" /> + <Reference Include="System.Runtime.Handles" /> + <Reference Include="System.IO" /> + <Reference Include="System.Threading.Tasks" /> + <Reference Include="System.Net.Primitives" /> + <Reference Include="System.Net.Http" /> + <Reference Include="System.Diagnostics.DiagnosticSource" /> + <Reference Include="Microsoft.Win32.Primitives" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Buffers" /> + <Reference Include="System.IO.Compression" /> + <Reference Include="System.Text.Encoding" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.msbuild b/src/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.msbuild index b3d345f053..b08b64e2c7 100644 --- a/src/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.msbuild +++ b/src/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.msbuild @@ -42,7 +42,6 @@ <CompileItem Include="$(MSBuildThisFileDirectory)\System\Net\Http\WinInetProxyHelper.cs" /> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' != 'net46'"> - <CompileItem Include="$(CommonPath)\Microsoft\Win32\SafeHandles\SafeHandleZeroOrMinusOneIsInvalid.cs" /> <CompileItem Include="$(CommonPath)\System\Net\HttpStatusDescription.cs" /> </ItemGroup> </Project> diff --git a/src/System.Net.Http.WinHttpHandler/src/project.json b/src/System.Net.Http.WinHttpHandler/src/project.json deleted file mode 100644 index 30d2835dd3..0000000000 --- a/src/System.Net.Http.WinHttpHandler/src/project.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.Win32.Primitives": "4.3.0", - "System.Buffers": "4.3.0", - "System.Collections": "4.3.0", - "System.Diagnostics.DiagnosticSource": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.Net.Http": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" - }, - "frameworks": { - "netstandard1.3": {} - } -}
\ No newline at end of file diff --git a/src/System.Net.Http/ref/System.Net.Http.csproj b/src/System.Net.Http/ref/System.Net.Http.csproj index 63a6153620..329f5c0126 100644 --- a/src/System.Net.Http/ref/System.Net.Http.csproj +++ b/src/System.Net.Http/ref/System.Net.Http.csproj @@ -1,19 +1,19 @@ -<?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 Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> - <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.7;uap10.1</PackageTargetFramework> - </PropertyGroup> <ItemGroup> <Compile Include="System.Net.Http.cs" /> </ItemGroup> - <ItemGroup> - <None Include="project.json" /> + <ItemGroup Condition="'$(TargetGroup)' == ''"> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> + <ProjectReference Include="..\..\System.Net.Primitives\ref\System.Net.Primitives.csproj" /> + <ProjectReference Include="..\..\System.Security.Cryptography.X509Certificates\ref\System.Security.Cryptography.X509Certificates.csproj" /> + <ProjectReference Include="..\..\System.Text.Encoding\ref\System.Text.Encoding.csproj" /> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == 'net46'"> <TargetingPackReference Include="System" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Net.Http/ref/project.json b/src/System.Net.Http/ref/project.json deleted file mode 100644 index 1d190094f9..0000000000 --- a/src/System.Net.Http/ref/project.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.Net.Primitives": "4.4.0-beta-24721-02", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24721-02", - "System.Text.Encoding": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {}, - "net46": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Net.Http/src/System.Net.Http.csproj b/src/System.Net.Http/src/System.Net.Http.csproj index 2ad34c90d0..910d19b7f9 100644 --- a/src/System.Net.Http/src/System.Net.Http.csproj +++ b/src/System.Net.Http/src/System.Net.Http.csproj @@ -1,4 +1,4 @@ -<?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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> @@ -360,7 +360,27 @@ <TargetingPackReference Include="System.Runtime" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Security.Cryptography.X509Certificates" /> + <Reference Include="System.Diagnostics.Tracing" /> + <Reference Include="System.Net.Primitives" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Collections.NonGeneric" /> + <Reference Include="System.Threading.Tasks" /> + <Reference Include="System.Diagnostics.DiagnosticSource" /> + <Reference Include="Microsoft.Win32.Primitives" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Buffers" /> + <Reference Include="System.IO.Compression" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Tools" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Net.Http/src/project.json b/src/System.Net.Http/src/project.json deleted file mode 100644 index 39064824d3..0000000000 --- a/src/System.Net.Http/src/project.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "dependencies": { - "System.Buffers": "4.4.0-beta-24721-02", - "System.Diagnostics.DiagnosticSource": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.Win32.Primitives": "4.4.0-beta-24721-02", - "System.Collections": "4.4.0-beta-24721-02", - "System.Diagnostics.Contracts": "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.Globalization": "4.4.0-beta-24721-02", - "System.Globalization.Extensions": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.IO.FileSystem": "4.4.0-beta-24721-02", - "System.IO.Compression": "4.4.0-beta-24721-02", - "System.Net.Primitives": "4.4.0-beta-24721-02", - "System.Resources.ResourceManager": "4.4.0-beta-24721-02", - "System.Runtime.Extensions": "4.4.0-beta-24721-02", - "System.Runtime.Handles": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Security.Cryptography.OpenSsl": "4.4.0-beta-24721-02", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24721-02", - "System.Text.Encoding": "4.4.0-beta-24721-02", - "System.Threading": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02" - } - }, - "uap10.1": { - "dependencies": { - "Microsoft.TargetingPack.Private.WinRT": "1.0.3", - "System.Collections": "4.4.0-beta-24721-02", - "System.Diagnostics.Contracts": "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.Globalization.Extensions": "4.4.0-beta-24721-02", - "System.Net.Primitives": "4.4.0-beta-24721-02", - "System.Resources.ResourceManager": "4.4.0-beta-24721-02", - "System.Runtime.Extensions": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Runtime.WindowsRuntime": "4.4.0-beta-24721-02", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24721-02", - "System.Text.Encoding.Extensions": "4.4.0-beta-24721-02", - "System.Threading": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02" - } - }, - "net46": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Net.HttpListener/ref/System.Net.HttpListener.csproj b/src/System.Net.HttpListener/ref/System.Net.HttpListener.csproj index 64222b5443..89c94ab838 100644 --- a/src/System.Net.HttpListener/ref/System.Net.HttpListener.csproj +++ b/src/System.Net.HttpListener/ref/System.Net.HttpListener.csproj @@ -1,17 +1,21 @@ -<?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.HttpListener.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\Microsoft.Win32.Primitives\ref\Microsoft.Win32.Primitives.csproj" /> + <ProjectReference Include="..\..\System.Collections.NonGeneric\ref\System.Collections.NonGeneric.csproj" /> + <ProjectReference Include="..\..\System.Collections.Specialized\ref\System.Collections.Specialized.csproj" /> + <ProjectReference Include="..\..\System.Net.Primitives\ref\System.Net.Primitives.csproj" /> + <ProjectReference Include="..\..\System.Net.WebHeaderCollection\ref\System.Net.WebHeaderCollection.csproj" /> + <ProjectReference Include="..\..\System.Net.WebSockets\ref\System.Net.WebSockets.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" /> + <ProjectReference Include="..\..\System.Security.Claims\ref\System.Security.Claims.csproj" /> + <ProjectReference Include="..\..\System.Security.Cryptography.X509Certificates\ref\System.Security.Cryptography.X509Certificates.csproj" /> + <ProjectReference Include="..\..\System.Security.Principal\ref\System.Security.Principal.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Net.HttpListener/ref/project.json b/src/System.Net.HttpListener/ref/project.json deleted file mode 100644 index 99f94f2661..0000000000 --- a/src/System.Net.HttpListener/ref/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "dependencies": { - "System.Collections.Specialized": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Net.Primitives": "4.4.0-beta-24721-02", - "System.Net.WebHeaderCollection": "4.4.0-beta-24721-02", - "System.Net.WebSockets": "4.4.0-beta-24721-02", - "System.Security.Claims": "4.4.0-beta-24721-02", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24721-02", - "System.Security.Principal": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02", - "Microsoft.Win32.Primitives": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": { - "imports": [ - "dotnet5.8" - ] - } - } -} diff --git a/src/System.Net.HttpListener/src/System.Net.HttpListener.csproj b/src/System.Net.HttpListener/src/System.Net.HttpListener.csproj index 0f41adddc5..5def2f7239 100644 --- a/src/System.Net.HttpListener/src/System.Net.HttpListener.csproj +++ b/src/System.Net.HttpListener/src/System.Net.HttpListener.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"> <PropertyGroup> <Configuration Condition="'$(Configuration)' == '' AND '$(TargetGroup)' == ''">Windows_Debug</Configuration> @@ -18,7 +18,34 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Net.Primitives" /> + <Reference Include="System.Threading.Overlapped" /> + <Reference Include="System.Net.WebHeaderCollection" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Net.Security" /> + <Reference Include="System.Security.Principal.Windows" /> + <Reference Include="Microsoft.Win32.Primitives" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Security.Claims" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Security.Principal" /> + <Reference Include="System.Security.Cryptography.X509Certificates" /> + <Reference Include="System.Collections.Specialized" /> + <Reference Include="System.Diagnostics.Tracing" /> + <Reference Include="System.Net.WebSockets" /> + <Reference Include="System.Threading.Tasks" /> + <Reference Include="System.Security.Cryptography.Algorithms" /> + <Reference Include="System.Threading.Timer" /> + <Reference Include="System.Net.Requests" /> + <Reference Include="System.Text.Encoding.Extensions" /> + <Reference Include="System.Net.NameResolution" /> + <Reference Include="System.Security.Cryptography.Primitives" /> + <Reference Include="System.Collections.NonGeneric" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> <Compile Include="System\Net\AuthenticationSchemeSelector.cs" /> @@ -186,4 +213,4 @@ <TargetingPackReference Include="System" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Net.HttpListener/src/project.json b/src/System.Net.HttpListener/src/project.json deleted file mode 100644 index 6f66c4e566..0000000000 --- a/src/System.Net.HttpListener/src/project.json +++ /dev/null @@ -1,47 +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.Collections.Specialized": "4.4.0-beta-24721-02", - "System.Diagnostics.Tools": "4.4.0-beta-24721-02", - "System.Diagnostics.Debug": "4.4.0-beta-24721-02", - "System.Diagnostics.Tracing": "4.4.0-beta-24721-02", - "System.Globalization": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Runtime.Extensions": "4.4.0-beta-24721-02", - "System.Net.NameResolution": "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.Security": "4.4.0-beta-24721-02", - "System.Net.WebHeaderCollection": "4.4.0-beta-24721-02", - "System.Net.WebSockets": "4.4.0-beta-24721-02", - "System.Resources.ResourceManager": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Security.Claims": "4.4.0-beta-24721-02", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24721-02", - "System.Security.Principal": "4.4.0-beta-24721-02", - "System.Security.Principal.Windows": "4.4.0-beta-24721-02", - "System.Text.Encoding": "4.4.0-beta-24721-02", - "System.Text.Encoding.Extensions": "4.4.0-beta-24721-02", - "System.Threading": "4.4.0-beta-24721-02", - "System.Threading.Overlapped": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02", - "System.Threading.ThreadPool": "4.4.0-beta-24721-02", - "System.Threading.Timer": "4.4.0-beta-24721-02", - "Microsoft.Win32.Primitives": "4.4.0-beta-24721-02" - }, - "imports": [ - "dotnet5.8" - ] - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -}
\ No newline at end of file diff --git a/src/System.Net.Mail/ref/System.Net.Mail.csproj b/src/System.Net.Mail/ref/System.Net.Mail.csproj index 538cbdcae4..986b2a9803 100644 --- a/src/System.Net.Mail/ref/System.Net.Mail.csproj +++ b/src/System.Net.Mail/ref/System.Net.Mail.csproj @@ -1,18 +1,20 @@ -<?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.Mime.cs" /> <Compile Include="System.Net.Mail.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.ComponentModel.EventBasedAsync\ref\System.ComponentModel.EventBasedAsync.csproj" /> + <ProjectReference Include="..\..\System.Net.Primitives\ref\System.Net.Primitives.csproj" /> + <ProjectReference Include="..\..\System.Net.ServicePoint\ref\System.Net.ServicePoint.csproj" /> + <ProjectReference Include="..\..\System.Collections.Specialized\ref\System.Collections.Specialized.csproj" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Security.Cryptography.X509Certificates\ref\System.Security.Cryptography.X509Certificates.csproj" /> + <ProjectReference Include="..\..\System.Text.Encoding\ref\System.Text.Encoding.csproj" /> + <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Net.Mail/ref/project.json b/src/System.Net.Mail/ref/project.json deleted file mode 100644 index 93d0e48f41..0000000000 --- a/src/System.Net.Mail/ref/project.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "dependencies": { - "System.ComponentModel.EventBasedAsync": "4.4.0-beta-24721-02", - "System.Net.Primitives": "4.4.0-beta-24721-02", - "System.Net.ServicePoint": "4.4.0-beta-24721-02", - "System.Collections.Specialized": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24721-02", - "System.Text.Encoding": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Net.Mail/src/System.Net.Mail.csproj b/src/System.Net.Mail/src/System.Net.Mail.csproj index 23269f8e69..563c2fc6c4 100644 --- a/src/System.Net.Mail/src/System.Net.Mail.csproj +++ b/src/System.Net.Mail/src/System.Net.Mail.csproj @@ -1,5 +1,8 @@ -<?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"> + <PropertyGroup> + <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{53D09AF4-0C13-4197-B8AD-9746F0374E88}</ProjectGuid> @@ -290,7 +293,33 @@ <TargetingPackReference Include="System" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Collections.Specialized" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Collections.NonGeneric" /> + <Reference Include="System.Threading.Tasks" /> + <Reference Include="System.Diagnostics.Tracing" /> + <Reference Include="System.Net.Primitives" /> + <Reference Include="System.Net.Sockets" /> + <Reference Include="System.Net.Security" /> + <Reference Include="System.Security.Cryptography.X509Certificates" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Security.Principal.Windows" /> + <Reference Include="System.Net.Requests" /> + <Reference Include="System.Globalization.Extensions" /> + <Reference Include="System.ComponentModel.EventBasedAsync" /> + <Reference Include="System.Threading.Timer" /> + <Reference Include="System.Net.ServicePoint" /> + <Reference Include="System.Security.Permissions" /> + <Reference Include="Microsoft.Win32.Primitives" /> + <Reference Include="System.Net.NetworkInformation" /> + <Reference Include="System.IO.FileSystem" /> + <Reference Include="System.Security.Claims" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Net.Mail/src/project.json b/src/System.Net.Mail/src/project.json deleted file mode 100644 index 130cabb888..0000000000 --- a/src/System.Net.Mail/src/project.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.4.0-beta-24721-02", - "System.Collections.Specialized": "4.4.0-beta-24721-02", - "System.ComponentModel.EventBasedAsync": "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.IO.FileSystem": "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.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.Security": "4.4.0-beta-24721-02", - "System.Net.ServicePoint": "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.Security.Cryptography.X509Certificates": "4.4.0-beta-24721-02", - "System.Security.Permissions": "4.4.0-beta-24721-02", - "System.Text.Encoding": "4.4.0-beta-24721-02", - "System.Threading": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02", - "System.Threading.Timer": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -}
\ No newline at end of file diff --git a/src/System.Net.NameResolution/ref/System.Net.NameResolution.csproj b/src/System.Net.NameResolution/ref/System.Net.NameResolution.csproj index 3c39f72798..19441db2e4 100644 --- a/src/System.Net.NameResolution/ref/System.Net.NameResolution.csproj +++ b/src/System.Net.NameResolution/ref/System.Net.NameResolution.csproj @@ -1,15 +1,13 @@ -<?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.3</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="System.Net.NameResolution.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Net.Primitives\ref\System.Net.Primitives.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Net.NameResolution/ref/project.json b/src/System.Net.NameResolution/ref/project.json deleted file mode 100644 index 9545fe9f9f..0000000000 --- a/src/System.Net.NameResolution/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Net.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading.Tasks": "4.3.0" - }, - "frameworks": { - "netstandard1.3": {} - } -}
\ No newline at end of file diff --git a/src/System.Net.NameResolution/src/System.Net.NameResolution.csproj b/src/System.Net.NameResolution/src/System.Net.NameResolution.csproj index 65e45579be..fc84bbec23 100644 --- a/src/System.Net.NameResolution/src/System.Net.NameResolution.csproj +++ b/src/System.Net.NameResolution/src/System.Net.NameResolution.csproj @@ -1,4 +1,4 @@ -<?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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> @@ -50,9 +50,6 @@ <Compile Include="$(CommonPath)\System\Net\LazyAsyncResult.cs"> <Link>Common\System\Net\LazyAsyncResult.cs</Link> </Compile> - <Compile Include="$(CommonPath)\System\Net\Shims\DBNull.cs"> - <Link>Common\System\Net\Shims\DBNull.cs</Link> - </Compile> <Compile Include="$(CommonPath)\System\Net\Sockets\ProtocolType.cs"> <Link>Common\System\Net\Sockets\ProtocolType.cs</Link> </Compile> @@ -72,10 +69,6 @@ <Compile Include="$(CommonPath)\System\Net\DebugSafeHandle.cs"> <Link>Common\System\Net\DebugSafeHandle.cs</Link> </Compile> - <!-- Common --> - <Compile Include="$(CommonPath)\Microsoft\Win32\SafeHandles\SafeHandleZeroOrMinusOneIsInvalid.cs"> - <Link>Common\Microsoft\Win32\SafeHandles\SafeHandleZeroOrMinusOneIsInvalid.cs</Link> - </Compile> <!-- System.Net.Internals --> <Compile Include="$(CommonPath)\System\Net\Internals\IPAddressExtensions.cs"> <Link>Common\System\Net\Internals\IPAddressExtensions.cs</Link> @@ -207,7 +200,22 @@ <TargetingPackReference Include="System" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Net.Primitives" /> + <Reference Include="System.Runtime.Handles" /> + <Reference Include="System.Threading.Tasks" /> + <Reference Include="System.Diagnostics.Tracing" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Security.Principal.Windows" /> + <Reference Include="System.Globalization" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Security.Claims" /> + <Reference Include="Microsoft.Win32.Primitives" /> + <Reference Include="System.Diagnostics.Contracts" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Net.NameResolution/src/project.json b/src/System.Net.NameResolution/src/project.json deleted file mode 100644 index 9571c76750..0000000000 --- a/src/System.Net.NameResolution/src/project.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "frameworks": { - "netstandard1.3": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Contracts": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Principal.Windows": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "net46": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -}
\ No newline at end of file diff --git a/src/System.Net.NetworkInformation/ref/System.Net.NetworkInformation.csproj b/src/System.Net.NetworkInformation/ref/System.Net.NetworkInformation.csproj index 4e30c23618..d35900e37a 100644 --- a/src/System.Net.NetworkInformation/ref/System.Net.NetworkInformation.csproj +++ b/src/System.Net.NetworkInformation/ref/System.Net.NetworkInformation.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> - <!-- copy to uap10.1 until nuget makes the change to map that to ns1.7 --> - <PackageTargetFramework>netstandard1.7;uap10.1</PackageTargetFramework> - </PropertyGroup> <ItemGroup> <Compile Include="System.Net.NetworkInformation.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\Microsoft.Win32.Primitives\ref\Microsoft.Win32.Primitives.csproj" /> + <ProjectReference Include="..\..\System.Net.Primitives\ref\System.Net.Primitives.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Net.NetworkInformation/ref/project.json b/src/System.Net.NetworkInformation/ref/project.json deleted file mode 100644 index 8e606ccc8e..0000000000 --- a/src/System.Net.NetworkInformation/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "Microsoft.Win32.Primitives": "4.4.0-beta-24721-02", - "System.Net.Primitives": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj b/src/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj index 2d211409ca..b6644eca13 100644 --- a/src/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj +++ b/src/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj @@ -1,4 +1,4 @@ -<?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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> @@ -387,7 +387,22 @@ </ProjectReference> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Net.Primitives" /> + <Reference Include="System.Net.Sockets" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Diagnostics.Tracing" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Security.Principal.Windows" /> + <Reference Include="System.Threading.Overlapped" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="Microsoft.Win32.Primitives" /> + <Reference Include="System.Threading.ThreadPool" /> + <Reference Include="System.Security.Claims" /> + <Reference Include="System.Diagnostics.Contracts" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Net.NetworkInformation/src/project.json b/src/System.Net.NetworkInformation/src/project.json deleted file mode 100644 index de37a178d6..0000000000 --- a/src/System.Net.NetworkInformation/src/project.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.Win32.Primitives": "4.4.0-beta-24721-02", - "System.Diagnostics.Contracts": "4.4.0-beta-24721-02", - "System.Diagnostics.Debug": "4.4.0-beta-24721-02", - "System.Diagnostics.Tracing": "4.4.0-beta-24721-02", - "System.IO.FileSystem": "4.4.0-beta-24721-02", - "System.Linq": "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.Extensions": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Security.Principal.Windows": "4.4.0-beta-24721-02", - "System.Threading": "4.4.0-beta-24721-02", - "System.Threading.Timer": "4.4.0-beta-24721-02", - "System.Threading.Thread": "4.4.0-beta-24721-02", - "System.Threading.ThreadPool": "4.4.0-beta-24721-02", - "System.Threading.Overlapped": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - }, - "uap10.1": { - "dependencies": { - "Microsoft.TargetingPack.Private.WinRT": "1.0.3", - "Microsoft.Win32.Primitives": "4.4.0-beta-24721-02", - "System.Diagnostics.Debug": "4.4.0-beta-24721-02", - "System.Diagnostics.Tracing": "4.4.0-beta-24721-02", - "System.Linq": "4.4.0-beta-24721-02", - "System.Net.Sockets": "4.4.0-beta-24721-02", - "System.Net.Primitives": "4.4.0-beta-24721-02", - "System.Resources.ResourceManager": "4.4.0-beta-24721-02", - "System.Runtime.Extensions": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices.WindowsRuntime": "4.4.0-beta-24721-02", - "System.Threading": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02" - } - } - } -} diff --git a/src/System.Net.Ping/ref/System.Net.Ping.csproj b/src/System.Net.Ping/ref/System.Net.Ping.csproj index ca3d39d0fc..1ad3fa2cbf 100644 --- a/src/System.Net.Ping/ref/System.Net.Ping.csproj +++ b/src/System.Net.Ping/ref/System.Net.Ping.csproj @@ -1,15 +1,15 @@ -<?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> <ItemGroup> <Compile Include="System.Net.Ping.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.ComponentModel.EventBasedAsync\ref\System.ComponentModel.EventBasedAsync.csproj" /> + <ProjectReference Include="..\..\System.ComponentModel.Primitives\ref\System.ComponentModel.Primitives.csproj" /> + <ProjectReference Include="..\..\System.Net.Primitives\ref\System.Net.Primitives.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Net.Ping/ref/project.json b/src/System.Net.Ping/ref/project.json deleted file mode 100644 index 02c73fdcd3..0000000000 --- a/src/System.Net.Ping/ref/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "System.ComponentModel.EventBasedAsync": "4.4.0-beta-24721-02", - "System.ComponentModel.Primitives": "4.4.0-beta-24721-02", - "System.Net.Primitives": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Net.Ping/src/System.Net.Ping.csproj b/src/System.Net.Ping/src/System.Net.Ping.csproj index cd3a5c45b0..89aab4483f 100644 --- a/src/System.Net.Ping/src/System.Net.Ping.csproj +++ b/src/System.Net.Ping/src/System.Net.Ping.csproj @@ -1,4 +1,4 @@ -<?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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> @@ -146,7 +146,20 @@ <TargetingPackReference Include="System" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Net.Primitives" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Diagnostics.Tracing" /> + <Reference Include="System.ComponentModel.Primitives" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Threading.ThreadPool" /> + <Reference Include="System.Threading.Tasks" /> + <Reference Include="System.ComponentModel.EventBasedAsync" /> + <Reference Include="System.Net.NameResolution" /> + <Reference Include="Microsoft.Win32.Primitives" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Net.Ping/src/project.json b/src/System.Net.Ping/src/project.json deleted file mode 100644 index 8db4913969..0000000000 --- a/src/System.Net.Ping/src/project.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.Win32.Primitives": "4.4.0-beta-24721-02", - "System.Collections": "4.4.0-beta-24721-02", - "System.ComponentModel.Primitives": "4.4.0-beta-24721-02", - "System.ComponentModel.EventBasedAsync": "4.4.0-beta-24721-02", - "System.Diagnostics.Debug": "4.4.0-beta-24721-02", - "System.Diagnostics.Process": "4.4.0-beta-24721-02", - "System.Diagnostics.Tracing": "4.4.0-beta-24721-02", - "System.Globalization": "4.4.0-beta-24721-02", - "System.IO.FileSystem": "4.4.0-beta-24721-02", - "System.Net.NameResolution": "4.4.0-beta-24721-02", - "System.Net.Primitives": "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.Runtime.Handles": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Threading": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02", - "System.Threading.ThreadPool": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -}
\ No newline at end of file diff --git a/src/System.Net.Primitives/ref/System.Net.Primitives.csproj b/src/System.Net.Primitives/ref/System.Net.Primitives.csproj index f7191f33b0..bfc1cf7f74 100644 --- a/src/System.Net.Primitives/ref/System.Net.Primitives.csproj +++ b/src/System.Net.Primitives/ref/System.Net.Primitives.csproj @@ -1,17 +1,13 @@ -<?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 Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> - <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.7;uap10.1</PackageTargetFramework> - <DefineConstants Condition="'$(TargetGroup)' == 'netcoreapp1.1'">$(DefineConstants);netcoreapp11</DefineConstants> - </PropertyGroup> <ItemGroup> <Compile Include="System.Net.Primitives.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\Microsoft.Win32.Primitives\ref\Microsoft.Win32.Primitives.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Handles\ref\System.Runtime.Handles.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Net.Primitives/ref/project.json b/src/System.Net.Primitives/ref/project.json deleted file mode 100644 index 4633947a19..0000000000 --- a/src/System.Net.Primitives/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "Microsoft.Win32.Primitives": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Runtime.Handles": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {}, - "netcoreapp1.1": {} - } -} diff --git a/src/System.Net.Primitives/src/System.Net.Primitives.csproj b/src/System.Net.Primitives/src/System.Net.Primitives.csproj index e5d34d4596..f75c1b1124 100644 --- a/src/System.Net.Primitives/src/System.Net.Primitives.csproj +++ b/src/System.Net.Primitives/src/System.Net.Primitives.csproj @@ -1,4 +1,4 @@ -<?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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> @@ -226,7 +226,17 @@ </ProjectReference> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Diagnostics.Tracing" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="Microsoft.Win32.Primitives" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Contracts" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Net.Primitives/src/project.json b/src/System.Net.Primitives/src/project.json deleted file mode 100644 index 307c380ac8..0000000000 --- a/src/System.Net.Primitives/src/project.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.Win32.Primitives": "4.4.0-beta-24721-02", - "System.Collections": "4.4.0-beta-24721-02", - "System.Diagnostics.Contracts": "4.4.0-beta-24721-02", - "System.Diagnostics.Debug": "4.4.0-beta-24721-02", - "System.Diagnostics.Tracing": "4.4.0-beta-24721-02", - "System.Globalization": "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.Runtime.Handles": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Threading": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02" - } - }, - "uap10.1": { - "dependencies": { - "Microsoft.TargetingPack.Private.WinRT": "1.0.3", - "Microsoft.Win32.Primitives": "4.4.0-beta-24721-02", - "System.Collections": "4.4.0-beta-24721-02", - "System.Diagnostics.Contracts": "4.4.0-beta-24721-02", - "System.Diagnostics.Debug": "4.4.0-beta-24721-02", - "System.Diagnostics.Tracing": "4.4.0-beta-24721-02", - "System.Globalization": "4.4.0-beta-24721-02", - "System.ObjectModel": "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.Runtime.Handles": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Runtime.WindowsRuntime": "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.2": "1.0.1" - } - } - } -} diff --git a/src/System.Net.Requests/ref/System.Net.Requests.csproj b/src/System.Net.Requests/ref/System.Net.Requests.csproj index 399b553515..9d5d660309 100644 --- a/src/System.Net.Requests/ref/System.Net.Requests.csproj +++ b/src/System.Net.Requests/ref/System.Net.Requests.csproj @@ -1,17 +1,21 @@ -<?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> - <AssemblyVersion>4.1.0.0</AssemblyVersion> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="System.Net.Requests.cs" /> <Compile Include="System.Net.Requests.Manual.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Collections.Specialized\ref\System.Collections.Specialized.csproj" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> + <ProjectReference Include="..\..\System.Net.Primitives\ref\System.Net.Primitives.csproj" /> + <ProjectReference Include="..\..\System.Net.Security\ref\System.Net.Security.csproj" /> + <ProjectReference Include="..\..\System.Net.ServicePoint\ref\System.Net.ServicePoint.csproj" /> + <ProjectReference Include="..\..\System.Net.WebHeaderCollection\ref\System.Net.WebHeaderCollection.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Security.Cryptography.X509Certificates\ref\System.Security.Cryptography.X509Certificates.csproj" /> + <ProjectReference Include="..\..\System.Security.Principal\ref\System.Security.Principal.csproj" /> + <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Net.Requests/ref/project.json b/src/System.Net.Requests/ref/project.json deleted file mode 100644 index a912bf81e5..0000000000 --- a/src/System.Net.Requests/ref/project.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "dependencies": { - "System.Collections.Specialized": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.Net.Primitives": "4.4.0-beta-24721-02", - "System.Net.Security": "4.4.0-beta-24721-02", - "System.Net.ServicePoint": "4.4.0-beta-24721-02", - "System.Net.WebHeaderCollection": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24721-02", - "System.Security.Principal": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Net.Requests/src/System.Net.Requests.csproj b/src/System.Net.Requests/src/System.Net.Requests.csproj index 3f61a0fed8..fc5642d370 100644 --- a/src/System.Net.Requests/src/System.Net.Requests.csproj +++ b/src/System.Net.Requests/src/System.Net.Requests.csproj @@ -1,4 +1,4 @@ -<?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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> @@ -122,9 +122,29 @@ <TargetingPackReference Include="System" /> </ItemGroup> <ItemGroup> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.Net.Primitives\pkg\System.Net.Primitives.pkgproj" /> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Collections.Specialized" /> + <Reference Include="System.Collections.NonGeneric" /> + <Reference Include="System.Net.Primitives" /> + <Reference Include="System.Net.WebHeaderCollection" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Net.Http" /> + <Reference Include="System.Net.ServicePoint" /> + <Reference Include="System.Threading.Tasks" /> + <Reference Include="System.Security.Cryptography.X509Certificates" /> + <Reference Include="System.Net.Security" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Security.Principal" /> + <Reference Include="System.Net.Sockets" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Diagnostics.Tracing" /> + <Reference Include="System.Security.Principal.Windows" /> + <Reference Include="System.Threading.Thread" /> + <Reference Include="System.Security.Claims" /> + <Reference Include="Microsoft.Win32.Primitives" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Net.Requests/src/project.json b/src/System.Net.Requests/src/project.json deleted file mode 100644 index ee17f1a830..0000000000 --- a/src/System.Net.Requests/src/project.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.Win32.Primitives": "4.4.0-beta-24721-02", - "System.Collections": "4.4.0-beta-24721-02", - "System.Collections.Concurrent": "4.4.0-beta-24721-02", - "System.Collections.NonGeneric": "4.4.0-beta-24721-02", - "System.Collections.Specialized": "4.4.0-beta-24721-02", - "System.Diagnostics.Debug": "4.4.0-beta-24721-02", - "System.Diagnostics.Tracing": "4.4.0-beta-24721-02", - "System.Globalization": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.IO.Compression": "4.4.0-beta-24721-02", - "System.IO.FileSystem": "4.4.0-beta-24721-02", - "System.Net.Http": "4.4.0-beta-24721-02", - "System.Net.Primitives": "4.4.0-beta-24721-02", - "System.Net.Security": "4.4.0-beta-24721-02", - "System.Net.Sockets": "4.4.0-beta-24721-02", - "System.Net.ServicePoint": "4.4.0-beta-24721-02", - "System.Net.WebHeaderCollection": "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.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Security.Principal": "4.4.0-beta-24721-02", - "System.Security.Principal.Windows": "4.4.0-beta-24721-02", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24721-02", - "System.Threading": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02", - "System.Threading.Thread": "4.4.0-beta-24721-02", - "System.Runtime.Serialization.Primitives": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -}
\ No newline at end of file diff --git a/src/System.Net.Security/ref/System.Net.Security.csproj b/src/System.Net.Security/ref/System.Net.Security.csproj index f6d6dc6a39..9d527af911 100644 --- a/src/System.Net.Security/ref/System.Net.Security.csproj +++ b/src/System.Net.Security/ref/System.Net.Security.csproj @@ -1,16 +1,21 @@ -<?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> - <DefineConstants Condition="'$(TargetGroup)' == 'netcoreapp1.1'">$(DefineConstants);netcoreapp11</DefineConstants> + <DefineConstants Condition="'$(TargetGroup)' == ''">$(DefineConstants);netcoreapp11</DefineConstants> </PropertyGroup> <ItemGroup> <Compile Include="System.Net.Security.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Collections.NonGeneric\ref\System.Collections.NonGeneric.csproj" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> + <ProjectReference Include="..\..\System.Net.Primitives\ref\System.Net.Primitives.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Handles\ref\System.Runtime.Handles.csproj" /> + <ProjectReference Include="..\..\System.Security.Cryptography.X509Certificates\ref\System.Security.Cryptography.X509Certificates.csproj" /> + <ProjectReference Include="..\..\System.Security.Principal\ref\System.Security.Principal.csproj" /> + <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Net.Security/ref/project.json b/src/System.Net.Security/ref/project.json deleted file mode 100644 index de89ad53cb..0000000000 --- a/src/System.Net.Security/ref/project.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "dependencies": { - "System.Collections.NonGeneric": "4.4.0-beta-24721-02", - "System.IO": "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.Handles": "4.4.0-beta-24721-02", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24721-02", - "System.Security.Principal": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {}, - "netcoreapp1.1": {} - } -} diff --git a/src/System.Net.Security/src/System.Net.Security.csproj b/src/System.Net.Security/src/System.Net.Security.csproj index 416e36522e..b380bba4fd 100644 --- a/src/System.Net.Security/src/System.Net.Security.csproj +++ b/src/System.Net.Security/src/System.Net.Security.csproj @@ -1,4 +1,4 @@ -<?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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> @@ -13,14 +13,6 @@ <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net463'">None</ResourcesSourceOutputDirectory> <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> - <PropertyGroup Condition=" '$(TargetsWindows)' == 'true' and '$(ProjectJson)' == '' "> - <ProjectJson>win/project.json</ProjectJson> - <ProjectLockJson>win/project.lock.json</ProjectLockJson> - </PropertyGroup> - <PropertyGroup Condition=" '$(TargetsUnix)' == 'true' and '$(ProjectJson)' == '' "> - <ProjectJson>unix/project.json</ProjectJson> - <ProjectLockJson>unix/project.lock.json</ProjectLockJson> - </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Release|AnyCPU'" /> @@ -374,5 +366,25 @@ <TargetingPackReference Include="mscorlib" /> <TargetingPackReference Include="System" /> </ItemGroup> + <ItemGroup> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Security.Cryptography.X509Certificates" /> + <Reference Include="System.Collections.Concurrent" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Diagnostics.Tracing" /> + <Reference Include="System.Net.Primitives" /> + <Reference Include="System.Collections.NonGeneric" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Security.Principal.Windows" /> + <Reference Include="System.Security.Cryptography.Encoding" /> + <Reference Include="Microsoft.Win32.Primitives" /> + <Reference Include="System.Security.Principal" /> + <Reference Include="System.Threading.ThreadPool" /> + <Reference Include="System.Security.Claims" /> + </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Net.Security/src/unix/project.json b/src/System.Net.Security/src/unix/project.json deleted file mode 100644 index 85fe5ff08e..0000000000 --- a/src/System.Net.Security/src/unix/project.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.Win32.Primitives": "4.4.0-beta-24721-02", - "System.Collections": "4.4.0-beta-24721-02", - "System.Collections.Concurrent": "4.4.0-beta-24721-02", - "System.Collections.NonGeneric": "4.4.0-beta-24721-02", - "System.Diagnostics.Contracts": "4.4.0-beta-24721-02", - "System.Diagnostics.Debug": "4.4.0-beta-24721-02", - "System.Diagnostics.Tracing": "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.Primitives": "4.4.0-beta-24721-02", - "System.Resources.ResourceManager": "4.4.0-beta-24721-02", - "System.Runtime.Extensions": "4.4.0-beta-24721-02", - "System.Runtime.Handles": "4.4.0-beta-24721-02", - "System.Security.Cryptography.OpenSsl": "4.4.0-beta-24721-02", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24721-02", - "System.Security.Principal": "4.4.0-beta-24721-02", - "System.Security.Principal.Windows": "4.4.0-beta-24721-02", - "System.Text.Encoding": "4.4.0-beta-24721-02", - "System.Threading": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02", - "System.Threading.ThreadPool": "4.4.0-beta-24721-02" - } - } - } -}
\ No newline at end of file diff --git a/src/System.Net.Security/src/win/project.json b/src/System.Net.Security/src/win/project.json deleted file mode 100644 index 00685d094d..0000000000 --- a/src/System.Net.Security/src/win/project.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.Win32.Primitives": "4.4.0-beta-24721-02", - "System.Collections": "4.4.0-beta-24721-02", - "System.Collections.Concurrent": "4.4.0-beta-24721-02", - "System.Collections.NonGeneric": "4.4.0-beta-24721-02", - "System.Diagnostics.Contracts": "4.4.0-beta-24721-02", - "System.Diagnostics.Debug": "4.4.0-beta-24721-02", - "System.Diagnostics.Tracing": "4.4.0-beta-24721-02", - "System.Globalization": "4.4.0-beta-24721-02", - "System.Net.Primitives": "4.4.0-beta-24721-02", - "System.Resources.ResourceManager": "4.4.0-beta-24721-02", - "System.Runtime.Extensions": "4.4.0-beta-24721-02", - "System.Runtime.Handles": "4.4.0-beta-24721-02", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24721-02", - "System.Security.Principal": "4.4.0-beta-24721-02", - "System.Security.Principal.Windows": "4.4.0-beta-24721-02", - "System.Threading": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02", - "System.Threading.ThreadPool": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -}
\ No newline at end of file diff --git a/src/System.Net.ServicePoint/ref/System.Net.ServicePoint.csproj b/src/System.Net.ServicePoint/ref/System.Net.ServicePoint.csproj index b811714769..bf2dc03d47 100644 --- a/src/System.Net.ServicePoint/ref/System.Net.ServicePoint.csproj +++ b/src/System.Net.ServicePoint/ref/System.Net.ServicePoint.csproj @@ -1,18 +1,17 @@ -<?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> <DefineConstants Condition="'$(TargetGroup)' == 'netcoreapp1.1'">$(DefineConstants);netcoreapp11</DefineConstants> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.7_Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.7_Release|AnyCPU'" /> <ItemGroup> <Compile Include="System.Net.ServicePoint.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Net.Primitives\ref\System.Net.Primitives.csproj" /> + <ProjectReference Include="..\..\System.Net.Security\ref\System.Net.Security.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Security.Cryptography.X509Certificates\ref\System.Security.Cryptography.X509Certificates.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Net.ServicePoint/ref/project.json b/src/System.Net.ServicePoint/ref/project.json deleted file mode 100644 index bfc80bf89c..0000000000 --- a/src/System.Net.ServicePoint/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.Net.Primitives": "4.4.0-beta-24721-02", - "System.Net.Security": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Net.ServicePoint/src/System.Net.ServicePoint.csproj b/src/System.Net.ServicePoint/src/System.Net.ServicePoint.csproj index 9a291ede36..f06a12f056 100644 --- a/src/System.Net.ServicePoint/src/System.Net.ServicePoint.csproj +++ b/src/System.Net.ServicePoint/src/System.Net.ServicePoint.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> @@ -22,7 +22,14 @@ <TargetingPackReference Include="System" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Net.Primitives" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Security.Cryptography.X509Certificates" /> + <Reference Include="System.Collections.Concurrent" /> + <Reference Include="System.Net.Security" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Net.ServicePoint/src/project.json b/src/System.Net.ServicePoint/src/project.json deleted file mode 100644 index 440207f73a..0000000000 --- a/src/System.Net.ServicePoint/src/project.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.4.0-beta-24721-02", - "System.Collections.Concurrent": "4.4.0-beta-24721-02", - "System.Diagnostics.Debug": "4.4.0-beta-24721-02", - "System.Net.Primitives": "4.4.0-beta-24721-02", - "System.Net.Security": "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.Security.Cryptography.X509Certificates": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -}
\ No newline at end of file diff --git a/src/System.Net.Sockets/ref/System.Net.Sockets.csproj b/src/System.Net.Sockets/ref/System.Net.Sockets.csproj index 309b134f39..c04b4915fb 100644 --- a/src/System.Net.Sockets/ref/System.Net.Sockets.csproj +++ b/src/System.Net.Sockets/ref/System.Net.Sockets.csproj @@ -1,15 +1,15 @@ -<?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> <ItemGroup> <Compile Include="System.Net.Sockets.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> + <ProjectReference Include="..\..\System.IO.FileSystem.Primitives\ref\System.IO.FileSystem.Primitives.csproj" /> + <ProjectReference Include="..\..\System.Net.Primitives\ref\System.Net.Primitives.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Net.Sockets/ref/project.json b/src/System.Net.Sockets/ref/project.json deleted file mode 100644 index d3cee61390..0000000000 --- a/src/System.Net.Sockets/ref/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "System.IO": "4.4.0-beta-24721-02", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24721-02", - "System.Net.Primitives": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Net.Sockets/src/System.Net.Sockets.csproj b/src/System.Net.Sockets/src/System.Net.Sockets.csproj index 5eb31e188e..74b787c7e0 100644 --- a/src/System.Net.Sockets/src/System.Net.Sockets.csproj +++ b/src/System.Net.Sockets/src/System.Net.Sockets.csproj @@ -1,4 +1,4 @@ -<?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"> <PropertyGroup> <Configuration Condition="'$(Configuration)' == '' AND '$(TargetGroup)' == ''">Windows_Debug</Configuration> @@ -15,10 +15,6 @@ <DefineConstants Condition="'$(TargetGroup)' == 'netcore50'">$(DefineConstants);netcore50</DefineConstants> <ContractProject Condition="'$(AssemblyVersion)'=='4.1.1.0'">../ref/4.1.0/System.Net.Sockets.depproj</ContractProject> </PropertyGroup> - <PropertyGroup Condition=" '$(TargetsWindows)' == 'true' AND '$(TargetGroup)' == ''"> - <ProjectJson>win/project.json</ProjectJson> - <ProjectLockJson>win/project.lock.json</ProjectLockJson> - </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Release|AnyCPU'" /> @@ -445,7 +441,22 @@ <TargetingPackReference Include="System" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Net.Primitives" /> + <Reference Include="System.Diagnostics.Tracing" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Security.Principal.Windows" /> + <Reference Include="System.Threading.Tasks" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Threading.Overlapped" /> + <Reference Include="System.Net.NameResolution" /> + <Reference Include="System.Buffers" /> + <Reference Include="System.Security.Claims" /> + <Reference Include="Microsoft.Win32.Primitives" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Net.Sockets/src/netcore50/project.json b/src/System.Net.Sockets/src/netcore50/project.json deleted file mode 100644 index 2daed84540..0000000000 --- a/src/System.Net.Sockets/src/netcore50/project.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "frameworks": { - "netcore50": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "Microsoft.TargetingPack.Private.WinRT": "1.0.3", - "System.Buffers": "4.3.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Net.NameResolution": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.ObjectModel": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.WindowsRuntime": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Overlapped": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - } - } -}
\ No newline at end of file diff --git a/src/System.Net.Sockets/src/project.json b/src/System.Net.Sockets/src/project.json deleted file mode 100644 index 33d9eb55b8..0000000000 --- a/src/System.Net.Sockets/src/project.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "System.Buffers": "4.4.0-beta-24721-02", - "System.Collections": "4.4.0-beta-24721-02", - "System.Diagnostics.Debug": "4.4.0-beta-24721-02", - "System.Diagnostics.Tracing": "4.4.0-beta-24721-02", - "System.Globalization": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.IO.FileSystem": "4.4.0-beta-24721-02", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24721-02", - "System.Net.NameResolution": "4.4.0-beta-24721-02", - "System.Net.Primitives": "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.Runtime.Handles": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Security.Principal.Windows": "4.4.0-beta-24721-02", - "System.Threading": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02", - "System.Threading.ThreadPool": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Net.Sockets/src/win/project.json b/src/System.Net.Sockets/src/win/project.json deleted file mode 100644 index 5dad100ff0..0000000000 --- a/src/System.Net.Sockets/src/win/project.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "System.Buffers": "4.4.0-beta-24721-02", - "System.Collections": "4.4.0-beta-24721-02", - "System.Diagnostics.Debug": "4.4.0-beta-24721-02", - "System.Diagnostics.Tracing": "4.4.0-beta-24721-02", - "System.Globalization": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.IO.FileSystem": "4.4.0-beta-24721-02", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24721-02", - "System.Net.NameResolution": "4.4.0-beta-24721-02", - "System.Net.Primitives": "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.Runtime.Handles": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Security.Principal.Windows": "4.4.0-beta-24721-02", - "System.Threading": "4.4.0-beta-24721-02", - "System.Threading.Overlapped": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02", - "System.Threading.ThreadPool": "4.4.0-beta-24721-02" - } - } - } -} diff --git a/src/System.Net.WebClient/ref/System.Net.WebClient.csproj b/src/System.Net.WebClient/ref/System.Net.WebClient.csproj index a03f40eef0..1e791d02eb 100644 --- a/src/System.Net.WebClient/ref/System.Net.WebClient.csproj +++ b/src/System.Net.WebClient/ref/System.Net.WebClient.csproj @@ -1,17 +1,21 @@ -<?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.WebClient.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Collections.Specialized\ref\System.Collections.Specialized.csproj" /> + <ProjectReference Include="..\..\System.ComponentModel\ref\System.ComponentModel.csproj" /> + <ProjectReference Include="..\..\System.ComponentModel.Primitives\ref\System.ComponentModel.Primitives.csproj" /> + <ProjectReference Include="..\..\System.ComponentModel.EventBasedAsync\ref\System.ComponentModel.EventBasedAsync.csproj" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> + <ProjectReference Include="..\..\System.Net.Primitives\ref\System.Net.Primitives.csproj" /> + <ProjectReference Include="..\..\System.Net.Requests\ref\System.Net.Requests.csproj" /> + <ProjectReference Include="..\..\System.Net.WebHeaderCollection\ref\System.Net.WebHeaderCollection.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Text.Encoding\ref\System.Text.Encoding.csproj" /> + <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Net.WebClient/ref/project.json b/src/System.Net.WebClient/ref/project.json deleted file mode 100644 index 3da47c2744..0000000000 --- a/src/System.Net.WebClient/ref/project.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "dependencies": { - "System.Collections.Specialized": "4.4.0-beta-24721-02", - "System.ComponentModel": "4.4.0-beta-24721-02", - "System.ComponentModel.Primitives": "4.4.0-beta-24721-02", - "System.ComponentModel.EventBasedAsync": "4.4.0-beta-24721-02", - "System.IO": "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.WebHeaderCollection": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Text.Encoding": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Net.WebClient/src/System.Net.WebClient.csproj b/src/System.Net.WebClient/src/System.Net.WebClient.csproj index e15631338b..120721cfa8 100644 --- a/src/System.Net.WebClient/src/System.Net.WebClient.csproj +++ b/src/System.Net.WebClient/src/System.Net.WebClient.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> @@ -34,7 +34,20 @@ <TargetingPackReference Include="System" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.ComponentModel.Primitives" /> + <Reference Include="System.ComponentModel.EventBasedAsync" /> + <Reference Include="System.Net.Primitives" /> + <Reference Include="System.Net.WebHeaderCollection" /> + <Reference Include="System.Collections.Specialized" /> + <Reference Include="System.Net.Requests" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Threading.Tasks" /> + <Reference Include="System.IO.FileSystem" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Net.WebClient/src/project.json b/src/System.Net.WebClient/src/project.json deleted file mode 100644 index 7a7d1ba6c7..0000000000 --- a/src/System.Net.WebClient/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.Specialized": "4.4.0-beta-24721-02", - "System.ComponentModel": "4.4.0-beta-24721-02", - "System.ComponentModel.Primitives": "4.4.0-beta-24721-02", - "System.ComponentModel.EventBasedAsync": "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.IO.FileSystem": "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.Primitives": "4.4.0-beta-24721-02", - "System.Net.Requests": "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.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 diff --git a/src/System.Net.WebHeaderCollection/ref/System.Net.WebHeaderCollection.csproj b/src/System.Net.WebHeaderCollection/ref/System.Net.WebHeaderCollection.csproj index 7390d9b034..99b045400c 100644 --- a/src/System.Net.WebHeaderCollection/ref/System.Net.WebHeaderCollection.csproj +++ b/src/System.Net.WebHeaderCollection/ref/System.Net.WebHeaderCollection.csproj @@ -1,15 +1,12 @@ -<?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> <ItemGroup> <Compile Include="System.Net.WebHeaderCollection.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Collections.Specialized\ref\System.Collections.Specialized.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Net.WebHeaderCollection/ref/project.json b/src/System.Net.WebHeaderCollection/ref/project.json deleted file mode 100644 index a8832303eb..0000000000 --- a/src/System.Net.WebHeaderCollection/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Collections.Specialized": "4.4.0-beta-24721-02" - } - } - } -} diff --git a/src/System.Net.WebHeaderCollection/src/System.Net.WebHeaderCollection.csproj b/src/System.Net.WebHeaderCollection/src/System.Net.WebHeaderCollection.csproj index 29153952eb..e7e59e52c5 100644 --- a/src/System.Net.WebHeaderCollection/src/System.Net.WebHeaderCollection.csproj +++ b/src/System.Net.WebHeaderCollection/src/System.Net.WebHeaderCollection.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> @@ -45,7 +45,12 @@ <TargetingPackReference Include="System" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Collections.Specialized" /> + <Reference Include="System.Diagnostics.Tracing" /> + <Reference Include="System.Diagnostics.Debug" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Net.WebHeaderCollection/src/project.json b/src/System.Net.WebHeaderCollection/src/project.json deleted file mode 100644 index 337a9d47bd..0000000000 --- a/src/System.Net.WebHeaderCollection/src/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24721-02", - "System.Collections": "4.4.0-beta-24721-02", - "System.Collections.Specialized": "4.4.0-beta-24721-02", - "System.Diagnostics.Tracing": "4.4.0-beta-24721-02", - "System.Diagnostics.Debug": "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" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} 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 diff --git a/src/System.Net.WebSockets.Client/ref/System.Net.WebSockets.Client.csproj b/src/System.Net.WebSockets.Client/ref/System.Net.WebSockets.Client.csproj index a3c910abcb..9e8cc516e6 100644 --- a/src/System.Net.WebSockets.Client/ref/System.Net.WebSockets.Client.csproj +++ b/src/System.Net.WebSockets.Client/ref/System.Net.WebSockets.Client.csproj @@ -1,15 +1,15 @@ -<?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.3</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="System.Net.WebSockets.Client.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Net.Primitives\ref\System.Net.Primitives.csproj" /> + <ProjectReference Include="..\..\System.Net.WebSockets\ref\System.Net.WebSockets.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Security.Cryptography.X509Certificates\ref\System.Security.Cryptography.X509Certificates.csproj" /> + <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Net.WebSockets.Client/ref/project.json b/src/System.Net.WebSockets.Client/ref/project.json deleted file mode 100644 index d49ad6df0b..0000000000 --- a/src/System.Net.WebSockets.Client/ref/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "System.Net.Primitives": "4.3.0", - "System.Net.WebSockets": "4.3.0", - "System.Runtime": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Threading.Tasks": "4.3.0" - }, - "frameworks": { - "netstandard1.3": {} - } -}
\ No newline at end of file diff --git a/src/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj b/src/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj index 5f0bc3dc48..7f953bfb21 100644 --- a/src/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj +++ b/src/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> @@ -61,9 +61,6 @@ <Compile Include="System\Net\WebSockets\WinHttpWebSocketCallback.cs" /> <Compile Include="System\Net\WebSockets\WinHttpWebSocketState.cs" /> <!-- Common --> - <Compile Include="$(CommonPath)\Microsoft\Win32\SafeHandles\SafeHandleZeroOrMinusOneIsInvalid.cs"> - <Link>Common\Microsoft\Win32\SafeHandles\SafeHandleZeroOrMinusOneIsInvalid.cs</Link> - </Compile> <Compile Include="$(CommonPath)\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs"> <Link>Common\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs</Link> </Compile> @@ -129,7 +126,26 @@ <ProjectReference Include="$(SourceDir)/mscorlib.WinRT-Facade/mscorlib.WinRT-Facade.csproj" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Handles" /> + <Reference Include="System.Diagnostics.Tracing" /> + <Reference Include="Microsoft.Win32.Primitives" /> + <Reference Include="System.Net.WebSockets" /> + <Reference Include="System.Threading.Tasks" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Collections.NonGeneric" /> + <Reference Include="System.Net.WebHeaderCollection" /> + <Reference Include="System.Net.Primitives" /> + <Reference Include="System.Security.Cryptography.X509Certificates" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Globalization" /> + <Reference Include="System.Text.Encoding" /> + <Reference Include="System.Collections.Specialized" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Net.WebSockets.Client/src/project.json b/src/System.Net.WebSockets.Client/src/project.json deleted file mode 100644 index 3304ae05ed..0000000000 --- a/src/System.Net.WebSockets.Client/src/project.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "frameworks": { - "netstandard1.3": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.Win32.Primitives": "4.3.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Net.WebHeaderCollection": "4.3.0", - "System.Net.WebSockets": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "net46": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -}
\ No newline at end of file diff --git a/src/System.Net.WebSockets/ref/System.Net.WebSockets.csproj b/src/System.Net.WebSockets/ref/System.Net.WebSockets.csproj index 833eb20bb6..71dbfebf64 100644 --- a/src/System.Net.WebSockets/ref/System.Net.WebSockets.csproj +++ b/src/System.Net.WebSockets/ref/System.Net.WebSockets.csproj @@ -1,15 +1,17 @@ -<?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> <ItemGroup> <Compile Include="System.Net.WebSockets.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\Microsoft.Win32.Primitives\ref\Microsoft.Win32.Primitives.csproj" /> + <ProjectReference Include="..\..\System.Collections.Specialized\ref\System.Collections.Specialized.csproj" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> + <ProjectReference Include="..\..\System.Net.Primitives\ref\System.Net.Primitives.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Security.Principal\ref\System.Security.Principal.csproj" /> + <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Net.WebSockets/ref/project.json b/src/System.Net.WebSockets/ref/project.json deleted file mode 100644 index e006f8c8de..0000000000 --- a/src/System.Net.WebSockets/ref/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "dependencies": { - "Microsoft.Win32.Primitives": "4.4.0-beta-24721-02", - "System.Collections.Specialized": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.Net.Primitives": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Security.Principal": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Net.WebSockets/src/System.Net.WebSockets.csproj b/src/System.Net.WebSockets/src/System.Net.WebSockets.csproj index 9fbc065072..9b56cc16e7 100644 --- a/src/System.Net.WebSockets/src/System.Net.WebSockets.csproj +++ b/src/System.Net.WebSockets/src/System.Net.WebSockets.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> @@ -28,7 +28,16 @@ <TargetingPackReference Include="System" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Collections.Specialized" /> + <Reference Include="System.Net.Primitives" /> + <Reference Include="System.Security.Principal" /> + <Reference Include="Microsoft.Win32.Primitives" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Net.WebSockets/src/project.json b/src/System.Net.WebSockets/src/project.json deleted file mode 100644 index ace132e603..0000000000 --- a/src/System.Net.WebSockets/src/project.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.Win32.Primitives": "4.4.0-beta-24721-02", - "System.Collections.Specialized": "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.Net.Primitives": "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.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Security.Principal": "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" - } - } - } -} diff --git a/src/System.Numerics.Vectors.WindowsRuntime/src/System.Numerics.Vectors.WindowsRuntime.csproj b/src/System.Numerics.Vectors.WindowsRuntime/src/System.Numerics.Vectors.WindowsRuntime.csproj.disabled index a1c88524a5..a1c88524a5 100644 --- a/src/System.Numerics.Vectors.WindowsRuntime/src/System.Numerics.Vectors.WindowsRuntime.csproj +++ b/src/System.Numerics.Vectors.WindowsRuntime/src/System.Numerics.Vectors.WindowsRuntime.csproj.disabled diff --git a/src/System.Numerics.Vectors/ref/System.Numerics.Vectors.csproj b/src/System.Numerics.Vectors/ref/System.Numerics.Vectors.csproj index 0c5647038f..5a1489d30e 100644 --- a/src/System.Numerics.Vectors/ref/System.Numerics.Vectors.csproj +++ b/src/System.Numerics.Vectors/ref/System.Numerics.Vectors.csproj @@ -1,15 +1,11 @@ -<?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.0</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="System.Numerics.Vectors.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Numerics.Vectors/ref/project.json b/src/System.Numerics.Vectors/ref/project.json deleted file mode 100644 index e6c2196e0e..0000000000 --- a/src/System.Numerics.Vectors/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.3.0" - }, - "frameworks": { - "netstandard1.0": {} - } -}
\ No newline at end of file diff --git a/src/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj b/src/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj index b57b813f85..b237b3d9ad 100644 --- a/src/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj +++ b/src/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj @@ -1,4 +1,4 @@ -<?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> @@ -79,7 +79,12 @@ <Generator>TextTemplatingFileGenerator</Generator> <LastGenOutput>Vector.cs</LastGenOutput> </Content> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Globalization" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Diagnostics.Tools" /> + <Reference Include="System.Diagnostics.Contracts" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Numerics.Vectors/src/project.json b/src/System.Numerics.Vectors/src/project.json deleted file mode 100644 index 04378f96c4..0000000000 --- a/src/System.Numerics.Vectors/src/project.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "frameworks": { - "netstandard1.0": { - "dependencies": { - "System.Runtime": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Globalization": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Diagnostics.Contracts": "4.3.0" - } - }, - "net46": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -}
\ No newline at end of file diff --git a/src/System.ObjectModel/ref/System.ObjectModel.csproj b/src/System.ObjectModel/ref/System.ObjectModel.csproj index 016888124b..197ffd0afe 100644 --- a/src/System.ObjectModel/ref/System.ObjectModel.csproj +++ b/src/System.ObjectModel/ref/System.ObjectModel.csproj @@ -1,15 +1,12 @@ -<?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> <ItemGroup> <Compile Include="System.ObjectModel.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Collections\ref\System.Collections.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.ObjectModel/ref/project.json b/src/System.ObjectModel/ref/project.json deleted file mode 100644 index 2e538d17ec..0000000000 --- a/src/System.ObjectModel/ref/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Collections": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.ObjectModel/src/System.ObjectModel.csproj b/src/System.ObjectModel/src/System.ObjectModel.csproj index de2871b9ad..e3ad42d23a 100644 --- a/src/System.ObjectModel/src/System.ObjectModel.csproj +++ b/src/System.ObjectModel/src/System.ObjectModel.csproj @@ -1,4 +1,4 @@ -<?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> @@ -37,7 +37,13 @@ <TargetingPackReference Include="System" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.ObjectModel/src/project.json b/src/System.ObjectModel/src/project.json deleted file mode 100644 index 8acfc5d99a..0000000000 --- a/src/System.ObjectModel/src/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24721-02", - "System.Collections": "4.4.0-beta-24721-02", - "System.Diagnostics.Contracts": "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.Resources.ResourceManager": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Threading": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj b/src/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj index 36926e64f9..fda3730f5c 100644 --- a/src/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj +++ b/src/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.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> @@ -163,7 +163,28 @@ <EmbeddedResource Include="$(MsBuildThisFileDirectory)Resources\$(AssemblyName).rd.xml" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Xml.ReaderWriter" /> + <Reference Include="System.Text.Encoding.Extensions" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Threading.Tasks" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Reflection.Emit.Lightweight" /> + <Reference Include="System.Reflection.Emit.ILGeneration" /> + <Reference Include="System.Reflection.Primitives" /> + <Reference Include="System.Runtime.Serialization.Primitives" /> + <Reference Include="System.CodeDom" /> + <Reference Include="System.Collections.Concurrent" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Linq" /> + <Reference Include="System.Collections.NonGeneric" /> + <Reference Include="System.Text.RegularExpressions" /> + <Reference Include="System.Xml.XDocument" /> + <Reference Include="System.Xml.XmlSerializer" /> + <Reference Include="System.Runtime.Serialization.Formatters" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Private.DataContractSerialization/src/project.json b/src/System.Private.DataContractSerialization/src/project.json deleted file mode 100644 index 2cd9843f53..0000000000 --- a/src/System.Private.DataContractSerialization/src/project.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24721-02", - "System.CodeDom": "4.4.0-beta-24721-02", - "System.Collections": "4.4.0-beta-24721-02", - "System.Collections.Concurrent": "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.Globalization": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.Linq": "4.4.0-beta-24721-02", - "System.Reflection": "4.4.0-beta-24721-02", - "System.Reflection.Emit": "4.4.0-beta-24721-02", - "System.Reflection.Emit.ILGeneration": "4.4.0-beta-24721-02", - "System.Reflection.Emit.Lightweight": "4.4.0-beta-24721-02", - "System.Reflection.Extensions": "4.4.0-beta-24721-02", - "System.Reflection.Primitives": "4.4.0-beta-24721-02", - "System.Reflection.TypeExtensions": "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.Runtime.Serialization.Primitives": "4.4.0-beta-24721-02", - "System.Runtime.Serialization.Formatters": "4.4.0-beta-24721-02", - "System.Text.Encoding": "4.4.0-beta-24721-02", - "System.Text.Encoding.Extensions": "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", - "System.Xml.ReaderWriter": "4.4.0-beta-24721-02", - "System.Xml.XDocument": "4.4.0-beta-24721-02", - "System.Xml.XmlDocument": "4.4.0-beta-24721-02", - "System.Xml.XmlSerializer": "4.4.0-beta-24721-02" - } - } - } -} diff --git a/src/System.Private.Uri/src/System.Private.Uri.csproj b/src/System.Private.Uri/src/System.Private.Uri.csproj index f4546c47a0..5b679aff9e 100644 --- a/src/System.Private.Uri/src/System.Private.Uri.csproj +++ b/src/System.Private.Uri/src/System.Private.Uri.csproj @@ -1,4 +1,4 @@ -<?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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> @@ -13,8 +13,6 @@ <NoWarn>0436</NoWarn> <SkipCommonResourcesIncludes Condition="'$(TargetGroup)'=='uap101aot'">true</SkipCommonResourcesIncludes> <DefineConstants Condition="'$(TargetGroup)'==''">$(DefineConstants);netstandard10</DefineConstants> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.0</NuGetTargetMoniker> - <PackageTargetFramework Condition="'$(TargetGroup)'==''">netstandard1.0;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> @@ -152,9 +150,10 @@ </ItemGroup> <ItemGroup> <TargetingPackReference Include="System.Private.CoreLib" /> + <Reference Include="System.Private.CoreLib" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Private.CoreLib" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Private.Uri/src/project.json b/src/System.Private.Uri/src/project.json deleted file mode 100644 index 2b516312ff..0000000000 --- a/src/System.Private.Uri/src/project.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "frameworks": { - "netstandard1.0": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24728-02" - } - }, - "netcore50": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24728-00" - } - }, - "uap10.1": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24728-00" - } - } - } -} diff --git a/src/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj b/src/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj index 78c79ce804..97262d7603 100644 --- a/src/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj +++ b/src/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj @@ -19,7 +19,6 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> <ProjectReference Include="..\..\System.Private.Xml\src\System.Private.Xml.csproj"> - <OSGroup>$(InputOSGroup)</OSGroup> </ProjectReference> <Compile Include="$(CommonPath)\System\Collections\Generic\ArrayBuilder.cs"> <Link>System\Collections\Generic\ArrayBuilder.cs</Link> @@ -75,7 +74,15 @@ <TargetingPackReference Include="System.Xml.Linq" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Diagnostics.Tools" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Linq" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Private.Xml.Linq/src/project.json b/src/System.Private.Xml.Linq/src/project.json deleted file mode 100644 index 76d3978ba3..0000000000 --- a/src/System.Private.Xml.Linq/src/project.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Resources.ResourceManager": "4.4.0-beta-24721-02", - "System.Globalization": "4.4.0-beta-24721-02", - "System.Collections": "4.4.0-beta-24721-02", - "System.Collections.NonGeneric": "4.4.0-beta-24721-02", - "System.Collections.Specialized": "4.4.0-beta-24721-02", - "System.Diagnostics.TraceSource": "4.4.0-beta-24721-02", - "Microsoft.Win32.Registry": "4.4.0-beta-24721-02", - "System.IO.FileSystem": "4.4.0-beta-24721-02", - "System.Reflection.TypeExtensions": "4.4.0-beta-24721-02", - "System.ComponentModel.TypeConverter": "4.4.0-beta-24721-02", - "System.Console": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.Linq": "4.4.0-beta-24721-02", - "System.Diagnostics.Tools": "4.4.0-beta-24721-02", - "System.Diagnostics.Debug": "4.4.0-beta-24721-02", - "System.Reflection": "4.4.0-beta-24721-02", - "System.Runtime.Extensions": "4.4.0-beta-24721-02", - "System.Threading": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02", - "System.Threading.Tasks.Extensions": "4.4.0-beta-24721-02", - "System.Text.Encoding": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Private.Xml/src/System.Private.Xml.csproj b/src/System.Private.Xml/src/System.Private.Xml.csproj index 4da318975f..f3529055e0 100644 --- a/src/System.Private.Xml/src/System.Private.Xml.csproj +++ b/src/System.Private.Xml/src/System.Private.Xml.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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> @@ -509,7 +509,36 @@ <EmbeddedResource Include="Resources\$(AssemblyName).rd.xml" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Threading.Tasks.Extensions\src\System.Threading.Tasks.Extensions.csproj" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Threading.Tasks" /> + <Reference Include="System.Diagnostics.TraceSource" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Text.RegularExpressions" /> + <Reference Include="System.Net.Primitives" /> + <Reference Include="System.Net.Http" /> + <Reference Include="Microsoft.Win32.Registry" /> + <Reference Include="System.Text.Encoding.Extensions" /> + <Reference Include="System.Reflection.Emit" /> + <Reference Include="System.Reflection.Emit.ILGeneration" /> + <Reference Include="System.Collections.NonGeneric" /> + <Reference Include="System.Reflection.Primitives" /> + <Reference Include="System.Collections.Specialized" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Diagnostics.Tools" /> + <Reference Include="System.Reflection.Emit.Lightweight" /> + <Reference Include="System.ObjectModel" /> + <Reference Include="System.Linq" /> + <Reference Include="System.IO.FileSystem" /> + <Reference Include="System.Console" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Tools" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <ItemGroup> <Compile Include="System\Xml\Xsl\IlGen\GenerateHelper.cs" /> @@ -730,4 +759,4 @@ <Compile Include="System\Xml\Xsl\Runtime\XmlCollation.Unix.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Private.Xml/src/project.json b/src/System.Private.Xml/src/project.json deleted file mode 100644 index 7dd3cc472b..0000000000 --- a/src/System.Private.Xml/src/project.json +++ /dev/null @@ -1,97 +0,0 @@ -{ - "compilationOptions": { - "define": [ - "ASYNC" - ] - }, - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.CSharp": "4.4.0-beta-24721-02", - "Microsoft.NETCore.Platforms": "1.2.0-beta-24721-02", - "Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24728-02", - "Microsoft.Win32.Registry": "4.4.0-beta-24721-02", - "System.Collections": "4.4.0-beta-24721-02", - "System.Collections.NonGeneric": "4.4.0-beta-24721-02", - "System.Collections.Specialized": "4.4.0-beta-24721-02", - "System.Console": "4.4.0-beta-24721-02", - "System.ComponentModel.TypeConverter": "4.4.0-beta-24721-02", - "System.Diagnostics.Contracts": "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.TraceSource": "4.4.0-beta-24721-02", - "System.Globalization": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.IO.FileSystem": "4.4.0-beta-24721-02", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24721-02", - "System.Linq": "4.4.0-beta-24721-02", - "System.Net.Http": "4.4.0-beta-24721-02", - "System.Reflection": "4.4.0-beta-24721-02", - "System.Reflection.Emit": "4.4.0-beta-24721-02", - "System.Reflection.Emit.ILGeneration": "4.4.0-beta-24721-02", - "System.Reflection.Emit.Lightweight": "4.4.0-beta-24721-02", - "System.Reflection.Extensions": "4.4.0-beta-24721-02", - "System.Reflection.Primitives": "4.4.0-beta-24721-02", - "System.Reflection.TypeExtensions": "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.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Security.Permissions": "4.4.0-beta-24721-02", - "System.Text.Encoding": "4.4.0-beta-24721-02", - "System.Text.Encoding.Extensions": "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", - "System.Threading.Tasks.Extensions": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - }, - "uap10.1": { - "dependencies": { - "Microsoft.CSharp": "4.4.0-beta-24721-02", - "Microsoft.NETCore.Platforms": "1.2.0-beta-24721-02", - "Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24728-02", - "Microsoft.Win32.Registry": "4.4.0-beta-24721-02", - "System.Collections": "4.4.0-beta-24721-02", - "System.Collections.NonGeneric": "4.4.0-beta-24721-02", - "System.Collections.Specialized": "4.4.0-beta-24721-02", - "System.Console": "4.4.0-beta-24721-02", - "System.ComponentModel.TypeConverter": "4.4.0-beta-24721-02", - "System.Data.Common": "4.4.0-beta-24721-02", - "System.Diagnostics.Contracts": "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.TraceSource": "4.4.0-beta-24721-02", - "System.Globalization": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.IO.FileSystem": "4.4.0-beta-24721-02", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24721-02", - "System.Linq": "4.4.0-beta-24721-02", - "System.Net.Http": "4.4.0-beta-24721-02", - "System.Net.Primitives": "4.4.0-beta-24721-02", - "System.Reflection": "4.4.0-beta-24721-02", - "System.Reflection.Emit": "4.4.0-beta-24721-02", - "System.Reflection.Emit.ILGeneration": "4.4.0-beta-24721-02", - "System.Reflection.Emit.Lightweight": "4.4.0-beta-24721-02", - "System.Reflection.Extensions": "4.4.0-beta-24721-02", - "System.Reflection.Primitives": "4.4.0-beta-24721-02", - "System.Reflection.TypeExtensions": "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.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Text.Encoding": "4.4.0-beta-24721-02", - "System.Text.Encoding.Extensions": "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", - "System.Threading.Tasks.Extensions": "4.4.0-beta-24721-02" - } - } - } -} diff --git a/src/System.Reflection.Context/ref/System.Reflection.Context.csproj b/src/System.Reflection.Context/ref/System.Reflection.Context.csproj index d65893d2da..e0aa96f6a1 100644 --- a/src/System.Reflection.Context/ref/System.Reflection.Context.csproj +++ b/src/System.Reflection.Context/ref/System.Reflection.Context.csproj @@ -1,22 +1,16 @@ -<?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> <UseECMAKey Condition="'$(UseECMAKey)' == ''">true</UseECMAKey> - <AssemblyVersion>4.0.0.0</AssemblyVersion> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.1</NuGetTargetMoniker> - <!-- Xamarin frameworks claim to support PCL profiles which include this assembly, - but do not include this assembly in the targeting pack. - This causes NuGet to give them the placeholder from the portable-* folder. - Instead give them this assembly. --> - <PackageTargetFramework>netstandard1.1;MonoAndroid10;MonoTouch10;xamarinios10;xamarintvos10;xamarinwatchos10</PackageTargetFramework> </PropertyGroup> <ItemGroup> <Compile Include="System.Reflection.Context.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Reflection.Primitives\ref\System.Reflection.Primitives.csproj" /> + <ProjectReference Include="..\..\System.Reflection\ref\System.Reflection.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Reflection.Context/ref/project.json b/src/System.Reflection.Context/ref/project.json deleted file mode 100644 index 884f2496fd..0000000000 --- a/src/System.Reflection.Context/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Reflection.Primitives": "4.3.0", - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - }, - "frameworks": { - "netstandard1.1": {} - } -}
\ No newline at end of file diff --git a/src/System.Reflection.Context/src/System.Reflection.Context.csproj b/src/System.Reflection.Context/src/System.Reflection.Context.csproj index d9ca231f9d..665d5063db 100644 --- a/src/System.Reflection.Context/src/System.Reflection.Context.csproj +++ b/src/System.Reflection.Context/src/System.Reflection.Context.csproj @@ -1,4 +1,4 @@ -<?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> @@ -18,7 +18,8 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Reflection" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Reflection.Context/src/project.json b/src/System.Reflection.Context/src/project.json deleted file mode 100644 index 884f2496fd..0000000000 --- a/src/System.Reflection.Context/src/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Reflection.Primitives": "4.3.0", - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - }, - "frameworks": { - "netstandard1.1": {} - } -}
\ No newline at end of file diff --git a/src/System.Reflection.DispatchProxy/ref/System.Reflection.DispatchProxy.csproj b/src/System.Reflection.DispatchProxy/ref/System.Reflection.DispatchProxy.csproj index 760ab97395..453c235dd3 100644 --- a/src/System.Reflection.DispatchProxy/ref/System.Reflection.DispatchProxy.csproj +++ b/src/System.Reflection.DispatchProxy/ref/System.Reflection.DispatchProxy.csproj @@ -1,16 +1,16 @@ -<?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> <ProjectGuid>{7DF3C428-AAD6-41C7-98E6-6CACFD5C391E}</ProjectGuid> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> </PropertyGroup> <ItemGroup> <Compile Include="System.Reflection.DispatchProxy.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Reflection.Primitives\ref\System.Reflection.Primitives.csproj" /> + <ProjectReference Include="..\..\System.Reflection\ref\System.Reflection.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Reflection.DispatchProxy/ref/project.json b/src/System.Reflection.DispatchProxy/ref/project.json deleted file mode 100644 index 80e4afbc5f..0000000000 --- a/src/System.Reflection.DispatchProxy/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection": "4.3.0" - }, - "frameworks": { - "netstandard1.3": {} - } -}
\ No newline at end of file diff --git a/src/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.csproj b/src/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.csproj index 4f37fd1e1d..74f2720e2e 100644 --- a/src/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.csproj +++ b/src/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.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> @@ -22,7 +22,17 @@ <TargetingPackReference Include="System.Private.Interop" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Reflection" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Reflection.Emit" /> + <Reference Include="System.Reflection.Emit.ILGeneration" /> + <Reference Include="System.Reflection.Primitives" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Linq" /> + <Reference Include="System.Reflection.Extensions" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Reflection.DispatchProxy/src/project.json b/src/System.Reflection.DispatchProxy/src/project.json deleted file mode 100644 index 24c042c4a1..0000000000 --- a/src/System.Reflection.DispatchProxy/src/project.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "frameworks": { - "netstandard1.3": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Linq": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "netcore50": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24728-00", - "System.Runtime": "4.3.0" - } - } - } -} diff --git a/src/System.Reflection.Emit.ILGeneration/ref/System.Reflection.Emit.ILGeneration.csproj b/src/System.Reflection.Emit.ILGeneration/ref/System.Reflection.Emit.ILGeneration.csproj index 2ff71dbc60..d8396c3a98 100644 --- a/src/System.Reflection.Emit.ILGeneration/ref/System.Reflection.Emit.ILGeneration.csproj +++ b/src/System.Reflection.Emit.ILGeneration/ref/System.Reflection.Emit.ILGeneration.csproj @@ -1,16 +1,13 @@ -<?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> - <AssemblyVersion>4.0.0.0</AssemblyVersion> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="System.Reflection.Emit.ILGeneration.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Reflection\ref\System.Reflection.csproj" /> + <ProjectReference Include="..\..\System.Reflection.Primitives\ref\System.Reflection.Primitives.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Reflection.Emit.ILGeneration/ref/project.json b/src/System.Reflection.Emit.ILGeneration/ref/project.json deleted file mode 100644 index 00a9a5092c..0000000000 --- a/src/System.Reflection.Emit.ILGeneration/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Primitives": "4.3.0" - }, - "frameworks": { - "netstandard1.0": {} - } -}
\ No newline at end of file diff --git a/src/System.Reflection.Emit.ILGeneration/src/System.Reflection.Emit.ILGeneration.csproj b/src/System.Reflection.Emit.ILGeneration/src/System.Reflection.Emit.ILGeneration.csproj index 05ba5e4cc3..0b0afad680 100644 --- a/src/System.Reflection.Emit.ILGeneration/src/System.Reflection.Emit.ILGeneration.csproj +++ b/src/System.Reflection.Emit.ILGeneration/src/System.Reflection.Emit.ILGeneration.csproj @@ -1,4 +1,4 @@ -<?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> @@ -14,7 +14,7 @@ <TargetingPackReference Include="System.Private.CoreLib" Condition="'$(TargetGroup)' != 'net46'" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Private.CoreLib" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Reflection.Emit.ILGeneration/src/project.json b/src/System.Reflection.Emit.ILGeneration/src/project.json deleted file mode 100644 index 54b2045297..0000000000 --- a/src/System.Reflection.Emit.ILGeneration/src/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "frameworks": { - "netstandard1.3": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24728-02" - } - } - } -} diff --git a/src/System.Reflection.Emit.Lightweight/ref/System.Reflection.Emit.Lightweight.Manual.cs b/src/System.Reflection.Emit.Lightweight/ref/System.Reflection.Emit.Lightweight.Manual.cs deleted file mode 100644 index 852163788e..0000000000 --- a/src/System.Reflection.Emit.Lightweight/ref/System.Reflection.Emit.Lightweight.Manual.cs +++ /dev/null @@ -1,15 +0,0 @@ -// 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. -// ------------------------------------------------------------------------------ -// Changes to this file must follow the http://aka.ms/api-review process. -// ------------------------------------------------------------------------------ - - -namespace System.Reflection.Emit -{ - public partial class DynamicMethod : System.Reflection.MethodInfo - { - public override MethodImplAttributes MethodImplementationFlags { get { throw null; } } - } -} diff --git a/src/System.Reflection.Emit.Lightweight/ref/System.Reflection.Emit.Lightweight.cs b/src/System.Reflection.Emit.Lightweight/ref/System.Reflection.Emit.Lightweight.cs index d707e55356..e9dfca7877 100644 --- a/src/System.Reflection.Emit.Lightweight/ref/System.Reflection.Emit.Lightweight.cs +++ b/src/System.Reflection.Emit.Lightweight/ref/System.Reflection.Emit.Lightweight.cs @@ -30,17 +30,26 @@ namespace System.Reflection.Emit public override System.Reflection.CallingConventions CallingConvention { get { throw null; } } public override System.Type DeclaringType { get { throw null; } } public bool InitLocals { get { throw null; } set { } } + public override System.RuntimeMethodHandle MethodHandle { get { throw null; } } public override string Name { get { throw null; } } + public override System.Type ReflectedType { get { throw null; } } public override System.Reflection.ParameterInfo ReturnParameter { get { throw null; } } public override System.Type ReturnType { get { throw null; } } + public override System.Reflection.ICustomAttributeProvider ReturnTypeCustomAttributes { get { throw null; } } [System.Security.SecuritySafeCriticalAttribute] public sealed override System.Delegate CreateDelegate(System.Type delegateType) { throw null; } [System.Security.SecuritySafeCriticalAttribute] public sealed override System.Delegate CreateDelegate(System.Type delegateType, object target) { throw null; } + public override System.Reflection.MethodInfo GetBaseDefinition() { throw null; } + public override object[] GetCustomAttributes(bool inherit) { throw null; } + public override object[] GetCustomAttributes(System.Type attributeType, bool inherit) { throw null; } public System.Reflection.Emit.ILGenerator GetILGenerator() { throw null; } [System.Security.SecuritySafeCriticalAttribute] public System.Reflection.Emit.ILGenerator GetILGenerator(int streamSize) { throw null; } + public override System.Reflection.MethodImplAttributes GetMethodImplementationFlags() { throw null; } public override System.Reflection.ParameterInfo[] GetParameters() { throw null; } + public override object Invoke(object obj, System.Reflection.BindingFlags invokeAttr, System.Reflection.Binder binder, object[] parameters, System.Globalization.CultureInfo culture) { throw null; } + public override bool IsDefined(System.Type attributeType, bool inherit) { throw null; } public override string ToString() { throw null; } } } diff --git a/src/System.Reflection.Emit.Lightweight/ref/System.Reflection.Emit.Lightweight.csproj b/src/System.Reflection.Emit.Lightweight/ref/System.Reflection.Emit.Lightweight.csproj index 054dcc2b3d..8471275d45 100644 --- a/src/System.Reflection.Emit.Lightweight/ref/System.Reflection.Emit.Lightweight.csproj +++ b/src/System.Reflection.Emit.Lightweight/ref/System.Reflection.Emit.Lightweight.csproj @@ -1,17 +1,12 @@ -<?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> - <AssemblyVersion>4.0.0.0</AssemblyVersion> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="System.Reflection.Emit.Lightweight.cs" /> - <Compile Include="System.Reflection.Emit.Lightweight.Manual.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Reflection.Emit.ILGeneration\ref\System.Reflection.Emit.ILGeneration.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Reflection.Emit.Lightweight/ref/project.json b/src/System.Reflection.Emit.Lightweight/ref/project.json deleted file mode 100644 index c3f5d52012..0000000000 --- a/src/System.Reflection.Emit.Lightweight/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Primitives": "4.3.0" - }, - "frameworks": { - "netstandard1.0": {} - } -}
\ No newline at end of file diff --git a/src/System.Reflection.Emit.Lightweight/src/System.Reflection.Emit.Lightweight.csproj b/src/System.Reflection.Emit.Lightweight/src/System.Reflection.Emit.Lightweight.csproj index 431fa91663..b7b0d47998 100644 --- a/src/System.Reflection.Emit.Lightweight/src/System.Reflection.Emit.Lightweight.csproj +++ b/src/System.Reflection.Emit.Lightweight/src/System.Reflection.Emit.Lightweight.csproj @@ -1,4 +1,4 @@ -<?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> @@ -14,7 +14,7 @@ <TargetingPackReference Include="System.Private.CoreLib" Condition="'$(TargetGroup)' != 'net46'" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Private.CoreLib" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Reflection.Emit.Lightweight/src/project.json b/src/System.Reflection.Emit.Lightweight/src/project.json deleted file mode 100644 index 54b2045297..0000000000 --- a/src/System.Reflection.Emit.Lightweight/src/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "frameworks": { - "netstandard1.3": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24728-02" - } - } - } -} diff --git a/src/System.Reflection.Emit/ref/System.Reflection.Emit.Manual.cs b/src/System.Reflection.Emit/ref/System.Reflection.Emit.Manual.cs deleted file mode 100644 index 78f0bc7750..0000000000 --- a/src/System.Reflection.Emit/ref/System.Reflection.Emit.Manual.cs +++ /dev/null @@ -1,120 +0,0 @@ -// 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. -// ------------------------------------------------------------------------------ -// Changes to this file must follow the http://aka.ms/api-review process. -// ------------------------------------------------------------------------------ - - -// This is only needed for COMAwareEventInfo to inherit from EventInfo. Next version when -// Reflection is extensible then we should remove this InternalsVisibleTo. -[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("System.Runtime.InteropServices, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")] - -// This is required so that AssemblyBuilder can derive from Assembly. -[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("System.Reflection.Emit, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")] - -// This is required so that DynamicMethod can derive from MethodInfo. -[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("System.Reflection.Emit.Lightweight, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")] - -namespace System.Reflection.Emit -{ - public partial class TypeBuilder : System.Reflection.TypeInfo - { - // These members override base definitions on TypeInfo. - public override System.Reflection.TypeAttributes Attributes { get { throw null; } } - public override Assembly Assembly { get { throw null; } } - public override Type BaseType { get { throw null; } } - public override MethodBase DeclaringMethod { get { throw null; } } - public override GenericParameterAttributes GenericParameterAttributes { get { throw null; } } - public override Module Module { get { throw null; } } - - public override int GetArrayRank() { throw null; } - public override Type GetElementType() { throw null; } - public override System.Type[] GetGenericParameterConstraints() { throw null; } - public override System.Type[] GenericTypeArguments { get { throw null; } } - public override bool ContainsGenericParameters { get { throw null; } } - public override int GenericParameterPosition { get { throw null; } } - public override Guid GUID { get { throw null; } } - public override bool IsEnum { get { throw null; } } - public override bool IsGenericType { get { throw null; } } - public override bool IsGenericTypeDefinition { get { throw null; } } - public override bool IsSerializable { get { throw null; } } - public override string Namespace { get { throw null; } } - - public override Type DeclaringType { get { throw null; } } - } - - public partial class EnumBuilder : System.Reflection.TypeInfo - { - // These members override base definitions on TypeInfo. - public override System.Reflection.TypeAttributes Attributes { get { throw null; } } - public override Assembly Assembly { get { throw null; } } - public override Type BaseType { get { throw null; } } - public override Module Module { get { throw null; } } - - public override int GetArrayRank() { throw null; } - public override Type GetElementType() { throw null; } - public override System.Type[] GetGenericParameterConstraints() { throw null; } - public override System.Type[] GenericTypeArguments { get { throw null; } } - public override Type GetGenericTypeDefinition() { throw null; } - public override bool ContainsGenericParameters { get { throw null; } } - public override MethodBase DeclaringMethod { get { throw null; } } - public override GenericParameterAttributes GenericParameterAttributes { get { throw null; } } - public override int GenericParameterPosition { get { throw null; } } - public override Guid GUID { get { throw null; } } - public override bool IsEnum { get { throw null; } } - public override bool IsGenericParameter { get { throw null; } } - public override bool IsGenericType { get { throw null; } } - public override bool IsGenericTypeDefinition { get { throw null; } } - public override bool IsSerializable { get { throw null; } } - public override string Namespace { get { throw null; } } - public override Type MakeGenericType(params System.Type[] typeArguments) { throw null; } - - public override Type DeclaringType { get { throw null; } } - } - - public partial class GenericTypeParameterBuilder : System.Reflection.TypeInfo - { - // These members override base definitions on TypeInfo. - public override bool IsSubclassOf(Type c) { throw null; } - - public override System.Reflection.TypeAttributes Attributes { get { throw null; } } - public override Assembly Assembly { get { throw null; } } - public override Type BaseType { get { throw null; } } - public override MethodBase DeclaringMethod { get { throw null; } } - public override GenericParameterAttributes GenericParameterAttributes { get { throw null; } } - public override Module Module { get { throw null; } } - - public override int GetArrayRank() { throw null; } - public override Type GetElementType() { throw null; } - public override System.Type[] GetGenericParameterConstraints() { throw null; } - public override System.Type[] GenericTypeArguments { get { throw null; } } - public override bool ContainsGenericParameters { get { throw null; } } - public override int GenericParameterPosition { get { throw null; } } - public override Guid GUID { get { throw null; } } - public override bool IsEnum { get { throw null; } } - public override bool IsGenericType { get { throw null; } } - public override bool IsGenericTypeDefinition { get { throw null; } } - public override bool IsSerializable { get { throw null; } } - public override string Namespace { get { throw null; } } - - public override Type DeclaringType { get { throw null; } } - } - - public partial class AssemblyBuilder : System.Reflection.Assembly - { - public override System.Collections.Generic.IEnumerable<TypeInfo> DefinedTypes { get { throw null; } } - - public override System.Collections.Generic.IEnumerable<Module> Modules { get { throw null; } } - } - - public partial class MethodBuilder : System.Reflection.MethodInfo - { - public override MethodImplAttributes MethodImplementationFlags { get { throw null; } } - } - - public partial class ConstructorBuilder : System.Reflection.ConstructorInfo - { - public override MethodImplAttributes MethodImplementationFlags { get { throw null; } } - } -} diff --git a/src/System.Reflection.Emit/ref/System.Reflection.Emit.cs b/src/System.Reflection.Emit/ref/System.Reflection.Emit.cs index 09322ca5b7..6ba1c8c4a5 100644 --- a/src/System.Reflection.Emit/ref/System.Reflection.Emit.cs +++ b/src/System.Reflection.Emit/ref/System.Reflection.Emit.cs @@ -39,26 +39,77 @@ namespace System.Reflection.Emit public override System.Reflection.CallingConventions CallingConvention { get { throw null; } } public override System.Type DeclaringType { get { throw null; } } public bool InitLocals { get { throw null; } set { } } + public override System.RuntimeMethodHandle MethodHandle { get { throw null; } } + public override System.Reflection.Module Module { get { throw null; } } public override string Name { get { throw null; } } + public override System.Type ReflectedType { get { throw null; } } public System.Reflection.Emit.ParameterBuilder DefineParameter(int iSequence, System.Reflection.ParameterAttributes attributes, string strParamName) { throw null; } + public override object[] GetCustomAttributes(bool inherit) { throw null; } + public override object[] GetCustomAttributes(System.Type attributeType, bool inherit) { throw null; } public System.Reflection.Emit.ILGenerator GetILGenerator() { throw null; } public System.Reflection.Emit.ILGenerator GetILGenerator(int streamSize) { throw null; } + public override System.Reflection.MethodImplAttributes GetMethodImplementationFlags() { throw null; } public override System.Reflection.ParameterInfo[] GetParameters() { throw null; } + public override object Invoke(object obj, System.Reflection.BindingFlags invokeAttr, System.Reflection.Binder binder, object[] parameters, System.Globalization.CultureInfo culture) { throw null; } + public override object Invoke(System.Reflection.BindingFlags invokeAttr, System.Reflection.Binder binder, object[] parameters, System.Globalization.CultureInfo culture) { throw null; } + public override bool IsDefined(System.Type attributeType, bool inherit) { throw null; } public void SetCustomAttribute(System.Reflection.ConstructorInfo con, byte[] binaryAttribute) { } public void SetCustomAttribute(System.Reflection.Emit.CustomAttributeBuilder customBuilder) { } public void SetImplementationFlags(System.Reflection.MethodImplAttributes attributes) { } public override string ToString() { throw null; } } - public sealed partial class EnumBuilder : System.Reflection.TypeInfo + public sealed partial class EnumBuilder : System.Type //TYPEINFO: System.Reflection.TypeInfo doesn't have a public ctor { internal EnumBuilder() { } + public override System.Reflection.Assembly Assembly { get { throw null; } } public override string AssemblyQualifiedName { get { throw null; } } + public override System.Type BaseType { get { throw null; } } + public override System.Type DeclaringType { get { throw null; } } public override string FullName { get { throw null; } } + public override System.Guid GUID { get { throw null; } } + public override bool IsConstructedGenericType { get { throw null; } } + public override System.Reflection.Module Module { get { throw null; } } public override string Name { get { throw null; } } + public override string Namespace { get { throw null; } } + public override System.Type ReflectedType { get { throw null; } } + public override System.RuntimeTypeHandle TypeHandle { get { throw null; } } public System.Reflection.Emit.FieldBuilder UnderlyingField { get { throw null; } } + public override System.Type UnderlyingSystemType { get { throw null; } } public System.Reflection.TypeInfo CreateTypeInfo() { throw null; } public System.Reflection.Emit.FieldBuilder DefineLiteral(string literalName, object literalValue) { throw null; } - public override bool IsAssignableFrom(System.Reflection.TypeInfo typeInfo) { throw null; } + protected override System.Reflection.TypeAttributes GetAttributeFlagsImpl() { throw null; } + protected override System.Reflection.ConstructorInfo GetConstructorImpl(System.Reflection.BindingFlags bindingAttr, System.Reflection.Binder binder, System.Reflection.CallingConventions callConvention, System.Type[] types, System.Reflection.ParameterModifier[] modifiers) { throw null; } + public override System.Reflection.ConstructorInfo[] GetConstructors(System.Reflection.BindingFlags bindingAttr) { throw null; } + public override object[] GetCustomAttributes(bool inherit) { throw null; } + public override object[] GetCustomAttributes(System.Type attributeType, bool inherit) { throw null; } + public override System.Type GetElementType() { throw null; } + public override System.Type GetEnumUnderlyingType() { throw null; } + public override System.Reflection.EventInfo GetEvent(string name, System.Reflection.BindingFlags bindingAttr) { throw null; } + public override System.Reflection.EventInfo[] GetEvents() { throw null; } + public override System.Reflection.EventInfo[] GetEvents(System.Reflection.BindingFlags bindingAttr) { throw null; } + public override System.Reflection.FieldInfo GetField(string name, System.Reflection.BindingFlags bindingAttr) { throw null; } + public override System.Reflection.FieldInfo[] GetFields(System.Reflection.BindingFlags bindingAttr) { throw null; } + public override System.Type GetInterface(string name, bool ignoreCase) { throw null; } + public override System.Reflection.InterfaceMapping GetInterfaceMap(System.Type interfaceType) { throw null; } + public override System.Type[] GetInterfaces() { throw null; } + public override System.Reflection.MemberInfo[] GetMember(string name, System.Reflection.MemberTypes type, System.Reflection.BindingFlags bindingAttr) { throw null; } + public override System.Reflection.MemberInfo[] GetMembers(System.Reflection.BindingFlags bindingAttr) { throw null; } + protected override System.Reflection.MethodInfo GetMethodImpl(string name, System.Reflection.BindingFlags bindingAttr, System.Reflection.Binder binder, System.Reflection.CallingConventions callConvention, System.Type[] types, System.Reflection.ParameterModifier[] modifiers) { throw null; } + public override System.Reflection.MethodInfo[] GetMethods(System.Reflection.BindingFlags bindingAttr) { throw null; } + public override System.Type GetNestedType(string name, System.Reflection.BindingFlags bindingAttr) { throw null; } + public override System.Type[] GetNestedTypes(System.Reflection.BindingFlags bindingAttr) { throw null; } + public override System.Reflection.PropertyInfo[] GetProperties(System.Reflection.BindingFlags bindingAttr) { throw null; } + protected override System.Reflection.PropertyInfo GetPropertyImpl(string name, System.Reflection.BindingFlags bindingAttr, System.Reflection.Binder binder, System.Type returnType, System.Type[] types, System.Reflection.ParameterModifier[] modifiers) { throw null; } + protected override bool HasElementTypeImpl() { throw null; } + public override object InvokeMember(string name, System.Reflection.BindingFlags invokeAttr, System.Reflection.Binder binder, object target, object[] args, System.Reflection.ParameterModifier[] modifiers, System.Globalization.CultureInfo culture, string[] namedParameters) { throw null; } + protected override bool IsArrayImpl() { throw null; } +//TYPEINFO public override bool IsAssignableFrom(System.Reflection.TypeInfo typeInfo) { throw null; } + protected override bool IsByRefImpl() { throw null; } + protected override bool IsCOMObjectImpl() { throw null; } + public override bool IsDefined(System.Type attributeType, bool inherit) { throw null; } + protected override bool IsPointerImpl() { throw null; } + protected override bool IsPrimitiveImpl() { throw null; } + protected override bool IsValueTypeImpl() { throw null; } public override System.Type MakeArrayType() { throw null; } public override System.Type MakeArrayType(int rank) { throw null; } public override System.Type MakeByRefType() { throw null; } @@ -81,25 +132,81 @@ namespace System.Reflection.Emit internal FieldBuilder() { } public override System.Reflection.FieldAttributes Attributes { get { throw null; } } public override System.Type DeclaringType { get { throw null; } } + public override System.RuntimeFieldHandle FieldHandle { get { throw null; } } public override System.Type FieldType { get { throw null; } } public override string Name { get { throw null; } } + public override System.Type ReflectedType { get { throw null; } } + public override object[] GetCustomAttributes(bool inherit) { throw null; } + public override object[] GetCustomAttributes(System.Type attributeType, bool inherit) { throw null; } public override object GetValue(object obj) { throw null; } + public override bool IsDefined(System.Type attributeType, bool inherit) { throw null; } public void SetConstant(object defaultValue) { } public void SetCustomAttribute(System.Reflection.ConstructorInfo con, byte[] binaryAttribute) { } public void SetCustomAttribute(System.Reflection.Emit.CustomAttributeBuilder customBuilder) { } public void SetOffset(int iOffset) { } + public override void SetValue(object obj, object val, System.Reflection.BindingFlags invokeAttr, System.Reflection.Binder binder, System.Globalization.CultureInfo culture) { } } - public sealed partial class GenericTypeParameterBuilder : System.Reflection.TypeInfo + public sealed partial class GenericTypeParameterBuilder : System.Type //TYPEINFO: System.Reflection.TypeInfo { internal GenericTypeParameterBuilder() { } + public override System.Reflection.Assembly Assembly { get { throw null; } } public override string AssemblyQualifiedName { get { throw null; } } + public override System.Type BaseType { get { throw null; } } + public override bool ContainsGenericParameters { get { throw null; } } + public override System.Reflection.MethodBase DeclaringMethod { get { throw null; } } + public override System.Type DeclaringType { get { throw null; } } public override string FullName { get { throw null; } } + public override System.Reflection.GenericParameterAttributes GenericParameterAttributes { get { throw null; } } + public override int GenericParameterPosition { get { throw null; } } + public override System.Guid GUID { get { throw null; } } + public override bool IsConstructedGenericType { get { throw null; } } public override bool IsGenericParameter { get { throw null; } } + public override bool IsGenericType { get { throw null; } } + public override bool IsGenericTypeDefinition { get { throw null; } } + public override System.Reflection.Module Module { get { throw null; } } public override string Name { get { throw null; } } + public override string Namespace { get { throw null; } } + public override System.Type ReflectedType { get { throw null; } } + public override System.RuntimeTypeHandle TypeHandle { get { throw null; } } + public override System.Type UnderlyingSystemType { get { throw null; } } public override bool Equals(object o) { throw null; } + protected override System.Reflection.TypeAttributes GetAttributeFlagsImpl() { throw null; } + protected override System.Reflection.ConstructorInfo GetConstructorImpl(System.Reflection.BindingFlags bindingAttr, System.Reflection.Binder binder, System.Reflection.CallingConventions callConvention, System.Type[] types, System.Reflection.ParameterModifier[] modifiers) { throw null; } + public override System.Reflection.ConstructorInfo[] GetConstructors(System.Reflection.BindingFlags bindingAttr) { throw null; } + public override object[] GetCustomAttributes(bool inherit) { throw null; } + public override object[] GetCustomAttributes(System.Type attributeType, bool inherit) { throw null; } + public override System.Type GetElementType() { throw null; } + public override System.Reflection.EventInfo GetEvent(string name, System.Reflection.BindingFlags bindingAttr) { throw null; } + public override System.Reflection.EventInfo[] GetEvents() { throw null; } + public override System.Reflection.EventInfo[] GetEvents(System.Reflection.BindingFlags bindingAttr) { throw null; } + public override System.Reflection.FieldInfo GetField(string name, System.Reflection.BindingFlags bindingAttr) { throw null; } + public override System.Reflection.FieldInfo[] GetFields(System.Reflection.BindingFlags bindingAttr) { throw null; } + public override System.Type[] GetGenericArguments() { throw null; } public override System.Type GetGenericTypeDefinition() { throw null; } public override int GetHashCode() { throw null; } - public override bool IsAssignableFrom(System.Reflection.TypeInfo typeInfo) { throw null; } + public override System.Type GetInterface(string name, bool ignoreCase) { throw null; } + public override System.Reflection.InterfaceMapping GetInterfaceMap(System.Type interfaceType) { throw null; } + public override System.Type[] GetInterfaces() { throw null; } + public override System.Reflection.MemberInfo[] GetMember(string name, System.Reflection.MemberTypes type, System.Reflection.BindingFlags bindingAttr) { throw null; } + public override System.Reflection.MemberInfo[] GetMembers(System.Reflection.BindingFlags bindingAttr) { throw null; } + protected override System.Reflection.MethodInfo GetMethodImpl(string name, System.Reflection.BindingFlags bindingAttr, System.Reflection.Binder binder, System.Reflection.CallingConventions callConvention, System.Type[] types, System.Reflection.ParameterModifier[] modifiers) { throw null; } + public override System.Reflection.MethodInfo[] GetMethods(System.Reflection.BindingFlags bindingAttr) { throw null; } + public override System.Type GetNestedType(string name, System.Reflection.BindingFlags bindingAttr) { throw null; } + public override System.Type[] GetNestedTypes(System.Reflection.BindingFlags bindingAttr) { throw null; } + public override System.Reflection.PropertyInfo[] GetProperties(System.Reflection.BindingFlags bindingAttr) { throw null; } + protected override System.Reflection.PropertyInfo GetPropertyImpl(string name, System.Reflection.BindingFlags bindingAttr, System.Reflection.Binder binder, System.Type returnType, System.Type[] types, System.Reflection.ParameterModifier[] modifiers) { throw null; } + protected override bool HasElementTypeImpl() { throw null; } + public override object InvokeMember(string name, System.Reflection.BindingFlags invokeAttr, System.Reflection.Binder binder, object target, object[] args, System.Reflection.ParameterModifier[] modifiers, System.Globalization.CultureInfo culture, string[] namedParameters) { throw null; } + protected override bool IsArrayImpl() { throw null; } +//TYPEINFO: public override bool IsAssignableFrom(System.Reflection.TypeInfo typeInfo) { throw null; } + public override bool IsAssignableFrom(System.Type c) { throw null; } + protected override bool IsByRefImpl() { throw null; } + protected override bool IsCOMObjectImpl() { throw null; } + public override bool IsDefined(System.Type attributeType, bool inherit) { throw null; } + protected override bool IsPointerImpl() { throw null; } + protected override bool IsPrimitiveImpl() { throw null; } + public override bool IsSubclassOf(System.Type c) { throw null; } + protected override bool IsValueTypeImpl() { throw null; } public override System.Type MakeArrayType() { throw null; } public override System.Type MakeArrayType(int rank) { throw null; } public override System.Type MakeByRefType() { throw null; } @@ -122,18 +229,28 @@ namespace System.Reflection.Emit public bool InitLocals { get { throw null; } set { } } public override bool IsGenericMethod { get { throw null; } } public override bool IsGenericMethodDefinition { get { throw null; } } + public override System.RuntimeMethodHandle MethodHandle { get { throw null; } } + public override System.Reflection.Module Module { get { throw null; } } public override string Name { get { throw null; } } + public override System.Type ReflectedType { get { throw null; } } public override System.Reflection.ParameterInfo ReturnParameter { get { throw null; } } public override System.Type ReturnType { get { throw null; } } + public override System.Reflection.ICustomAttributeProvider ReturnTypeCustomAttributes { get { throw null; } } public System.Reflection.Emit.GenericTypeParameterBuilder[] DefineGenericParameters(params string[] names) { throw null; } public System.Reflection.Emit.ParameterBuilder DefineParameter(int position, System.Reflection.ParameterAttributes attributes, string strParamName) { throw null; } public override bool Equals(object obj) { throw null; } + public override System.Reflection.MethodInfo GetBaseDefinition() { throw null; } + public override object[] GetCustomAttributes(bool inherit) { throw null; } + public override object[] GetCustomAttributes(System.Type attributeType, bool inherit) { throw null; } public override System.Type[] GetGenericArguments() { throw null; } public override System.Reflection.MethodInfo GetGenericMethodDefinition() { throw null; } public override int GetHashCode() { throw null; } public System.Reflection.Emit.ILGenerator GetILGenerator() { throw null; } public System.Reflection.Emit.ILGenerator GetILGenerator(int size) { throw null; } + public override System.Reflection.MethodImplAttributes GetMethodImplementationFlags() { throw null; } public override System.Reflection.ParameterInfo[] GetParameters() { throw null; } + public override object Invoke(object obj, System.Reflection.BindingFlags invokeAttr, System.Reflection.Binder binder, object[] parameters, System.Globalization.CultureInfo culture) { throw null; } + public override bool IsDefined(System.Type attributeType, bool inherit) { throw null; } public override System.Reflection.MethodInfo MakeGenericMethod(params System.Type[] typeArguments) { throw null; } public void SetCustomAttribute(System.Reflection.ConstructorInfo con, byte[] binaryAttribute) { } public void SetCustomAttribute(System.Reflection.Emit.CustomAttributeBuilder customBuilder) { } @@ -176,28 +293,56 @@ namespace System.Reflection.Emit public override bool CanRead { get { throw null; } } public override bool CanWrite { get { throw null; } } public override System.Type DeclaringType { get { throw null; } } + public override System.Reflection.Module Module { get { throw null; } } public override string Name { get { throw null; } } public override System.Type PropertyType { get { throw null; } } + public override System.Type ReflectedType { get { throw null; } } public void AddOtherMethod(System.Reflection.Emit.MethodBuilder mdBuilder) { } + public override System.Reflection.MethodInfo[] GetAccessors(bool nonPublic) { throw null; } + public override object[] GetCustomAttributes(bool inherit) { throw null; } + public override object[] GetCustomAttributes(System.Type attributeType, bool inherit) { throw null; } + public override System.Reflection.MethodInfo GetGetMethod(bool nonPublic) { throw null; } public override System.Reflection.ParameterInfo[] GetIndexParameters() { throw null; } + public override System.Reflection.MethodInfo GetSetMethod(bool nonPublic) { throw null; } public override object GetValue(object obj, object[] index) { throw null; } + public override object GetValue(object obj, System.Reflection.BindingFlags invokeAttr, System.Reflection.Binder binder, object[] index, System.Globalization.CultureInfo culture) { throw null; } + public override bool IsDefined(System.Type attributeType, bool inherit) { throw null; } public void SetConstant(object defaultValue) { } public void SetCustomAttribute(System.Reflection.ConstructorInfo con, byte[] binaryAttribute) { } public void SetCustomAttribute(System.Reflection.Emit.CustomAttributeBuilder customBuilder) { } public void SetGetMethod(System.Reflection.Emit.MethodBuilder mdBuilder) { } public void SetSetMethod(System.Reflection.Emit.MethodBuilder mdBuilder) { } public override void SetValue(object obj, object value, object[] index) { } + public override void SetValue(object obj, object value, System.Reflection.BindingFlags invokeAttr, System.Reflection.Binder binder, object[] index, System.Globalization.CultureInfo culture) { } } - public sealed partial class TypeBuilder : System.Reflection.TypeInfo + public sealed partial class TypeBuilder : System.Type //TYPEINFO: System.Reflection.TypeInfo { internal TypeBuilder() { } public const int UnspecifiedTypeSize = 0; + public override System.Reflection.Assembly Assembly { get { throw null; } } public override string AssemblyQualifiedName { get { throw null; } } + public override System.Type BaseType { get { throw null; } } + public override System.Reflection.MethodBase DeclaringMethod { get { throw null; } } + public override System.Type DeclaringType { get { throw null; } } public override string FullName { get { throw null; } } + public override System.Reflection.GenericParameterAttributes GenericParameterAttributes { get { throw null; } } + public override int GenericParameterPosition { get { throw null; } } + public override System.Guid GUID { get { throw null; } } + public override bool IsConstructedGenericType { get { throw null; } } public override bool IsGenericParameter { get { throw null; } } + public override bool IsGenericType { get { throw null; } } + public override bool IsGenericTypeDefinition { get { throw null; } } + public override bool IsSecurityCritical { get { throw null; } } + public override bool IsSecuritySafeCritical { get { throw null; } } + public override bool IsSecurityTransparent { get { throw null; } } + public override System.Reflection.Module Module { get { throw null; } } public override string Name { get { throw null; } } + public override string Namespace { get { throw null; } } public System.Reflection.Emit.PackingSize PackingSize { get { throw null; } } + public override System.Type ReflectedType { get { throw null; } } public int Size { get { throw null; } } + public override System.RuntimeTypeHandle TypeHandle { get { throw null; } } + public override System.Type UnderlyingSystemType { get { throw null; } } public void AddInterfaceImplementation(System.Type interfaceType) { } public System.Reflection.TypeInfo CreateTypeInfo() { throw null; } public System.Reflection.Emit.ConstructorBuilder DefineConstructor(System.Reflection.MethodAttributes attributes, System.Reflection.CallingConventions callingConvention, System.Type[] parameterTypes) { throw null; } @@ -227,12 +372,45 @@ namespace System.Reflection.Emit public System.Reflection.Emit.PropertyBuilder DefineProperty(string name, System.Reflection.PropertyAttributes attributes, System.Type returnType, System.Type[] returnTypeRequiredCustomModifiers, System.Type[] returnTypeOptionalCustomModifiers, System.Type[] parameterTypes, System.Type[][] parameterTypeRequiredCustomModifiers, System.Type[][] parameterTypeOptionalCustomModifiers) { throw null; } public System.Reflection.Emit.ConstructorBuilder DefineTypeInitializer() { throw null; } public System.Reflection.Emit.FieldBuilder DefineUninitializedData(string name, int size, System.Reflection.FieldAttributes attributes) { throw null; } + protected override System.Reflection.TypeAttributes GetAttributeFlagsImpl() { throw null; } public static System.Reflection.ConstructorInfo GetConstructor(System.Type type, System.Reflection.ConstructorInfo constructor) { throw null; } + protected override System.Reflection.ConstructorInfo GetConstructorImpl(System.Reflection.BindingFlags bindingAttr, System.Reflection.Binder binder, System.Reflection.CallingConventions callConvention, System.Type[] types, System.Reflection.ParameterModifier[] modifiers) { throw null; } + public override System.Reflection.ConstructorInfo[] GetConstructors(System.Reflection.BindingFlags bindingAttr) { throw null; } + public override object[] GetCustomAttributes(bool inherit) { throw null; } + public override object[] GetCustomAttributes(System.Type attributeType, bool inherit) { throw null; } + public override System.Type GetElementType() { throw null; } + public override System.Reflection.EventInfo GetEvent(string name, System.Reflection.BindingFlags bindingAttr) { throw null; } + public override System.Reflection.EventInfo[] GetEvents() { throw null; } + public override System.Reflection.EventInfo[] GetEvents(System.Reflection.BindingFlags bindingAttr) { throw null; } + public override System.Reflection.FieldInfo GetField(string name, System.Reflection.BindingFlags bindingAttr) { throw null; } public static System.Reflection.FieldInfo GetField(System.Type type, System.Reflection.FieldInfo field) { throw null; } + public override System.Reflection.FieldInfo[] GetFields(System.Reflection.BindingFlags bindingAttr) { throw null; } + public override System.Type[] GetGenericArguments() { throw null; } public override System.Type GetGenericTypeDefinition() { throw null; } + public override System.Type GetInterface(string name, bool ignoreCase) { throw null; } + public override System.Reflection.InterfaceMapping GetInterfaceMap(System.Type interfaceType) { throw null; } + public override System.Type[] GetInterfaces() { throw null; } + public override System.Reflection.MemberInfo[] GetMember(string name, System.Reflection.MemberTypes type, System.Reflection.BindingFlags bindingAttr) { throw null; } + public override System.Reflection.MemberInfo[] GetMembers(System.Reflection.BindingFlags bindingAttr) { throw null; } public static System.Reflection.MethodInfo GetMethod(System.Type type, System.Reflection.MethodInfo method) { throw null; } - public override bool IsAssignableFrom(System.Reflection.TypeInfo typeInfo) { throw null; } + protected override System.Reflection.MethodInfo GetMethodImpl(string name, System.Reflection.BindingFlags bindingAttr, System.Reflection.Binder binder, System.Reflection.CallingConventions callConvention, System.Type[] types, System.Reflection.ParameterModifier[] modifiers) { throw null; } + public override System.Reflection.MethodInfo[] GetMethods(System.Reflection.BindingFlags bindingAttr) { throw null; } + public override System.Type GetNestedType(string name, System.Reflection.BindingFlags bindingAttr) { throw null; } + public override System.Type[] GetNestedTypes(System.Reflection.BindingFlags bindingAttr) { throw null; } + public override System.Reflection.PropertyInfo[] GetProperties(System.Reflection.BindingFlags bindingAttr) { throw null; } + protected override System.Reflection.PropertyInfo GetPropertyImpl(string name, System.Reflection.BindingFlags bindingAttr, System.Reflection.Binder binder, System.Type returnType, System.Type[] types, System.Reflection.ParameterModifier[] modifiers) { throw null; } + protected override bool HasElementTypeImpl() { throw null; } + public override object InvokeMember(string name, System.Reflection.BindingFlags invokeAttr, System.Reflection.Binder binder, object target, object[] args, System.Reflection.ParameterModifier[] modifiers, System.Globalization.CultureInfo culture, string[] namedParameters) { throw null; } + protected override bool IsArrayImpl() { throw null; } +//TYPEINFO: public override bool IsAssignableFrom(System.Reflection.TypeInfo typeInfo) { throw null; } + public override bool IsAssignableFrom(System.Type c) { throw null; } + protected override bool IsByRefImpl() { throw null; } + protected override bool IsCOMObjectImpl() { throw null; } public bool IsCreated() { throw null; } + public override bool IsDefined(System.Type attributeType, bool inherit) { throw null; } + protected override bool IsPointerImpl() { throw null; } + protected override bool IsPrimitiveImpl() { throw null; } + public override bool IsSubclassOf(System.Type c) { throw null; } public override System.Type MakeArrayType() { throw null; } public override System.Type MakeArrayType(int rank) { throw null; } public override System.Type MakeByRefType() { throw null; } diff --git a/src/System.Reflection.Emit/ref/System.Reflection.Emit.csproj b/src/System.Reflection.Emit/ref/System.Reflection.Emit.csproj index c890fd92aa..6941527b23 100644 --- a/src/System.Reflection.Emit/ref/System.Reflection.Emit.csproj +++ b/src/System.Reflection.Emit/ref/System.Reflection.Emit.csproj @@ -1,17 +1,13 @@ -<?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> - <AssemblyVersion>4.0.0.0</AssemblyVersion> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.1</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="System.Reflection.Emit.cs" /> - <Compile Include="System.Reflection.Emit.Manual.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Reflection.Primitives\ref\System.Reflection.Primitives.csproj" /> + <ProjectReference Include="..\..\System.Reflection.Emit.ILGeneration\ref\System.Reflection.Emit.ILGeneration.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Reflection.Emit/ref/project.json b/src/System.Reflection.Emit/ref/project.json deleted file mode 100644 index ea5da7b475..0000000000 --- a/src/System.Reflection.Emit/ref/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.3.0", - "System.IO": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0" - }, - "frameworks": { - "netstandard1.1": {} - } -}
\ No newline at end of file diff --git a/src/System.Reflection.Emit/src/System.Reflection.Emit.csproj b/src/System.Reflection.Emit/src/System.Reflection.Emit.csproj index 8613502b89..8a49d79bb5 100644 --- a/src/System.Reflection.Emit/src/System.Reflection.Emit.csproj +++ b/src/System.Reflection.Emit/src/System.Reflection.Emit.csproj @@ -1,4 +1,4 @@ -<?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> @@ -14,7 +14,7 @@ <TargetingPackReference Include="System.Private.CoreLib" Condition="'$(TargetGroup)' != 'net46'" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Private.CoreLib" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Reflection.Emit/src/project.json b/src/System.Reflection.Emit/src/project.json deleted file mode 100644 index 54b2045297..0000000000 --- a/src/System.Reflection.Emit/src/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "frameworks": { - "netstandard1.3": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24728-02" - } - } - } -} diff --git a/src/System.Reflection.Extensions/ref/System.Reflection.Extensions.csproj b/src/System.Reflection.Extensions/ref/System.Reflection.Extensions.csproj index 7b3898ee93..b27943b305 100644 --- a/src/System.Reflection.Extensions/ref/System.Reflection.Extensions.csproj +++ b/src/System.Reflection.Extensions/ref/System.Reflection.Extensions.csproj @@ -1,16 +1,13 @@ -<?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> - <PackageTargetFramework>netstandard1.7;uap10.1</PackageTargetFramework> - </PropertyGroup> <ItemGroup> <Compile Include="System.Reflection.Extensions.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Reflection\ref\System.Reflection.csproj" /> + <ProjectReference Include="..\..\System.Reflection.Primitives\ref\System.Reflection.Primitives.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Reflection.Extensions/ref/project.json b/src/System.Reflection.Extensions/ref/project.json deleted file mode 100644 index 477d1c75da..0000000000 --- a/src/System.Reflection.Extensions/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Reflection": "4.3.0", - "System.Reflection.Primitives": "4.3.0" - }, - "frameworks": { - "netstandard1.7": {} - } -}
\ No newline at end of file diff --git a/src/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj b/src/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj index 73708a6a54..cd4dc2f868 100644 --- a/src/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj +++ b/src/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj @@ -1,4 +1,4 @@ -<?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> @@ -17,7 +17,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Reflection.Extensions/src/project.json b/src/System.Reflection.Extensions/src/project.json deleted file mode 100644 index 1119147f64..0000000000 --- a/src/System.Reflection.Extensions/src/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Resources.ResourceManager": "4.3.0" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - }, - "uap10.1": { - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Resources.ResourceManager": "4.3.0" - } - } - } -}
\ No newline at end of file diff --git a/src/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj b/src/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj index 801b51f524..7d51dcd8d2 100644 --- a/src/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj +++ b/src/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj @@ -1,4 +1,4 @@ -<?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> @@ -246,7 +246,22 @@ <Compile Include="System\Reflection\System.Reflection.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Collections.Immutable\src\System.Collections.Immutable.csproj" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Reflection.Primitives" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Collections" /> + <Reference Include="System.IO" /> + <Reference Include="System.IO.Compression" /> + <Reference Include="System.Text.Encoding" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Linq" /> + <Reference Include="System.Reflection" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Text.Encoding.Extensions" /> + <Reference Include="System.Reflection.Extensions" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Reflection.Metadata/src/project.json b/src/System.Reflection.Metadata/src/project.json deleted file mode 100644 index 096c04c7ab..0000000000 --- a/src/System.Reflection.Metadata/src/project.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Collections.Immutable": "1.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.IO": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.Threading": "4.3.0", - "System.IO.Compression": "4.3.0" - }, - "frameworks": { - "netstandard1.1": {} - } -}
\ No newline at end of file diff --git a/src/System.Reflection.Primitives/ref/System.Reflection.Primitives.csproj b/src/System.Reflection.Primitives/ref/System.Reflection.Primitives.csproj index 4a094b0e49..6cfd0adabf 100644 --- a/src/System.Reflection.Primitives/ref/System.Reflection.Primitives.csproj +++ b/src/System.Reflection.Primitives/ref/System.Reflection.Primitives.csproj @@ -1,16 +1,11 @@ -<?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> - <PackageTargetFramework>netstandard1.7;uap10.1</PackageTargetFramework> - </PropertyGroup> <ItemGroup> <Compile Include="System.Reflection.Primitives.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Reflection.Primitives/ref/project.json b/src/System.Reflection.Primitives/ref/project.json deleted file mode 100644 index 11f44fb8b7..0000000000 --- a/src/System.Reflection.Primitives/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj b/src/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj index b5487a8aec..d00c0053c8 100644 --- a/src/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj +++ b/src/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj @@ -1,4 +1,4 @@ -<?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> @@ -26,7 +26,7 @@ <TargetingPackReference Include="System.Private.CoreLib" Condition="'$(TargetGroup)' != 'net463'" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Private.CoreLib" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Reflection.Primitives/src/project.json b/src/System.Reflection.Primitives/src/project.json deleted file mode 100644 index c97410a2cb..0000000000 --- a/src/System.Reflection.Primitives/src/project.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24728-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - }, - "uap10.1": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24728-00" - } - } - } -} diff --git a/src/System.Reflection.TypeExtensions/ref/System.Reflection.TypeExtensions.csproj b/src/System.Reflection.TypeExtensions/ref/System.Reflection.TypeExtensions.csproj index 27da08594d..65c3e3dd54 100644 --- a/src/System.Reflection.TypeExtensions/ref/System.Reflection.TypeExtensions.csproj +++ b/src/System.Reflection.TypeExtensions/ref/System.Reflection.TypeExtensions.csproj @@ -1,16 +1,13 @@ -<?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.5</NuGetTargetMoniker> - <PackageTargetFramework>netstandard1.5;uap10.1</PackageTargetFramework> - </PropertyGroup> <ItemGroup> <Compile Include="System.Reflection.TypeExtensions.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Reflection.Primitives\ref\System.Reflection.Primitives.csproj" /> + <ProjectReference Include="..\..\System.Reflection\ref\System.Reflection.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Reflection.TypeExtensions/ref/project.json b/src/System.Reflection.TypeExtensions/ref/project.json deleted file mode 100644 index b0c33a637c..0000000000 --- a/src/System.Reflection.TypeExtensions/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection": "4.3.0" - }, - "frameworks": { - "netstandard1.5": {} - } -}
\ No newline at end of file diff --git a/src/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj b/src/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj index 0dbddfaac1..6fcfc60a95 100644 --- a/src/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj +++ b/src/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj @@ -1,4 +1,4 @@ -<?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> @@ -22,7 +22,7 @@ <TargetingPackReference Include="System.Private.CoreLib" Condition="'$(TargetGroup)' != 'net462'" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Private.CoreLib" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Reflection.TypeExtensions/src/project.json b/src/System.Reflection.TypeExtensions/src/project.json deleted file mode 100644 index ed5380849a..0000000000 --- a/src/System.Reflection.TypeExtensions/src/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "frameworks": { - "netstandard1.5": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24728-02" - } - }, - "net462": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - }, - "uap10.1": { - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Reflection": "4.4.0-beta-24721-02", - "System.Resources.ResourceManager": "4.4.0-beta-24721-02" - } - } - } -} diff --git a/src/System.Reflection/ref/System.Reflection.csproj b/src/System.Reflection/ref/System.Reflection.csproj index 4c82f81215..ac24a564e2 100644 --- a/src/System.Reflection/ref/System.Reflection.csproj +++ b/src/System.Reflection/ref/System.Reflection.csproj @@ -1,17 +1,12 @@ -<?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> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> - <PackageTargetFramework>netstandard1.7;uap10.1</PackageTargetFramework> - </PropertyGroup> <ItemGroup> <Compile Include="System.Reflection.cs" /> <Compile Include="System.Reflection.Manual.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Reflection/ref/project.json b/src/System.Reflection/ref/project.json deleted file mode 100644 index 11f44fb8b7..0000000000 --- a/src/System.Reflection/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Reflection/src/System.Reflection.csproj b/src/System.Reflection/src/System.Reflection.csproj index 4c1760e287..78ac409f4f 100644 --- a/src/System.Reflection/src/System.Reflection.csproj +++ b/src/System.Reflection/src/System.Reflection.csproj @@ -1,4 +1,4 @@ -<?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> @@ -17,7 +17,7 @@ <TargetingPackReference Include="System.Private.CoreLib" Condition="'$(TargetGroup)' != 'net463'" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Private.CoreLib" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Reflection/src/project.json b/src/System.Reflection/src/project.json deleted file mode 100644 index 3b0655d1ff..0000000000 --- a/src/System.Reflection/src/project.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24728-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - }, - "uap10.1": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24728-00" - } - } - } -} diff --git a/src/System.Resources.Reader/ref/System.Resources.Reader.csproj b/src/System.Resources.Reader/ref/System.Resources.Reader.csproj index cdb3539d6b..33781f940d 100644 --- a/src/System.Resources.Reader/ref/System.Resources.Reader.csproj +++ b/src/System.Resources.Reader/ref/System.Resources.Reader.csproj @@ -1,15 +1,13 @@ -<?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> <ItemGroup> <Compile Include="System.Resources.Reader.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Resources.ResourceManager\ref\System.Resources.ResourceManager.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Resources.Reader/ref/project.json b/src/System.Resources.Reader/ref/project.json deleted file mode 100644 index a04ce52e9a..0000000000 --- a/src/System.Resources.Reader/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Resources.ResourceManager": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Resources.Reader/src/System.Resources.Reader.csproj b/src/System.Resources.Reader/src/System.Resources.Reader.csproj index 1f42172949..734e1c1e43 100644 --- a/src/System.Resources.Reader/src/System.Resources.Reader.csproj +++ b/src/System.Resources.Reader/src/System.Resources.Reader.csproj @@ -1,4 +1,4 @@ -<?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> @@ -15,7 +15,8 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> </PropertyGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Resources.Reader/src/project.json b/src/System.Resources.Reader/src/project.json deleted file mode 100644 index 2ea14cc31f..0000000000 --- a/src/System.Resources.Reader/src/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "System.Resources.ResourceManager": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Resources.ResourceManager/ref/System.Resources.ResourceManager.csproj b/src/System.Resources.ResourceManager/ref/System.Resources.ResourceManager.csproj index fae72be0de..14551c77a0 100644 --- a/src/System.Resources.ResourceManager/ref/System.Resources.ResourceManager.csproj +++ b/src/System.Resources.ResourceManager/ref/System.Resources.ResourceManager.csproj @@ -1,16 +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> - <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.7;uap10.1</PackageTargetFramework> - </PropertyGroup> <ItemGroup> <Compile Include="System.Resources.ResourceManager.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Runtime.InteropServices\ref\System.Runtime.InteropServices.csproj" /> + <ProjectReference Include="..\..\System.Reflection\ref\System.Reflection.csproj" /> + <ProjectReference Include="..\..\System.Globalization\ref\System.Globalization.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Resources.ResourceManager/ref/project.json b/src/System.Resources.ResourceManager/ref/project.json deleted file mode 100644 index 59ca9c2921..0000000000 --- a/src/System.Resources.ResourceManager/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Reflection": "4.4.0-beta-24721-02", - "System.Globalization": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Resources.ResourceManager/src/System.Resources.ResourceManager.csproj b/src/System.Resources.ResourceManager/src/System.Resources.ResourceManager.csproj index 80e8d652c3..98944ae247 100644 --- a/src/System.Resources.ResourceManager/src/System.Resources.ResourceManager.csproj +++ b/src/System.Resources.ResourceManager/src/System.Resources.ResourceManager.csproj @@ -1,4 +1,4 @@ -<?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> @@ -34,7 +34,8 @@ <TargetingPackReference Include="mscorlib"/> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Private.CoreLib" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Resources.ResourceManager/src/project.json b/src/System.Resources.ResourceManager/src/project.json deleted file mode 100644 index 3a5f4c436d..0000000000 --- a/src/System.Resources.ResourceManager/src/project.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24728-02" - } - }, - "uap10.1": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24728-00", - "Microsoft.TargetingPack.Private.WinRT": "1.0.3", - "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.Reflection": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Threading": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.Resources.Writer/ref/System.Resources.Writer.csproj b/src/System.Resources.Writer/ref/System.Resources.Writer.csproj index cf6628a522..018bb6f66b 100644 --- a/src/System.Resources.Writer/ref/System.Resources.Writer.csproj +++ b/src/System.Resources.Writer/ref/System.Resources.Writer.csproj @@ -1,15 +1,12 @@ -<?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> <ItemGroup> <Compile Include="System.Resources.Writer.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Resources.Writer/ref/project.json b/src/System.Resources.Writer/ref/project.json deleted file mode 100644 index 100913c4f0..0000000000 --- a/src/System.Resources.Writer/ref/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Resources.Writer/src/System.Resources.Writer.csproj b/src/System.Resources.Writer/src/System.Resources.Writer.csproj index d71560dce7..4ddcde6872 100644 --- a/src/System.Resources.Writer/src/System.Resources.Writer.csproj +++ b/src/System.Resources.Writer/src/System.Resources.Writer.csproj @@ -1,4 +1,4 @@ -<?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> @@ -22,7 +22,14 @@ <ProjectReference Include="../../System.Resources.ResourceManager/ref/System.Resources.ResourceManager.csproj"/> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Resources.Writer/src/project.json b/src/System.Resources.Writer/src/project.json deleted file mode 100644 index 733aac41a5..0000000000 --- a/src/System.Resources.Writer/src/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.4.0-beta-24721-02", - "System.Diagnostics.Contracts": "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.Globalization": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.IO.FileSystem": "4.4.0-beta-24721-02", - "System.IO.FileSystem.Primitives": "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.Threading": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -}
\ No newline at end of file diff --git a/src/System.Runtime.CompilerServices.VisualC/ref/System.Runtime.CompilerServices.VisualC.csproj b/src/System.Runtime.CompilerServices.VisualC/ref/System.Runtime.CompilerServices.VisualC.csproj index 9a1dfeeb5b..22f8583356 100644 --- a/src/System.Runtime.CompilerServices.VisualC/ref/System.Runtime.CompilerServices.VisualC.csproj +++ b/src/System.Runtime.CompilerServices.VisualC/ref/System.Runtime.CompilerServices.VisualC.csproj @@ -1,15 +1,11 @@ -<?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> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="System.Runtime.CompilerServices.VisualC.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Runtime.CompilerServices.VisualC/ref/project.json b/src/System.Runtime.CompilerServices.VisualC/ref/project.json deleted file mode 100644 index 11f44fb8b7..0000000000 --- a/src/System.Runtime.CompilerServices.VisualC/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Runtime.CompilerServices.VisualC/src/System.Runtime.CompilerServices.VisualC.csproj b/src/System.Runtime.CompilerServices.VisualC/src/System.Runtime.CompilerServices.VisualC.csproj index 448392c479..80877948f6 100644 --- a/src/System.Runtime.CompilerServices.VisualC/src/System.Runtime.CompilerServices.VisualC.csproj +++ b/src/System.Runtime.CompilerServices.VisualC/src/System.Runtime.CompilerServices.VisualC.csproj @@ -1,4 +1,4 @@ -<?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> @@ -19,7 +19,7 @@ <TargetingPackReference Condition="'$(TargetGroup)' == 'net463'" Include="mscorlib" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Runtime.CompilerServices.VisualC/src/project.json b/src/System.Runtime.CompilerServices.VisualC/src/project.json deleted file mode 100644 index 4d7c1583fe..0000000000 --- a/src/System.Runtime.CompilerServices.VisualC/src/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Runtime.Extensions/ref/System.Runtime.Extensions.csproj b/src/System.Runtime.Extensions/ref/System.Runtime.Extensions.csproj index 4b55f5f4eb..2558ba1389 100644 --- a/src/System.Runtime.Extensions/ref/System.Runtime.Extensions.csproj +++ b/src/System.Runtime.Extensions/ref/System.Runtime.Extensions.csproj @@ -1,11 +1,7 @@ -<?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 Condition="'$(TargetGroup)' == ''">.NETCoreApp,Version=v1.1</NuGetTargetMoniker> - <!-- copy to uap10.1 until nuget makes the change to map that to ns1.7 --> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard1.7'">netstandard1.7;uap10.1</PackageTargetFramework> <DefineConstants Condition="'$(TargetGroup)' == ''">$(DefineConstants);netcoreapp11</DefineConstants> </PropertyGroup> <ItemGroup> @@ -13,11 +9,8 @@ <Compile Include="System.Runtime.Extensions.Manual.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> - </ItemGroup> - <ItemGroup> - <!-- Temporary till we publish System.Security.Principal updated package --> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> <ProjectReference Include="..\..\System.Security.Principal\ref\System.Security.Principal.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Runtime.Extensions/ref/project.json b/src/System.Runtime.Extensions/ref/project.json deleted file mode 100644 index bf65296cd8..0000000000 --- a/src/System.Runtime.Extensions/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Security.Principal": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {}, - "netcoreapp1.1": {} - } -} diff --git a/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj b/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj index 752fab755d..469b9aa04a 100644 --- a/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj +++ b/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj @@ -1,4 +1,4 @@ -<?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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> @@ -433,14 +433,17 @@ <ItemGroup Condition="'$(TargetGroup)' == ''"> <ProjectReference Include="..\..\System.Private.Uri\src\System.Private.Uri.csproj"> <UndefineProperties>%(ProjectReference.UndefineProperties);TargetGroup</UndefineProperties> + <UndefineProperties>%(ProjectReference.UndefineProperties);OSGroup</UndefineProperties> </ProjectReference> <ProjectReference Include="..\..\System.Diagnostics.Debug\src\System.Diagnostics.Debug.csproj"> <UndefineProperties>%(ProjectReference.UndefineProperties);TargetGroup</UndefineProperties> + <UndefineProperties>%(ProjectReference.UndefineProperties);OSGroup</UndefineProperties> </ProjectReference> <ProjectReference Include="..\..\System.Security.Principal\src\System.Security.Principal.csproj"> <Aliases>System_Security_Principal</Aliases> </ProjectReference> <ProjectReference Include="..\..\System.Runtime\src\System.Runtime.csproj"> + <UndefineProperties>%(ProjectReference.UndefineProperties);OSGroup</UndefineProperties> </ProjectReference> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == 'net462' Or '$(TargetGroup)' == 'net463'"> @@ -458,7 +461,7 @@ </ProjectReference> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Private.CoreLib" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Runtime.Extensions/src/project.json b/src/System.Runtime.Extensions/src/project.json deleted file mode 100644 index dbf7a6e994..0000000000 --- a/src/System.Runtime.Extensions/src/project.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24728-02" - } - }, - "netstandard1.5": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24728-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - }, - "net462": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - }, - "netcore50": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24728-00", - "Microsoft.TargetingPack.Private.WinRT": "1.0.3" - } - } - } -} diff --git a/src/System.Runtime.Handles/ref/System.Runtime.Handles.csproj b/src/System.Runtime.Handles/ref/System.Runtime.Handles.csproj index c242d27f8f..99493e3f15 100644 --- a/src/System.Runtime.Handles/ref/System.Runtime.Handles.csproj +++ b/src/System.Runtime.Handles/ref/System.Runtime.Handles.csproj @@ -1,17 +1,11 @@ -<?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> - <AssemblyVersion>4.1.0.0</AssemblyVersion> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> - <PackageTargetFramework>netstandard1.7;uap10.1</PackageTargetFramework> - </PropertyGroup> <ItemGroup> <Compile Include="System.Runtime.Handles.Forwards.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Runtime.Handles/ref/project.json b/src/System.Runtime.Handles/ref/project.json deleted file mode 100644 index 11f44fb8b7..0000000000 --- a/src/System.Runtime.Handles/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Runtime.Handles/src/System.Runtime.Handles.csproj b/src/System.Runtime.Handles/src/System.Runtime.Handles.csproj index 95400fb3b9..0febf4da39 100644 --- a/src/System.Runtime.Handles/src/System.Runtime.Handles.csproj +++ b/src/System.Runtime.Handles/src/System.Runtime.Handles.csproj @@ -1,4 +1,4 @@ -<?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> @@ -23,7 +23,7 @@ <TargetingPackReference Include="System.Core" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Runtime.Handles/src/project.json b/src/System.Runtime.Handles/src/project.json deleted file mode 100644 index ac9e264b02..0000000000 --- a/src/System.Runtime.Handles/src/project.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - }, - "uap10.1": { - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02" - } - } - } -} diff --git a/src/System.Runtime.InteropServices.RuntimeInformation/ref/System.Runtime.InteropServices.RuntimeInformation.csproj b/src/System.Runtime.InteropServices.RuntimeInformation/ref/System.Runtime.InteropServices.RuntimeInformation.csproj index 7f4af13270..ca07fc756e 100644 --- a/src/System.Runtime.InteropServices.RuntimeInformation/ref/System.Runtime.InteropServices.RuntimeInformation.csproj +++ b/src/System.Runtime.InteropServices.RuntimeInformation/ref/System.Runtime.InteropServices.RuntimeInformation.csproj @@ -1,15 +1,11 @@ -<?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.1</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="System.Runtime.InteropServices.RuntimeInformation.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Runtime.InteropServices.RuntimeInformation/ref/project.json b/src/System.Runtime.InteropServices.RuntimeInformation/ref/project.json deleted file mode 100644 index e9ce2da7f5..0000000000 --- a/src/System.Runtime.InteropServices.RuntimeInformation/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.3.0" - }, - "frameworks": { - "netstandard1.1": {} - } -}
\ No newline at end of file diff --git a/src/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj b/src/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj index c6eadabec7..1583c0df36 100644 --- a/src/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj +++ b/src/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj @@ -1,4 +1,4 @@ -<?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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'=='' AND '$(TargetGroup)' == ''">Windows_Debug</Configuration> @@ -85,7 +85,13 @@ </Compile> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Reflection" /> + <Reference Include="System.Reflection.Extensions" /> + <Reference Include="System.Runtime.InteropServices" /> </ItemGroup> <ItemGroup Condition="'$(GeneratePlatformNotSupportedAssembly)' != 'true'"> <Compile Include="System\Runtime\InteropServices\RuntimeInformation\RuntimeInformation.cs" /> @@ -93,4 +99,4 @@ <Compile Include="System\Runtime\InteropServices\RuntimeInformation\OSPlatform.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Runtime.InteropServices.RuntimeInformation/src/project.json b/src/System.Runtime.InteropServices.RuntimeInformation/src/project.json deleted file mode 100644 index b962f1559d..0000000000 --- a/src/System.Runtime.InteropServices.RuntimeInformation/src/project.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Reflection": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Threading": "4.3.0", - "System.Reflection.Extensions": "4.3.0" - }, - "frameworks": { - "netstandard1.1": { - "dependencies": {} - } - } -}
\ No newline at end of file diff --git a/src/System.Runtime.InteropServices.WindowsRuntime/ref/System.Runtime.InteropServices.WindowsRuntime.csproj b/src/System.Runtime.InteropServices.WindowsRuntime/ref/System.Runtime.InteropServices.WindowsRuntime.csproj index 90a341d17e..1f54d3ed2e 100644 --- a/src/System.Runtime.InteropServices.WindowsRuntime/ref/System.Runtime.InteropServices.WindowsRuntime.csproj +++ b/src/System.Runtime.InteropServices.WindowsRuntime/ref/System.Runtime.InteropServices.WindowsRuntime.csproj @@ -1,16 +1,11 @@ -<?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> - <AssemblyVersion>4.0.0.0</AssemblyVersion> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="System.Runtime.InteropServices.WindowsRuntime.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Runtime.InteropServices.WindowsRuntime/ref/project.json b/src/System.Runtime.InteropServices.WindowsRuntime/ref/project.json deleted file mode 100644 index e6c2196e0e..0000000000 --- a/src/System.Runtime.InteropServices.WindowsRuntime/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.3.0" - }, - "frameworks": { - "netstandard1.0": {} - } -}
\ No newline at end of file diff --git a/src/System.Runtime.InteropServices.WindowsRuntime/src/System.Runtime.InteropServices.WindowsRuntime.csproj b/src/System.Runtime.InteropServices.WindowsRuntime/src/System.Runtime.InteropServices.WindowsRuntime.csproj index b005b55248..a0d3b82113 100644 --- a/src/System.Runtime.InteropServices.WindowsRuntime/src/System.Runtime.InteropServices.WindowsRuntime.csproj +++ b/src/System.Runtime.InteropServices.WindowsRuntime/src/System.Runtime.InteropServices.WindowsRuntime.csproj @@ -1,4 +1,4 @@ -<?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> @@ -21,7 +21,7 @@ <TargetingPackReference Include="System.Private.Interop" Condition="'$(TargetGroup)' == 'netcore50aot'" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Private.CoreLib" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Runtime.InteropServices.WindowsRuntime/src/project.json b/src/System.Runtime.InteropServices.WindowsRuntime/src/project.json deleted file mode 100644 index ccc075c14e..0000000000 --- a/src/System.Runtime.InteropServices.WindowsRuntime/src/project.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "frameworks": { - "netstandard1.3": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24728-02" - } - }, - "netcore50": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24728-00", - "System.Runtime": "4.3.0" - } - }, - "net46": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.cs b/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.cs index 102e536897..b7ee818d4b 100644 --- a/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.cs +++ b/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.cs @@ -1670,9 +1670,9 @@ namespace System.Runtime.InteropServices.ComTypes namespace System.Security { - [System.CLSCompliant(false)] public sealed class SecureString : IDisposable { public SecureString() { } + [System.CLSCompliant(false)] public unsafe SecureString(char* value, int length) { } public int Length { get { throw null; } } public void AppendChar(char c) { } diff --git a/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj b/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj index 0e51514a45..eb2df3faa0 100644 --- a/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj +++ b/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj @@ -1,4 +1,4 @@ -<?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> @@ -6,20 +6,16 @@ to its own obsolete API. --> <NoWarn>618</NoWarn> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <OutputType>Library</OutputType> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETCoreApp,Version=v1.1</NuGetTargetMoniker> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard1.7'">netstandard1.7;uap10.1</PackageTargetFramework> - <DefineConstants Condition="'$(TargetGroup)' == ''">$(DefineConstants);netcoreapp11</DefineConstants> <ProjectGuid>{B17014F1-D902-417F-89B0-271204695831}</ProjectGuid> </PropertyGroup> <ItemGroup> <Compile Include="System.Runtime.InteropServices.cs" /> - - <!-- TODO: Remove this when the package reference is ready --> - <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Reflection\ref\System.Reflection.csproj" /> + <ProjectReference Include="..\..\System.Reflection.Primitives\ref\System.Reflection.Primitives.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Handles\ref\System.Runtime.Handles.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Runtime.InteropServices/ref/project.json b/src/System.Runtime.InteropServices/ref/project.json deleted file mode 100644 index 10e966f2c2..0000000000 --- a/src/System.Runtime.InteropServices/ref/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "System.Reflection": "4.4.0-beta-24721-02", - "System.Reflection.Primitives": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Runtime.Handles": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {}, - "netcoreapp1.1": {} - } -} diff --git a/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj b/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj index c389772192..52f001a6ac 100644 --- a/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj +++ b/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj @@ -1,4 +1,4 @@ -<?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> @@ -65,7 +65,7 @@ <TargetingPackReference Include="System.Private.Interop" Condition="'$(TargetGroup)' == 'uap101aot'" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Private.CoreLib" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Runtime.InteropServices/src/project.json b/src/System.Runtime.InteropServices/src/project.json deleted file mode 100644 index 6498bd79ed..0000000000 --- a/src/System.Runtime.InteropServices/src/project.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24728-02" - } - }, - "uap10.1": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24728-00" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Runtime.Loader/ref/System.Runtime.Loader.csproj b/src/System.Runtime.Loader/ref/System.Runtime.Loader.csproj index 63389a9a36..2a9c25d02c 100644 --- a/src/System.Runtime.Loader/ref/System.Runtime.Loader.csproj +++ b/src/System.Runtime.Loader/ref/System.Runtime.Loader.csproj @@ -1,16 +1,17 @@ -<?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> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NuGetTargetMoniker>.NETStandard,Version=v1.5</NuGetTargetMoniker> </PropertyGroup> <ItemGroup> <Compile Include="System.Runtime.Loader.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Reflection\ref\System.Reflection.csproj" /> + <ProjectReference Include="..\..\System.Reflection.Primitives\ref\System.Reflection.Primitives.csproj" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Runtime.Loader/ref/project.json b/src/System.Runtime.Loader/ref/project.json deleted file mode 100644 index 5105cd724f..0000000000 --- a/src/System.Runtime.Loader/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.IO": "4.3.0" - }, - "frameworks": { - "netstandard1.5": {} - } -}
\ No newline at end of file diff --git a/src/System.Runtime.Loader/src/System.Runtime.Loader.csproj b/src/System.Runtime.Loader/src/System.Runtime.Loader.csproj index 281a3e32bb..ae9f1601eb 100644 --- a/src/System.Runtime.Loader/src/System.Runtime.Loader.csproj +++ b/src/System.Runtime.Loader/src/System.Runtime.Loader.csproj @@ -1,4 +1,4 @@ -<?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> @@ -13,7 +13,7 @@ <TargetingPackReference Include="System.Private.CoreLib" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Private.CoreLib" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Runtime.Loader/src/project.json b/src/System.Runtime.Loader/src/project.json deleted file mode 100644 index c9906b24d5..0000000000 --- a/src/System.Runtime.Loader/src/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "frameworks": { - "netstandard1.5": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24728-02" - } - } - } -} diff --git a/src/System.Runtime.Numerics/ref/System.Runtime.Numerics.csproj b/src/System.Runtime.Numerics/ref/System.Runtime.Numerics.csproj index aaf9fc4fbe..dd1fedb0c5 100644 --- a/src/System.Runtime.Numerics/ref/System.Runtime.Numerics.csproj +++ b/src/System.Runtime.Numerics/ref/System.Runtime.Numerics.csproj @@ -1,15 +1,11 @@ -<?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> <ItemGroup> <Compile Include="System.Runtime.Numerics.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Runtime.Numerics/ref/project.json b/src/System.Runtime.Numerics/ref/project.json deleted file mode 100644 index 11f44fb8b7..0000000000 --- a/src/System.Runtime.Numerics/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Runtime.Numerics/src/System.Runtime.Numerics.csproj b/src/System.Runtime.Numerics/src/System.Runtime.Numerics.csproj index bdf7e261cb..61f3e1d846 100644 --- a/src/System.Runtime.Numerics/src/System.Runtime.Numerics.csproj +++ b/src/System.Runtime.Numerics/src/System.Runtime.Numerics.csproj @@ -1,4 +1,4 @@ -<?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> @@ -39,7 +39,12 @@ <TargetingPackReference Include="System.Numerics" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Runtime.Numerics/src/project.json b/src/System.Runtime.Numerics/src/project.json deleted file mode 100644 index cb9b107be1..0000000000 --- a/src/System.Runtime.Numerics/src/project.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "System.Diagnostics.Contracts": "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.Globalization": "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" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Runtime.Serialization.Formatters/ref/System.Runtime.Serialization.Formatters.csproj b/src/System.Runtime.Serialization.Formatters/ref/System.Runtime.Serialization.Formatters.csproj index bc08c547a6..23ca3e7da7 100644 --- a/src/System.Runtime.Serialization.Formatters/ref/System.Runtime.Serialization.Formatters.csproj +++ b/src/System.Runtime.Serialization.Formatters/ref/System.Runtime.Serialization.Formatters.csproj @@ -1,15 +1,16 @@ -<?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> <ItemGroup> <Compile Include="System.Runtime.Serialization.Formatters.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Collections.NonGeneric\ref\System.Collections.NonGeneric.csproj" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> + <ProjectReference Include="..\..\System.Reflection\ref\System.Reflection.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Serialization.Primitives\ref\System.Runtime.Serialization.Primitives.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Runtime.Serialization.Formatters/ref/project.json b/src/System.Runtime.Serialization.Formatters/ref/project.json deleted file mode 100644 index ccb4a58920..0000000000 --- a/src/System.Runtime.Serialization.Formatters/ref/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "dependencies": { - "System.Collections.NonGeneric": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.Reflection": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Runtime.Extensions": "4.4.0-beta-24721-02", - "System.Runtime.Serialization.Primitives": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj b/src/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj index d1c85c002f..f87f872dce 100644 --- a/src/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj +++ b/src/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj @@ -1,4 +1,4 @@ -<?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> @@ -63,7 +63,15 @@ <Compile Include="System\Runtime\Serialization\Formatters\Binary\BinaryUtilClasses.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Collections.NonGeneric" /> + <Reference Include="System.Collections.Concurrent" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Text.Encoding.Extensions" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Runtime.Serialization.Formatters/src/project.json b/src/System.Runtime.Serialization.Formatters/src/project.json deleted file mode 100644 index d5f084eda5..0000000000 --- a/src/System.Runtime.Serialization.Formatters/src/project.json +++ /dev/null @@ -1,52 +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.Collections.Concurrent": "4.4.0-beta-24721-02", - "System.Diagnostics.Debug": "4.4.0-beta-24721-02", - "System.Reflection": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.Reflection.Extensions": "4.4.0-beta-24721-02", - "System.Reflection.TypeExtensions": "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.Runtime.Serialization.Primitives": "4.4.0-beta-24721-02", - "System.Globalization": "4.4.0-beta-24721-02", - "System.Text.Encoding.Extensions": "4.4.0-beta-24721-02", - "System.Text.Encoding": "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" - } - }, - "netcoreapp1.1": { - "dependencies": { - "System.Collections": "4.4.0-beta-24721-02", - "System.Collections.NonGeneric": "4.4.0-beta-24721-02", - "System.Collections.Concurrent": "4.4.0-beta-24721-02", - "System.Diagnostics.Debug": "4.4.0-beta-24721-02", - "System.Reflection": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.Reflection.Extensions": "4.4.0-beta-24721-02", - "System.Reflection.TypeExtensions": "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.Runtime.Serialization.Primitives": "4.4.0-beta-24721-02", - "System.Globalization": "4.4.0-beta-24721-02", - "System.Text.Encoding.Extensions": "4.4.0-beta-24721-02", - "System.Text.Encoding": "4.4.0-beta-24721-02", - "System.Threading": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02" - } - } - } -}
\ No newline at end of file diff --git a/src/System.Runtime.Serialization.Json/ref/System.Runtime.Serialization.Json.csproj b/src/System.Runtime.Serialization.Json/ref/System.Runtime.Serialization.Json.csproj index 15b551f9ea..c181713305 100644 --- a/src/System.Runtime.Serialization.Json/ref/System.Runtime.Serialization.Json.csproj +++ b/src/System.Runtime.Serialization.Json/ref/System.Runtime.Serialization.Json.csproj @@ -1,18 +1,16 @@ -<?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> - <AssemblyVersion>4.0.0.0</AssemblyVersion> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="System.Runtime.Serialization.Json.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> + <ProjectReference Include="..\..\System.Xml.ReaderWriter\ref\System.Xml.ReaderWriter.csproj" /> + <ProjectReference Include="..\..\System.Text.Encoding\ref\System.Text.Encoding.csproj" /> <!-- ToDo: Remove this P2P reference once the required types are pushed in System.Runtime.Serialization.Xml --> <ProjectReference Include="..\..\System.Runtime.Serialization.Xml\ref\System.Runtime.Serialization.Xml.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Runtime.Serialization.Json/ref/project.json b/src/System.Runtime.Serialization.Json/ref/project.json deleted file mode 100644 index 815247f09c..0000000000 --- a/src/System.Runtime.Serialization.Json/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.Xml.ReaderWriter": "4.4.0-beta-24721-02", - "System.Text.Encoding": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Runtime.Serialization.Json/src/System.Runtime.Serialization.Json.csproj b/src/System.Runtime.Serialization.Json/src/System.Runtime.Serialization.Json.csproj index 95b9066840..1800f194a8 100644 --- a/src/System.Runtime.Serialization.Json/src/System.Runtime.Serialization.Json.csproj +++ b/src/System.Runtime.Serialization.Json/src/System.Runtime.Serialization.Json.csproj @@ -1,4 +1,4 @@ -<?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> @@ -18,7 +18,7 @@ <TargetingPackReference Include="System.Runtime.Serialization" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Runtime.Serialization.Json/src/project.json b/src/System.Runtime.Serialization.Json/src/project.json deleted file mode 100644 index 3aa1ba81cf..0000000000 --- a/src/System.Runtime.Serialization.Json/src/project.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Runtime.Serialization.Primitives": "4.4.0-beta-24721-02", - "System.Collections.NonGeneric": "4.4.0-beta-24721-02", - "System.Collections.Specialized": "4.4.0-beta-24721-02", - "System.Diagnostics.TraceSource": "4.4.0-beta-24721-02", - "System.IO.FileSystem": "4.4.0-beta-24721-02", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24721-02", - "System.Data.Common": "4.4.0-beta-24721-02", - "System.Console": "4.4.0-beta-24721-02", - "System.ComponentModel.TypeConverter": "4.4.0-beta-24721-02", - "Microsoft.Win32.Registry": "4.4.0-beta-24721-02", - "System.Reflection": "4.4.0-beta-24721-02", - "System.Reflection.TypeExtensions": "4.4.0-beta-24721-02", - "System.Xml.ReaderWriter": "4.4.0-beta-24721-02", - "System.Xml.XmlDocument": "4.4.0-beta-24721-02", - "System.Threading.Tasks.Extensions": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Runtime.Serialization.Primitives/ref/4.1.1/project.json b/src/System.Runtime.Serialization.Primitives/ref/4.1.1/project.json deleted file mode 100644 index 8ac56a89cc..0000000000 --- a/src/System.Runtime.Serialization.Primitives/ref/4.1.1/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime.Serialization.Primitives": "4.3.0" - }, - "frameworks": { - "netstandard1.3": {} - } -}
\ No newline at end of file diff --git a/src/System.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.csproj b/src/System.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.csproj index a63320a991..0b331177f6 100644 --- a/src/System.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.csproj +++ b/src/System.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.csproj @@ -1,16 +1,11 @@ -<?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> - <PackageTargetFramework>netstandard1.7;uap10.1</PackageTargetFramework> - </PropertyGroup> <ItemGroup> <Compile Include="System.Runtime.Serialization.Primitives.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Runtime.Serialization.Primitives/ref/project.json b/src/System.Runtime.Serialization.Primitives/ref/project.json deleted file mode 100644 index 11f44fb8b7..0000000000 --- a/src/System.Runtime.Serialization.Primitives/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj b/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj index 679a787f3a..0d802d6288 100644 --- a/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj +++ b/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.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> @@ -54,7 +54,8 @@ <Compile Include="System\Runtime\Serialization\ISerializationSurrogateProvider.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> </ItemGroup> <ItemGroup> <EmbeddedResource Include="Resources\$(AssemblyName).rd.xml" /> diff --git a/src/System.Runtime.Serialization.Primitives/src/project.json b/src/System.Runtime.Serialization.Primitives/src/project.json deleted file mode 100644 index 6611e94d2e..0000000000 --- a/src/System.Runtime.Serialization.Primitives/src/project.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "frameworks": { - "netstandard1.3": { - "dependencies": { - "System.Runtime": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "netstandard1.7": { - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Resources.ResourceManager": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02" - } - }, - "netcore50": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Runtime": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - }, - "uap10.1": { - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Resources.ResourceManager": "4.3.0" - } - } - } -}
\ No newline at end of file diff --git a/src/System.Runtime.Serialization.Xml/ref/System.Runtime.Serialization.Xml.csproj b/src/System.Runtime.Serialization.Xml/ref/System.Runtime.Serialization.Xml.csproj index 56cb52ae9e..165f0640b2 100644 --- a/src/System.Runtime.Serialization.Xml/ref/System.Runtime.Serialization.Xml.csproj +++ b/src/System.Runtime.Serialization.Xml/ref/System.Runtime.Serialization.Xml.csproj @@ -1,16 +1,18 @@ -<?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> <ItemGroup> <Compile Include="System.Runtime.Serialization.Xml.cs" /> <Compile Include="System.Runtime.Serialization.Xml.Manual.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> + <ProjectReference Include="..\..\System.Collections.NonGeneric\ref\System.Collections.NonGeneric.csproj" /> + <ProjectReference Include="..\..\System.Collections.Specialized\ref\System.Collections.Specialized.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Serialization.Primitives\ref\System.Runtime.Serialization.Primitives.csproj" /> + <ProjectReference Include="..\..\System.Xml.ReaderWriter\ref\System.Xml.ReaderWriter.csproj" /> + <ProjectReference Include="..\..\System.Text.Encoding\ref\System.Text.Encoding.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Runtime.Serialization.Xml/ref/project.json b/src/System.Runtime.Serialization.Xml/ref/project.json deleted file mode 100644 index 959f48bdea..0000000000 --- a/src/System.Runtime.Serialization.Xml/ref/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.Collections.NonGeneric": "4.4.0-beta-24721-02", - "System.Collections.Specialized": "4.4.0-beta-24721-02", - "System.Runtime.Serialization.Primitives": "4.4.0-beta-24721-02", - "System.Xml.ReaderWriter": "4.4.0-beta-24721-02", - "System.Text.Encoding": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Runtime.Serialization.Xml/src/System.Runtime.Serialization.Xml.csproj b/src/System.Runtime.Serialization.Xml/src/System.Runtime.Serialization.Xml.csproj index 0a8dda9cbd..91804c0f94 100644 --- a/src/System.Runtime.Serialization.Xml/src/System.Runtime.Serialization.Xml.csproj +++ b/src/System.Runtime.Serialization.Xml/src/System.Runtime.Serialization.Xml.csproj @@ -1,4 +1,4 @@ -<?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> @@ -23,7 +23,8 @@ </Compile> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Runtime.Serialization.Primitives" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Runtime.Serialization.Xml/src/project.json b/src/System.Runtime.Serialization.Xml/src/project.json deleted file mode 100644 index 9ae9337830..0000000000 --- a/src/System.Runtime.Serialization.Xml/src/project.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Runtime.Serialization.Primitives": "4.4.0-beta-24721-02", - "System.Collections.NonGeneric": "4.4.0-beta-24721-02", - "System.Collections.Specialized": "4.4.0-beta-24721-02", - "System.Diagnostics.TraceSource": "4.4.0-beta-24721-02", - "System.IO.FileSystem": "4.4.0-beta-24721-02", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24721-02", - "System.Data.Common": "4.4.0-beta-24721-02", - "System.Console": "4.4.0-beta-24721-02", - "System.ComponentModel.TypeConverter": "4.4.0-beta-24721-02", - "Microsoft.Win32.Registry": "4.4.0-beta-24721-02", - "System.Reflection": "4.4.0-beta-24721-02", - "System.Reflection.TypeExtensions": "4.4.0-beta-24721-02", - "System.Xml.ReaderWriter": "4.4.0-beta-24721-02", - "System.Xml.XmlDocument": "4.4.0-beta-24721-02", - "System.Threading.Tasks.Extensions": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1", - "System.Runtime.Serialization.Primitives": "4.4.0-beta-24721-02" - } - } - } -} diff --git a/src/System.Runtime.WindowsRuntime.UI.Xaml/ref/System.Runtime.WindowsRuntime.UI.Xaml.csproj b/src/System.Runtime.WindowsRuntime.UI.Xaml/ref/System.Runtime.WindowsRuntime.UI.Xaml.csproj index 1cb3b804e0..aa8ab8c02b 100644 --- a/src/System.Runtime.WindowsRuntime.UI.Xaml/ref/System.Runtime.WindowsRuntime.UI.Xaml.csproj +++ b/src/System.Runtime.WindowsRuntime.UI.Xaml/ref/System.Runtime.WindowsRuntime.UI.Xaml.csproj @@ -1,16 +1,15 @@ -<?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> <UseECMAKey Condition="'$(UseECMAKey)' == ''">true</UseECMAKey> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.1</NuGetTargetMoniker> </PropertyGroup> <ItemGroup> <Compile Include="System.Runtime.WindowsRuntime.UI.Xaml.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Runtime.WindowsRuntime\ref\System.Runtime.WindowsRuntime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Runtime.WindowsRuntime.UI.Xaml/ref/project.json b/src/System.Runtime.WindowsRuntime.UI.Xaml/ref/project.json deleted file mode 100644 index 743a8c6f63..0000000000 --- a/src/System.Runtime.WindowsRuntime.UI.Xaml/ref/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.3.0", - "System.Runtime.WindowsRuntime": "4.3.0" - }, - "frameworks": { - "netstandard1.1": {} - } -}
\ No newline at end of file diff --git a/src/System.Runtime.WindowsRuntime.UI.Xaml/src/System.Runtime.WindowsRuntime.UI.Xaml.csproj b/src/System.Runtime.WindowsRuntime.UI.Xaml/src/System.Runtime.WindowsRuntime.UI.Xaml.csproj.disabled index 7f3faa560f..34a550ae1d 100644 --- a/src/System.Runtime.WindowsRuntime.UI.Xaml/src/System.Runtime.WindowsRuntime.UI.Xaml.csproj +++ b/src/System.Runtime.WindowsRuntime.UI.Xaml/src/System.Runtime.WindowsRuntime.UI.Xaml.csproj.disabled @@ -28,5 +28,8 @@ <Compile Include="System\Windows\Media\Animation\RepeatBehavior.cs" /> <Compile Include="System\Windows\Media\Media3D\Matrix3D.cs" /> </ItemGroup> + <ItemGroup> + <None Include="project.json" /> + </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj b/src/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj index cf7afa6939..ac384978d6 100644 --- a/src/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj +++ b/src/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj @@ -1,27 +1,29 @@ -<?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> <UseECMAKey>true</UseECMAKey> - <!-- + <!-- NOTE: Suppress false positive warning for the special case where we're building System.Runtime.WindowsRuntime itself at a version other than 4.0.0.0, which is referenced indirectly via the mscorlib.dll design-time facade, which in turn is a required compile-time-only reference when building anything with a reference to a WinMD. - - error CS1698: Warning as Error: Circular assembly reference 'System.Runtime.WindowsRuntime, - Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089' does not - match the output assembly name 'System.Runtime.WindowsRuntime, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b77a5c561934e089'. + + error CS1698: Warning as Error: Circular assembly reference 'System.Runtime.WindowsRuntime, + Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089' does not + match the output assembly name 'System.Runtime.WindowsRuntime, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b77a5c561934e089'. --> <NoWarn>1698</NoWarn> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.2</NuGetTargetMoniker> </PropertyGroup> <ItemGroup> <Compile Include="System.Runtime.WindowsRuntime.cs" /> <Compile Include="System.Runtime.WindowsRuntime.Manual.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\Microsoft.TargetingPack.Private.WinRT\ref\Microsoft.TargetingPack.Private.WinRT.depproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> + <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <!-- Temporarily disable TFM validation until its fixed to ignore windows.winmd --> diff --git a/src/System.Runtime.WindowsRuntime/ref/project.json b/src/System.Runtime.WindowsRuntime/ref/project.json deleted file mode 100644 index 323cf2f895..0000000000 --- a/src/System.Runtime.WindowsRuntime/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "Microsoft.TargetingPack.Private.WinRT": "1.0.3", - "System.Runtime": "4.3.0", - "System.IO": "4.3.0", - "System.Threading.Tasks": "4.3.0" - }, - "frameworks": { - "netstandard1.2": {} - } -}
\ No newline at end of file diff --git a/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj b/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj.disabled index b8bc132ebc..b8bc132ebc 100644 --- a/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj +++ b/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj.disabled diff --git a/src/System.Runtime/ref/System.Runtime.csproj b/src/System.Runtime/ref/System.Runtime.csproj index d4d607b994..584eda1056 100644 --- a/src/System.Runtime/ref/System.Runtime.csproj +++ b/src/System.Runtime/ref/System.Runtime.csproj @@ -3,10 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <OutputType>Library</OutputType> <IsCoreAssembly>true</IsCoreAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)'==''">.NETCoreApp,Version=v1.1</NuGetTargetMoniker> - <PackageTargetFramework Condition="'$(TargetGroup)'=='netstandard1.7'">netstandard1.7;uap10.1</PackageTargetFramework> <ProjectGuid>{ADBCF120-3454-4A3C-9D1D-AC4293E795D6}</ProjectGuid> <DefineConstants Condition="'$(TargetGroup)' == ''">$(DefineConstants);netcoreapp11</DefineConstants> </PropertyGroup> diff --git a/src/System.Runtime/ref/project.json b/src/System.Runtime/ref/project.json deleted file mode 100644 index 339acccf0d..0000000000 --- a/src/System.Runtime/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": {}, - "frameworks": { - "netstandard1.7": {}, - "netcoreapp1.1": {}, - "uap10.1": {} - } -} diff --git a/src/System.Runtime/src/System.Runtime.csproj b/src/System.Runtime/src/System.Runtime.csproj index a20ef93bd2..b3449942ff 100644 --- a/src/System.Runtime/src/System.Runtime.csproj +++ b/src/System.Runtime/src/System.Runtime.csproj @@ -1,4 +1,4 @@ -<?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> @@ -7,9 +7,7 @@ <AssemblyVersion Condition="'$(TargetGroup)'=='net462' OR '$(TargetGroup)'=='netstandard1.5'">4.1.1.0</AssemblyVersion> <ContractProject Condition="'$(AssemblyVersion)'=='4.1.1.0'">../ref/4.1.0/System.Runtime.depproj</ContractProject> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <PackageTargetFramework Condition="'$(TargetGroup)'==''">netstandard1.7;uap10.1</PackageTargetFramework> <GenFacadesArgs Condition="'$(TargetGroup)' == 'uap101aot'">$(GenFacadesArgs) -ignoreMissingTypes</GenFacadesArgs> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -56,7 +54,6 @@ </ItemGroup> <ItemGroup> <ProjectReference Include="..\..\System.Private.Uri\src\System.Private.Uri.csproj" Condition="'$(TargetGroup)' != 'net462' And '$(TargetGroup)' != 'net463' And '$(TargetGroup)' != 'uap101aot'"> - <OSGroup>Windows_NT</OSGroup> <UndefineProperties>%(ProjectReference.UndefineProperties);TargetGroup</UndefineProperties> </ProjectReference> <ProjectReference Include="..\..\System.Private.Uri\src\System.Private.Uri.csproj" Condition="'$(TargetGroup)' == 'uap101aot'"> @@ -72,7 +69,8 @@ <TargetingPackReference Include="System.ComponentModel.Composition" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Private.CoreLib" /> + <Reference Include="System.Private.CoreLib" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Runtime/src/project.json b/src/System.Runtime/src/project.json deleted file mode 100644 index 60cd66226f..0000000000 --- a/src/System.Runtime/src/project.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24728-02" - } - }, - "netstandard1.5": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24728-02" - } - }, - "netcore50": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24728-00" - } - }, - "net462": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - }, - "uap10.1": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24728-00" - } - } - } -} diff --git a/src/System.Security.AccessControl/ref/System.Security.AccessControl.csproj b/src/System.Security.AccessControl/ref/System.Security.AccessControl.csproj index d81c8a3209..efbe83ff6d 100644 --- a/src/System.Security.AccessControl/ref/System.Security.AccessControl.csproj +++ b/src/System.Security.AccessControl/ref/System.Security.AccessControl.csproj @@ -1,16 +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> <ItemGroup> <Compile Include="System.Security.AccessControl.cs" /> <Compile Include="System.Security.AccessControl.Manual.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Handles\ref\System.Runtime.Handles.csproj" /> + <ProjectReference Include="..\..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Security.AccessControl/ref/project.json b/src/System.Security.AccessControl/ref/project.json deleted file mode 100644 index ca4f00e45e..0000000000 --- a/src/System.Security.AccessControl/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Runtime.Handles": "4.4.0-beta-24721-02", - "System.Security.Principal.Windows": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Security.AccessControl/src/System.Security.AccessControl.csproj b/src/System.Security.AccessControl/src/System.Security.AccessControl.csproj index 6f5a9a5222..d6a0a648a9 100644 --- a/src/System.Security.AccessControl/src/System.Security.AccessControl.csproj +++ b/src/System.Security.AccessControl/src/System.Security.AccessControl.csproj @@ -1,4 +1,4 @@ -<?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"> <PropertyGroup> <OSGroup Condition="'$(OSGroup)' == ''">Windows_NT</OSGroup> @@ -119,7 +119,16 @@ </Compile> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Security.Principal.Windows" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Threading.Thread" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Diagnostics.Contracts" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Security.AccessControl/src/project.json b/src/System.Security.AccessControl/src/project.json deleted file mode 100644 index daccfab986..0000000000 --- a/src/System.Security.AccessControl/src/project.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "System.Collections": "4.4.0-beta-24721-02", - "System.Diagnostics.Contracts": "4.4.0-beta-24721-02", - "System.Diagnostics.Debug": "4.4.0-beta-24721-02", - "System.Diagnostics.Process": "4.4.0-beta-24721-02", - "System.Globalization": "4.4.0-beta-24721-02", - "System.IO": "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.Handles": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Security.Claims": "4.4.0-beta-24721-02", - "System.Security.Principal": "4.4.0-beta-24721-02", - "System.Security.Principal.Windows": "4.4.0-beta-24721-02", - "System.Reflection": "4.4.0-beta-24721-02", - "System.Threading": "4.4.0-beta-24721-02", - "System.Threading.Thread": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Security.Claims/ref/System.Security.Claims.csproj b/src/System.Security.Claims/ref/System.Security.Claims.csproj index 042b4aaf5a..00d133cf4e 100644 --- a/src/System.Security.Claims/ref/System.Security.Claims.csproj +++ b/src/System.Security.Claims/ref/System.Security.Claims.csproj @@ -1,15 +1,15 @@ -<?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> <ItemGroup> <Compile Include="System.Security.Claims.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Net.WebSockets\ref\System.Net.WebSockets.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> + <ProjectReference Include="..\..\System.Security.Principal\ref\System.Security.Principal.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Security.Claims/ref/project.json b/src/System.Security.Claims/ref/project.json deleted file mode 100644 index 109061d468..0000000000 --- a/src/System.Security.Claims/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Runtime.Extensions": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.Security.Principal": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Security.Claims/src/System.Security.Claims.csproj b/src/System.Security.Claims/src/System.Security.Claims.csproj index 51a331915a..d89070183a 100644 --- a/src/System.Security.Claims/src/System.Security.Claims.csproj +++ b/src/System.Security.Claims/src/System.Security.Claims.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> @@ -25,7 +25,12 @@ <TargetingPackReference Include="mscorlib" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Security.Principal" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Diagnostics.Contracts" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Security.Claims/src/project.json b/src/System.Security.Claims/src/project.json deleted file mode 100644 index e94a2f7963..0000000000 --- a/src/System.Security.Claims/src/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "System.Collections": "4.4.0-beta-24721-02", - "System.Diagnostics.Contracts": "4.4.0-beta-24721-02", - "System.Globalization": "4.4.0-beta-24721-02", - "System.IO": "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.Security.Principal": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Security.Cryptography.Algorithms/ref/System.Security.Cryptography.Algorithms.csproj b/src/System.Security.Cryptography.Algorithms/ref/System.Security.Cryptography.Algorithms.csproj index ad37157d83..b56c2f122c 100644 --- a/src/System.Security.Cryptography.Algorithms/ref/System.Security.Cryptography.Algorithms.csproj +++ b/src/System.Security.Cryptography.Algorithms/ref/System.Security.Cryptography.Algorithms.csproj @@ -1,18 +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> <ItemGroup> <Compile Include="System.Security.Cryptography.Algorithms.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> - </ItemGroup> - <ItemGroup> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> + <ProjectReference Include="..\..\System.Security.Cryptography.Encoding\ref\System.Security.Cryptography.Encoding.csproj" /> <ProjectReference Include="..\..\System.Security.Cryptography.Primitives\ref\System.Security.Cryptography.Primitives.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> diff --git a/src/System.Security.Cryptography.Algorithms/ref/project.json b/src/System.Security.Cryptography.Algorithms/ref/project.json deleted file mode 100644 index 8cd41f6c5e..0000000000 --- a/src/System.Security.Cryptography.Algorithms/ref/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Runtime.Extensions": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.Security.Cryptography.Encoding": "4.4.0-beta-24721-02", - "System.Security.Cryptography.Primitives": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj b/src/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj index da42a7d12f..f1a2f11284 100644 --- a/src/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj +++ b/src/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj @@ -1,4 +1,4 @@ -<?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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> @@ -437,13 +437,17 @@ <ProjectReference Include="../../System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> - </ItemGroup> - <ItemGroup> - <!-- ToDo: Remove once prerelease gets updated again --> - <ProjectReference Include="..\..\System.Security.Cryptography.Primitives\pkg\System.Security.Cryptography.Primitives.pkgproj"> - <Name>System.Security.Cryptography.Primitives</Name> - </ProjectReference> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Security.Cryptography.Encoding" /> + <Reference Include="System.Security.Cryptography.Primitives" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Runtime.InteropServices.RuntimeInformation" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Security.Cryptography.Algorithms/src/project.json b/src/System.Security.Cryptography.Algorithms/src/project.json deleted file mode 100644 index 9d5e673649..0000000000 --- a/src/System.Security.Cryptography.Algorithms/src/project.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "System.Collections": "4.4.0-beta-24721-02", - "System.Diagnostics.Contracts": "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.IO": "4.4.0-beta-24721-02", - "System.Reflection": "4.4.0-beta-24721-02", - "System.Resources.ResourceManager": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Text.Encoding": "4.4.0-beta-24721-02", - "System.Runtime.Extensions": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-beta-24721-02", - "System.Runtime.Numerics": "4.4.0-beta-24721-02", - "System.Security.Cryptography.Primitives": "4.4.0-beta-24721-02", - "System.Security.Cryptography.Encoding": "4.4.0-beta-24721-02", - "System.Text.Encoding.Extensions": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.csproj b/src/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.csproj index d142a5b492..614bf7de71 100644 --- a/src/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.csproj +++ b/src/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.csproj @@ -1,15 +1,15 @@ -<?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> <ItemGroup> <Compile Include="System.Security.Cryptography.Cng.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Handles\ref\System.Runtime.Handles.csproj" /> + <ProjectReference Include="..\..\System.Security.Cryptography.Algorithms\ref\System.Security.Cryptography.Algorithms.csproj" /> + <ProjectReference Include="..\..\System.Security.Cryptography.Primitives\ref\System.Security.Cryptography.Primitives.csproj" /> </ItemGroup> <ItemGroup> <!-- ToDo: Remove once prerelease gets updated again --> @@ -21,4 +21,4 @@ </ProjectReference> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Security.Cryptography.Cng/ref/project.json b/src/System.Security.Cryptography.Cng/ref/project.json deleted file mode 100644 index 53483ce063..0000000000 --- a/src/System.Security.Cryptography.Cng/ref/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.Runtime.Handles": "4.4.0-beta-24721-02", - "System.Security.Cryptography.Algorithms": "4.4.0-beta-24721-02", - "System.Security.Cryptography.Primitives": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj b/src/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj index 6ca8142202..8538a9c2ce 100644 --- a/src/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj +++ b/src/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj @@ -1,4 +1,4 @@ -<?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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'==''">Windows_NT_Debug</Configuration> @@ -254,17 +254,21 @@ <Link>Common\System\Security\Cryptography\RSACng.SignVerify.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true'"> - <!-- ToDo: Remove these P2P references once new packages are produced and updated --> - <ProjectReference Include="..\..\System.Runtime\pkg\System.Runtime.pkgproj" /> - <ProjectReference Include="..\..\System.Runtime.Extensions\pkg\System.Runtime.Extensions.pkgproj" /> - <ProjectReference Include="..\..\System.IO\pkg\System.IO.pkgproj" /> - <ProjectReference Include="..\..\System.Security.Cryptography.Algorithms\pkg\System.Security.Cryptography.Algorithms.pkgproj" /> - <ProjectReference Include="..\..\System.Security.Cryptography.Primitives\pkg\System.Security.Cryptography.Primitives.pkgproj" /> - </ItemGroup> <ItemGroup Condition="'$(IsPartialFacadeAssembly)' == 'true'"> <TargetingPackReference Include="mscorlib" /> <TargetingPackReference Include="System.Core" /> </ItemGroup> + <ItemGroup> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Security.Cryptography.Encoding" /> + <Reference Include="System.Security.Cryptography.Primitives" /> + <Reference Include="System.Security.Cryptography.Algorithms" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Runtime.InteropServices.RuntimeInformation" /> + <Reference Include="System.Diagnostics.Tools" /> + </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Security.Cryptography.Cng/src/project.json b/src/System.Security.Cryptography.Cng/src/project.json deleted file mode 100644 index a2ddb29cda..0000000000 --- a/src/System.Security.Cryptography.Cng/src/project.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24721-02", - "System.Diagnostics.Debug": "4.4.0-beta-24721-02", - "System.Diagnostics.Tools": "4.4.0-beta-24721-02", - "System.IO": "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.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-beta-24721-02", - "System.Security.Cryptography.Algorithms": "4.4.0-beta-24721-02", - "System.Security.Cryptography.Encoding": "4.4.0-beta-24721-02", - "System.Security.Cryptography.Primitives": "4.4.0-beta-24721-02", - "System.Text.Encoding": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.Security.Cryptography.Csp/ref/System.Security.Cryptography.Csp.csproj b/src/System.Security.Cryptography.Csp/ref/System.Security.Cryptography.Csp.csproj index 607d7f5dd6..e38c4ebb88 100644 --- a/src/System.Security.Cryptography.Csp/ref/System.Security.Cryptography.Csp.csproj +++ b/src/System.Security.Cryptography.Csp/ref/System.Security.Cryptography.Csp.csproj @@ -1,24 +1,15 @@ -<?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 Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="System.Security.Cryptography.Csp.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> - </ItemGroup> - <ItemGroup> - <!-- ToDo: Remove once prerelease gets updated again --> - <ProjectReference Include="..\..\System.Security.Cryptography.Primitives\ref\System.Security.Cryptography.Primitives.csproj"> - <Name>System.Security.Cryptography.Primitives</Name> - </ProjectReference> - <ProjectReference Include="..\..\System.Security.Cryptography.Algorithms\ref\System.Security.Cryptography.Algorithms.csproj"> - <Name>System.Security.Cryptography.Algorithms</Name> - </ProjectReference> + <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Runtime.InteropServices\ref\System.Runtime.InteropServices.csproj" /> + <ProjectReference Include="..\..\System.Security.Cryptography.Algorithms\ref\System.Security.Cryptography.Algorithms.csproj" /> + <ProjectReference Include="..\..\System.Security.Cryptography.Primitives\ref\System.Security.Cryptography.Primitives.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Security.Cryptography.Csp/ref/project.json b/src/System.Security.Cryptography.Csp/ref/project.json deleted file mode 100644 index 78f9c5162e..0000000000 --- a/src/System.Security.Cryptography.Csp/ref/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "System.IO": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Security.Cryptography.Algorithms": "4.4.0-beta-24721-02", - "System.Security.Cryptography.Primitives": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.csproj b/src/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.csproj index a7df05fceb..8541009828 100644 --- a/src/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.csproj +++ b/src/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.csproj @@ -1,4 +1,4 @@ -<?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"> <PropertyGroup> <OSGroup Condition="'$(OSGroup)' == ''">Windows_NT</OSGroup> @@ -66,24 +66,22 @@ <Link>Common\Microsoft\Win32\SafeHandles\SafeHandleCache.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> - <ProjectReference Include="../../System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj" /> - </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == 'net463'"> <TargetingPackReference Include="mscorlib" /> <TargetingPackReference Include="System.Core" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> - </ItemGroup> - <ItemGroup> - <!-- ToDo: Remove once prerelease gets updated again --> - <ProjectReference Include="..\..\System.Security.Cryptography.Algorithms\pkg\System.Security.Cryptography.Algorithms.pkgproj"> - <Name>System.Security.Cryptography.Algorithms</Name> - </ProjectReference> - <ProjectReference Include="..\..\System.Security.Cryptography.Primitives\pkg\System.Security.Cryptography.Primitives.pkgproj"> - <Name>System.Security.Cryptography.Primitives</Name> - </ProjectReference> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Security.Cryptography.Encoding" /> + <Reference Include="System.Security.Cryptography.Primitives" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Security.Cryptography.Algorithms" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Security.Cryptography.Csp/src/project.json b/src/System.Security.Cryptography.Csp/src/project.json deleted file mode 100644 index 88cd55d795..0000000000 --- a/src/System.Security.Cryptography.Csp/src/project.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24721-02", - "System.Diagnostics.Contracts": "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.IO": "4.4.0-beta-24721-02", - "System.Reflection": "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.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Security.Cryptography.Algorithms": "4.4.0-beta-24721-02", - "System.Security.Cryptography.Encoding": "4.4.0-beta-24721-02", - "System.Security.Cryptography.Primitives": "4.4.0-beta-24721-02", - "System.Text.Encoding": "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.2": "1.0.1" - } - } - } -} diff --git a/src/System.Security.Cryptography.Encoding/ref/System.Security.Cryptography.Encoding.csproj b/src/System.Security.Cryptography.Encoding/ref/System.Security.Cryptography.Encoding.csproj index cecb3dddfa..8e9071fa74 100644 --- a/src/System.Security.Cryptography.Encoding/ref/System.Security.Cryptography.Encoding.csproj +++ b/src/System.Security.Cryptography.Encoding/ref/System.Security.Cryptography.Encoding.csproj @@ -1,15 +1,12 @@ -<?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> <ItemGroup> <Compile Include="System.Security.Cryptography.Encoding.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Security.Cryptography.Primitives\ref\System.Security.Cryptography.Primitives.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Security.Cryptography.Encoding/ref/project.json b/src/System.Security.Cryptography.Encoding/ref/project.json deleted file mode 100644 index 4490abdf0f..0000000000 --- a/src/System.Security.Cryptography.Encoding/ref/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Security.Cryptography.Primitives": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj b/src/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj index a9884b359a..7e4df729ea 100644 --- a/src/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj +++ b/src/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj @@ -1,4 +1,4 @@ -<?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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> @@ -97,7 +97,16 @@ <TargetingPackReference Include="System" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Security.Cryptography.Primitives" /> + <Reference Include="System.Collections.Concurrent" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Linq" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Diagnostics.Contracts" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Security.Cryptography.Encoding/src/project.json b/src/System.Security.Cryptography.Encoding/src/project.json deleted file mode 100644 index da896f4367..0000000000 --- a/src/System.Security.Cryptography.Encoding/src/project.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24721-02", - "System.Collections": "4.4.0-beta-24721-02", - "System.Collections.Concurrent": "4.4.0-beta-24721-02", - "System.Diagnostics.Contracts": "4.4.0-beta-24721-02", - "System.Diagnostics.Debug": "4.4.0-beta-24721-02", - "System.Linq": "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.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Text.Encoding": "4.4.0-beta-24721-02", - "System.Security.Cryptography.Primitives": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.Security.Cryptography.OpenSsl/ref/System.Security.Cryptography.OpenSsl.csproj b/src/System.Security.Cryptography.OpenSsl/ref/System.Security.Cryptography.OpenSsl.csproj index 308a00f203..ea7bf90077 100644 --- a/src/System.Security.Cryptography.OpenSsl/ref/System.Security.Cryptography.OpenSsl.csproj +++ b/src/System.Security.Cryptography.OpenSsl/ref/System.Security.Cryptography.OpenSsl.csproj @@ -1,15 +1,15 @@ -<?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> <ItemGroup> <Compile Include="System.Security.Cryptography.OpenSsl.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Handles\ref\System.Runtime.Handles.csproj" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> + <ProjectReference Include="..\..\System.Security.Cryptography.Algorithms\ref\System.Security.Cryptography.Algorithms.csproj" /> + <ProjectReference Include="..\..\System.Security.Cryptography.Primitives\ref\System.Security.Cryptography.Primitives.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Security.Cryptography.OpenSsl/ref/project.json b/src/System.Security.Cryptography.OpenSsl/ref/project.json deleted file mode 100644 index f84636cc4d..0000000000 --- a/src/System.Security.Cryptography.OpenSsl/ref/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Runtime.Handles": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.Security.Cryptography.Algorithms": "4.4.0-beta-24721-02", - "System.Security.Cryptography.Primitives": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj b/src/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj index a4de975abe..c97dc491ab 100644 --- a/src/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj +++ b/src/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj @@ -1,4 +1,4 @@ -<?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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'==''">Unix_Debug</Configuration> @@ -111,7 +111,18 @@ </Compile> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Security.Cryptography.Algorithms" /> + <Reference Include="System.Security.Cryptography.Primitives" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Security.Cryptography.Encoding" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Runtime.Numerics" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Security.Cryptography.OpenSsl/src/project.json b/src/System.Security.Cryptography.OpenSsl/src/project.json deleted file mode 100644 index 938797c129..0000000000 --- a/src/System.Security.Cryptography.OpenSsl/src/project.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24721-02", - "System.Collections": "4.4.0-beta-24721-02", - "System.Diagnostics.Contracts": "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.IO": "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.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Runtime.Numerics": "4.4.0-beta-24721-02", - "System.Security.Cryptography.Algorithms": "4.4.0-beta-24721-02", - "System.Security.Cryptography.Encoding": "4.4.0-beta-24721-02", - "System.Security.Cryptography.Primitives": "4.4.0-beta-24721-02", - "System.Text.Encoding": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02" - } - } - } -} diff --git a/src/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj b/src/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj index 6c325e9e52..26a71de656 100644 --- a/src/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj +++ b/src/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj @@ -1,15 +1,13 @@ -<?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.3</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="System.Security.Cryptography.Pkcs.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Security.Cryptography.Encoding\ref\System.Security.Cryptography.Encoding.csproj" /> + <ProjectReference Include="..\..\System.Security.Cryptography.X509Certificates\ref\System.Security.Cryptography.X509Certificates.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Security.Cryptography.Pkcs/ref/project.json b/src/System.Security.Cryptography.Pkcs/ref/project.json deleted file mode 100644 index d9c333563e..0000000000 --- a/src/System.Security.Cryptography.Pkcs/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0" - }, - "frameworks": { - "netstandard1.3": {} - } -}
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj b/src/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj index 5499745eb6..a27ceae4d8 100644 --- a/src/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj +++ b/src/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj @@ -1,4 +1,4 @@ -<?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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> @@ -184,7 +184,19 @@ <TargetingPackReference Include="System.Security" /> </ItemGroup> <ItemGroup> - <None Include="$(ProjectJson)" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Handles" /> + <Reference Include="System.Security.Cryptography.Encoding" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Security.Cryptography.X509Certificates" /> + <Reference Include="System.Security.Cryptography.Primitives" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Collections.NonGeneric" /> + <Reference Include="System.Text.Encoding" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Diagnostics.Contracts" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Security.Cryptography.Pkcs/src/project.json b/src/System.Security.Cryptography.Pkcs/src/project.json deleted file mode 100644 index eb30a73ed3..0000000000 --- a/src/System.Security.Cryptography.Pkcs/src/project.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "frameworks": { - "netstandard1.3": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24721-02", - "System.Collections": "4.3.0", - "System.Diagnostics.Contracts": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "net46": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -}
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.csproj b/src/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.csproj index 7ceaa3ff64..65bbbf5d64 100644 --- a/src/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.csproj +++ b/src/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.csproj @@ -1,19 +1,13 @@ -<?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 Condition="'$(TargetGroup)'==''">.NETCoreApp,Version=v1.1</NuGetTargetMoniker> - <DefineConstants Condition="'$(TargetGroup)' == ''">$(DefineConstants);netcoreapp11</DefineConstants> - </PropertyGroup> <ItemGroup> <Compile Include="System.Security.Cryptography.Primitives.cs" /> - - <!-- TODO: Remove this when the package reference is ready --> - <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> + <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Security.Cryptography.Primitives/ref/project.json b/src/System.Security.Cryptography.Primitives/ref/project.json deleted file mode 100644 index df67acd0fa..0000000000 --- a/src/System.Security.Cryptography.Primitives/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {}, - "netcoreapp1.1": {} - } -} diff --git a/src/System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj b/src/System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj index c66eff530e..80445b6db5 100644 --- a/src/System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj +++ b/src/System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj @@ -1,4 +1,4 @@ -<?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> @@ -41,11 +41,12 @@ </ItemGroup> <ItemGroup> - <!-- TODO: Remove this when the package reference is ready --> - <ProjectReference Include="..\..\System.Runtime\pkg\System.Runtime.pkgproj" /> - </ItemGroup> - <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Threading.Tasks" /> + <Reference Include="System.Diagnostics.Contracts" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Security.Cryptography.Primitives/src/project.json b/src/System.Security.Cryptography.Primitives/src/project.json deleted file mode 100644 index 95021572cc..0000000000 --- a/src/System.Security.Cryptography.Primitives/src/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "System.Diagnostics.Contracts": "4.4.0-beta-24721-02", - "System.Diagnostics.Debug": "4.4.0-beta-24721-02", - "System.Globalization": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.Resources.ResourceManager": "4.4.0-beta-24721-02", - "System.Runtime": "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.2": "1.0.1" - } - } - } -} diff --git a/src/System.Security.Cryptography.ProtectedData/ref/System.Security.Cryptography.ProtectedData.csproj b/src/System.Security.Cryptography.ProtectedData/ref/System.Security.Cryptography.ProtectedData.csproj index a1141ff5c4..90eeb76255 100644 --- a/src/System.Security.Cryptography.ProtectedData/ref/System.Security.Cryptography.ProtectedData.csproj +++ b/src/System.Security.Cryptography.ProtectedData/ref/System.Security.Cryptography.ProtectedData.csproj @@ -1,15 +1,11 @@ -<?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.3</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="System.Security.Cryptography.ProtectedData.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Security.Cryptography.ProtectedData/ref/project.json b/src/System.Security.Cryptography.ProtectedData/ref/project.json deleted file mode 100644 index 63a27a29be..0000000000 --- a/src/System.Security.Cryptography.ProtectedData/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.3.0" - }, - "frameworks": { - "netstandard1.3": {} - } -}
\ No newline at end of file diff --git a/src/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj b/src/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj index 1c85df06cf..d77541a71e 100644 --- a/src/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj +++ b/src/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj @@ -1,4 +1,4 @@ -<?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"> <PropertyGroup> <OSGroup Condition="'$(OSGroup)' == ''">Windows_NT</OSGroup> @@ -50,7 +50,11 @@ <TargetingPackReference Include="System.Security" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Security.Cryptography.Primitives" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Security.Cryptography.ProtectedData/src/project.json b/src/System.Security.Cryptography.ProtectedData/src/project.json deleted file mode 100644 index f8805a2dd7..0000000000 --- a/src/System.Security.Cryptography.ProtectedData/src/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "frameworks": { - "netstandard1.3": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24721-02", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0" - } - }, - "net46": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -}
\ No newline at end of file diff --git a/src/System.Security.Cryptography.X509Certificates/ref/System.Security.Cryptography.X509Certificates.csproj b/src/System.Security.Cryptography.X509Certificates/ref/System.Security.Cryptography.X509Certificates.csproj index ac7a3c2e75..4cc2645b77 100644 --- a/src/System.Security.Cryptography.X509Certificates/ref/System.Security.Cryptography.X509Certificates.csproj +++ b/src/System.Security.Cryptography.X509Certificates/ref/System.Security.Cryptography.X509Certificates.csproj @@ -1,16 +1,16 @@ -<?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 Condition="'$(TargetGroup)' == ''">.NETCoreApp,Version=v1.1</NuGetTargetMoniker> - <DefineConstants Condition="'$(TargetGroup)' == ''">$(DefineConstants);netcoreapp11</DefineConstants> - </PropertyGroup> <ItemGroup> <Compile Include="System.Security.Cryptography.X509Certificates.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Runtime.InteropServices\ref\System.Runtime.InteropServices.csproj" /> + <ProjectReference Include="..\..\System.Collections.NonGeneric\ref\System.Collections.NonGeneric.csproj" /> + <ProjectReference Include="..\..\System.Security.Cryptography.Algorithms\ref\System.Security.Cryptography.Algorithms.csproj" /> + <ProjectReference Include="..\..\System.Security.Cryptography.Encoding\ref\System.Security.Cryptography.Encoding.csproj" /> + <ProjectReference Include="..\..\System.Security.Cryptography.Primitives\ref\System.Security.Cryptography.Primitives.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Security.Cryptography.X509Certificates/ref/project.json b/src/System.Security.Cryptography.X509Certificates/ref/project.json deleted file mode 100644 index 2c98397c1f..0000000000 --- a/src/System.Security.Cryptography.X509Certificates/ref/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "dependencies": { - "System.Collections.NonGeneric": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Security.Cryptography.Algorithms": "4.4.0-beta-24721-02", - "System.Security.Cryptography.Encoding": "4.4.0-beta-24721-02", - "System.Security.Cryptography.Primitives": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {}, - "netcoreapp1.1": {} - } -} diff --git a/src/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj b/src/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj index d48e08b90e..8b7902f34e 100644 --- a/src/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj +++ b/src/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj @@ -1,4 +1,4 @@ -<?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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> @@ -14,14 +14,6 @@ <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net463'">true</IsPartialFacadeAssembly> <NuGetTargetMoniker Condition="'$(TargetGroup)'==''">.NETCoreApp,Version=v1.1</NuGetTargetMoniker> </PropertyGroup> - <PropertyGroup Condition=" '$(TargetsWindows)' == 'true' AND '$(IsPartialFacadeAssembly)' != 'true' AND '$(ProjectJson)' == '' "> - <ProjectJson>win/project.json</ProjectJson> - <ProjectLockJson>win/project.lock.json</ProjectLockJson> - </PropertyGroup> - <PropertyGroup Condition=" '$(TargetsUnix)' == 'true' and '$(ProjectJson)' == '' "> - <ProjectJson>unix/project.json</ProjectJson> - <ProjectLockJson>unix/project.lock.json</ProjectLockJson> - </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Debug|AnyCPU'" /> @@ -308,5 +300,23 @@ <TargetingPackReference Include="System" /> <TargetingPackReference Include="System.Core" /> </ItemGroup> + <ItemGroup> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Security.Cryptography.Cng" /> + <Reference Include="System.Security.Cryptography.Encoding" /> + <Reference Include="System.Security.Cryptography.Algorithms" /> + <Reference Include="System.Security.Cryptography.Primitives" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Collections.NonGeneric" /> + <Reference Include="System.Runtime.Numerics" /> + <Reference Include="System.Security.Cryptography.Csp" /> + <Reference Include="System.Threading" /> + <Reference Include="System.IO.FileSystem" /> + <Reference Include="System.Diagnostics.Tools" /> + </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Security.Cryptography.X509Certificates/src/project.json b/src/System.Security.Cryptography.X509Certificates/src/project.json deleted file mode 100644 index 7deae350bf..0000000000 --- a/src/System.Security.Cryptography.X509Certificates/src/project.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections.NonGeneric": "4.4.0-beta-24721-02", - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24728-02", - "System.Diagnostics.Tools": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.Security.Cryptography.X509Certificates/src/unix/project.json b/src/System.Security.Cryptography.X509Certificates/src/unix/project.json deleted file mode 100644 index a00034f631..0000000000 --- a/src/System.Security.Cryptography.X509Certificates/src/unix/project.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24721-02", - "System.Collections": "4.4.0-beta-24721-02", - "System.Collections.NonGeneric": "4.4.0-beta-24721-02", - "System.Diagnostics.Contracts": "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.Globalization": "4.4.0-beta-24721-02", - "System.Globalization.Calendars": "4.4.0-beta-24721-02", - "System.IO.FileSystem": "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.Runtime.Handles": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Runtime.Numerics": "4.4.0-beta-24721-02", - "System.Security.Cryptography.Algorithms": "4.4.0-beta-24721-02", - "System.Security.Cryptography.Encoding": "4.4.0-beta-24721-02", - "System.Security.Cryptography.OpenSsl": "4.4.0-beta-24721-02", - "System.Security.Cryptography.Primitives": "4.4.0-beta-24721-02", - "System.Security.SecureString": "4.4.0-beta-24721-02", - "System.Text.Encoding": "4.4.0-beta-24721-02", - "System.Threading": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {}, - "netcoreapp1.1": {} - } -} diff --git a/src/System.Security.Cryptography.X509Certificates/src/win/project.json b/src/System.Security.Cryptography.X509Certificates/src/win/project.json deleted file mode 100644 index 6088d742ac..0000000000 --- a/src/System.Security.Cryptography.X509Certificates/src/win/project.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24721-02", - "System.Collections": "4.4.0-beta-24721-02", - "System.Collections.NonGeneric": "4.4.0-beta-24721-02", - "System.Diagnostics.Contracts": "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.Globalization": "4.4.0-beta-24721-02", - "System.Globalization.Calendars": "4.4.0-beta-24721-02", - "System.IO.FileSystem": "4.4.0-beta-24721-02", - "System.IO.FileSystem.Watcher": "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.Runtime.Handles": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Runtime.Numerics": "4.4.0-beta-24721-02", - "System.Security.Cryptography.Algorithms": "4.4.0-beta-24721-02", - "System.Security.Cryptography.Cng": "4.4.0-beta-24721-02", - "System.Security.Cryptography.Csp": "4.4.0-beta-24721-02", - "System.Security.Cryptography.Encoding": "4.4.0-beta-24721-02", - "System.Security.Cryptography.Primitives": "4.4.0-beta-24721-02", - "System.Security.SecureString": "4.4.0-beta-24721-02", - "System.Text.Encoding": "4.4.0-beta-24721-02", - "System.Threading": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {}, - "netcoreapp1.1": {} - } -} diff --git a/src/System.Security.Permissions/ref/System.Security.Permissions.csproj b/src/System.Security.Permissions/ref/System.Security.Permissions.csproj index f6a72a1762..b962a1e34c 100644 --- a/src/System.Security.Permissions/ref/System.Security.Permissions.csproj +++ b/src/System.Security.Permissions/ref/System.Security.Permissions.csproj @@ -1,19 +1,19 @@ -<?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> - <PackageTargetFramework>netstandard1.7</PackageTargetFramework> - <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="System.Security.Permissions.cs" /> - <!-- ToDo: Remove these P2P references once packages are updated --> - <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" /> - <ProjectReference Include="..\..\System.Collections.NonGeneric\ref\System.Collections.NonGeneric.csproj" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Collections.NonGeneric\ref\System.Collections.NonGeneric.csproj" /> + <ProjectReference Include="..\..\System.Reflection\ref\System.Reflection.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj" /> + <ProjectReference Include="..\..\System.Security.Cryptography.Primitives\ref\System.Security.Cryptography.Primitives.csproj" /> + <ProjectReference Include="..\..\System.Security.Cryptography.X509Certificates\ref\System.Security.Cryptography.X509Certificates.csproj" /> + <ProjectReference Include="..\..\System.Security.Principal\ref\System.Security.Principal.csproj" /> + <ProjectReference Include="..\..\System.Threading\ref\System.Threading.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Security.Permissions/ref/project.json b/src/System.Security.Permissions/ref/project.json deleted file mode 100644 index 775933a5a6..0000000000 --- a/src/System.Security.Permissions/ref/project.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "dependencies": { - "System.Collections.NonGeneric": "4.4.0-beta-24721-02", - "System.Reflection": "4.4.0-beta-24721-02", - "System.Runtime.Extensions": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Security.AccessControl": "4.4.0-beta-24721-02", - "System.Security.Cryptography.Primitives": "4.4.0-beta-24721-02", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24721-02", - "System.Security.Principal": "4.4.0-beta-24721-02", - "System.Threading": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Security.Permissions/src/System.Security.Permissions.csproj b/src/System.Security.Permissions/src/System.Security.Permissions.csproj index b1aebb58fd..01e68f2a2f 100644 --- a/src/System.Security.Permissions/src/System.Security.Permissions.csproj +++ b/src/System.Security.Permissions/src/System.Security.Permissions.csproj @@ -1,4 +1,4 @@ -<?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> @@ -114,16 +114,23 @@ <Compile Include="System\Security\HostSecurityManagerOptions.cs" /> <Compile Include="System\Security\HostSecurityManager.cs" /> <Compile Include="System\Security\HostProtectionException.cs" /> - <!-- Remove these P2P references once packages are updated --> - <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" /> - <ProjectReference Include="..\..\System.Collections.NonGeneric\pkg\System.Collections.NonGeneric.pkgproj" /> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == 'net463'"> <TargetingPackReference Include="mscorlib" /> <TargetingPackReference Include="System" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Security.Cryptography.X509Certificates" /> + <Reference Include="System.Security.Cryptography.Primitives" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Security.Principal" /> + <Reference Include="System.Security.AccessControl" /> + <Reference Include="System.Threading.Thread" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Security.Permissions/src/project.json b/src/System.Security.Permissions/src/project.json deleted file mode 100644 index ac445e3182..0000000000 --- a/src/System.Security.Permissions/src/project.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.Win32.Primitives": "4.4.0-beta-24721-02", - "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.Reflection": "4.4.0-beta-24721-02", - "System.Resources.ResourceManager": "4.4.0-beta-24721-02", - "System.Runtime.Extensions": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Security.AccessControl": "4.4.0-beta-24721-02", - "System.Security.Cryptography.Primitives": "4.4.0-beta-24721-02", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24721-02", - "System.Security.Principal": "4.4.0-beta-24721-02", - "System.Threading": "4.4.0-beta-24721-02", - "System.Threading.Thread": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -}
\ No newline at end of file diff --git a/src/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj b/src/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj index cdf4360289..5642bae11b 100644 --- a/src/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj +++ b/src/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj @@ -1,15 +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> <ItemGroup> <Compile Include="System.Security.Principal.Windows.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Handles\ref\System.Runtime.Handles.csproj" /> + <ProjectReference Include="..\..\System.Security.Claims\ref\System.Security.Claims.csproj" /> + <ProjectReference Include="..\..\System.Security.Principal\ref\System.Security.Principal.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Security.Principal.Windows/ref/project.json b/src/System.Security.Principal.Windows/ref/project.json deleted file mode 100644 index b9aa7d294c..0000000000 --- a/src/System.Security.Principal.Windows/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Runtime.Handles": "4.4.0-beta-24721-02", - "System.Security.Claims": "4.4.0-beta-24721-02", - "System.Security.Principal": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj b/src/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj index 6afc674927..73129f71cb 100644 --- a/src/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj +++ b/src/System.Security.Principal.Windows/src/System.Security.Principal.Windows.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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> @@ -185,7 +185,18 @@ <TargetingPackReference Include="mscorlib" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Security.Claims" /> + <Reference Include="System.Security.Principal" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="Microsoft.Win32.Primitives" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Security.Principal.Windows/src/project.json b/src/System.Security.Principal.Windows/src/project.json deleted file mode 100644 index 5e370a35dc..0000000000 --- a/src/System.Security.Principal.Windows/src/project.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24721-02", - "Microsoft.Win32.Primitives": "4.4.0-beta-24721-02", - "System.Collections": "4.4.0-beta-24721-02", - "System.Diagnostics.Contracts": "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.Globalization": "4.4.0-beta-24721-02", - "System.Reflection": "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.Runtime.Handles": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Security.Claims": "4.4.0-beta-24721-02", - "System.Security.Principal": "4.4.0-beta-24721-02", - "System.Text.Encoding": "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.2": "1.0.1" - } - } - } -} diff --git a/src/System.Security.Principal/ref/System.Security.Principal.csproj b/src/System.Security.Principal/ref/System.Security.Principal.csproj index d6613eec9d..de83507c1b 100644 --- a/src/System.Security.Principal/ref/System.Security.Principal.csproj +++ b/src/System.Security.Principal/ref/System.Security.Principal.csproj @@ -1,17 +1,11 @@ -<?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> - <!-- copy to uap10.1 until nuget makes the change to map that to ns1.7 --> - <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.7;uap10.1</PackageTargetFramework> - </PropertyGroup> <ItemGroup> <Compile Include="System.Security.Principal.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Security.Principal/ref/project.json b/src/System.Security.Principal/ref/project.json deleted file mode 100644 index 11f44fb8b7..0000000000 --- a/src/System.Security.Principal/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Security.Principal/src/System.Security.Principal.csproj b/src/System.Security.Principal/src/System.Security.Principal.csproj index bf72ac681f..e7ad294244 100644 --- a/src/System.Security.Principal/src/System.Security.Principal.csproj +++ b/src/System.Security.Principal/src/System.Security.Principal.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> @@ -26,7 +26,7 @@ <TargetingPackReference Include="mscorlib" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Security.Principal/src/project.json b/src/System.Security.Principal/src/project.json deleted file mode 100644 index 4d7c1583fe..0000000000 --- a/src/System.Security.Principal/src/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Security.SecureString/ref/System.Security.SecureString.csproj b/src/System.Security.SecureString/ref/System.Security.SecureString.csproj index f21355ac29..b1023e1d01 100644 --- a/src/System.Security.SecureString/ref/System.Security.SecureString.csproj +++ b/src/System.Security.SecureString/ref/System.Security.SecureString.csproj @@ -1,16 +1,15 @@ -<?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> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <OutputType>Library</OutputType> - <NuGetTargetMoniker Condition="'$(TargetGroup)'==''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <ItemGroup> <Compile Include="System.Security.SecureString.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Runtime.InteropServices\ref\System.Runtime.InteropServices.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Security.SecureString/ref/project.json b/src/System.Security.SecureString/ref/project.json deleted file mode 100644 index 30314a1a21..0000000000 --- a/src/System.Security.SecureString/ref/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Security.SecureString/src/System.Security.SecureString.csproj b/src/System.Security.SecureString/src/System.Security.SecureString.csproj index bc7f024b98..8ca2f789b0 100644 --- a/src/System.Security.SecureString/src/System.Security.SecureString.csproj +++ b/src/System.Security.SecureString/src/System.Security.SecureString.csproj @@ -1,4 +1,4 @@ -<?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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'=='' AND '$(TargetGroup)' == ''">Windows_Debug</Configuration> @@ -24,7 +24,8 @@ </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Runtime.InteropServices" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Security.SecureString/src/project.json b/src/System.Security.SecureString/src/project.json deleted file mode 100644 index 27c47825a8..0000000000 --- a/src/System.Security.SecureString/src/project.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "System.Runtime.InteropServices": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1", - "System.Runtime.InteropServices": "4.4.0-beta-24721-02" - } - } - } -} diff --git a/src/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj b/src/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj index f569cfd27b..d9bd903b9a 100644 --- a/src/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj +++ b/src/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj @@ -1,15 +1,12 @@ -<?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> <ItemGroup> <Compile Include="System.ServiceProcess.ServiceController.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Handles\ref\System.Runtime.Handles.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.ServiceProcess.ServiceController/ref/project.json b/src/System.ServiceProcess.ServiceController/ref/project.json deleted file mode 100644 index f913ef267f..0000000000 --- a/src/System.ServiceProcess.ServiceController/ref/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Runtime.Handles": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj b/src/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj index 6ac21515b7..dcd5e41d63 100644 --- a/src/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj +++ b/src/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj @@ -1,4 +1,4 @@ -<?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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> @@ -80,7 +80,13 @@ <TargetingPackReference Include="System.ServiceProcess" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="Microsoft.Win32.Primitives" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.ServiceProcess.ServiceController/src/project.json b/src/System.ServiceProcess.ServiceController/src/project.json deleted file mode 100644 index df0df586b3..0000000000 --- a/src/System.ServiceProcess.ServiceController/src/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.Win32.Primitives": "4.4.0-beta-24721-02", - "System.Collections": "4.4.0-beta-24721-02", - "System.Diagnostics.Tools": "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.Handles": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices": "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": "1.0.1" - } - } - } -} diff --git a/src/System.Text.Encoding.CodePages/ref/System.Text.Encoding.CodePages.csproj b/src/System.Text.Encoding.CodePages/ref/System.Text.Encoding.CodePages.csproj index 6668d530c0..b323a7a095 100644 --- a/src/System.Text.Encoding.CodePages/ref/System.Text.Encoding.CodePages.csproj +++ b/src/System.Text.Encoding.CodePages/ref/System.Text.Encoding.CodePages.csproj @@ -1,15 +1,12 @@ -<?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> <ItemGroup> <Compile Include="System.Text.Encoding.CodePages.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Text.Encoding\ref\System.Text.Encoding.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Text.Encoding.CodePages/ref/project.json b/src/System.Text.Encoding.CodePages/ref/project.json deleted file mode 100644 index 3d360ef515..0000000000 --- a/src/System.Text.Encoding.CodePages/ref/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Text.Encoding": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj b/src/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj index 8265d04ede..6c3e2d4229 100644 --- a/src/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj +++ b/src/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj @@ -1,4 +1,4 @@ -<?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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> @@ -68,7 +68,15 @@ <ItemGroup> <None Include="Data\CodePageNameMappings.csv" /> <None Include="Data\PreferredCodePageNames.csv" /> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <!-- Generator for code mapping table, target to invoke is GenerateEncodingSource --> @@ -83,4 +91,4 @@ <OutputDataTablePath>System\Text\EncodingTable.Data.cs</OutputDataTablePath> </PropertyGroup> <Import Project="$(ToolsDir)encoding.targets" Condition="Exists('$(ToolsDir)encoding.targets')" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Text.Encoding.CodePages/src/project.json b/src/System.Text.Encoding.CodePages/src/project.json deleted file mode 100644 index 90108265ba..0000000000 --- a/src/System.Text.Encoding.CodePages/src/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "dependencies": { - "System.Collections": "4.4.0-beta-24721-02", - "System.Diagnostics.Contracts": "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.Globalization": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.Reflection": "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.Runtime.Handles": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Text.Encoding": "4.4.0-beta-24721-02", - "System.Threading": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Text.Encoding.Extensions/ref/System.Text.Encoding.Extensions.csproj b/src/System.Text.Encoding.Extensions/ref/System.Text.Encoding.Extensions.csproj index cb96f7d8d3..740e35dbd5 100644 --- a/src/System.Text.Encoding.Extensions/ref/System.Text.Encoding.Extensions.csproj +++ b/src/System.Text.Encoding.Extensions/ref/System.Text.Encoding.Extensions.csproj @@ -1,16 +1,15 @@ -<?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> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <ItemGroup> <Compile Include="System.Text.Encoding.Extensions.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Text.Encoding\ref\System.Text.Encoding.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Text.Encoding.Extensions/ref/project.json b/src/System.Text.Encoding.Extensions/ref/project.json deleted file mode 100644 index 97aad22eb7..0000000000 --- a/src/System.Text.Encoding.Extensions/ref/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.3.0", - "System.Text.Encoding": "4.3.0" - }, - "frameworks": { - "netstandard1.7": {} - } -}
\ No newline at end of file diff --git a/src/System.Text.Encoding.Extensions/src/System.Text.Encoding.Extensions.csproj b/src/System.Text.Encoding.Extensions/src/System.Text.Encoding.Extensions.csproj index 0dbb3b5626..029b902de8 100644 --- a/src/System.Text.Encoding.Extensions/src/System.Text.Encoding.Extensions.csproj +++ b/src/System.Text.Encoding.Extensions/src/System.Text.Encoding.Extensions.csproj @@ -1,4 +1,4 @@ -<?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> @@ -22,7 +22,7 @@ <TargetingPackReference Include="System.Private.CoreLib" Condition="'$(TargetGroup)' != 'net463'" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Private.CoreLib" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Text.Encoding.Extensions/src/project.json b/src/System.Text.Encoding.Extensions/src/project.json deleted file mode 100644 index 8b642f3fbd..0000000000 --- a/src/System.Text.Encoding.Extensions/src/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24728-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Text.Encoding/ref/System.Text.Encoding.csproj b/src/System.Text.Encoding/ref/System.Text.Encoding.csproj index 8374f0beb2..38910a3980 100644 --- a/src/System.Text.Encoding/ref/System.Text.Encoding.csproj +++ b/src/System.Text.Encoding/ref/System.Text.Encoding.csproj @@ -1,23 +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> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <AssemblyVersion>4.1.0.0</AssemblyVersion> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> - <!-- copy to uap10.1 until nuget makes the change to map that to ns1.7 --> - <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.7;uap10.1</PackageTargetFramework> </PropertyGroup> <ItemGroup> <Compile Include="System.Text.Encoding.Forwards.cs" /> </ItemGroup> <ItemGroup> - <!-- Temporary till we publish System.Runtime updated package --> <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> - <ItemGroup> - <None Include="project.json" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Text.Encoding/ref/project.json b/src/System.Text.Encoding/ref/project.json deleted file mode 100644 index 11f44fb8b7..0000000000 --- a/src/System.Text.Encoding/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Text.Encoding/src/System.Text.Encoding.csproj b/src/System.Text.Encoding/src/System.Text.Encoding.csproj index fc099e8170..f2bc6fad3b 100644 --- a/src/System.Text.Encoding/src/System.Text.Encoding.csproj +++ b/src/System.Text.Encoding/src/System.Text.Encoding.csproj @@ -1,4 +1,4 @@ -<?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> @@ -20,7 +20,7 @@ <TargetingPackReference Include="System.Private.CoreLib" Condition="'$(TargetGroup)' != 'net463'" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Private.CoreLib" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Text.Encoding/src/project.json b/src/System.Text.Encoding/src/project.json deleted file mode 100644 index 6498bd79ed..0000000000 --- a/src/System.Text.Encoding/src/project.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24728-02" - } - }, - "uap10.1": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24728-00" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj b/src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj index a57c9ed62a..c0550fdb0d 100644 --- a/src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj +++ b/src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj @@ -1,4 +1,4 @@ -<?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> @@ -35,7 +35,15 @@ <EmbeddedResource Include="Resources\unicode8definedcharacters.bin" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.IO" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Reflection" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Text.Encodings.Web/src/project.json b/src/System.Text.Encodings.Web/src/project.json deleted file mode 100644 index 245a599138..0000000000 --- a/src/System.Text.Encodings.Web/src/project.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24721-02", - "System.Diagnostics.Contracts": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.IO": "4.3.0", - "System.Reflection": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - }, - "frameworks": { - "netstandard1.0": {} - } -}
\ No newline at end of file diff --git a/src/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.csproj b/src/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.csproj index 035f155655..fd3f48818f 100644 --- a/src/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.csproj +++ b/src/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.csproj @@ -1,18 +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 Condition="'$(TargetGroup)' == ''">.NETCoreApp,Version=v1.1</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="System.Text.RegularExpressions.cs" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == ''"> <Compile Include="System.Text.RegularExpressions.netcoreapp1.1.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" /> + <ProjectReference Include="..\..\System.Collections.NonGeneric\ref\System.Collections.NonGeneric.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Text.RegularExpressions/ref/project.json b/src/System.Text.RegularExpressions/ref/project.json deleted file mode 100644 index 6e2f9c2560..0000000000 --- a/src/System.Text.RegularExpressions/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.Collections.NonGeneric": "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": {}, - "netcoreapp1.1": {} - } -} diff --git a/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj b/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj index 1357399d25..49b175f3f6 100644 --- a/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj +++ b/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.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> @@ -55,7 +55,13 @@ <TargetingPackReference Include="System" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Text.RegularExpressions/src/project.json b/src/System.Text.RegularExpressions/src/project.json deleted file mode 100644 index f0aa9d1581..0000000000 --- a/src/System.Text.RegularExpressions/src/project.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24721-02", - "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.Globalization": "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.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" - } - } - } -} diff --git a/src/System.Threading.AccessControl/ref/System.Threading.AccessControl.csproj b/src/System.Threading.AccessControl/ref/System.Threading.AccessControl.csproj index 2fc927d34e..c43ef00ca9 100644 --- a/src/System.Threading.AccessControl/ref/System.Threading.AccessControl.csproj +++ b/src/System.Threading.AccessControl/ref/System.Threading.AccessControl.csproj @@ -1,16 +1,16 @@ -<?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.3</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="System.Threading.AccessControl.cs" /> <Compile Include="System.Threading.AccessControl.Manual.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj" /> + <ProjectReference Include="..\..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj" /> + <ProjectReference Include="..\..\System.Threading\ref\System.Threading.csproj" /> + <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Threading.AccessControl/ref/project.json b/src/System.Threading.AccessControl/ref/project.json deleted file mode 100644 index 9f6433ce39..0000000000 --- a/src/System.Threading.AccessControl/ref/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.3.0", - "System.Security.AccessControl": "4.3.0", - "System.Security.Principal.Windows": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" - }, - "frameworks": { - "netstandard1.3": {} - } -}
\ No newline at end of file diff --git a/src/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj b/src/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj index a8ccc5bb27..7307c68031 100644 --- a/src/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj +++ b/src/System.Threading.AccessControl/src/System.Threading.AccessControl.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"> <PropertyGroup> <OSGroup Condition="'$(OSGroup)' == ''">Windows_NT</OSGroup> @@ -31,7 +31,13 @@ <Compile Include="System\Threading\ThreadingAclExtensions.net46.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Security.AccessControl" /> + <Reference Include="System.Security.Principal.Windows" /> + <Reference Include="System.Runtime.Handles" /> + <Reference Include="System.Diagnostics.Contracts" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Threading.AccessControl/src/project.json b/src/System.Threading.AccessControl/src/project.json deleted file mode 100644 index 46e8b8a773..0000000000 --- a/src/System.Threading.AccessControl/src/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "frameworks": { - "netstandard1.3": { - "dependencies": { - "System.Diagnostics.Contracts": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.AccessControl": "4.3.0", - "System.Security.Principal.Windows": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "net46": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -}
\ No newline at end of file diff --git a/src/System.Threading.Overlapped/ref/System.Threading.Overlapped.csproj b/src/System.Threading.Overlapped/ref/System.Threading.Overlapped.csproj index ce9e9cc4fd..3e43ac771a 100644 --- a/src/System.Threading.Overlapped/ref/System.Threading.Overlapped.csproj +++ b/src/System.Threading.Overlapped/ref/System.Threading.Overlapped.csproj @@ -1,16 +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> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <ItemGroup> <Compile Include="System.Threading.Overlapped.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Threading.Overlapped/ref/project.json b/src/System.Threading.Overlapped/ref/project.json deleted file mode 100644 index 11f44fb8b7..0000000000 --- a/src/System.Threading.Overlapped/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Threading.Overlapped/src/System.Threading.Overlapped.csproj b/src/System.Threading.Overlapped/src/System.Threading.Overlapped.csproj index 45000cf1ab..6a005679be 100644 --- a/src/System.Threading.Overlapped/src/System.Threading.Overlapped.csproj +++ b/src/System.Threading.Overlapped/src/System.Threading.Overlapped.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"> <PropertyGroup> <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> @@ -25,6 +25,7 @@ <ProjectReference Include="..\..\System.Diagnostics.Debug\src\System.Diagnostics.Debug.csproj"> <Project>{E7E8DE8A-9EC1-46A8-A6EE-727DB32DBEB8}</Project> <Name>System.Diagnostics.Debug</Name> + <UndefineProperties>%(ProjectReference.UndefineProperties);OSGroup</UndefineProperties> </ProjectReference> </ItemGroup> <ItemGroup Condition="'$(TargetsUnix)' != 'true'"> @@ -67,7 +68,7 @@ <Compile Include="System\Threading\Win32ThreadPoolPreAllocatedOverlapped.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Private.CoreLib" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Threading.Overlapped/src/project.json b/src/System.Threading.Overlapped/src/project.json deleted file mode 100644 index c501c6ccaa..0000000000 --- a/src/System.Threading.Overlapped/src/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24728-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj b/src/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj index c192798bfd..665b1fbe1a 100644 --- a/src/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj +++ b/src/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj @@ -1,4 +1,4 @@ -<?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> @@ -59,5 +59,22 @@ <ItemGroup> <Content Include="XmlDocs\System.Threading.Tasks.Dataflow.xml" /> </ItemGroup> + <ItemGroup> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Collections.Concurrent" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Threading.Tasks" /> + <Reference Include="System.Dynamic.Runtime" /> + <Reference Include="System.Diagnostics.Tracing" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Linq" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Tools" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Tools" /> + </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Threading.Tasks.Dataflow/src/project.json b/src/System.Threading.Tasks.Dataflow/src/project.json deleted file mode 100644 index e62cc167cc..0000000000 --- a/src/System.Threading.Tasks.Dataflow/src/project.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "frameworks": { - "netstandard1.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24721-02", - "System.Collections": "4.3.0", - "System.Diagnostics.Contracts": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Dynamic.Runtime": "4.3.0", - "System.Linq": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Serialization.Primitives": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "netstandard1.1": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24721-02", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Diagnostics.Contracts": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Dynamic.Runtime": "4.3.0", - "System.Linq": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Serialization.Primitives": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - } - } -}
\ No newline at end of file diff --git a/src/System.Threading.Tasks.Extensions/src/System.Threading.Tasks.Extensions.csproj b/src/System.Threading.Tasks.Extensions/src/System.Threading.Tasks.Extensions.csproj index c2fdecd4ff..9ac31dd65c 100644 --- a/src/System.Threading.Tasks.Extensions/src/System.Threading.Tasks.Extensions.csproj +++ b/src/System.Threading.Tasks.Extensions/src/System.Threading.Tasks.Extensions.csproj @@ -1,4 +1,4 @@ -<?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> @@ -20,7 +20,10 @@ <Compile Include="System\Threading\Tasks\ValueTask.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Threading.Tasks" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Collections" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Threading.Tasks.Extensions/src/project.json b/src/System.Threading.Tasks.Extensions/src/project.json deleted file mode 100644 index 5fbf14e1c5..0000000000 --- a/src/System.Threading.Tasks.Extensions/src/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24721-02", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading.Tasks": "4.3.0" - }, - "frameworks": { - "netstandard1.0": {} - } -}
\ No newline at end of file diff --git a/src/System.Threading.Tasks.Parallel/ref/System.Threading.Tasks.Parallel.csproj b/src/System.Threading.Tasks.Parallel/ref/System.Threading.Tasks.Parallel.csproj index 92035a8ea3..e39f2210ff 100644 --- a/src/System.Threading.Tasks.Parallel/ref/System.Threading.Tasks.Parallel.csproj +++ b/src/System.Threading.Tasks.Parallel/ref/System.Threading.Tasks.Parallel.csproj @@ -1,16 +1,13 @@ -<?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> - <AssemblyVersion>4.0.0.0</AssemblyVersion> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.1</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="System.Threading.Tasks.Parallel.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Collections.Concurrent\ref\System.Collections.Concurrent.csproj" /> + <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Threading.Tasks.Parallel/ref/project.json b/src/System.Threading.Tasks.Parallel/ref/project.json deleted file mode 100644 index a4c9f2d227..0000000000 --- a/src/System.Threading.Tasks.Parallel/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Threading.Tasks": "4.3.0" - }, - "frameworks": { - "netstandard1.1": {} - } -}
\ No newline at end of file diff --git a/src/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.csproj b/src/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.csproj index f1f5e17169..29e9f8f1be 100644 --- a/src/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.csproj +++ b/src/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.csproj @@ -1,4 +1,4 @@ -<?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> @@ -30,7 +30,16 @@ <TargetingPackReference Include="mscorlib" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Threading.Tasks" /> + <Reference Include="System.Collections.Concurrent" /> + <Reference Include="System.Diagnostics.Tracing" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Threading.Tasks.Parallel/src/project.json b/src/System.Threading.Tasks.Parallel/src/project.json deleted file mode 100644 index 7dd1374452..0000000000 --- a/src/System.Threading.Tasks.Parallel/src/project.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "frameworks": { - "netstandard1.3": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24721-02", - "System.Collections.Concurrent": "4.3.0", - "System.Diagnostics.Contracts": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "net46": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -}
\ No newline at end of file diff --git a/src/System.Threading.Tasks/ref/System.Threading.Tasks.csproj b/src/System.Threading.Tasks/ref/System.Threading.Tasks.csproj index 02634f13f3..98faf370a8 100644 --- a/src/System.Threading.Tasks/ref/System.Threading.Tasks.csproj +++ b/src/System.Threading.Tasks/ref/System.Threading.Tasks.csproj @@ -1,16 +1,11 @@ -<?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> - <PackageTargetFramework>netstandard1.7;uap10.1</PackageTargetFramework> - </PropertyGroup> <ItemGroup> <Compile Include="System.Threading.Tasks.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Threading.Tasks/ref/project.json b/src/System.Threading.Tasks/ref/project.json deleted file mode 100644 index 11f44fb8b7..0000000000 --- a/src/System.Threading.Tasks/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Threading.Tasks/src/System.Threading.Tasks.csproj b/src/System.Threading.Tasks/src/System.Threading.Tasks.csproj index 4b149d44da..4a10300ace 100644 --- a/src/System.Threading.Tasks/src/System.Threading.Tasks.csproj +++ b/src/System.Threading.Tasks/src/System.Threading.Tasks.csproj @@ -1,4 +1,4 @@ -<?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> @@ -17,7 +17,6 @@ <Compile Include="System\Threading\Tasks\TaskExtensions.CoreCLR.cs" /> <ProjectReference Include="..\..\System.Diagnostics.Debug\src\System.Diagnostics.Debug.csproj"> <UndefineProperties>%(ProjectReference.UndefineProperties);TargetGroup</UndefineProperties> - <OSGroup>$(InputOSGroup)</OSGroup> </ProjectReference> <TargetingPackReference Include="System.Private.CoreLib" /> </ItemGroup> @@ -30,7 +29,7 @@ <TargetingPackReference Include="System.Private.CoreLib" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Private.CoreLib" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Threading.Tasks/src/project.json b/src/System.Threading.Tasks/src/project.json deleted file mode 100644 index 6498bd79ed..0000000000 --- a/src/System.Threading.Tasks/src/project.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24728-02" - } - }, - "uap10.1": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24728-00" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Threading.Thread/ref/System.Threading.Thread.csproj b/src/System.Threading.Thread/ref/System.Threading.Thread.csproj index 4272797199..cf611b21bf 100644 --- a/src/System.Threading.Thread/ref/System.Threading.Thread.csproj +++ b/src/System.Threading.Thread/ref/System.Threading.Thread.csproj @@ -1,16 +1,14 @@ -<?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> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> - <PackageTargetFramework>netstandard1.7;uap10.1</PackageTargetFramework> - </PropertyGroup> <ItemGroup> <Compile Include="System.Threading.Thread.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" /> + <ProjectReference Include="..\..\System.Security.Principal\ref\System.Security.Principal.csproj" /> + <ProjectReference Include="..\..\System.Threading\ref\System.Threading.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Threading.Thread/ref/project.json b/src/System.Threading.Thread/ref/project.json deleted file mode 100644 index 5b8e875413..0000000000 --- a/src/System.Threading.Thread/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Runtime.Extensions": "4.4.0-beta-24721-02", - "System.Security.Principal": "4.4.0-beta-24721-02", - "System.Threading": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Threading.Thread/src/System.Threading.Thread.csproj b/src/System.Threading.Thread/src/System.Threading.Thread.csproj index 7fc0f6ce4a..705f5f2083 100644 --- a/src/System.Threading.Thread/src/System.Threading.Thread.csproj +++ b/src/System.Threading.Thread/src/System.Threading.Thread.csproj @@ -1,5 +1,8 @@ -<?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"> + <PropertyGroup> + <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <AssemblyName>System.Threading.Thread</AssemblyName> @@ -36,13 +39,18 @@ <ItemGroup Condition="'$(TargetGroup)' != 'net463' and '$(TargetGroup)' != 'uap101aot'"> <ProjectReference Include="..\..\System.Runtime\src\System.Runtime.csproj"> <Aliases>System_Runtime</Aliases> + <UndefineProperties>%(ProjectReference.UndefineProperties);OSGroup</UndefineProperties> </ProjectReference> <ProjectReference Include="..\..\System.Runtime.Extensions\src\System.Runtime.Extensions.csproj"> - <OSGroup>$(InputOSGroup)</OSGroup> <Aliases>System_Runtime_Extensions</Aliases> + <UndefineProperties>%(ProjectReference.UndefineProperties);OSGroup</UndefineProperties> </ProjectReference> <ProjectReference Include="..\..\System.Security.Principal\src\System.Security.Principal.csproj"> <Aliases>System_Security_Principal</Aliases> + <UndefineProperties>%(ProjectReference.UndefineProperties);OSGroup</UndefineProperties> + </ProjectReference> + <ProjectReference Include="..\..\System.Diagnostics.Debug\src\System.Diagnostics.Debug.csproj"> + <UndefineProperties>%(ProjectReference.UndefineProperties);OSGroup</UndefineProperties> </ProjectReference> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> @@ -58,7 +66,7 @@ <TargetingPackReference Include="System.Core" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Private.CoreLib" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Threading.Thread/src/project.json b/src/System.Threading.Thread/src/project.json deleted file mode 100644 index 585b85e29b..0000000000 --- a/src/System.Threading.Thread/src/project.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24728-02", - "System.Diagnostics.Debug": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - }, - "uap10.1": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24728-00" - } - } - } -} diff --git a/src/System.Threading.ThreadPool/ref/System.Threading.ThreadPool.csproj b/src/System.Threading.ThreadPool/ref/System.Threading.ThreadPool.csproj index 5d575c7e9b..4568c2ed7b 100644 --- a/src/System.Threading.ThreadPool/ref/System.Threading.ThreadPool.csproj +++ b/src/System.Threading.ThreadPool/ref/System.Threading.ThreadPool.csproj @@ -1,16 +1,16 @@ -<?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> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <ItemGroup> <Compile Include="System.Threading.ThreadPool.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Handles\ref\System.Runtime.Handles.csproj" /> + <ProjectReference Include="..\..\System.Threading.Overlapped\ref\System.Threading.Overlapped.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Threading.ThreadPool/ref/project.json b/src/System.Threading.ThreadPool/ref/project.json deleted file mode 100644 index 87cf590401..0000000000 --- a/src/System.Threading.ThreadPool/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Runtime.Handles": "4.4.0-beta-24721-02", - "System.Threading.Overlapped": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Threading.ThreadPool/src/System.Threading.ThreadPool.csproj b/src/System.Threading.ThreadPool/src/System.Threading.ThreadPool.csproj index d45df78141..e8ff3ebdd7 100644 --- a/src/System.Threading.ThreadPool/src/System.Threading.ThreadPool.csproj +++ b/src/System.Threading.ThreadPool/src/System.Threading.ThreadPool.csproj @@ -1,4 +1,4 @@ -<?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> @@ -16,7 +16,7 @@ <TargetingPackReference Include="System.Private.CoreLib" Condition="'$(TargetGroup)' != 'net463'" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Private.CoreLib" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Threading.ThreadPool/src/project.json b/src/System.Threading.ThreadPool/src/project.json deleted file mode 100644 index c501c6ccaa..0000000000 --- a/src/System.Threading.ThreadPool/src/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24728-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.Threading.Timer/ref/System.Threading.Timer.csproj b/src/System.Threading.Timer/ref/System.Threading.Timer.csproj index 6cea4e2483..06138470c7 100644 --- a/src/System.Threading.Timer/ref/System.Threading.Timer.csproj +++ b/src/System.Threading.Timer/ref/System.Threading.Timer.csproj @@ -1,16 +1,12 @@ -<?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> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="System.Threading.Timer.cs" /> <Compile Include="System.Threading.Timer.Manual.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Threading.Timer/ref/project.json b/src/System.Threading.Timer/ref/project.json deleted file mode 100644 index 11f44fb8b7..0000000000 --- a/src/System.Threading.Timer/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Threading.Timer/src/System.Threading.Timer.csproj b/src/System.Threading.Timer/src/System.Threading.Timer.csproj index f126a3a11c..0c94452448 100644 --- a/src/System.Threading.Timer/src/System.Threading.Timer.csproj +++ b/src/System.Threading.Timer/src/System.Threading.Timer.csproj @@ -1,4 +1,4 @@ -<?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> @@ -16,7 +16,7 @@ <TargetingPackReference Include="System.Private.CoreLib" Condition="'$(TargetGroup)' != 'net463'" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Private.CoreLib" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Threading.Timer/src/project.json b/src/System.Threading.Timer/src/project.json deleted file mode 100644 index c501c6ccaa..0000000000 --- a/src/System.Threading.Timer/src/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24728-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.Threading/ref/System.Threading.csproj b/src/System.Threading/ref/System.Threading.csproj index 53d98e48b1..d599fbf686 100644 --- a/src/System.Threading/ref/System.Threading.csproj +++ b/src/System.Threading/ref/System.Threading.csproj @@ -1,15 +1,11 @@ -<?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> <ItemGroup> <Compile Include="System.Threading.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Threading/ref/project.json b/src/System.Threading/ref/project.json deleted file mode 100644 index 11f44fb8b7..0000000000 --- a/src/System.Threading/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Threading/src/System.Threading.csproj b/src/System.Threading/src/System.Threading.csproj index 3371ccbd27..b884c4ea1e 100644 --- a/src/System.Threading/src/System.Threading.csproj +++ b/src/System.Threading/src/System.Threading.csproj @@ -1,4 +1,4 @@ -<?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> @@ -36,7 +36,6 @@ </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == ''"> <ProjectReference Include="..\..\System.Diagnostics.Debug\src\System.Diagnostics.Debug.csproj"> - <OSGroup>$(InputOSGroup)</OSGroup> </ProjectReference> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == 'net463'"> @@ -48,7 +47,7 @@ <TargetingPackReference Include="System.Private.CoreLib" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Private.CoreLib" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Threading/src/project.json b/src/System.Threading/src/project.json deleted file mode 100644 index c501c6ccaa..0000000000 --- a/src/System.Threading/src/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24728-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.Transactions/ref/System.Transactions.csproj b/src/System.Transactions/ref/System.Transactions.csproj index 4749468275..021a73fb35 100644 --- a/src/System.Transactions/ref/System.Transactions.csproj +++ b/src/System.Transactions/ref/System.Transactions.csproj @@ -1,17 +1,13 @@ -<?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> - <AssemblyVersion>4.0.0.0</AssemblyVersion> - <OutputType>Library</OutputType> - <PackageTargetFramework>netstandard1.7</PackageTargetFramework> - <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="System.Transactions.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Serialization.Primitives\ref\System.Runtime.Serialization.Primitives.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Serialization.Formatters\ref\System.Runtime.Serialization.Formatters.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Transactions/ref/project.json b/src/System.Transactions/ref/project.json deleted file mode 100644 index bcfd524bfe..0000000000 --- a/src/System.Transactions/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Runtime.Serialization.Primitives": "4.4.0-beta-24721-02", - "System.Runtime.Serialization.Formatters": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Transactions/src/System.Transactions.csproj b/src/System.Transactions/src/System.Transactions.csproj index a63012ea8b..2f108c06db 100644 --- a/src/System.Transactions/src/System.Transactions.csproj +++ b/src/System.Transactions/src/System.Transactions.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> @@ -48,10 +48,21 @@ <Compile Include="System\Transactions\Configuration\MachineSettingsSection.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Runtime.Serialization.Formatters" /> + <Reference Include="System.Threading.Timer" /> + <Reference Include="System.Threading.Thread" /> + <Reference Include="System.Threading.ThreadPool" /> + <Reference Include="System.Diagnostics.Tracing" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <ItemGroup> <Compile Include="System\Transactions\TransactionsEtwProvider.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Transactions/src/project.json b/src/System.Transactions/src/project.json deleted file mode 100644 index 904fb4430f..0000000000 --- a/src/System.Transactions/src/project.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24721-02", - "Microsoft.Win32.Primitives": "4.4.0-beta-24721-02", - "System.Collections": "4.4.0-beta-24721-02", - "System.Collections.Specialized": "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.Globalization": "4.4.0-beta-24721-02", - "System.Diagnostics.Process": "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.Diagnostics.TraceSource": "4.4.0-beta-24721-02", - "System.IO": "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.Runtime.Serialization.Formatters": "4.4.0-beta-24721-02", - "System.Runtime.InteropServices": "4.4.0-beta-24721-02", - "System.Threading": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02", - "System.Threading.Thread": "4.4.0-beta-24721-02", - "System.Threading.ThreadPool": "4.4.0-beta-24721-02", - "System.Threading.Timer": "4.4.0-beta-24721-02", - "System.Xml.XPath": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.ValueTuple/src/System.ValueTuple.csproj b/src/System.ValueTuple/src/System.ValueTuple.csproj index 1d8fff2f67..30cbc45270 100644 --- a/src/System.ValueTuple/src/System.ValueTuple.csproj +++ b/src/System.ValueTuple/src/System.ValueTuple.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> @@ -30,7 +30,10 @@ <TargetingPackReference Include="System.Core" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Diagnostics.Debug" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.ValueTuple/src/project.json b/src/System.ValueTuple/src/project.json deleted file mode 100644 index a421735ac6..0000000000 --- a/src/System.ValueTuple/src/project.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "frameworks": { - "netstandard1.0": { - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "portable-net40+sl4+win8+wp8": { - "dependencies": { - "Microsoft.TargetingPack.Portable.v4.0.Profile36": "1.0.0" - } - } - } -}
\ No newline at end of file diff --git a/src/System.Web.HttpUtility/ref/System.Web.HttpUtility.csproj b/src/System.Web.HttpUtility/ref/System.Web.HttpUtility.csproj index 4ee6fb474f..0534648a36 100644 --- a/src/System.Web.HttpUtility/ref/System.Web.HttpUtility.csproj +++ b/src/System.Web.HttpUtility/ref/System.Web.HttpUtility.csproj @@ -1,17 +1,15 @@ -<?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.3</NuGetTargetMoniker> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3_Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3_Release|AnyCPU'" /> <ItemGroup> <Compile Include="System.Web.HttpUtility.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Collections.Specialized\ref\System.Collections.Specialized.csproj" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" /> + <ProjectReference Include="..\..\System.Text.Encoding\ref\System.Text.Encoding.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Web.HttpUtility/ref/project.json b/src/System.Web.HttpUtility/ref/project.json deleted file mode 100644 index 9f04868e57..0000000000 --- a/src/System.Web.HttpUtility/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.Collections.Specialized": "4.3.0", - "System.IO": "4.3.0", - "System.Runtime": "4.3.0", - "System.Text.Encoding": "4.3.0" - }, - "frameworks": { - "netstandard1.3": {} - } -}
\ No newline at end of file diff --git a/src/System.Web.HttpUtility/src/System.Web.HttpUtility.csproj b/src/System.Web.HttpUtility/src/System.Web.HttpUtility.csproj index 68f1f4e33b..55575ce3e5 100644 --- a/src/System.Web.HttpUtility/src/System.Web.HttpUtility.csproj +++ b/src/System.Web.HttpUtility/src/System.Web.HttpUtility.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> @@ -23,7 +23,14 @@ <TargetingPackReference Include="System.Web" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Collections.Specialized" /> + <Reference Include="System.Text.Encoding" /> + <Reference Include="System.IO" /> + <Reference Include="System.Globalization" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Web.HttpUtility/src/project.json b/src/System.Web.HttpUtility/src/project.json deleted file mode 100644 index 3310d0f160..0000000000 --- a/src/System.Web.HttpUtility/src/project.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "frameworks": { - "netstandard1.3": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections.Specialized": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "net46": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -}
\ No newline at end of file diff --git a/src/System.Xml.ReaderWriter/ref/System.Xml.ReaderWriter.csproj b/src/System.Xml.ReaderWriter/ref/System.Xml.ReaderWriter.csproj index 5894fa9e62..90e1d2d006 100644 --- a/src/System.Xml.ReaderWriter/ref/System.Xml.ReaderWriter.csproj +++ b/src/System.Xml.ReaderWriter/ref/System.Xml.ReaderWriter.csproj @@ -1,15 +1,18 @@ -<?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> <ItemGroup> <Compile Include="System.Xml.ReaderWriter.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Collections.NonGeneric\ref\System.Collections.NonGeneric.csproj" /> + <ProjectReference Include="..\..\System.Diagnostics.Debug\ref\System.Diagnostics.Debug.csproj" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.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" /> + <ProjectReference Include="..\..\System.Text.Encoding\ref\System.Text.Encoding.csproj" /> + <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Xml.ReaderWriter/ref/project.json b/src/System.Xml.ReaderWriter/ref/project.json deleted file mode 100644 index 2c8b537c10..0000000000 --- a/src/System.Xml.ReaderWriter/ref/project.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "dependencies": { - "System.Collections.NonGeneric": "4.4.0-beta-24721-02", - "System.Diagnostics.Debug": "4.4.0-beta-24721-02", - "System.IO": "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", - "System.Text.Encoding": "4.4.0-beta-24721-02", - "System.Threading.Tasks": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Xml.ReaderWriter/src/System.Xml.ReaderWriter.csproj b/src/System.Xml.ReaderWriter/src/System.Xml.ReaderWriter.csproj index 7c8d5c4dd5..696e3e9800 100644 --- a/src/System.Xml.ReaderWriter/src/System.Xml.ReaderWriter.csproj +++ b/src/System.Xml.ReaderWriter/src/System.Xml.ReaderWriter.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> @@ -16,7 +16,6 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> <ProjectReference Include="..\..\System.Private.Xml\src\System.Private.Xml.csproj"> - <OSGroup>$(InputOSGroup)</OSGroup> </ProjectReference> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == 'net463'"> @@ -24,7 +23,7 @@ <TargetingPackReference Include="System.Xml" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Xml.ReaderWriter/src/project.json b/src/System.Xml.ReaderWriter/src/project.json deleted file mode 100644 index c8096bafc2..0000000000 --- a/src/System.Xml.ReaderWriter/src/project.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Collections.NonGeneric": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Xml.XDocument/ref/System.Xml.XDocument.csproj b/src/System.Xml.XDocument/ref/System.Xml.XDocument.csproj index 20dd5717d9..204d47cae5 100644 --- a/src/System.Xml.XDocument/ref/System.Xml.XDocument.csproj +++ b/src/System.Xml.XDocument/ref/System.Xml.XDocument.csproj @@ -1,16 +1,15 @@ -<?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> <ItemGroup> <Compile Include="System.Xml.XDocument.cs" /> <Compile Include="System.Xml.XDocument.Manual.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" /> + <ProjectReference Include="..\..\System.Xml.ReaderWriter\ref\System.Xml.ReaderWriter.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Xml.XDocument/ref/project.json b/src/System.Xml.XDocument/ref/project.json deleted file mode 100644 index ad59b52996..0000000000 --- a/src/System.Xml.XDocument/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.IO": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Runtime.Extensions": "4.4.0-beta-24721-02", - "System.Xml.ReaderWriter": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Xml.XDocument/src/System.Xml.XDocument.csproj b/src/System.Xml.XDocument/src/System.Xml.XDocument.csproj index eac891b0db..eb9a905033 100644 --- a/src/System.Xml.XDocument/src/System.Xml.XDocument.csproj +++ b/src/System.Xml.XDocument/src/System.Xml.XDocument.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> @@ -17,7 +17,6 @@ <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> <ProjectReference Include="..\..\System.Private.Xml.Linq\src\System.Private.Xml.Linq.csproj" /> <ProjectReference Include="..\..\System.Private.Xml\src\System.Private.Xml.csproj"> - <OSGroup>$(InputOSGroup)</OSGroup> </ProjectReference> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == 'net463'"> @@ -25,7 +24,7 @@ <TargetingPackReference Include="System.Xml.Linq" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Xml.XDocument/src/project.json b/src/System.Xml.XDocument/src/project.json deleted file mode 100644 index 4d7c1583fe..0000000000 --- a/src/System.Xml.XDocument/src/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Xml.XPath.XDocument/ref/System.Xml.XPath.XDocument.csproj b/src/System.Xml.XPath.XDocument/ref/System.Xml.XPath.XDocument.csproj index ebab879aa0..4350855048 100644 --- a/src/System.Xml.XPath.XDocument/ref/System.Xml.XPath.XDocument.csproj +++ b/src/System.Xml.XPath.XDocument/ref/System.Xml.XPath.XDocument.csproj @@ -1,16 +1,15 @@ -<?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> <ItemGroup> <Compile Include="System.Xml.XPath.XDocument.cs" /> <Compile Include="System.Xml.XPath.XDocument.Manual.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Xml.XDocument\ref\System.Xml.XDocument.csproj" /> + <ProjectReference Include="..\..\System.Xml.XPath\ref\System.Xml.XPath.csproj" /> + <ProjectReference Include="..\..\System.Xml.ReaderWriter\ref\System.Xml.ReaderWriter.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Xml.XPath.XDocument/ref/project.json b/src/System.Xml.XPath.XDocument/ref/project.json deleted file mode 100644 index 791faddd69..0000000000 --- a/src/System.Xml.XPath.XDocument/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Xml.XDocument": "4.4.0-beta-24721-02", - "System.Xml.XPath": "4.4.0-beta-24721-02", - "System.Xml.ReaderWriter": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Xml.XPath.XDocument/src/System.Xml.XPath.XDocument.csproj b/src/System.Xml.XPath.XDocument/src/System.Xml.XPath.XDocument.csproj index 775648c435..1a5c346ea1 100644 --- a/src/System.Xml.XPath.XDocument/src/System.Xml.XPath.XDocument.csproj +++ b/src/System.Xml.XPath.XDocument/src/System.Xml.XPath.XDocument.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> @@ -18,7 +18,6 @@ </ItemGroup> <ItemGroup Condition="'$(TargetGroup)'==''"> <ProjectReference Include="..\..\System.Private.Xml\src\System.Private.Xml.csproj"> - <OSGroup>$(InputOSGroup)</OSGroup> </ProjectReference> <ProjectReference Include="..\..\System.Private.Xml.Linq\src\System.Private.Xml.Linq.csproj" /> </ItemGroup> @@ -29,7 +28,9 @@ <TargetingPackReference Include="System.Xml.Linq" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Xml.XPath.XDocument/src/project.json b/src/System.Xml.XPath.XDocument/src/project.json deleted file mode 100644 index a2fb7845c7..0000000000 --- a/src/System.Xml.XPath.XDocument/src/project.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "System.Diagnostics.Debug": "4.4.0-beta-24721-02", - "System.Diagnostics.Tools": "4.4.0-beta-24721-02", - "System.Diagnostics.TraceSource": "4.4.0-beta-24721-02", - "Microsoft.Win32.Registry": "4.4.0-beta-24721-02", - "System.IO.FileSystem": "4.4.0-beta-24721-02", - "System.Reflection.TypeExtensions": "4.4.0-beta-24721-02", - "System.ComponentModel.TypeConverter": "4.4.0-beta-24721-02", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24721-02", - "System.Data.Common": "4.4.0-beta-24721-02", - "System.Console": "4.4.0-beta-24721-02", - "System.Collections.NonGeneric": "4.4.0-beta-24721-02", - "System.Collections.Specialized": "4.4.0-beta-24721-02", - "System.Linq": "4.4.0-beta-24721-02", - "System.Threading.Tasks.Extensions": "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.Threading": "4.4.0-beta-24721-02", - "System.Xml.ReaderWriter": { - "version": "4.3.0", - "exclude": "compile" - } - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -}
\ No newline at end of file diff --git a/src/System.Xml.XPath.XmlDocument/ref/System.Xml.XPath.XmlDocument.csproj b/src/System.Xml.XPath.XmlDocument/ref/System.Xml.XPath.XmlDocument.csproj index 7dbbe36471..24b6327b31 100644 --- a/src/System.Xml.XPath.XmlDocument/ref/System.Xml.XPath.XmlDocument.csproj +++ b/src/System.Xml.XPath.XmlDocument/ref/System.Xml.XPath.XmlDocument.csproj @@ -1,15 +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> <ItemGroup> <Compile Include="System.Xml.XPath.XmlDocument.Manual.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Xml.XmlDocument\ref\System.Xml.XmlDocument.csproj" /> + <ProjectReference Include="..\..\System.Xml.XPath\ref\System.Xml.XPath.csproj" /> + <ProjectReference Include="..\..\System.Xml.ReaderWriter\ref\System.Xml.ReaderWriter.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Xml.XPath.XmlDocument/ref/project.json b/src/System.Xml.XPath.XmlDocument/ref/project.json deleted file mode 100644 index 8e5faecb1c..0000000000 --- a/src/System.Xml.XPath.XmlDocument/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.3.0", - "System.Xml.XmlDocument": "4.3.0", - "System.Xml.XPath": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0" - }, - "frameworks": { - "netstandard1.7": {} - } -}
\ No newline at end of file diff --git a/src/System.Xml.XPath.XmlDocument/src/System.Xml.XPath.XmlDocument.csproj b/src/System.Xml.XPath.XmlDocument/src/System.Xml.XPath.XmlDocument.csproj index de1649855a..4efc31678b 100644 --- a/src/System.Xml.XPath.XmlDocument/src/System.Xml.XPath.XmlDocument.csproj +++ b/src/System.Xml.XPath.XmlDocument/src/System.Xml.XPath.XmlDocument.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> @@ -25,7 +25,11 @@ </Compile> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Xml.ReaderWriter" /> + <Reference Include="System.Diagnostics.Tools" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Xml.XPath.XmlDocument/src/project.json b/src/System.Xml.XPath.XmlDocument/src/project.json deleted file mode 100644 index 26de323b96..0000000000 --- a/src/System.Xml.XPath.XmlDocument/src/project.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24721-02", - "System.Collections": "4.4.0-beta-24721-02", - "System.Collections.NonGeneric": "4.4.0-beta-24721-02", - "System.Collections.Specialized": "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.TraceSource": "4.4.0-beta-24721-02", - "Microsoft.Win32.Registry": "4.4.0-beta-24721-02", - "System.Threading.Tasks.Extensions": "4.4.0-beta-24721-02", - "System.ComponentModel.TypeConverter": "4.4.0-beta-24721-02", - "System.Data.Common": "4.4.0-beta-24721-02", - "System.Console": "4.4.0-beta-24721-02", - "System.Globalization": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.IO.FileSystem": "4.4.0-beta-24721-02", - "System.Reflection.TypeExtensions": "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.Threading": "4.4.0-beta-24721-02", - "System.Xml.ReaderWriter": "4.4.0-beta-24721-02", - "System.Xml.XmlDocument": "4.4.0-beta-24721-02", - "System.Xml.XPath": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Xml.XPath/ref/System.Xml.XPath.csproj b/src/System.Xml.XPath/ref/System.Xml.XPath.csproj index c4438feb1b..68b8a812ea 100644 --- a/src/System.Xml.XPath/ref/System.Xml.XPath.csproj +++ b/src/System.Xml.XPath/ref/System.Xml.XPath.csproj @@ -1,15 +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> <ItemGroup> <Compile Include="System.Xml.XPath.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" /> + <ProjectReference Include="..\..\System.Xml.ReaderWriter\ref\System.Xml.ReaderWriter.csproj" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Xml.XPath/ref/project.json b/src/System.Xml.XPath/ref/project.json deleted file mode 100644 index a62761d2e3..0000000000 --- a/src/System.Xml.XPath/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Runtime.Extensions": "4.4.0-beta-24721-02", - "System.Xml.ReaderWriter": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Xml.XPath/src/System.Xml.XPath.csproj b/src/System.Xml.XPath/src/System.Xml.XPath.csproj index c0efa62112..b36ba66a2b 100644 --- a/src/System.Xml.XPath/src/System.Xml.XPath.csproj +++ b/src/System.Xml.XPath/src/System.Xml.XPath.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> @@ -15,7 +15,6 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> <ProjectReference Include="..\..\System.Private.Xml\src\System.Private.Xml.csproj"> - <OSGroup>$(InputOSGroup)</OSGroup> </ProjectReference> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == 'net463'"> @@ -23,7 +22,7 @@ <TargetingPackReference Include="System.Xml" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Xml.XPath/src/project.json b/src/System.Xml.XPath/src/project.json deleted file mode 100644 index 4d7c1583fe..0000000000 --- a/src/System.Xml.XPath/src/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Xml.XmlDocument/ref/System.Xml.XmlDocument.csproj b/src/System.Xml.XmlDocument/ref/System.Xml.XmlDocument.csproj index f64cb98d58..cb12427f19 100644 --- a/src/System.Xml.XmlDocument/ref/System.Xml.XmlDocument.csproj +++ b/src/System.Xml.XmlDocument/ref/System.Xml.XmlDocument.csproj @@ -1,15 +1,12 @@ -<?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> <ItemGroup> <Compile Include="System.Xml.XmlDocument.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Xml.ReaderWriter\ref\System.Xml.ReaderWriter.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Xml.XmlDocument/ref/project.json b/src/System.Xml.XmlDocument/ref/project.json deleted file mode 100644 index e22e27bc9d..0000000000 --- a/src/System.Xml.XmlDocument/ref/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Xml.ReaderWriter": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Xml.XmlDocument/src/System.Xml.XmlDocument.csproj b/src/System.Xml.XmlDocument/src/System.Xml.XmlDocument.csproj index 9aaff99769..0b8cb57257 100644 --- a/src/System.Xml.XmlDocument/src/System.Xml.XmlDocument.csproj +++ b/src/System.Xml.XmlDocument/src/System.Xml.XmlDocument.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> @@ -17,7 +17,6 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> <ProjectReference Include="..\..\System.Private.Xml\src\System.Private.Xml.csproj"> - <OSGroup>$(InputOSGroup)</OSGroup> </ProjectReference> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == 'net463'"> @@ -25,7 +24,7 @@ <TargetingPackReference Include="System.Xml" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Xml.XmlDocument/src/project.json b/src/System.Xml.XmlDocument/src/project.json deleted file mode 100644 index 4d7c1583fe..0000000000 --- a/src/System.Xml.XmlDocument/src/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Xml.XmlSerializer/ref/System.Xml.XmlSerializer.csproj b/src/System.Xml.XmlSerializer/ref/System.Xml.XmlSerializer.csproj index 2cb5050593..83187fda04 100644 --- a/src/System.Xml.XmlSerializer/ref/System.Xml.XmlSerializer.csproj +++ b/src/System.Xml.XmlSerializer/ref/System.Xml.XmlSerializer.csproj @@ -1,15 +1,18 @@ -<?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> <ItemGroup> <Compile Include="System.Xml.XmlSerializer.cs" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <ProjectReference Include="..\..\System.Collections.NonGeneric\ref\System.Collections.NonGeneric.csproj" /> + <ProjectReference Include="..\..\System.Collections.Specialized\ref\System.Collections.Specialized.csproj" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> + <ProjectReference Include="..\..\System.Reflection\ref\System.Reflection.csproj" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" /> + <ProjectReference Include="..\..\System.Xml.ReaderWriter\ref\System.Xml.ReaderWriter.csproj" /> + <ProjectReference Include="..\..\System.Xml.XmlDocument\ref\System.Xml.XmlDocument.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Xml.XmlSerializer/ref/project.json b/src/System.Xml.XmlSerializer/ref/project.json deleted file mode 100644 index 61b9b67b68..0000000000 --- a/src/System.Xml.XmlSerializer/ref/project.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "dependencies": { - "System.Collections.NonGeneric": "4.4.0-beta-24721-02", - "System.Collections.Specialized": "4.4.0-beta-24721-02", - "System.IO": "4.4.0-beta-24721-02", - "System.Reflection": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02", - "System.Runtime.Extensions": "4.4.0-beta-24721-02", - "System.Xml.ReaderWriter": "4.4.0-beta-24721-02", - "System.Xml.XmlDocument": "4.4.0-beta-24721-02" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Xml.XmlSerializer/src/System.Xml.XmlSerializer.csproj b/src/System.Xml.XmlSerializer/src/System.Xml.XmlSerializer.csproj index d6e603bf4c..a8e53afe15 100644 --- a/src/System.Xml.XmlSerializer/src/System.Xml.XmlSerializer.csproj +++ b/src/System.Xml.XmlSerializer/src/System.Xml.XmlSerializer.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -17,7 +17,6 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap101aot_Release|AnyCPU'" /> <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> <ProjectReference Include="..\..\System.Private.Xml\src\System.Private.Xml.csproj"> - <OSGroup>$(InputOSGroup)</OSGroup> </ProjectReference> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == 'uap101aot'"> @@ -28,7 +27,7 @@ <TargetingPackReference Include="System.Xml" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Runtime" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Xml.XmlSerializer/src/project.json b/src/System.Xml.XmlSerializer/src/project.json deleted file mode 100644 index fb32a85ecf..0000000000 --- a/src/System.Xml.XmlSerializer/src/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "System.Runtime": "4.4.0-beta-24721-02", - "System.Collections.NonGeneric": "4.4.0-beta-24721-02" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - }, - "uap10.1": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24728-00", - "System.Collections.NonGeneric": "4.4.0-beta-24721-02", - "System.Runtime": "4.4.0-beta-24721-02" - } - } - } -} diff --git a/src/dirs.proj b/src/dirs.proj index 71f6907575..e01e4b4af3 100644 --- a/src/dirs.proj +++ b/src/dirs.proj @@ -1,6 +1,11 @@ <Project ToolsVersion="14.0" DefaultTargets="BuildAndTest" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="dir.props" /> + <!-- required to build the projects in their specified order --> + <PropertyGroup> + <SerializeProjects>true</SerializeProjects> + </PropertyGroup> + <ItemGroup> <Project Include="ref.builds" /> <Project Include="src.builds" /> diff --git a/src/mscorlib.WinRT-Facade/mscorlib.WinRT-Facade.csproj b/src/mscorlib.WinRT-Facade/mscorlib.WinRT-Facade.csproj.disabled index c5c1d784f5..c5c1d784f5 100644 --- a/src/mscorlib.WinRT-Facade/mscorlib.WinRT-Facade.csproj +++ b/src/mscorlib.WinRT-Facade/mscorlib.WinRT-Facade.csproj.disabled diff --git a/src/ref.builds b/src/ref.builds index ffd28310a0..729bffab2b 100644 --- a/src/ref.builds +++ b/src/ref.builds @@ -2,8 +2,9 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> - <Project Include="*\ref\**\*.builds;*\ref\**\*.*proj"> + <Project Include="*\ref\*.*proj"> <UndefineProperties>OSGroup;TargetGroup</UndefineProperties> + <AdditionalMetadata>ConfigurationGroup=$(ConfigurationGroup)</AdditionalMetadata> </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> diff --git a/src/src.builds b/src/src.builds index cc651b2927..1d0317d75f 100644 --- a/src/src.builds +++ b/src/src.builds @@ -1,8 +1,16 @@ <?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" /> + <ItemGroup Condition="'$(OS)' != 'Windows_NT'"> + <ProjectExclusions Include="System.Memory/src/System.Memory.csproj" /> + </ItemGroup> <ItemGroup> - <Project Include="*\src\*.builds" /> + <Project Include="*/src/*.csproj" Exclude="@(ProjectExclusions)"> + <AdditionalMetadata>ConfigurationGroup=$(ConfigurationGroup)</AdditionalMetadata> + </Project> + <Project Include="*/src/*.vbproj" Exclude="@(ProjectExclusions)"> + <AdditionalMetadata>ConfigurationGroup=$(ConfigurationGroup)</AdditionalMetadata> + </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/targetingpacks.props b/targetingpacks.props new file mode 100644 index 0000000000..740ed84066 --- /dev/null +++ b/targetingpacks.props @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + + <ItemGroup> + <AdditionalReferencePaths Include="$(BinDir)netcoreapp/TargetingPack" /> + </ItemGroup> + + <PropertyGroup> + <ContractOutputPath>$(BinDir)netcoreapp/TargetingPack</ContractOutputPath> + <FrameworkPathOverride>$(ContractOutputPath)</FrameworkPathOverride> + <AssemblySearchPaths>$(AssemblySearchPaths);$(ContractOutputPath);{RawFileName}</AssemblySearchPaths> + </PropertyGroup> + +</Project> |