diff options
1611 files changed, 10775 insertions, 21443 deletions
diff --git a/Documentation/coding-guidelines/buildingvertical.md b/Documentation/coding-guidelines/buildingvertical.md deleted file mode 100644 index c143254a9d..0000000000 --- a/Documentation/coding-guidelines/buildingvertical.md +++ /dev/null @@ -1,118 +0,0 @@ -# Building a Vertical Implementation Details # - -**Definitions** - -*VerticalTargetGroup* - -`VerticalTargetGroup` - We need a property to define the vertical target group, but we don't want to set "TargetGroup" explicitly or we won't be able to build the "" TargetGroups for projects. - If `VerticalTargetGroup != ""`, we import buildvertical.targets which will contain our additional targets. - -*SupportedGroups* - -For each ref project and src project, we define `SupportedGroups`. `SupportedGroups` is a tuple for the supported `TargetGroups` and `OSGroups`. - - -ie - -ref\System.Runtime.csproj -```MSBuild -<PropertyGroup> - <SupportedGroups> - netstandard1.7_Windows_NT; - netstandard1.7_OSX; - netstandard1.7_Linux; - netcoreapp1.1_Windows_NT; - netcoreapp1.1_OSX; - netcoreapp1.1_Linux - </SupportedGroups> -<PropertyGroup> -``` - -*Contract Layer* - -We have a contract layer (msbuild task). - -Inputs: - - SupportedGroups - VerticalTargetGroup - OSGroup -Output: - - VerticalTargets (ItemTask) - metadata: TargetGroup - OSGroup - -Given the supported target and OS groups, and the desired vertical target and OS groups, return the closest supported group or empty metadata items. -How should we handle determining the target / os groups, fallback groups, etc...? The simplest solution is to use the NuGet api's for targets. We can use platforms\runtime.json for os groups, or try to use the already existent os group filtering instead of adding it to the contract layer. - -Options: - -1. Use NuGet API's - -2. Make use of inormation we already have and develop our own resolution algorithm. - -The current plan is to use the NuGet API's. We know that there is an intrinsic problem with the NuGet API's, in that we (CoreFx) define the targets (tfm's), but NuGet contains the data / logic, so anytime we want to create a new tfm, we have to go make an update to NuGet. This is an existent problem. For now, it is much simpler to utilize NuGet instead of deriving a second solution. When we break free of the NuGet dependency and wholly define our tfm graph, then we should utilize that solution for this work. - -**Building a vertical implementation steps** - -1 - Include all projects, we don't need to build the .builds files for each library, because we only want to build each project at most once for a given vertical. - -```MSBuild -<ItemGroup> - <Project Include="**\ref\*proj" /> - <Project Include="**\src\*proj" /> -</ItemGroup> -``` - -2 - Iterate all projects through the contract layer, removing (and logging) any projects which return null metadata (not supported). - -3 - Build `OutputPath` is set to drop all binaries into a single folder - -Current standard `OutputPath` - -```MSBuild -<OutputPath Condition="'$(OutputPath)'==''">$(BaseOutputPath)$(OSPlatformConfig)/$(MSBuildProjectName)/$(TargetOutputRelPath)$(OutputPathSubfolder)</OutputPath> -``` -Example: E:\gh\chcosta\corefx\bin/AnyOS.AnyCPU.Debug/System.Buffers/netcoreapp1.1/ - -Proposed vertical `OutputPath` - -```MSBuild -<OutputPath Condition="'$(OutputPath)'==''">$(BinDir)/$(VerticalTargetGroup)/$(OSPlatformConfig)</OutputPath> -``` -Example: E:\gh\chcosta\corefx\bin/netcoreapp1.7/AnyOS.AnyCPU.Debug - -Traditionally, the output path contains the `TargetGroup` as a part of the path. The flat structure means we don't have to play games with the `TargetPath` to figure out when, for example, "System.Buffers" ("netstandard1.1") is trying to find the "System.Runtime" reference ("netstandard1.7"), that there is no path for "System.Runtime.dll" containing the "netstandard1.1" target group. - -4 - Build all reference assemblies. The reference assembly projects, which were not trimmed in step 2, are all built. TBD, should we again use the contract layer during the build to determine the targets for the project, or should we capture that as metadata for the project in step 2? - -5 - Build all src assemblies into the "OutputPath". The src assembly projects, which were not trimmed in step 2. are all built. - -6 - build packages, TBD - -**Building a library** - -In addition to the ability to build an entire vertical, we require the ability to build a single library. This, single library build should utilize context to determine TargetGroup and OSGroup. ie, If a vertical build completes, and you want to build an individual library, it should use the group values from the vertical build unless you specify otherwise. If you specify otherwise, then those settings become the new settings. If no context is available, then the library should be built with a set of commond default values. - -When building an individual library, or project, its P2P references must be queried to determine supported configurations for building that refernce and then the best configuration must be chosen. - -**Additional issues** - -- building specific folders (filter by partition)? - -- building / running tests for a vertical - - - building tests against packages - -- Official builds? - -- CI testing? - -- Validation - - - Is it an error condition if any library does not contribute to the latest standard vertical? - - - Is it an error condition if a library does not contribute to any OS group? probably - - diff --git a/Documentation/coding-guidelines/project-guidelines.md b/Documentation/coding-guidelines/project-guidelines.md index 5dc6639a63..133f8bcbf8 100644 --- a/Documentation/coding-guidelines/project-guidelines.md +++ b/Documentation/coding-guidelines/project-guidelines.md @@ -1,49 +1,118 @@ -#Library Project guidelines -Library projects should use the following directory layout. +#Build Project Guidelines +In order to work in corefx repo you must first run build.cmd/sh from the root of the repo at least +once before you can iterate and work on a given library project. + +##Behind the scenes with build.cmd/sh + +- Setup tools (currently done in init-tools but will later be a boot-strap script in run.cmd/sh) +- Restore external dependencies + - CoreCLR - Copy to `bin\runtime\$(BuildConfiguration)` + - Netstandard Library - Copy to `bin\ref\netstandard` + - UAP - Copy to `bin\runtime\$(BuildConfiguration)` + - NetFx targeting pack - Copy to `bin\ref\netfx` +- Build targeting pack + - Build src\ref.builds which builds all references assembly projects. For reference assembly project information see [ref](#ref) +- Build product + - Build src\src.builds which builds all the source library projects. For source library project information see [src](#src). +- Sign product + - Build src\sign.builds +//**CONSIDER**: We should make this as part of the src.builds file instead of a separate .builds file. + +##Behind the scenes with build-test.cmd/sh +- build-test.cmd cannot be ran successfully until build.cmd has been ran at least once for a `BuildConfiguration`. +- Build src\tests.builds which builds all applicable test projects. For test project information see [tests](#tests). +- The build pass will happen twice. Once for the specific `$(BuildConfiguration)` and once for netstandard. That way we run both sets of applicable tests against for the given `$(BuildConfiguration)`. +- TODO: Currently as part of src/post.builds we call CloudBuild.targets which sets up our test runs. This needs to be moved to be part of build-test.cmd now. + +##Behind the scenes with build-packages.cmd/sh +- build-packages.cmd cannot be run successfully until build.cmd has been ran at least once for a BuildConfiguration. +- Build src\packages.builds which will build only the packages it has the context to build which will generally be only the ones for the given `BuildConfiguration`. If a package requires assets from multiple `BuildConfigurations` it will require that all `BuildConfigurations` are built first. + +#Build Pivots +Below is a list of all the various options we pivot the project builds on: + +- **Target Frameworks:** NetFx (aka Desktop), netstandard (aka dotnet/Portable), NETCoreApp (aka .NET Core), UAP (aka UWP/Store/netcore50) +- **Platform Runtimes:** NetFx (aka CLR/Desktop), CoreCLR, CoreRT (aka NetNative/AOT/MRT) +- **OS:** Windows_NT, Linux, OSX, FreeBSD, AnyOS +- **Flavor:** Debug, Release +- **Architecture:** x86, x64, ARM, ARM64, AnyCPU + +##Individual build properties +The following are the properties associated with each build pivot + +- `$(TargetGroup) -> netstandard | netcoreapp | netcoreappcorert | netfx | uap | uapaot` +//**CONSIDER**: naming netcoreappcorert something shorter maybe just corert. +- `$(OSGroup) -> empty/AnyOS* | Windows | Linux | OSX | FreeBSD` +- `$(ConfigurationGroup) -> empty/Debug* | Release` +- `$(ArchGroup) - empty/AnyCPU* | x86 | x64 | ARM | ARM64` + +For more information on various targets see also [.NET Standard](https://github.com/dotnet/standard/blob/master/docs/versions.md) + +<BR/>`*` -> *default values* + +##Aggregate build properties +Each project will define a set of supported build configurations + ``` -src\<Library Name>\src - Contains the source code for the library. -src\<Library Name>\ref - Contains any reference assembly projects for the library -src\<Library Name>\pkg - Contains package projects for the library. -src\<Library Name>\tests - Contains the test code for a library +<PropertyGroup> + <BuildConfigurations> + [BuildConfiguration1]; + [BuildConfiguration2]; + ... + </BuildConfigurations> +<PropertyGroup> ``` -In the src directory for a library there should be only **one** `.csproj` file that contains any information necessary to build the library in various configurations (see [Configurations](#project-configuration-conventions)). The src directory should also contain exactly **one** `.builds` file which contains all the valid configurations that a library should be built for (see [#.builds file](#project-builds-file)). -In the ref directory for the library there should be at most **one** `.csproj` that contains the latest API for the reference assembly for the library. If a library cannot support all supported targets using the latest API it should use `.depproj` projects for each significant historical version in order to download and redistribute the historical reference assembly in the latest package. If a library is a pure portable library with a single implementation it need not use a reference assembly at all. (see [Reference assembly projects](#reference-assembly-projects)). +- `$(BuildConfiguration) -> $(TargetGroup)[-$(OSGroup)][-$(ConfigurationGroup)][-$(ArchGroup)]` + - Note this property should be file path safe and thus can be used in file names or directories that need to a unique path for a project configuration. + - The only required configuration value is the `$(TargetGroup)` the others are optional. -In the pkg directory for the library there should be only **one** `.pkgproj` for the primary package for the library. If the library has platform-specific implementations those should be split into platform specific projects in a subfolder for each platform. (see [Package projects](./package-projects.md)) +Example: +Pure netstandard configuration: +``` +<PropertyGroup> + <BuildConfigurations> + netstandard; + </BuildConfigurations> +<PropertyGroup> +``` -##Build Pivots -Below is a list of all the various options we pivot the project builds on. +All supported targets with unique windows/unix build for netcoreapp: +``` +<PropertyGroup> + <BuildConfigurations> + netcoreapp-Windows_NT; + netcoreapp-Unix; + netfx-Windows_NT; + uap-Windows_NT; + </BuildConfigurations> +<PropertyGroup> +``` -- **Architecture:** x86, x64, ARM, ARM64 -- **Flavor:** Debug, Release -- **OS:** Windows_NT, Linux, OSX, FreeBSD -- **Platform Runtimes:** NetFx (aka CLR/Desktop), CoreCLR, CoreRT (aka NetNative/AOT/MRT) -- **Target Frameworks:** NetFx (aka Desktop), netstandard (aka dotnet/Portable), NETCoreApp (aka .NET Core), UAP (aka UWP/Store/netcore50) -- **Version:** Potentially multiple versions at the same time. -- **TestTFM:** net46, netcoreapp1.1, netcore50. This is the TFM that will be used to run the tests in. (Used in test projects only) +##Full build configuration +The `BuildConfiguration` property can either be set directly via +`/p:BuildConfiguration=[BuildConfiguration]` or will be defaulted based +on where you are running the build. The default will look like `netcoreapp-[RunningOS]-Debug-[RunningProcessArch]`, example `netcoreapp-Windows_NT-Debug-x64`. + +##Selecting the correct build configuration +When building an individual project the `BuildConfiguation` will be used to select the closest matching configuration listed in the projects `BuildConfigurations` property. The rules used to select the configuration will consider compatible target frameworks and OS fallbacks. -##Full Repo build pass -**Build Parameters:** *Flavor, Architecture*<BR/> -For each combination of build parameters there should be a full build pass over the entire repo. +TODO: Link to the target framework and OS fallbacks when they are available. +Temporary versions are at https://github.com/dotnet/corefx/blob/dev/eng/src/Tools/GenerateProps/osgroups.props and https://github.com/dotnet/corefx/blob/dev/eng/src/Tools/GenerateProps/targetgroups.props -##Project build pass -**Optional Build Parameters:** *OS, Platform Runtime, Target Framework, Version*<BR/> -These are optional build parameters for specific projects and don't require a full build pass but instead should be scoped to individual projects within the most appropriate full build pass. +##Supported full build configurations +- .NET Core latest on current OS (default) -> `netcoreapp-[RunningOS]` +- .NET Core CoreRT -> `netcoreappcorert-[RunningOS]` +- .NET Framework latest -> `netfx-Windows_NT` +- UWP -> `uapaot-Windows_NT` +- UAP F5 -> `uap-Windows_NT` -#Project configuration conventions +##Project configurations for VS For each unique configuration needed for a given library project a configuration property group should be added to the project so it can be selected and built in VS and also clearly identify the various configurations.<BR/> -`<PropertyGroup Condition="'$(Configuration)|$(Platform)' == '$(<OSGroup>_<TargetGroup>_<ConfigurationGroup>)|$(Platform)'">` - -- `$(Platform) -> AnyCPU* | x86 | x64 | ARM | ARM64` -- `$(Configuration) -> $(OSGroup)_$(TargetGroup)_$(ConfigurationGroup)` -- `$(OSGroup) -> [Empty]/AnyOS* | Windows | Linux | OSX | FreeBSD` -- `$(TargetGroup) -> [Empty]* | <PackageTargetFramework> | <PackageTargetRuntime> | <Version> | <PackageTargetFramework><PackageTargetRuntime>` - - `$(PackageTargetFramework) -> net46x | netstandard1.x | netcoreapp1.x | uap10.x | netcore50` - - `$(PackageTargetRuntime) -> aot` - - For more information on various targets see also [.NET Standard](https://github.com/dotnet/standard/blob/master/docs/versions.md) -- `$(ConfigurationGroup) -> Debug* | Release` -<BR/>`*` -> *default values* + +`<PropertyGroup Condition="'$(Configuration)|$(Platform)' == '$(OSGroup)-$(TargetGroup)-$(ConfigurationGroup)|$(Platform)'">` + +- Note that the majority of managed projects, currently all in corefx, $(Platform) is overridden to be AnyCPU. ####*Examples* Project configurations for a pure IL library project which targets the defaults. @@ -51,124 +120,87 @@ Project configurations for a pure IL library project which targets the defaults. <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> ``` -Project configurations with a unique implementation for each OS +Project configurations with a unique implementation on Unix and Windows ```xml - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'FreeBSD_Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'FreeBSD_Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Linux_Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Linux_Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'OSX_Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'OSX_Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_NT-Release|AnyCPU'" /> ``` Project configurations that are unique for a few different target frameworks and runtimes ```xml <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap101aot_Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap101aot_Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap101_Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap101_Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap101aot-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap101aot-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap101-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap101-Release|AnyCPU'" /> ``` -## Project .builds file -To drive the Project build pass we have a `.builds` project file that will multiplex the various optional build parameters we have for all the various configurtions within a given build pass. - -####*Examples* - -Project configurations for pure IL library project -```xml -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <ItemGroup> - <Project Include="System.Reflection.Metadata.csproj" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> -``` -Project configurations with a unique implementation for each OS -```xml -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <ItemGroup> - <Project Include="System.IO.FileSystem.csproj"> - <OSGroup>FreeBSD</OSGroup> - </Project> - <Project Include="System.IO.FileSystem.csproj"> - <OSGroup>Linux</OSGroup> - </Project> - <Project Include="System.IO.FileSystem.csproj"> - <OSGroup>OSX</OSGroup> - </Project> - <Project Include="System.IO.FileSystem.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.IO.FileSystem.csproj"> - <OSGroup>Windows_NT</OSGroup> - <TargetGroup>uap101</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +#Library project guidelines +Library projects should use the following directory layout. ``` -Project configurations that are unique for a few different target frameworks and runtimes -```xml -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <ItemGroup> - <Project Include="System.Linq.Expressions.csproj" /> - <Project Include="System.Linq.Expressions.csproj"> - <OSGroup>Windows_NT</OSGroup> - <TargetGroup>uap101</TargetGroup> - </Project> - <Project Include="System.Linq.Expressions.csproj"> - <OSGroup>Windows_NT</OSGroup> - <TargetGroup>uap101aot</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +src\<Library Name>\src - Contains the source code for the library. +src\<Library Name>\ref - Contains any reference assembly projects for the library +src\<Library Name>\pkg - Contains package projects for the library. +src\<Library Name>\tests - Contains the test code for a library ``` -###Tests project .builds files +##ref +Reference assemblies are required for any library that has more than one implementation or uses a facade. A reference assembly is a surface-area-only assembly that represents the public API of the library. To generate a reference assembly source file you can use the [GenAPI tool](https://www.nuget.org/packages/Microsoft.DotNet.BuildTools.GenAPI). If a library is a pure portable library with a single implementation it need not use a reference assembly at all. -The tests .builds files are very similar to the regular ones, except that they usually tend to pass in one extra property as metadata: `TestTFMs`. The purpose for this extra metadata property, is to show which TFMs are supported by the test projects build configuration. When doing a full build, a TestTFM will be specified (if not specified netcoreapp1.1 will be used as default), and the build will look into all of these test .builds files to try and find which configurations support testing in that TestTFM, and then start running the tests for those configurations. +In the ref directory for the library there should be at most **one** `.csproj` that contains the latest API for the reference assembly for the library. That project can contain multiple entries in its `BuildConfigurations` property. -####How to know which TestTFMs does a project support -`TargetGroup` and `TestTFM` are closely tied together, given that `TargetGroup` selects the TFM (the surface area) that the test assembly will use, and the `TestTFM` is where tests will actually run on. Here is a small cheat sheet of which `TestTFMs` you should add to the builds file given a `TargetGroup`: +There are two types of reference assembly projects: -TargetGroup | TestTFMs Supported ------------ | ------------------ -netstandard1.1 | netcoreapp1.0;net45 -netstandard1.2 | netcoreapp1.0;net451 -netstandard1.3 | netcoreapp1.0;net46 -netstandard1.4 | netcoreapp1.0;netcore50;net46 -netcoreapp1.0 | netcoreapp1.0 -netstandard1.6 | netcoreapp1.0;net462;netcore50 -netcoreapp1.1 | netcoreapp1.1 -netstandard1.7 | netcoreapp1.1;uap10.1;net463 +1. Libraries that are contain APIs in netstandard + - `BuildConfigurations` should contain non-netstandard configurations for the platforms they support. + - Should use a relative path `<ProjectReference>` to the dependencies it has. Those depedencies should only be libraries with similar build configurations and be part of netstandard. +<BR/>//**CONSIDER**: just using Reference with a custom task to pull from TP or turn to ProjectReference +2. Libraries that are built on top of netstandard + - `BuildConfigurations` should contain only netstandard configurations. + - Should contain `<Reference Include='netstandard'>` + - Anything outside of netstandard should use a relative path `<ProjectReference>` to its dependencies it has. Those depdencies should only be libraries that are built against netstandard as well. -####*Example* -```xml -<?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> - <Project Include="System.Linq.Expressions.Tests.csproj" /> - <Project Include="System.Linq.Expressions.Tests.csproj"> - <OSGroup>Windows_NT</OSGroup> - <TestTFMs>net463</TestTFMs> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> -``` -In the example above, the first configuration does not pass in `TestTFMs`, which means that this configuration is supported only by [the default TestTFM](https://github.com/dotnet/corefx/blob/master/dir.props#L495) +###ref output +The output for the ref project build will be a flat targeting pack folder in the following directory: + +`bin\ref\$(TargetGroup)` + +<BR/>//**CONSIDER**: Do we need a specific BuildConfiguration version of TargetGroup for this output path to ensure all projects output to same targeting path? + +##src +In the src directory for a library there should be only **one** `.csproj` file that contains any information necessary to build the library in various configurations. All supported configurations should be listed in the `BuildConfigurations` property. + +All libraries should use '<Reference Include="..." />' for all their project references. That will cause them to be resolved against a targeting pack (i.e. `bin\ref\netcoreapp` or `\bin\ref\netstanard`) based on the project configuration. There should not be any direct project references to other libraries. The only exception to that rule right now is for partial facades which directly reference System.Private.CoreLib and thus need to directly reference other partial facades to avoid type conflicts. +<BR>//**CONSIDER**: just using Reference and use a reference to System.Private.CoreLib as a trigger to turn the other References into a ProjectReference automatically. That will allow us to have consistency where all projects just use Reference. + +###src output +The output for the src product build will be a flat runtime folder into the following directory: + +`bin\runtime\$(BuildConfiguration)` + +Note: The `BuildConfiguration` is the global property and not the project configuration because we need all projects to output to the same runtime directory no matter which compatible configuration we select and build the project with. + +##pkg +In the pkg directory for the library there should be only **one** `.pkgproj` for the primary package for the library. If the library has platform-specific implementations those should be split into platform specific projects in a subfolder for each platform. (see [Package projects](./package-projects.md)) + +TODO: Outline changes needed for pkgprojs + +##tests +Similar to the src projects tests projects will define a `BuildConfigurations` property so they can list out the set of build configurations they support. + +Tests should not have any `<Reference>` or `<ProjectReference>` items in their project because they will automatically reference everything in the targeting pack based on the configuration they are building in. The only exception to this is a `<ProjectReference>` can be used to reference other test helper libraries or assets. + +In order to build and run a test project in a given configuration a root level build.cmd/sh must have been completed for that configuration first. Tests will run on the live built runtime at `bin\runtime\$(BuildConfiguration)`. +TODO: We need update our test host so that it can run from the shared runtime directory as well as resolve assemblies from the test output directory. + +###tests output +All test outputs should be under + +`bin\tests\$(MSBuildProjectName)\$(BuildConfiguration)` or +`bin\tests\$(MSBuildProjectName)\netstandard` ##Facades Facade are unique in that they don't have any code and instead are generated by finding a contract reference assembly with the matching identity and generating type forwards for all the types to where they live in the implementation assemblies (aka facade seeds). There are also partial facades which contain some type forwards as well as some code definitions. All the various build configurations should be contained in the one csproj file per library. @@ -203,9 +235,4 @@ Each source file should use the following guidelines As mentioned in [Conventions for forked code](conventions-for-forked-code) `#ifdef`ing the code is the last resort as it makes code harder to maintain overtime. If we do need to use `#ifdef`'s we should use the following conventions: - Defines based on conventions should be one of `$(OSGroup)`, `$(TargetGroup)`, `$(ConfigurationGroup)`, or `$(Platform)`, matching exactly by case to ensure consistency. - Examples: `<DefineConstants>$(DefineConstants),net46</DefineContants>` -- Defines based on convention should match the pattern `FEATURE_<feature name>`. These can unique to a given library project or potentially shared (via name) across multiple projects. - -# Reference assembly projects -Reference assemblies are required for any library that has more than one implementation or uses a facade. A reference assembly is a surface-area-only assembly that represents the public API of the library. To generate a reference assembly source file you can use the [GenAPI tool](https://www.nuget.org/packages/Microsoft.DotNet.BuildTools.GenAPI). - -When adding API to a library it is sometimes impossible to support the new API on all the platforms where the library is supported today. We strive to support new APIs everywhere, but sometimes this is not possible. For example: string is part of the core library so a new property on string must exist on the core library type. We cannot ship a new copy of string to the desktop due to limitations in binding rules for the desktop. Instead of dropping support for desktop we include an older version of the reference assembly that represents the smaller surface area for that version of desktop. This is achieved by adding a deployment project (`.depproj`) to deploy the old reference assembly from the old package. +- Defines based on convention should match the pattern `FEATURE_<feature name>`. These can unique to a given library project or potentially shared (via name) across multiple projects.
\ No newline at end of file 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/Packaging.props b/Packaging.props index 223cae4f16..8b89c9054f 100644 --- a/Packaging.props +++ b/Packaging.props @@ -23,6 +23,8 @@ <PackageVersion Condition="'$(PackageVersion)' == ''">4.4.0</PackageVersion> <SkipValidatePackageTargetFramework>true</SkipValidatePackageTargetFramework> <SkipGenerationCheck>true</SkipGenerationCheck> + <!-- disable layout creation in favor of binplacing --> + <ShouldCreateLayout>false</ShouldCreateLayout> </PropertyGroup> <Import Condition="Exists('pkg/baseline/baseline.props') AND '$(MSBuildProjectExtension)' == '.pkgproj'" Project="pkg/baseline/baseline.props" /> diff --git a/Tools-Override/ApiCompat.targets b/Tools-Override/ApiCompat.targets new file mode 100644 index 0000000000..927cfa2bbd --- /dev/null +++ b/Tools-Override/ApiCompat.targets @@ -0,0 +1,120 @@ +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <UsingTask TaskName="PrereleaseResolveNuGetPackageAssets" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll"/> + <UsingTask TaskName="LocatePreviousContract" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll"/> + + <PropertyGroup> + <ApiCompatBaseline Condition="!Exists('$(ApiCompatBaseline)')">$(MSBuildProjectDirectory)\ApiCompatBaseline.$(TargetGroup).txt</ApiCompatBaseline> + <ApiCompatBaseline Condition="!Exists('$(ApiCompatBaseline)')">$(MSBuildProjectDirectory)\ApiCompatBaseline.txt</ApiCompatBaseline> + </PropertyGroup> + + <PropertyGroup> + <RunApiCompatForSrc Condition="$(MSBuildProjectDirectory.EndsWith('src'))">true</RunApiCompatForSrc> + <!-- TODO: Disable the version over version ref compat checks for now because + we don't have a great way to get the previous version --> + <RunApiCompatForRef Condition="$(MSBuildProjectDirectory.EndsWith('ref'))">false</RunApiCompatForRef> + <RunApiCompat Condition="'$(RunApiCompat)'==''">false</RunApiCompat> + + <ResolveMatchingContract Condition="'$(RunApiCompatForSrc)'=='true'">true</ResolveMatchingContract> + <TargetsTriggeredByCompilation Condition="'$(RunApiCompatForSrc)'=='true'">$(TargetsTriggeredByCompilation);ValidateApiCompatForSrc</TargetsTriggeredByCompilation> + <TargetsTriggeredByCompilation Condition="'$(RunApiCompatForRef)'=='true'">$(TargetsTriggeredByCompilation);ValidateApiCompatForRef</TargetsTriggeredByCompilation> + </PropertyGroup> + + <!-- ApiCompat for Implementation Assemblies --> + <Target Name="ValidateApiCompatForSrc" + Condition="'$(RunApiCompatForSrc)' == 'true' AND '$(RunApiCompat)' == 'true' and '@(ResolvedMatchingContract)' != ''"> + + <PropertyGroup> + <ReferenceAssembly>@(ResolvedMatchingContract)</ReferenceAssembly> + </PropertyGroup> + + <ItemGroup> + <_DependencyDirectoriesTemp Include="@(ReferencePath->'%(RootDir)%(Directory)')" /> + <!-- Remove duplicate directories by batching over them --> + <_DependencyDirectories Include="%(_DependencyDirectoriesTemp.Identity)" /> + <_ContractDependencyDirectories Include="@(ResolvedMatchingContract->'%(RootDir)%(Directory)')" /> + </ItemGroup> + + <PropertyGroup> + <ApiCompatArgs>$(ApiCompatArgs) "$(ReferenceAssembly)"</ApiCompatArgs> + <ApiCompatArgs>$(ApiCompatArgs) -contractDepends:"@(_ContractDependencyDirectories, ','),"</ApiCompatArgs> + <ApiCompatArgs>$(ApiCompatArgs) -implDirs:"$(IntermediateOutputPath),@(_DependencyDirectories, ','),"</ApiCompatArgs> + <ApiCompatArgs Condition="'$(BaselineAllAPICompatError)'!='true' and Exists('$(ApiCompatBaseline)')">$(ApiCompatArgs) -baseline:"$(ApiCompatBaseline)"</ApiCompatArgs> + <ApiCompatBaselineAll Condition="'$(BaselineAllAPICompatError)'=='true'">> $(ApiCompatBaseline)</ApiCompatBaselineAll> + <ApiCompatExitCode>0</ApiCompatExitCode> + + <ApiCompatResponseFile>$(IntermediateOutputPath)apicompat.rsp</ApiCompatResponseFile> + <ApiCompatCmd>$(ToolHostCmd) "$(ToolsDir)ApiCompat.exe"</ApiCompatCmd> + </PropertyGroup> + + <MakeDir Directories="$(IntermediateOutputPath)" /> + <WriteLinesToFile File="$(ApiCompatResponseFile)" Lines="$(ApiCompatArgs)" Overwrite="true" /> + + <Exec Condition="Exists('$(ReferenceAssembly)')" + Command="$(ApiCompatCmd) @"$(ApiCompatResponseFile)" $(ApiCompatBaselineAll)" + CustomErrorRegularExpression="^[a-zA-Z]+ :" + StandardOutputImportance="Low" + IgnoreExitCode="true" + > + <Output TaskParameter="ExitCode" PropertyName="ApiCompatExitCode" /> + </Exec> + + <!-- + To force incremental builds to show failures again we are invalidating + one compile input by touching the assembly info file + --> + <Touch Condition="'$(ApiCompatExitCode)'!='0'" Files="$(AssemblyInfoFile)" /> + <Error Condition="'$(ApiCompatExitCode)'!='0'" Text="ApiCompat failed for '$(TargetPath)'" /> + </Target> + + <!-- ApiCompat for Contract Assemblies --> + <Target Name="ValidateApiCompatForRef" + Condition="'$(RunApiCompatForRef)' == 'true' AND '$(RunApiCompat)' == 'true'" > + + <!-- + This target is opportunistic in the sense it only runs if the previous contract version + has been built. If it doesn't find and older version then it will not run. This is because + we don't have a great way to always force that the older contract exists and has been built. + --> + <LocatePreviousContract CurrentContractProjectPath="$(ReferenceAssemblyOutputPath)$(AssemblyName)" AssemblyVersion="$(AssemblyVersion)"> + <Output TaskParameter="PreviousContractVersion" PropertyName="PreviousContractVersion" /> + </LocatePreviousContract> + + <PropertyGroup Condition="'$(PreviousContractVersion)'!=''"> + <PreviousContractAssembly>$(ReferenceAssemblyOutputPath)$(AssemblyName)\$(PreviousContractVersion)\$(AssemblyName).dll</PreviousContractAssembly> + </PropertyGroup> + + <ItemGroup> + <_CurrentContractDependencies Include="@(ReferencePath->'%(RootDir)%(Directory)')" /> + <!-- + Use the current contract dependencies for the previous contacts. While this isn't + 100% correct it is the best way to ensure we have them all and it current version + should purely be a subset of the previous one. + --> + <_PreviousContractDependencyDirectories Include="@(_CurrentContractDependencies)" /> + </ItemGroup> + + <PropertyGroup> + <_ApiCompatCmd>$(ToolHostCmd) "$(ToolsDir)ApiCompat.exe" "$(PreviousContractAssembly)"</_ApiCompatCmd> + <_ApiCompatCmd>$(_ApiCompatCmd) -contractDepends:"@(_PreviousContractDependencyDirectories);"</_ApiCompatCmd> + <_ApiCompatCmd>$(_ApiCompatCmd) -implDirs:"$(IntermediateOutputPath);@(_CurrentContractDependencies);"</_ApiCompatCmd> + <_ApiCompatCmd Condition="Exists('$(ApiCompatBaseline)')">$(_ApiCompatCmd) -baseline:"$(ApiCompatBaseline)"</_ApiCompatCmd> + <ApiCompatExitCode>0</ApiCompatExitCode> + </PropertyGroup> + + <Exec Condition="Exists('$(PreviousContractAssembly)')" + Command="$(_ApiCompatCmd)" + CustomErrorRegularExpression="^[a-zA-Z]+ :" + StandardOutputImportance="Low" + IgnoreExitCode="true" + > + <Output TaskParameter="ExitCode" PropertyName="ApiCompatExitCode" /> + </Exec> + + <!-- + To force incremental builds to show failures again we are invaliding + one compile input by touching the assembly info file + --> + <Touch Condition="'$(ApiCompatExitCode)'!='0'" Files="$(AssemblyInfoFile)" /> + <Error Condition="'$(ApiCompatExitCode)'!='0'" Text="ApiCompat failed for '$(TargetPath)'" /> + </Target> +</Project> diff --git a/Tools-Override/FrameworkTargeting.targets b/Tools-Override/FrameworkTargeting.targets new file mode 100644 index 0000000000..c4dcd2230c --- /dev/null +++ b/Tools-Override/FrameworkTargeting.targets @@ -0,0 +1,161 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + + <ItemGroup> + <TargetingPackDirs Include="$(RefPath)" /> + <AdditionalReferencePaths Include="@(TargetingPackDirs)" /> + </ItemGroup> + + <PropertyGroup > + <!-- TODO: This will begin depending on a target once we start computing RefPath --> + <ContractOutputPath>$(RefPath)</ContractOutputPath> + <FrameworkPathOverride>$(ContractOutputPath)</FrameworkPathOverride> + <AssemblySearchPaths>$(AssemblySearchPaths);$(ContractOutputPath);{RawFileName}</AssemblySearchPaths> + </PropertyGroup> + + <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> + + <!-- Configuration property shortcuts --> + <ProjectReference> + <AdditionalProperties Condition="'%(ProjectReference.Configuration)' != ''">Configuration=%(ProjectReference.Configuration);%(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/Tools-Override/publishtest.targets b/Tools-Override/publishtest.targets new file mode 100644 index 0000000000..426d9478bc --- /dev/null +++ b/Tools-Override/publishtest.targets @@ -0,0 +1,109 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + + <UsingTask TaskName="PrereleaseResolveNuGetPackageAssets" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll"/> + <UsingTask TaskName="RemoveDuplicatesWithLastOneWinsPolicy" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll"/> + <UsingTask TaskName="ZipFileCreateFromDirectory" Condition="'$(ArchiveTests)' == 'true'" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll"/> + <UsingTask TaskName="GenerateAssemblyList" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll"/> + <UsingTask TaskName="GetTargetMachineInfo" Condition="'$(TestWithLocalLibraries)'=='true'" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll"/> + + <PropertyGroup> + <SerializeProjects Condition="'$(TestWithLocalLibraries)'=='true'">true</SerializeProjects> + <TargetOS Condition="'$(OSGroup)'!='AnyOS'">$(OSGroup)</TargetOS> + </PropertyGroup> + + <!-- + Temporary until we have proper nuget support to deploy content files. + Copies supplemental test data to the build output and test directories. + --> + <Target Name="CopySupplementalTestData"> + <!-- coalesce supplemental test data items with and without DestinationDir metadata --> + <ItemGroup> + <_SupplementalTestData Include="@(SupplementalTestData)" Condition="'%(DestinationDir)' != ''"> + <DestinationDir>%(DestinationDir)</DestinationDir> + </_SupplementalTestData> + <_SupplementalTestData Include="@(SupplementalTestData)" Condition="'%(DestinationDir)' == ''"> + <DestinationDir>%(RecursiveDir)</DestinationDir> + </_SupplementalTestData> + </ItemGroup> + <ItemGroup> + <SupplementalTestDataTestDir Include="@(_SupplementalTestData->'$(TestPath)/%(DestinationDir)%(Filename)%(Extension)')" /> + <SupplementalTestDataOutDir Include="@(_SupplementalTestData->'$(OutDir)%(DestinationDir)%(Filename)%(Extension)')" /> + </ItemGroup> + <Copy + SourceFiles="@(_SupplementalTestData)" + DestinationFiles="@(SupplementalTestDataTestDir)" + SkipUnchangedFiles="$(SkipCopyUnchangedFiles)" + OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)" + Retries="$(CopyRetryCount)" + RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)" + UseHardlinksIfPossible="$(CreateHardLinksForCopyFilesToOutputDirectoryIfPossible)"> + + <Output TaskParameter="DestinationFiles" ItemName="FileWrites" /> + </Copy> + <Copy + SourceFiles="@(_SupplementalTestData)" + DestinationFiles="@(SupplementalTestDataOutDir)" + SkipUnchangedFiles="$(SkipCopyUnchangedFiles)" + OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)" + Retries="$(CopyRetryCount)" + RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)" + UseHardlinksIfPossible="$(CreateHardLinksForCopyFilesToOutputDirectoryIfPossible)"> + + <Output TaskParameter="DestinationFiles" ItemName="FileWrites" /> + </Copy> + </Target> + + <!-- Workaround for VS execution: This will form the same list and copy the same files as + copied via RunTests script so VS can work when the test dir is initially clean. + --> + <PropertyGroup Condition="'$(BuildingInsideVisualStudio)'=='true'"> + <PrepareForRunDependsOn>$(PrepareForRunDependsOn);CopyDefaultTestAssetsForVS</PrepareForRunDependsOn> + </PropertyGroup> + <Target Name="CopyDefaultTestAssetsForVS" DependsOnTargets="CopyTestToTestDirectory;CopySupplementalTestData"> + <!-- This was copied from RunTestsForProject in tests.targets + The RunTestsForProject target does not execute in VS context and would be confused by the script based runner. + _TestCopyLocalByFileNameWithoutDuplicates are the precise items that are fed to the runner script generation code. + --> + <ItemGroup> + <!-- Not all platforms can use the .ni.dlls that come from packages. If TestWithoutNativeImages is specified, we'll exclude them from copy generation. + If we end up needing this for any other sorts of filtering, we'll want to add a list of filtered extensions to be matched on EndsWith. --> + <_IncludedFileForTestsInVS Include="@(_TestCopyLocalByFileNameWithoutDuplicates)" + Condition="'$(TestWithoutNativeImages)' != 'true' Or !$([System.String]::Copy('%(_TestCopyLocalByFileNameWithoutDuplicates.SourcePath)').EndsWith('.ni.dll'))" > + <PackageRelativePath Condition="'%(_TestCopyLocalByFileNameWithoutDuplicates.NugetPackageId)' != ''">$([System.String]::Copy('%(_TestCopyLocalByFileNameWithoutDuplicates.SourcePath)').Replace('$(PackagesDir)',''))</PackageRelativePath> + <UseAbsolutePath Condition="'$(TestWithLocalLibraries)'=='true'">$([System.String]::Copy('%(_TestCopyLocalByFileNameWithoutDuplicates.SourcePath)').StartsWith('$(BinDir)'))</UseAbsolutePath> + <DestinationPath>$(TestPath)\%(Filename)%(Extension)</DestinationPath> + </_IncludedFileForTestsInVS> + <_IncludedFileForTestsInVs Remove="@(_IncludedFileForTestsInVS)" Condition="Exists('%(DestinationPath)')" /> + </ItemGroup> + + <Copy + SourceFiles="@(_IncludedFileForTestsInVS -> '%(SourcePath)')" + DestinationFiles="@(_IncludedFileForTestsInVS->'%(DestinationPath)')" + SkipUnchangedFiles="$(SkipCopyUnchangedFiles)" + OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)" + Retries="$(CopyRetryCount)" + RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)" + UseHardlinksIfPossible="true"> + <Output TaskParameter="DestinationFiles" ItemName="FileWrites" /> + </Copy> + </Target> + + <!-- archive the test binaries along with some supporting files --> + <Target Name="ArchiveTestBuild" Condition="'$(ArchiveTests)' == 'true'" DependsOnTargets="RunTestsForProject"> + <PropertyGroup> + <TestArchiveDir>$(TestWorkingDir)$(OSPlatformConfig)/archive/tests/$(TargetOutputRelPath)</TestArchiveDir> + <TestArchiveDir Condition="'$(TestTFM)' != ''">$(TestArchiveDir)$(TestTFM)/</TestArchiveDir> + <ProjectJson Condition="!Exists('$(ProjectJson)')">$(OriginalProjectJson)</ProjectJson> + </PropertyGroup> + <PropertyGroup Condition="'$(TestProjectName)'==''"> + <TestProjectName>$(MSBuildProjectName)</TestProjectName> + </PropertyGroup> + + <!-- the project json and runner script files need to be included in the archive --> + <Copy SourceFiles="$(ProjectJson);$(ProjectLockJson)" DestinationFolder="$(TestPath)" /> + <MakeDir Directories="$(TestArchiveDir)" /> + <ZipFileCreateFromDirectory SourceDirectory="$(TestPath)" DestinationArchive="$(TestArchiveDir)$(TestProjectName).zip" OverwriteDestination="true" /> + </Target> + +</Project> diff --git a/Tools-Override/resolveContract.targets b/Tools-Override/resolveContract.targets new file mode 100644 index 0000000000..8e74d22498 --- /dev/null +++ b/Tools-Override/resolveContract.targets @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + + <PropertyGroup Condition="'$(ResolveMatchingContract)' == 'true'"> + <ResolveReferencesDependsOn> + ResolveMatchingContract; + $(ResolveReferencesDependsOn) + </ResolveReferencesDependsOn> + <CleanDependsOn> + ResolveMatchingContract; + $(CleanDependsOn); + </CleanDependsOn> + </PropertyGroup> + + <Target Name="ResolveMatchingContract"> + <PropertyGroup> + <HasMatchingContract Condition="'$(HasMatchingContract)' == '' and Exists('$(SourceDir)/$(AssemblyName)/ref')">true</HasMatchingContract> + </PropertyGroup> + + <ItemGroup Condition="'$(HasMatchingContract)' == 'true'"> + <ResolvedMatchingContract Include="$(ContractOutputPath)/$(MSBuildProjectName).dll" /> + </ItemGroup> + + <Error Condition="'$(HasMatchingContract)' == 'true' and !Exists('%(ResolvedMatchingContract.Identity)')" Text="ResolveMatchingContract could not find a matching contract '%(ResolvedMatchingContract.Identity)' not found." /> + </Target> +</Project> diff --git a/Tools-Override/tests.targets b/Tools-Override/tests.targets new file mode 100644 index 0000000000..1930095952 --- /dev/null +++ b/Tools-Override/tests.targets @@ -0,0 +1,164 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + + <!-- This is the target that copies the test assets to the test output --> + <Import Project="$(MSBuildThisFileDirectory)publishtest.targets" /> + <UsingTask TaskName="GetTargetMachineInfo" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll"/> + + <!-- Which categories of tests to run by default --> + <PropertyGroup> + <TestDisabled>false</TestDisabled> + <TestDisabled Condition="'$(IsTestProject)'!='true' Or '$(SkipTests)'=='true' Or '$(RunTestsForProject)'=='false'">true</TestDisabled> + <TestsSuccessfulSemaphore>tests.passed</TestsSuccessfulSemaphore> + </PropertyGroup> + + <!-- In case that TestPath is not yet set, default it here --> + <PropertyGroup> + <TestPath Condition="'$(TestPath)'==''">$(OutDir)</TestPath> + </PropertyGroup> + + <ItemGroup> + <!-- Split semicolon separated lists --> + <WithCategoriesItems Include="$(WithCategories)" /> + <WithoutCategoriesItems Include="$(WithoutCategories)" /> + <DefaultNoCategories Include="$(DefaultNoCategories)" /> + <UnsupportedPlatformsItems Include="$(UnsupportedPlatforms)"/> + </ItemGroup> + + <PropertyGroup> + <TestRuntimeDir>$(RuntimePath)</TestRuntimeDir> + <TestHostExecutable Condition="'$(TestHostExecutable)' == ''">$(TestRuntimeDir)\corerun</TestHostExecutable> + <XunitExecutable Condition="'$(XunitExecutable)' == ''">$(TestRuntimeDir)/xunit.console.netcore.exe</XunitExecutable> + </PropertyGroup> + + <!-- General xunit options --> + <PropertyGroup> + <XunitResultsFileName>testResults.xml</XunitResultsFileName> + + <XunitOptions Condition="'$(TestWithCore)' != 'true'">$(XunitOptions) -noshadow </XunitOptions> + <XunitOptions>$(XunitOptions) -xml $(XunitResultsFileName)</XunitOptions> + + <XunitOptions Condition="'$(Performance)'!='true'">$(XunitOptions) -notrait Benchmark=true</XunitOptions> + + <XunitOptions Condition="'$(UseDotNetNativeToolchain)'=='true'">$(XunitOptions) -redirectoutput</XunitOptions> + + <XunitOptions Condition="'$(TestTFM)'!=''">$(XunitOptions) -notrait category=non$(TestTFM)tests</XunitOptions> + <XunitOptions Condition="'$(XunitMaxThreads)'!=''">$(XunitOptions) -maxthreads $(XunitMaxThreads)</XunitOptions> + <XunitTestAssembly Condition="'$(XunitTestAssembly)' == ''">$(TargetPath)</XunitTestAssembly> + <XunitArguments>$(XunitTestAssembly) $(XunitOptions)</XunitArguments> + + <TestProgram Condition="'$(TestHostExecutable)'!=''">$(TestHostExecutable)</TestProgram> + <TestArguments Condition="'$(TestHostExecutable)'!=''">$(XunitExecutable) $(XunitArguments)</TestArguments> + + <TestProgram Condition="'$(TestHostExecutable)'==''">$(XunitExecutable)</TestProgram> + <TestArguments Condition="'$(TestHostExecutable)'==''">$(XunitArguments)</TestArguments> + + <TestCommandLine Condition="'$(Performance)'!='true'">$(TestProgram) $(TestArguments) {XunitTraitOptions}</TestCommandLine> + </PropertyGroup> + + <!-- The Code Coverage targets will override TestHost and TestCommandLine if coverage is enabled --> + <Import Project="$(MSBuildThisFileDirectory)CodeCoverage.targets" /> + + <Target Name="DiscoverTestInputs" DependsOnTargets="ResolveReferences;GetCopyToOutputDirectoryItems"> + <ItemGroup> + <RunTestsForProjectInputs Include="@(ReferenceCopyLocalPaths)" /> + <RunTestsForProjectInputs Include="@(Content)" /> + <RunTestsForProjectInputs Include="@(IntermediateAssembly)" /> + <RunTestsForProjectInputs Include="@(_DebugSymbolsIntermediatePath)" /> + <RunTestsForProjectInputs Include="@(AllItemsFullPathWithTargetPath)" /> + </ItemGroup> + </Target> + + <Target Name="RunTestsForProject" + DependsOnTargets="DiscoverTestInputs;CheckTestCategories" + Inputs="@(RunTestsForProjectInputs)" + Outputs="$(TestsSuccessfulSemaphore);$(TestPath)/$(XunitResultsFileName);$(CoverageOutputFilePath)" + > + + <ItemGroup> + <RunWithoutTraits Condition="'$(TargetOS)'=='Windows_NT'" Include="nonwindowstests" /> + <RunWithoutTraits Condition="'$(TargetOS)'=='Linux'" Include="nonlinuxtests" /> + <RunWithoutTraits Condition="'$(TargetOS)'=='OSX'" Include="nonosxtests"/> + <RunWithoutTraits Condition="'$(TargetOS)'=='FreeBSD'" Include="nonfreebsdtests"/> + <RunWithoutTraits Condition="'$(TargetOS)'=='NetBSD'" Include="nonnetbsdtests"/> + </ItemGroup> + + <PropertyGroup> + <XunitTraitOptions Condition="'@(RunWithTraits)'!=''">$(XunitTraitOptions) -trait category=@(RunWithTraits, ' -trait category=') </XunitTraitOptions> + <XunitTraitOptions Condition="'@(RunWithoutTraits)'!=''">$(XunitTraitOptions) -notrait category=@(RunWithoutTraits, ' -notrait category=') </XunitTraitOptions> + <TestCommandLine>$(TestCommandLine.Replace('{XunitTraitOptions}', '$(XunitTraitOptions)'))</TestCommandLine> + </PropertyGroup> + + <MakeDir Condition="'$(CoverageEnabledForProject)'=='true'" Directories="$(CoverageReportDir)" /> + + <Exec Command="$(TestCommandLine)" + Condition="'$(TestDisabled)' != 'true'" + WorkingDirectory="$(OutDir)" + CustomErrorRegularExpression="Failed: [^0]" + ContinueOnError="true" + IgnoreStandardErrorWarningFormat="true" + EnvironmentVariables="CORE_LIBRARIES=$(OutDir)" + > + <Output PropertyName="TestRunExitCode" TaskParameter="ExitCode" /> + </Exec> + + <Error Condition="'$(TestDisabled)'!='true' And '$(TestRunExitCode)' != '0'" Text="One or more tests failed while running tests from '$(MSBuildProjectName)' please check $(TestPath)$(XunitResultsFileName) for details!" /> + <Touch Condition="'$(TestRunExitCode)' == '0'" Files="$(TestsSuccessfulSemaphore)" AlwaysCreate="true" /> + </Target> + + <!-- Needs to run before RunTestsForProject target as it computes categories and set TestDisabled --> + <Target Name="CheckTestCategories"> + + <!-- Default behavior is to disable OuterLoop and failing tests if not specified in WithCategories. --> + <ItemGroup> + <DefaultNoCategories Condition="'$(Outerloop)'!='true'" Include="OuterLoop" /> + <DefaultNoCategories Include="failing" /> + <WithoutCategoriesItems Include="@(DefaultNoCategories)" Exclude="@(WithCategoriesItems)" /> + <WithoutCategoriesItemsDistinct Include="@(WithoutCategoriesItems->Distinct())" /> + </ItemGroup> + + <ItemGroup> + <RunWithTraits Condition="'@(WithCategoriesItems)'!=''" Include="@(WithCategoriesItems)" /> + <RunWithoutTraits Condition="'@(WithoutCategoriesItemsDistinct)'!=''" Include="@(WithoutCategoriesItemsDistinct)" /> + </ItemGroup> + + <PropertyGroup> + <TestsSuccessfulSemaphore Condition="'@(RunWithTraits)' != ''">$(TestsSuccessfulSemaphore).with.@(RunWithTraits, '.')</TestsSuccessfulSemaphore> + <TestsSuccessfulSemaphore Condition="'@(RunWithoutTraits)' != ''">$(TestsSuccessfulSemaphore).without.@(RunWithoutTraits, '.')</TestsSuccessfulSemaphore> + <TestsSuccessfulSemaphore>$(TestPath)/$(TestsSuccessfulSemaphore)</TestsSuccessfulSemaphore> + </PropertyGroup> + + <Delete Condition="'$(ForceRunTests)'=='true' And Exists($(TestsSuccessfulSemaphore))" + Files="$(TestsSuccessfulSemaphore)" /> + </Target> + + <Target Name="CheckTestPlatforms"> + <GetTargetMachineInfo Condition="'$(TargetOS)' == ''"> + <Output TaskParameter="TargetOS" PropertyName="TargetOS" /> + </GetTargetMachineInfo> + <PropertyGroup> + <TestDisabled Condition="'%(UnsupportedPlatformsItems.Identity)' == '$(TargetOS)' Or '$(ConfigurationErrorMsg)' != ''">true</TestDisabled> + </PropertyGroup> + <Message Condition="'%(UnsupportedPlatformsItems.Identity)' == '$(TargetOS)'" + Text="Skipping tests in $(AssemblyName) because it is not supported on $(TargetOS)" /> + <Message Condition="'$(ConfigurationErrorMsg)' != ''" + Text="Skipping tests in $(AssemblyName) because there is no configuration compatible with the current BuildConfiguration." /> + </Target> + + <Target Name="SetupTestProperties" DependsOnTargets="CheckTestPlatforms;CheckTestCategories" /> + + <PropertyGroup> + <TestDependsOn> + $(TestDependsOn); + DiscoverTestInputs; + SetupTestProperties; + CopySupplementalTestData; + RunTestsForProject; + </TestDependsOn> + </PropertyGroup> + + <Target Name="Test" DependsOnTargets="$(TestDependsOn)" /> + <Target Name="BuildAndTest" DependsOnTargets="Build;Test" /> + <Target Name="RebuildAndTest" DependsOnTargets="Rebuild;Test" /> + +</Project> diff --git a/binplace.targets b/binplace.targets new file mode 100644 index 0000000000..a5602944f2 --- /dev/null +++ b/binplace.targets @@ -0,0 +1,76 @@ +<?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' AND '$(IsTestProject)' != 'true'">true</IsRuntimeAssembly> + <!-- Try to determine if this is a simple library without a ref project. + https://github.com/dotnet/corefx/issues/14291 is tracking cleaning this up --> + <IsRuntimeAndReferenceAssembly Condition="'$(IsRuntimeAndReferenceAssembly)' == '' and '$(IsRuntimeAssembly)' == 'true' and Exists('$(SourceDir)/$(AssemblyName)') and !Exists('$(SourceDir)/$(AssemblyName)/ref') and !$(AssemblyName.StartsWith('System.Private'))">true</IsRuntimeAndReferenceAssembly> + <IsNETCoreAppRef Condition="'$(IsNETCoreAppRef)' == ''">$(IsNETCoreApp)</IsNETCoreAppRef> + <BinPlaceStuffDependsOn Condition="'$(IsReferenceAssembly)' == 'true' OR '$(IsRuntimeAndReferenceAssembly)' == 'true'">$(BinPlaceStuffDependsOn);BinPlaceReferenceAssembly</BinPlaceStuffDependsOn> + <BinPlaceStuffDependsOn Condition="'$(IsRuntimeAssembly)' == 'true' OR '$(IsRuntimeAndReferenceAssembly)' == 'true'">$(BinPlaceStuffDependsOn);BinPlaceRuntimeAssembly</BinPlaceStuffDependsOn> + </PropertyGroup> + + <Target Name="BinPlaceStuff" DependsOnTargets="$(BinPlaceStuffDependsOn)" AfterTargets="CopyFilesToOutputDirectory"> + <Message Importance="low" Text="IsRuntimeAssembly: $(IsRuntimeAssembly)" /> + <Message Importance="low" Text="IsReferenceAssembly: $(IsReferenceAssembly)" /> + <Message Importance="low" Text="IsRuntimeAndReferenceAssembly: $(IsRuntimeAndReferenceAssembly)" /> + </Target> + + <Target Name="BinPlaceReferenceAssembly" DependsOnTargets="GetTargetingPackDir"> + <Message Importance="low" Text="TargetingPackDir: @(TargetingPackDir)" /> + <Copy Condition="'@(TargetingPackDir)' != ''" SourceFiles="$(TargetPath)" DestinationFolder="%(TargetingPackDir.Identity)" > + <Output TaskParameter="DestinationFiles" ItemName="FileWrites" /> + </Copy> + </Target> + + <Target Name="BinPlaceRuntimeAssembly" DependsOnTargets="GetRuntimeDir"> + <Copy Condition="'@(RuntimeDir)' != ''" SourceFiles="$(TargetPath)" DestinationFolder="%(RuntimeDir.Identity)"> + <Output TaskParameter="DestinationFiles" ItemName="FileWrites" /> + </Copy> + </Target> + + <Target Name="GetTargetingPackDir"> + <ItemGroup Condition="'$(NuGetTargetMoniker)' == '' Or $(NuGetTargetMoniker.Contains('NETCoreApp')) Or $(NuGetTargetMoniker.Contains('NETStandard'))"> + <TargetingPackDir Include="$(RefPath)" /> + <TargetingPackDir Condition="'$(IsNETCoreAppRef)' == 'true'" Include="$(BinDir)netcoreapp\pkg\ref" /> + </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 Condition="'$(NuGetTargetMoniker)' == '' Or $(NuGetTargetMoniker.Contains('NETCoreApp')) Or $(NuGetTargetMoniker.Contains('NETStandard'))"> + <RuntimeDir Include="$(RuntimePath)" /> + <RuntimeDir Condition="'$(IsNETCoreApp)' == 'true'" Include="$(BinDir)netcoreapp\pkg\lib" /> + </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> + + <ItemGroup> + <AdditionalCleanDirectories Include="$(BinDir)netcoreapp" /> + </ItemGroup> + + <!-- Incremental clean only cleans paths under Intermediate or OutDir, handle additional paths --> + <Target Name="_CleanGetCurrentAdditionalFileWrites" BeforeTargets="_CleanGetCurrentAndPriorFileWrites"> + <!-- find files under paths we care about and add them to _CleanCurrentFileWrites to ensure they are written to the file list --> + <FindUnderPath Path="%(AdditionalCleanDirectories.Identity)" Files="@(FileWrites)" UpdateToAbsolutePaths="true"> + <Output TaskParameter="InPath" ItemName="_CleanCurrentFileWrites" /> + </FindUnderPath> + </Target> + + <Target Name="IncrementalCleanAdditionalDirectories" BeforeTargets="IncrementalClean"> + <ItemGroup> + <_CleanOrphanAdditionalFileWrites Include="@(_CleanPriorFileWrites)" Exclude="@(_CleanCurrentFileWrites)" /> + </ItemGroup> + <FindUnderPath Path="%(AdditionalCleanDirectories.Identity)" Files="@(_CleanOrphanAdditionalFileWrites)"> + <Output TaskParameter="InPath" ItemName="_CleanOrphanFileWritesInAdditionalDirectories" /> + </FindUnderPath> + + <!-- Delete the orphaned files. IncrementalClean will remove these from the file list --> + <Delete Files="@(_CleanOrphanFileWritesInAdditionalDirectories)" TreatErrorsAsWarnings="true"> + <Output TaskParameter="DeletedFiles" ItemName="_CleanOrphanFilesDeleted" /> + </Delete> + </Target> +</Project> diff --git a/build.proj b/build.proj index 12696b378e..39ac5727a2 100644 --- a/build.proj +++ b/build.proj @@ -1,13 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <!-- Capture OSGroup passed to command line for setting default FilterToOSGroup value below --> - <_OriginalOSGroup>$(OSGroup)</_OriginalOSGroup> - </PropertyGroup> - <PropertyGroup> - <InputOSGroup>$(OSGroup)</InputOSGroup> - <InputOSGroup Condition="'$(InputOSGroup)'==''">$(FilterToOSGroup)</InputOSGroup> - </PropertyGroup> <Import Project="dir.props" /> <!-- required to build the projects in their specified order --> @@ -15,41 +7,37 @@ <SerializeProjects>true</SerializeProjects> </PropertyGroup> - <!-- The following properties are in place to keep the behavior of build.cmd while we work on the dev workflow steps. --> <PropertyGroup> - <!-- To disable the restoration of packages, set RestoreDuringBuild=false or pass /p:RestoreDuringBuild=false.--> - <RestoreDuringBuild Condition="'$(RestoreDuringBuild)'==''">true</RestoreDuringBuild> - <!-- To disable building packages, set BuildPackages=false or pass /p:BuildPackages=false.--> - <BuildPackages Condition="'$(BuildPackages)'==''">true</BuildPackages> - <!-- To disable building tests, set BuildTests=false or pass /p:BuildTests=false.--> - <BuildTests Condition="'$(BuildTests)'==''">true</BuildTests> + <GenerateCodeCoverageReportForAll>true</GenerateCodeCoverageReportForAll> </PropertyGroup> <PropertyGroup> - <GenerateCodeCoverageReportForAll>true</GenerateCodeCoverageReportForAll> + <BuildPackages Condition="'$(BuildPackages)'==''">true</BuildPackages> </PropertyGroup> + <Import Project="$(ToolsDir)CodeCoverage.targets" Condition="Exists('$(ToolsDir)CodeCoverage.targets')" /> <Import Project="$(ToolsDir)PerfTesting.targets" Condition="Exists('$(ToolsDir)PerfTesting.targets') and '$(Performance)' == 'true'"/> <Import Project="$(ToolsDir)VersionTools.targets" Condition="Exists('$(ToolsDir)VersionTools.targets')" /> - <ItemGroup Condition="$(BuildTests)!='true'"> - <Project Include="src\dirs.proj"> - <!-- For the root traversal default filter the OSGroup to the OSEnvironment which is the OS we are running on --> - <FilterToOSGroup Condition="'$(_OriginalOSGroup)' == ''">$(OSEnvironment)</FilterToOSGroup> + <ItemGroup> + <Project Include="external\dir.proj" /> + <Project Include="src\dirs.proj" /> + <!-- + <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> </Project> - <Project Include="layout\Microsoft.Private.CoreFx.NETCoreApp\Microsoft.Private.CoreFx.NETCoreApp.builds" Condition="'$(BuildPackages)'=='true'"> - <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> <ItemGroup Condition="$(BuildTests)=='true'"> @@ -64,158 +52,40 @@ <Import Project="$(ToolsDir)clean.targets" /> - <PropertyGroup Condition="'$(RestoreDuringBuild)'=='true'"> + <PropertyGroup> <TraversalBuildDependsOn> - BatchRestorePackages; - ValidateExactRestore; + BuildCoreFxTools; CreateOrUpdateCurrentVersionFile; $(TraversalBuildDependsOn); </TraversalBuildDependsOn> </PropertyGroup> - <PropertyGroup Condition="'$(BuildTestsAgainstPackages)' == 'true'"> - <TraversalBuildDependsOn> - UpdateVersionsOnTestProjectJson; - BatchGenerateTestProjectJsons; - $(TraversalBuildDependsOn); - </TraversalBuildDependsOn> - </PropertyGroup> - <!-- Create a collection of all project.json files for dependency updates. --> - <ItemGroup> - <ProjectJsonFiles Condition="'$(ExcludeNonTestRestores)' != 'true'" Include="$(SourceDir)**/project.json" /> - <ProjectJsonFiles Condition="'$(ExcludeNonTestRestores)' != 'true'" Include="$(ProjectDir)pkg/**/project.json" /> - <ProjectJsonFiles Include="$(MSBuildThisFileDirectory)layout/**/project.json" /> - <ProjectJsonFiles Include="$(MSBuildThisFileDirectory)layout/**/project.json" /> - <!-- Additional generated ProjectJsonFiles are added in the build.proj target AddGeneratedProjectJsons --> - </ItemGroup> - - <ItemGroup> - <TestProjectJsons Include="$(MSBuildThisFileDirectory)src/Common/test-runtime/project.json" /> - </ItemGroup> - - <PropertyGroup> - <SupportsDefinitionFile>@(SupportsDefinitionFileGroup)</SupportsDefinitionFile> - </PropertyGroup> - - <UsingTask TaskName="GatherDirectoriesToRestore" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll" /> - <Target Name="BatchRestorePackages" DependsOnTargets="AddGeneratedProjectJsons;VerifyDependencies"> - <MakeDir Directories="$(PackagesDir)" Condition="!Exists('$(PackagesDir)')" /> - - <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Restoring all packages..." /> - <IsRestoreRequired ProjectJsons="@(ProjectJsonFiles)" PackagesFolder="$(PackagesDir)"> - <Output TaskParameter="RestoreRequired" PropertyName="RestoreRequired" /> - </IsRestoreRequired> - - <Message Importance="High" Condition="'$(RestoreRequired)' == 'true' and '$(BuildTestsAgainstPackages)' != 'true'" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] $(DnuRestoreCommand) @(TestProjectJsons->'"%(Identity)"', ' ')" /> - - <!-- This is to restore the test-runtime project.json up front which contains the latest packages to be tested to avoid download contention within nuget. --> - <Exec Command="$(DnuRestoreCommand) @(TestProjectJsons->'"%(Identity)"', ' ')" - Condition="'$(RestoreRequired)' == 'true' and '$(BuildTestsAgainstPackages)' != 'true'" - StandardOutputImportance="Low" - CustomErrorRegularExpression="(^Unable to locate .*)|(^Updating the invalid lock file with .*)" - ContinueOnError="ErrorAndContinue" /> - - <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] $(DnuRestoreCommand) @(DnuRestoreDir->'"%(Identity)"', ' ')" /> - - - <Exec Command="$(DnuRestoreCommand) @(DnuRestoreDir->'"%(Identity)"', ' ')" - Condition="'$(RestoreRequired)' == 'true'" - StandardOutputImportance="Low" - CustomErrorRegularExpression="(^Unable to locate .*)|(^Updating the invalid lock file with .*)" - ContinueOnError="ErrorAndContinue" /> - - <!-- Given we ErrorAndContinue we need to propagate the error if the overall task failed --> - <Error Condition="'$(MSBuildLastTaskResult)'=='false'" /> - - <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Restoring all packages...Done." /> - </Target> - - <!-- Generated project.json's may not exist when the "ProjectJsonFiles"" item group is defined (in dir.props), This target - ensures those files are added to the itemgroup. --> - <Target Name="AddGeneratedProjectJsons"> + <Target Name="BuildCoreFxTools"> <ItemGroup> - <ProjectJsonFiles Condition="'$(BuildTestsAgainstPackages)' == 'true'" Include="$(GeneratedProjectJsonDir)/**/project.json" /> + <BuildToolsProject Include="src\Tools\CoreFx.Tools\CoreFx.Tools.csproj" /> + <BuildToolsProject Include="src\Tools\CoreFx.Tools\CoreFx.Tools.csproj"> + <TargetGroup>net45</TargetGroup> + </BuildToolsProject> + <BuildToolsProject Include="src\Tools\GenerateProps\GenerateProps.proj" /> </ItemGroup> + <MSBuild Projects="@(BuildToolsProject)" + ContinueOnError="ErrorAndContinue" + Condition="'%(Identity)' != ''" + Properties="TargetGroup=%(BuildToolsProject.TargetGroup)" /> </Target> - <UsingTask TaskName="AddDependenciesToProjectJson" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll"/> - <Target Name="UpdateVersionsOnTestProjectJson" DependsOnTargets="GetDefaultTestRid"> - <!-- Duplicate properties to be removed in future --> + <Target Name="Sync" DependsOnTargets="BuildCoreFxTools"> <ItemGroup> - <_PackagesDropsForCommonProjectJson Include="$(PackagesDrops)" /> + <ExternalProject Include="external\dir.proj" /> </ItemGroup> - <PropertyGroup> - <PackageNameRegex Condition="'$(PackageNameRegex)' == ''">(?%3Cname%3E.*)\.(?%3Cversion%3E\d+\.\d+\.\d+)(-(?%3Cprerelease%3E.*)?)?</PackageNameRegex> - </PropertyGroup> - - <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Using RuntimeIdentifier = '$(TestNugetRuntimeId)'" /> - - <PropertyGroup> - <FilterTestNugetTargetMoniker Condition="'$(FilterToTestTFM)' == 'netcoreapp1.0'">.NETCoreApp,Version=v1.0</FilterTestNugetTargetMoniker> - <FilterTestNugetTargetMoniker Condition="'$(FilterToTestTFM)' == 'netcoreapp1.1'">.NETCoreApp,Version=v1.1</FilterTestNugetTargetMoniker> - <FilterTestNugetTargetMoniker Condition="'$(FilterToTestTFM)' == 'net463'">.NETFramework,Version=v4.6.3</FilterTestNugetTargetMoniker> - <FilterTestNugetTargetMoniker Condition="'$(FilterToTestTFM)' == 'net462'">.NETFramework,Version=v4.6.2</FilterTestNugetTargetMoniker> - <FilterTestNugetTargetMoniker Condition="'$(FilterToTestTFM)' == 'net461'">.NETFramework,Version=v4.6.1</FilterTestNugetTargetMoniker> - <FilterTestNugetTargetMoniker Condition="'$(FilterToTestTFM)' == 'net46'">.NETFramework,Version=v4.6</FilterTestNugetTargetMoniker> - <FilterTestNugetTargetMoniker Condition="'$(FilterToTestTFM)' == 'net45'">.NETFramework,Version=v4.5</FilterTestNugetTargetMoniker> - <FilterTestNugetTargetMoniker Condition="'$(FilterToTestTFM)' == 'net451'">.NETFramework,Version=v4.5.1</FilterTestNugetTargetMoniker> - <FilterTestNugetTargetMoniker Condition="'$(FilterToTestTFM)' == 'net452'">.NETFramework,Version=v4.5.2</FilterTestNugetTargetMoniker> - <!-- Project template for UWP Apps uses uap10.0, this mapping allows support for the Debug and Release scenarios --> - <FilterTestNugetTargetMoniker Condition="'$(FilterToTestTFM)' == 'netcore50aot' Or '$(FilterToTestTFM)' == 'netcore50'">UAP,Version=v10.0</FilterTestNugetTargetMoniker> - </PropertyGroup> - - <AddDependenciesToProjectJson AdditionalDependencies="@(_InjectProjectReferenceDependency)" - PackagesDrops="@(_PackagesDropsForCommonProjectJson)" - PackageNameRegex="$(PackageNameRegex)" - VersionsFiles="@(_VersionsFiles)" - ProjectJson="$(CommonTestProjectJson)" - OutputProjectJson="$(CommonOutputTestProjectJson)" - UseNewestAvailablePackages="$(UseNewestAvailablePackages)" - SupportsFile="$(CommonTestProjectJson)" - TestRuntime="$(TestNugetRuntimeId)" - TestTargetFramework="$(FilterTestNugetTargetMoniker)" - /> - </Target> - - <!-- Evaluate our test projects (in src\tests.builds) --> - <Target Name="BatchGenerateTestProjectJsons" - Condition="'$(BuildTestsAgainstPackages)' == 'true'" - DependsOnTargets="FilterProjects;UpdateVersionsOnTestProjectJson" - BeforeTargets="RestorePackages"> - <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Generating Test project.json's..." /> - - <ItemGroup> - <GenerateForProject Include="src\tests.builds"> - <UndefineProperties>%(Project.UndefineProperties);OSGroup</UndefineProperties> - </GenerateForProject> - </ItemGroup> - <MSBuild Targets="GenerateAllTestProjectJsons" - Projects="@(GenerateForProject)" - /> - <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Generating Test project.json's...done" /> - </Target> - - <!-- Task from buildtools that uses lockfiles to validate that packages restored are exactly what were specified. --> - <UsingTask TaskName="ValidateExactRestore" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll" /> - <Target Name="ValidateExactRestore" - Condition="'$(AllowInexactRestore)'!='true'"> - <ValidateExactRestore ProjectLockJsons="@(ProjectJsonFiles->'%(RootDir)%(Directory)%(Filename).lock.json')" /> + <MSBuild Projects="@(ExternalProject)" + ContinueOnError="ErrorAndContinue" /> </Target> - <!-- Tasks from buildtools for easy project.json dependency updates --> - <UsingTask TaskName="UpdatePackageDependencyVersion" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll" /> - - <Target Name="UpdatePackageDependencyVersion"> - <UpdatePackageDependencyVersion ProjectJsons="@(ProjectJsonFiles)" - PackageId="$(PackageId)" - OldVersion="$(OldVersion)" - NewVersion="$(NewVersion)" /> - </Target> - - <!-- Packages.zip creation --> - <UsingTask TaskName="ZipFileCreateFromDependencyLists" Condition="'$(Platform)' == 'ARM64' and '$(ArchiveTests)' == 'true'" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll"/> - <Target Name="ArchiveTestBuild" Condition="'$(Platform)' == 'ARM64' and '$(ArchiveTests)' == 'true'" AfterTargets="Build" > + <!-- TODO: Can we move this archive test build to BuildTools --> + <UsingTask TaskName="ZipFileCreateFromDependencyLists" Condition="'$(ArchiveTests)' == 'true'" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll"/> + <Target Name="ArchiveTestBuild" Condition="'$(ArchiveTests)' == 'true'" AfterTargets="Build" > <ItemGroup> <ExcludeFromArchive Include="nupkg$" /> <ExcludeFromArchive Include="Microsoft.DotNet.BuildTools" /> @@ -230,9 +100,6 @@ OverwriteDestination="true" /> </Target> - <!-- Override RestorePackages from dir.traversal.targets and do a batch restore --> - <Target Name="RestorePackages" DependsOnTargets="BatchRestorePackages" /> - <!-- Override CleanAllProjects from dir.traversal.targets and just remove the full BinDir --> <Target Name="CleanAllProjects"> <RemoveDir Directories="$(BinDir)" /> diff --git a/buildpipeline/DotNet-CoreFx-Trusted-Linux-Native.json b/buildpipeline/DotNet-CoreFx-Trusted-Linux-Native.json deleted file mode 100644 index a1c8018eaf..0000000000 --- a/buildpipeline/DotNet-CoreFx-Trusted-Linux-Native.json +++ /dev/null @@ -1,755 +0,0 @@ -{ - "build": [ - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Delete files from $(Build.SourcesDirectory)", - "timeoutInMinutes": 0, - "task": { - "id": "b7e8b412-0437-4065-9371-edc5881de25b", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "SourceFolder": "$(Build.SourcesDirectory)", - "Contents": "**\n.gitignore" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "git clone", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "git", - "arguments": "clone $(VsoCorefxGitUrl) corefx", - "workingFolder": "", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "git checkout", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "git", - "arguments": "checkout $(SourceVersion)", - "workingFolder": "$(Build.SourcesDirectory)/corefx", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": true, - "displayName": "Initialize tools", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "$(Build.SourcesDirectory)/corefx/init-tools.sh", - "arguments": "", - "workingFolder": "", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": true, - "displayName": "Docker clean-up", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "$(Build.SourcesDirectory)/corefx/Tools/scripts/docker/cleanup-docker.sh", - "arguments": "", - "workingFolder": "", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Clone repository", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "docker", - "arguments": "run --name $(DockerContainerName) $(DockerImageName) git clone $(VsoCorefxGitUrl) $(GitDirectory)", - "workingFolder": "", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Commit changes", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "docker", - "arguments": "commit $(DockerContainerName) $(DockerContainerName)", - "workingFolder": "", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Remove container", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "docker", - "arguments": "rm $(DockerContainerName)", - "workingFolder": "", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Run clean.sh", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "docker", - "arguments": "run -w=\"$(GitDirectory)\" --name $(DockerContainerName) $(DockerContainerName) $(GitDirectory)/clean.sh", - "workingFolder": "", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Commit changes", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "docker", - "arguments": "commit $(DockerContainerName) $(DockerContainerName)", - "workingFolder": "", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Remove container", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "docker", - "arguments": "rm $(DockerContainerName)", - "workingFolder": "", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Check out the specified commit", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "docker", - "arguments": "run -w $(GitDirectory) --name $(DockerContainerName) $(DockerContainerName) git checkout $(SourceVersion)", - "workingFolder": "", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Commit changes", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "docker", - "arguments": "commit $(DockerContainerName) $(DockerContainerName)", - "workingFolder": "", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Remove container", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "docker", - "arguments": "rm $(DockerContainerName)", - "workingFolder": "", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Generate version assets", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "docker", - "arguments": "run -w=\"$(GitDirectory)\" --name $(DockerContainerName) $(DockerContainerName) $(GitDirectory)/build-managed.sh -OfficialBuildId=$(OfficialBuildId) -- /t:GenerateVersionSourceFile /p:GenerateVersionSourceFile=true", - "workingFolder": "", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Commit changes", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "docker", - "arguments": "commit $(DockerContainerName) $(DockerContainerName)", - "workingFolder": "", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Remove container", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "docker", - "arguments": "rm $(DockerContainerName)", - "workingFolder": "", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Run build.sh", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "docker", - "arguments": "run -w=\"$(GitDirectory)\" --name $(DockerContainerName) $(DockerContainerName) $(GitDirectory)/build-native.sh -buildArch=$(Platform) -$(ConfigurationGroup) $(portableLinux) -- generateversion", - "workingFolder": "", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Commit changes", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "docker", - "arguments": "commit $(DockerContainerName) $(DockerContainerName)", - "workingFolder": "", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Remove container", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "docker", - "arguments": "rm $(DockerContainerName)", - "workingFolder": "", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Run build-packages.sh", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "docker", - "arguments": "run -w=\"$(GitDirectory)\" --name $(DockerContainerName) $(DockerContainerName) $(GitDirectory)/build-packages.sh -$(ConfigurationGroup) -DisableManagedPackage $(portableLinux)", - "workingFolder": "", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Commit changes", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "docker", - "arguments": "commit $(DockerContainerName) $(DockerContainerName)", - "workingFolder": "", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Remove container", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "docker", - "arguments": "rm $(DockerContainerName)", - "workingFolder": "", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Publish packages", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "docker", - "arguments": "run -w=\"$(GitDirectory)\" --name $(DockerContainerName) $(DockerContainerName) $(GitDirectory)/publish-packages.sh -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -Container=$(Label) -verbose -- /p:OverwriteOnPublish=true", - "workingFolder": "", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Remove old docker build logs", - "timeoutInMinutes": 0, - "task": { - "id": "b7e8b412-0437-4065-9371-edc5881de25b", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "SourceFolder": "$(DockerCopyDest)", - "Contents": "*" - } - }, - { - "enabled": true, - "continueOnError": true, - "alwaysRun": true, - "displayName": "Expose docker repo for publishing", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "docker", - "arguments": "cp $(DockerContainerName):$(GitDirectory) $(DockerCopyDest)", - "workingFolder": "", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Remove container", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "docker", - "arguments": "rm $(DockerContainerName)", - "workingFolder": "", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": true, - "displayName": "Copy Publish Artifact: BuildLogs", - "timeoutInMinutes": 0, - "task": { - "id": "1d341bb0-2106-458c-8422-d00bcea6512a", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "CopyRoot": "$(DockerCopyDest)/corefx", - "Contents": "*.log", - "ArtifactName": "BuildLogs", - "ArtifactType": "Container", - "TargetPath": "\\\\my\\share\\$(Build.DefinitionName)\\$(Build.BuildNumber)" - } - }, - { - "enabled": false, - "continueOnError": true, - "alwaysRun": false, - "displayName": "Compress the bin directory", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "tar", - "arguments": "-zcvf $(DockerCopyDest)/bin.tar.gz bin", - "workingFolder": "$(DockerCopyDest)/corefx", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": true, - "alwaysRun": true, - "displayName": "Run docker version", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "docker", - "arguments": "version", - "workingFolder": "", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": true, - "alwaysRun": false, - "displayName": "Copy Publish Artifact: bin", - "timeoutInMinutes": 0, - "task": { - "id": "1d341bb0-2106-458c-8422-d00bcea6512a", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "CopyRoot": "$(DockerCopyDest)", - "Contents": "bin.tar.gz", - "ArtifactName": "bin", - "ArtifactType": "Container", - "TargetPath": "\\\\my\\share\\$(Build.DefinitionName)\\$(Build.BuildNumber)" - } - }, - { - "enabled": true, - "continueOnError": true, - "alwaysRun": true, - "displayName": "Report / clean agent", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "$(Build.SourcesDirectory)/corefx/Tools/dotnetcli/dotnet", - "arguments": "$(Build.SourcesDirectory)/corefx/Tools/MSBuild.exe $(Build.SourcesDirectory)/corefx/Tools/scripts/vstsagent/cleanupagent.proj /p:AgentDirectory=$(Agent.HomeDirectory) /p:DoClean=$(CleanAgent)", - "workingFolder": "", - "failOnStandardError": "false" - } - } - ], - "options": [ - { - "enabled": false, - "definition": { - "id": "7c555368-ca64-4199-add6-9ebaf0b0137d" - }, - "inputs": { - "multipliers": "[]", - "parallel": "false", - "continueOnError": "true", - "additionalFields": "{}" - } - }, - { - "enabled": false, - "definition": { - "id": "a9db38f9-9fdc-478c-b0f9-464221e58316" - }, - "inputs": { - "workItemType": "234347", - "assignToRequestor": "true", - "additionalFields": "{}" - } - }, - { - "enabled": false, - "definition": { - "id": "57578776-4c22-4526-aeb0-86b6da17ee9c" - }, - "inputs": { - "additionalFields": "{}" - } - } - ], - "variables": { - "system.debug": { - "value": "false", - "allowOverride": true - }, - "Platform": { - "value": "x64", - "allowOverride": true - }, - "ConfigurationGroup": { - "value": "Release", - "allowOverride": true - }, - "GitRepo": { - "value": "$(VsoCorefxGitUrl)" - }, - "GitDirectory": { - "value": "/root/corefx" - }, - "DockerContainerName": { - "value": "$(Build.BuildId)" - }, - "DockerImageName": { - "value": "$(DockerRepository):$(DockerTag)" - }, - "DockerRepository": { - "value": "chcosta/dotnetcore" - }, - "DockerTag": { - "value": "debian82_prereqs_2", - "allowOverride": true - }, - "CloudDropAccountName": { - "value": "dotnetbuildoutput" - }, - "CloudDropAccessToken": { - "value": null, - "isSecret": true - }, - "OfficialBuildId": { - "value": "$(Build.BuildNumber)", - "allowOverride": true - }, - "Label": { - "value": "$(Build.BuildNumber)", - "allowOverride": true - }, - "SourceVersion": { - "value": "HEAD", - "allowOverride": true - }, - "RepoUser": { - "value": "dn-bot" - }, - "RepoAccessToken": { - "value": null, - "isSecret": true - }, - "DockerCopyDest": { - "value": "$(Build.BinariesDirectory)/docker_repo" - }, - "VsoAccountName": { - "value": "dn-bot" - }, - "VsoPassword": { - "value": null, - "isSecret": true - }, - "VsoRepoName": { - "value": "DotNet-CoreFX-Trusted", - "allowOverride": true - }, - "VsoCorefxGitUrl": { - "value": "https://$(VsoAccountName):$(VsoPassword)@devdiv.visualstudio.com/DevDiv/_git/$(VsoRepoName)/" - }, - "CleanAgent": { - "value": "true" - }, - "portableLinux": { - "value": "", - "allowOverride": true - } - }, - "demands": [ - "Agent.OS -equals linux" - ], - "retentionRules": [ - { - "branches": [ - "+refs/heads/*" - ], - "artifacts": [ - "build.SourceLabel" - ], - "artifactTypesToDelete": [], - "daysToKeep": 10, - "minimumToKeep": 1, - "deleteBuildRecord": true, - "deleteTestResults": true - } - ], - "buildNumberFormat": "$(date:yyyyMMdd)$(rev:-rr)-$(DockerTag)", - "jobAuthorizationScope": "projectCollection", - "jobTimeoutInMinutes": 60, - "repository": { - "properties": { - "labelSources": "0", - "reportBuildStatus": "true", - "fetchDepth": "0", - "gitLfsSupport": "false", - "skipSyncSource": "false", - "cleanOptions": "0" - }, - "id": "58fa2458-e392-4373-ba2b-dd3ef0c2d7ce", - "type": "TfsGit", - "name": "DotNet-CoreFX-Trusted", - "url": "https://devdiv.visualstudio.com/DevDiv/_git/DotNet-CoreFX-Trusted", - "defaultBranch": "refs/heads/master", - "clean": "true", - "checkoutSubmodules": false - }, - "quality": "definition", - "defaultBranch": "refs/heads/master", - "queue": { - "pool": { - "id": 39, - "name": "DotNet-Build" - }, - "id": 36, - "name": "DotNet-Build" - }, - "path": "\\", - "type": "build", - "id": 1054, - "name": "DotNet-CoreFx-Trusted-Linux-Native", - "project": { - "id": "0bdbc590-a062-4c3f-b0f6-9383f67865ee", - "name": "DevDiv", - "description": "Visual Studio and DevDiv team project for git source code repositories. Work items will be added for Adams, Dev14 work items are tracked in vstfdevdiv. ", - "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/projects/0bdbc590-a062-4c3f-b0f6-9383f67865ee", - "state": "wellFormed", - "revision": 418097423 - } -}
\ No newline at end of file diff --git a/buildpipeline/DotNet-CoreFx-Trusted-Linux.json b/buildpipeline/DotNet-CoreFx-Trusted-Linux.json new file mode 100644 index 0000000000..aeb69910f6 --- /dev/null +++ b/buildpipeline/DotNet-CoreFx-Trusted-Linux.json @@ -0,0 +1,484 @@ +{ + "build": [ + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Delete files from $(Build.SourcesDirectory)", + "timeoutInMinutes": 0, + "task": { + "id": "b7e8b412-0437-4065-9371-edc5881de25b", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "SourceFolder": "$(Build.SourcesDirectory)", + "Contents": "**\n.gitignore" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "git clone", + "timeoutInMinutes": 0, + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "git", + "arguments": "clone $(PB_VsoCorefxGitUrl) corefx", + "workingFolder": "", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "git checkout", + "timeoutInMinutes": 0, + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "git", + "arguments": "checkout $(SourceVersion)", + "workingFolder": "$(Build.SourcesDirectory)/corefx", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": true, + "displayName": "Initialize tools", + "timeoutInMinutes": 0, + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "$(Build.SourcesDirectory)/corefx/init-tools.sh", + "arguments": "", + "workingFolder": "", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": true, + "displayName": "Docker clean-up", + "timeoutInMinutes": 0, + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "$(Build.SourcesDirectory)/corefx/Tools/scripts/docker/cleanup-docker.sh", + "arguments": "", + "workingFolder": "", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Start detached docker container", + "timeoutInMinutes": 0, + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "docker", + "arguments": "run -d -w $(PB_GitDirectory) --name $(PB_DockerContainerName) $(PB_DockerImageName) sleep 7200", + "workingFolder": "", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Clone repository", + "timeoutInMinutes": 0, + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "docker", + "arguments": "exec $(PB_DockerContainerName) git clone $(PB_VsoCorefxGitUrl) $(PB_GitDirectory)", + "workingFolder": "", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Check out the specified commit", + "timeoutInMinutes": 0, + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "docker", + "arguments": "exec $(PB_DockerContainerName) git checkout $(SourceVersion)", + "workingFolder": "", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Generate version assets", + "timeoutInMinutes": 0, + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "docker", + "arguments": "exec $(PB_DockerContainerName) $(PB_GitDirectory)/build-managed.sh -OfficialBuildId=$(OfficialBuildId) -- /t:GenerateVersionSourceFile /p:GenerateVersionSourceFile=true", + "workingFolder": "", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Run build.sh", + "timeoutInMinutes": 0, + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "docker", + "arguments": "exec $(PB_DockerContainerName) $(PB_GitDirectory)/build.sh -buildArch=$(PB_Platform) -$(PB_ConfigurationGroup)", + "workingFolder": "", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Remove old docker build logs", + "timeoutInMinutes": 0, + "task": { + "id": "b7e8b412-0437-4065-9371-edc5881de25b", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "SourceFolder": "$(PB_DockerCopyDest)", + "Contents": "*" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": true, + "displayName": "Expose docker repo for publishing", + "timeoutInMinutes": 0, + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "docker", + "arguments": "cp $(PB_DockerContainerName):$(PB_GitDirectory) $(PB_DockerCopyDest)", + "workingFolder": "", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Stop detached docker container", + "timeoutInMinutes": 0, + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "docker", + "arguments": "stop $(PB_DockerContainerName)", + "workingFolder": "", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Remove container", + "timeoutInMinutes": 0, + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "docker", + "arguments": "rm $(PB_DockerContainerName)", + "workingFolder": "", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": true, + "displayName": "Copy Publish Artifact: BuildLogs", + "timeoutInMinutes": 0, + "task": { + "id": "1d341bb0-2106-458c-8422-d00bcea6512a", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "CopyRoot": "$(PB_DockerCopyDest)/corefx", + "Contents": "*.log", + "ArtifactName": "BuildLogs", + "ArtifactType": "Container", + "TargetPath": "\\\\my\\share\\$(Build.DefinitionName)\\$(Build.BuildNumber)" + } + }, + { + "enabled": false, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Compress the bin directory", + "timeoutInMinutes": 0, + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "tar", + "arguments": "-zcvf $(PB_DockerCopyDest)/bin.tar.gz bin", + "workingFolder": "$(DockerCopyDest)/corefx", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": true, + "displayName": "Run docker version", + "timeoutInMinutes": 0, + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "docker", + "arguments": "version", + "workingFolder": "", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Copy Publish Artifact: bin", + "timeoutInMinutes": 0, + "task": { + "id": "1d341bb0-2106-458c-8422-d00bcea6512a", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "CopyRoot": "$(PB_DockerCopyDest)", + "Contents": "bin.tar.gz", + "ArtifactName": "bin", + "ArtifactType": "Container", + "TargetPath": "\\\\my\\share\\$(Build.DefinitionName)\\$(Build.BuildNumber)" + } + } + ], + "options": [ + { + "enabled": false, + "definition": { + "id": "7c555368-ca64-4199-add6-9ebaf0b0137d" + }, + "inputs": { + "multipliers": "[]", + "parallel": "false", + "continueOnError": "true", + "additionalFields": "{}" + } + }, + { + "enabled": false, + "definition": { + "id": "a9db38f9-9fdc-478c-b0f9-464221e58316" + }, + "inputs": { + "workItemType": "234347", + "assignToRequestor": "true", + "additionalFields": "{}" + } + }, + { + "enabled": false, + "definition": { + "id": "57578776-4c22-4526-aeb0-86b6da17ee9c" + }, + "inputs": { + "additionalFields": "{}" + } + } + ], + "variables": { + "system.debug": { + "value": "false", + "allowOverride": true + }, + "PB_Platform": { + "value": "x64", + "allowOverride": true + }, + "PB_ConfigurationGroup": { + "value": "Release", + "allowOverride": true + }, + "PB_GitDirectory": { + "value": "/root/corefx" + }, + "PB_DockerContainerName": { + "value": "$(Build.BuildId)" + }, + "PB_DockerImageName": { + "value": "$(PB_DockerRepository):$(PB_DockerTag)" + }, + "PB_DockerRepository": { + "value": "chcosta/dotnetcore" + }, + "PB_DockerTag": { + "value": "debian82_prereqs_2", + "allowOverride": true + }, + "PB_CloudDropAccountName": { + "value": "dotnetbuildoutput" + }, + "CloudDropAccessToken": { + "value": "PassedViaPipeBuild" + }, + "OfficialBuildId": { + "value": "$(Build.BuildNumber)", + "allowOverride": true + }, + "PB_Label": { + "value": "$(Build.BuildNumber)", + "allowOverride": true + }, + "SourceVersion": { + "value": "HEAD", + "allowOverride": true + }, + "PB_DockerCopyDest": { + "value": "$(Build.BinariesDirectory)/docker_repo" + }, + "PB_VsoAccountName": { + "value": "dn-bot" + }, + "VsoPassword": { + "value": "PassedViaPipeBuild" + }, + "PB_VsoRepoName": { + "value": "DotNet-CoreFX-Trusted", + "allowOverride": true + }, + "PB_VsoCorefxGitUrl": { + "value": "https://github.com/dotnet/corefx" + } + }, + "demands": [ + "Agent.OS -equals linux" + ], + "retentionRules": [ + { + "branches": [ + "+refs/heads/*" + ], + "artifacts": [ + "build.SourceLabel" + ], + "artifactTypesToDelete": [], + "daysToKeep": 10, + "minimumToKeep": 1, + "deleteBuildRecord": true, + "deleteTestResults": true + } + ], + "buildNumberFormat": "$(date:yyyyMMdd)$(rev:-rr)-$(PB_DockerTag)", + "jobAuthorizationScope": "projectCollection", + "jobTimeoutInMinutes": 60, + "repository": { + "properties": { + "labelSources": "0", + "reportBuildStatus": "true", + "fetchDepth": "0", + "gitLfsSupport": "false", + "skipSyncSource": "false", + "cleanOptions": "0" + }, + "id": "58fa2458-e392-4373-ba2b-dd3ef0c2d7ce", + "type": "TfsGit", + "name": "DotNet-CoreFX-Trusted", + "url": "https://devdiv.visualstudio.com/DevDiv/_git/DotNet-CoreFX-Trusted", + "defaultBranch": "refs/heads/master", + "clean": "true", + "checkoutSubmodules": false + }, + "quality": "definition", + "defaultBranch": "refs/heads/master", + "queue": { + "pool": { + "id": 83, + "name": "DotNetCore-Test" + }, + "id": 159, + "name": "DotNetCore-Test" + }, + "path": "\\", + "type": "build", + "id": 5008, + "name": "DotNet-CoreFx-Trusted-Linux", + "project": { + "id": "0bdbc590-a062-4c3f-b0f6-9383f67865ee", + "name": "DevDiv", + "description": "Visual Studio and DevDiv team project for git source code repositories. Work items will be added for Adams, Dev14 work items are tracked in vstfdevdiv. ", + "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/projects/0bdbc590-a062-4c3f-b0f6-9383f67865ee", + "state": "wellFormed", + "revision": 418097435 + } +}
\ No newline at end of file diff --git a/buildpipeline/DotNet-CoreFx-Trusted-Mac-Native.json b/buildpipeline/DotNet-CoreFx-Trusted-Mac-Native.json deleted file mode 100644 index 048796caca..0000000000 --- a/buildpipeline/DotNet-CoreFx-Trusted-Mac-Native.json +++ /dev/null @@ -1,364 +0,0 @@ -{ - "build": [ - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Delete files from $(Agent.BuildDirectory)/s", - "timeoutInMinutes": 0, - "task": { - "id": "b7e8b412-0437-4065-9371-edc5881de25b", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "SourceFolder": "$(Agent.BuildDirectory)/s", - "Contents": "**\n.gitignore" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "git clone", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "git", - "arguments": "clone $(VsoCorefxGitUrl) $(Agent.BuildDirectory)/s/corefx", - "workingFolder": "", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "git checkout", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "git", - "arguments": "checkout $(SourceVersion)", - "workingFolder": "$(Agent.BuildDirectory)/s/corefx", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Run $(Agent.BuildDirectory)/s/corefx/clean.sh", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "$(Agent.BuildDirectory)/s/corefx/clean.sh", - "arguments": "-all", - "workingFolder": "", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Generate Native Version Assets", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "$(Agent.BuildDirectory)/s/corefx/build-managed.sh", - "arguments": "-OfficialBuildId=$(OfficialBuildId) -- /t:GenerateVersionSourceFile /p:GenerateVersionSourceFile=true", - "workingFolder": "$(Agent.BuildDirectory)/s/corefx", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Run $(Agent.BuildDirectory)/s/corefx/build-native.sh", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "$(Agent.BuildDirectory)/s/corefx/build-native.sh", - "arguments": "-buildArch=$(Platform) -$(ConfigurationGroup) -- generateversion", - "workingFolder": "", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Run $(Agent.BuildDirectory)/s/corefx/build-packages.sh", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "$(Agent.BuildDirectory)/s/corefx/build-packages.sh", - "arguments": "-$(ConfigurationGroup) -DisableManagedPackage -FilterToOSGroup=osx.10", - "workingFolder": "$(Agent.BuildDirectory)/s/corefx", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Run $(Agent.BuildDirectory)/s/corefx/publish-packages.sh", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "$(Agent.BuildDirectory)/s/corefx/publish-packages.sh", - "arguments": "-AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -Container=$(Label) -- /p:OverwriteOnPublish=true", - "workingFolder": "$(Agent.BuildDirectory)/s/corefx", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": true, - "displayName": "Copy Publish Artifact: BuildLogs", - "timeoutInMinutes": 0, - "task": { - "id": "1d341bb0-2106-458c-8422-d00bcea6512a", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "CopyRoot": "", - "Contents": "*.log\n$(Agent.BuildDirectory)/s/corefx/*.log", - "ArtifactName": "BuildLogs", - "ArtifactType": "Container", - "TargetPath": "\\\\my\\share\\$(Build.DefinitionName)\\$(Build.BuildNumber)" - } - }, - { - "enabled": true, - "continueOnError": true, - "alwaysRun": false, - "displayName": "Compress the bin directory", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "tar", - "arguments": "-zcvf $(Agent.BuildDirectory)/s/corefx/bin.tar.gz bin", - "workingFolder": "$(Agent.BuildDirectory)/s/corefx", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": true, - "alwaysRun": false, - "displayName": "Copy Publish Artifact: bin", - "timeoutInMinutes": 0, - "task": { - "id": "1d341bb0-2106-458c-8422-d00bcea6512a", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "CopyRoot": "$(Agent.BuildDirectory)/s/corefx/bin", - "Contents": "bin.tar.gz", - "ArtifactName": "bin", - "ArtifactType": "Container", - "TargetPath": "\\\\my\\share\\$(Build.DefinitionName)\\$(Build.BuildNumber)" - } - }, - { - "enabled": true, - "continueOnError": true, - "alwaysRun": true, - "displayName": "Report / clean agent", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "$(Agent.BuildDirectory)/s/corefx/Tools/dotnetcli/dotnet", - "arguments": "$(Agent.BuildDirectory)/s/corefx/Tools/MSBuild.exe $(Agent.BuildDirectory)/s/corefx/Tools/scripts/vstsagent/cleanupagent.proj /p:AgentDirectory=$(Agent.HomeDirectory) /p:DoClean=$(CleanAgent)", - "workingFolder": "", - "failOnStandardError": "false" - } - } - ], - "options": [ - { - "enabled": false, - "definition": { - "id": "7c555368-ca64-4199-add6-9ebaf0b0137d" - }, - "inputs": { - "multipliers": "[]", - "parallel": "false", - "continueOnError": "true", - "additionalFields": "{}" - } - }, - { - "enabled": false, - "definition": { - "id": "a9db38f9-9fdc-478c-b0f9-464221e58316" - }, - "inputs": { - "workItemType": "234347", - "assignToRequestor": "true", - "additionalFields": "{}" - } - }, - { - "enabled": false, - "definition": { - "id": "57578776-4c22-4526-aeb0-86b6da17ee9c" - }, - "inputs": { - "additionalFields": "{}" - } - } - ], - "variables": { - "system.debug": { - "value": "false", - "allowOverride": true - }, - "Platform": { - "value": "x64", - "allowOverride": true - }, - "ConfigurationGroup": { - "value": "Release", - "allowOverride": true - }, - "CloudDropAccountName": { - "value": "dotnetbuildoutput" - }, - "CloudDropAccessToken": { - "value": null, - "isSecret": true - }, - "OfficialBuildId": { - "value": "$(Build.BuildNumber)", - "allowOverride": true - }, - "Label": { - "value": "$(Build.BuildNumber)", - "allowOverride": true - }, - "SourceVersion": { - "value": "HEAD", - "allowOverride": true - }, - "VsoAccountName": { - "value": "dn-bot" - }, - "VsoPassword": { - "value": null, - "isSecret": true - }, - "VsoRepositoryName": { - "value": "DotNet-CoreFX-Trusted", - "allowOverride": true - }, - "VsoCorefxGitUrl": { - "value": "https://$(VsoAccountName):$(VsoPassword)@devdiv.visualstudio.com/DevDiv/_git/$(VsoRepositoryName)/" - }, - "CleanAgent": { - "value": "true" - } - }, - "demands": [ - "Agent.OS -equals darwin" - ], - "retentionRules": [ - { - "branches": [ - "+refs/heads/*" - ], - "artifacts": [ - "build.SourceLabel" - ], - "artifactTypesToDelete": [], - "daysToKeep": 10, - "minimumToKeep": 1, - "deleteBuildRecord": true, - "deleteTestResults": true - } - ], - "buildNumberFormat": "$(date:yyyyMMdd)$(rev:-rr)", - "jobAuthorizationScope": "projectCollection", - "jobTimeoutInMinutes": 60, - "repository": { - "properties": { - "labelSources": "0", - "reportBuildStatus": "true", - "fetchDepth": "0", - "gitLfsSupport": "false", - "skipSyncSource": "false", - "cleanOptions": "0" - }, - "id": "0a2b2664-c1be-429c-9b40-8a24dee27a4a", - "type": "TfsGit", - "name": "DotNet-BuildPipeline", - "url": "https://devdiv.visualstudio.com/DevDiv/_git/DotNet-BuildPipeline", - "defaultBranch": "refs/heads/master", - "clean": "true", - "checkoutSubmodules": false - }, - "quality": "definition", - "defaultBranch": "refs/heads/master", - "queue": { - "pool": { - "id": 39, - "name": "DotNet-Build" - }, - "id": 36, - "name": "DotNet-Build" - }, - "path": "\\", - "type": "build", - "id": 1053, - "name": "DotNet-CoreFx-Trusted-Mac-Native", - "project": { - "id": "0bdbc590-a062-4c3f-b0f6-9383f67865ee", - "name": "DevDiv", - "description": "Visual Studio and DevDiv team project for git source code repositories. Work items will be added for Adams, Dev14 work items are tracked in vstfdevdiv. ", - "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/projects/0bdbc590-a062-4c3f-b0f6-9383f67865ee", - "state": "wellFormed", - "revision": 418097423 - } -}
\ No newline at end of file diff --git a/buildpipeline/DotNet-CoreFx-Trusted-OSX.json b/buildpipeline/DotNet-CoreFx-Trusted-OSX.json new file mode 100644 index 0000000000..623129509e --- /dev/null +++ b/buildpipeline/DotNet-CoreFx-Trusted-OSX.json @@ -0,0 +1,308 @@ +{ + "build": [ + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Delete files from $(Agent.BuildDirectory)/s", + "timeoutInMinutes": 0, + "task": { + "id": "b7e8b412-0437-4065-9371-edc5881de25b", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "SourceFolder": "$(Agent.BuildDirectory)/s", + "Contents": "**\n.gitignore" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "git clone", + "timeoutInMinutes": 0, + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "git", + "arguments": "clone $(PB_VsoCorefxGitUrl) $(Agent.BuildDirectory)/s/corefx", + "workingFolder": "", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "git checkout", + "timeoutInMinutes": 0, + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "git", + "arguments": "checkout $(SourceVersion)", + "workingFolder": "$(Agent.BuildDirectory)/s/corefx", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Run $(Agent.BuildDirectory)/s/corefx/clean.sh", + "timeoutInMinutes": 0, + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "$(Agent.BuildDirectory)/s/corefx/clean.sh", + "arguments": "-all", + "workingFolder": "$(Agent.BuildDirectory)/s/corefx", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Generate Native Version Assets", + "timeoutInMinutes": 0, + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "$(Agent.BuildDirectory)/s/corefx/build-managed.sh", + "arguments": "-OfficialBuildId=$(OfficialBuildId) -- /t:GenerateVersionSourceFile /p:GenerateVersionSourceFile=true", + "workingFolder": "$(Agent.BuildDirectory)/s/corefx", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Run $(Agent.BuildDirectory)/s/corefx/build.sh", + "timeoutInMinutes": 0, + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "$(Agent.BuildDirectory)/s/corefx/build.sh", + "arguments": "-buildArch=$(PB_Platform) -$(PB_ConfigurationGroup)", + "workingFolder": "$(Agent.BuildDirectory)/s/corefx/", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": true, + "displayName": "Copy Publish Artifact: BuildLogs", + "timeoutInMinutes": 0, + "task": { + "id": "1d341bb0-2106-458c-8422-d00bcea6512a", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "CopyRoot": "", + "Contents": "*.log\n$(Agent.BuildDirectory)/s/corefx/*.log", + "ArtifactName": "BuildLogs", + "ArtifactType": "Container", + "TargetPath": "\\\\my\\share\\$(Build.DefinitionName)\\$(Build.BuildNumber)" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Compress the bin directory", + "timeoutInMinutes": 0, + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "tar", + "arguments": "-zcvf $(Agent.BuildDirectory)/s/corefx/bin.tar.gz bin", + "workingFolder": "$(Agent.BuildDirectory)/s/corefx", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Copy Publish Artifact: bin", + "timeoutInMinutes": 0, + "task": { + "id": "1d341bb0-2106-458c-8422-d00bcea6512a", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "CopyRoot": "$(Agent.BuildDirectory)/s/corefx/bin", + "Contents": "bin.tar.gz", + "ArtifactName": "bin", + "ArtifactType": "Container", + "TargetPath": "\\\\my\\share\\$(Build.DefinitionName)\\$(Build.BuildNumber)" + } + } + ], + "options": [ + { + "enabled": false, + "definition": { + "id": "7c555368-ca64-4199-add6-9ebaf0b0137d" + }, + "inputs": { + "multipliers": "[]", + "parallel": "false", + "continueOnError": "true", + "additionalFields": "{}" + } + }, + { + "enabled": false, + "definition": { + "id": "a9db38f9-9fdc-478c-b0f9-464221e58316" + }, + "inputs": { + "workItemType": "234347", + "assignToRequestor": "true", + "additionalFields": "{}" + } + }, + { + "enabled": false, + "definition": { + "id": "57578776-4c22-4526-aeb0-86b6da17ee9c" + }, + "inputs": { + "additionalFields": "{}" + } + } + ], + "variables": { + "system.debug": { + "value": "false", + "allowOverride": true + }, + "PB_Platform": { + "value": "x64", + "allowOverride": true + }, + "PB_ConfigurationGroup": { + "value": "Release", + "allowOverride": true + }, + "PB_CloudDropAccountName": { + "value": "dotnetbuildoutput" + }, + "CloudDropAccessToken": { + "value": "PassedViaPipeBuild" + }, + "OfficialBuildId": { + "value": "$(Build.BuildNumber)", + "allowOverride": true + }, + "PB_Label": { + "value": "$(Build.BuildNumber)", + "allowOverride": true + }, + "SourceVersion": { + "value": "HEAD", + "allowOverride": true + }, + "PB_VsoAccountName": { + "value": "dn-bot" + }, + "VsoPassword": { + "value": "PassedViaPipeBuild" + }, + "PB_VsoRepositoryName": { + "value": "DotNet-CoreFX-Trusted", + "allowOverride": true + }, + "PB_VsoCorefxGitUrl": { + "value": "https://github.com/dotnet/corefx" + }, + "Build.Clean": { + "value": "all" + } + }, + "demands": [ + "Agent.OS -equals darwin" + ], + "retentionRules": [ + { + "branches": [ + "+refs/heads/*" + ], + "artifacts": [ + "build.SourceLabel" + ], + "artifactTypesToDelete": [], + "daysToKeep": 10, + "minimumToKeep": 1, + "deleteBuildRecord": true, + "deleteTestResults": true + } + ], + "buildNumberFormat": "$(date:yyyyMMdd)$(rev:-rr)", + "jobAuthorizationScope": "projectCollection", + "jobTimeoutInMinutes": 60, + "repository": { + "properties": { + "labelSources": "0", + "reportBuildStatus": "true", + "fetchDepth": "0", + "gitLfsSupport": "false", + "skipSyncSource": "false", + "cleanOptions": "0" + }, + "id": "0a2b2664-c1be-429c-9b40-8a24dee27a4a", + "type": "TfsGit", + "name": "DotNet-BuildPipeline", + "url": "https://devdiv.visualstudio.com/DevDiv/_git/DotNet-BuildPipeline", + "defaultBranch": "refs/heads/master", + "clean": "true", + "checkoutSubmodules": false + }, + "quality": "definition", + "defaultBranch": "refs/heads/master", + "queue": { + "pool": { + "id": 39, + "name": "DotNet-Build" + }, + "id": 36, + "name": "DotNet-Build" + }, + "path": "\\", + "type": "build", + "id": 1053, + "name": "DotNet-CoreFx-Trusted-OSX", + "project": { + "id": "0bdbc590-a062-4c3f-b0f6-9383f67865ee", + "name": "DevDiv", + "description": "Visual Studio and DevDiv team project for git source code repositories. Work items will be added for Adams, Dev14 work items are tracked in vstfdevdiv. ", + "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/projects/0bdbc590-a062-4c3f-b0f6-9383f67865ee", + "state": "wellFormed", + "revision": 418097435 + } +}
\ No newline at end of file diff --git a/buildpipeline/DotNet-CoreFx-Trusted-Windows-Build-Test.json b/buildpipeline/DotNet-CoreFx-Trusted-Windows-Build-Test.json deleted file mode 100644 index 46417dbb2d..0000000000 --- a/buildpipeline/DotNet-CoreFx-Trusted-Windows-Build-Test.json +++ /dev/null @@ -1,519 +0,0 @@ -{ - "build": [ - { - "enabled": true, - "continueOnError": false, - "alwaysRun": true, - "displayName": "Delete 'corefx'", - "timeoutInMinutes": 0, - "task": { - "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "scriptType": "inlineScript", - "scriptName": "", - "arguments": "-path $(build.SourcesDirectory)\\corefx", - "inlineScript": "param($path)\n\nif (Test-Path $path){\n # this will print out an error each time a file can't be deleted.\n Remove-Item -Recurse -Force $path\n }\n\nif (Test-Path $path){\n # this will print out an error each time a file can't be deleted.\n .\\diag_tools\\handle.exe -accepteula $path\n }", - "workingFolder": "", - "failOnStandardError": "true" - } - }, - { - "enabled": false, - "continueOnError": false, - "alwaysRun": true, - "displayName": "Delete files from $(build.SourcesDirectory)", - "timeoutInMinutes": 0, - "task": { - "id": "b7e8b412-0437-4065-9371-edc5881de25b", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "SourceFolder": "$(build.SourcesDirectory)", - "Contents": "corefx" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "git clone", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "$(Git)", - "arguments": "clone $(VsoCorefxGitUrl) corefx", - "workingFolder": "", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "git checkout", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "$(Git)", - "arguments": "checkout $(SourceVersion)", - "workingFolder": "corefx", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Setup environment", - "timeoutInMinutes": 0, - "task": { - "id": "bfc8bf76-e7ac-4a8c-9a55-a944a9f632fd", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "$(VS140COMNTOOLS)\\\\VsDevCmd.bat", - "arguments": "", - "modifyEnvironment": "true", - "workingFolder": "corefx", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Run $(Build.SourcesDirectory)\\corefx\\clean.cmd", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "$(Build.SourcesDirectory)\\corefx\\clean.cmd", - "arguments": "-all", - "workingFolder": "corefx", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Run sync.cmd -ab", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "$(Build.SourcesDirectory)\\corefx\\sync.cmd", - "arguments": "-ab -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -Container=$(Label) -- /p:\"DownloadDirectory=$(PackagesTransferDirectory)\" /p:\"SkipCleanPackages=true\" /p:\"PackagesDrops=$(PackagesTransferDirectory)\\$(ConfigurationGroup)\"", - "workingFolder": "corefx", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Generate Version Assets", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "$(Build.SourcesDirectory)\\corefx\\build-managed.cmd", - "arguments": "-GenerateVersion -OfficialBuildId=$(OfficialBuildId)", - "workingFolder": "corefx", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Run sync.cmd -t", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "$(Build.SourcesDirectory)\\corefx\\sync.cmd", - "arguments": "-t -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -Container=$(Label) -- /p:\"DownloadDirectory=$(PackagesTransferDirectory)\" /p:\"SkipCleanPackages=true\" /p:\"PackagesDrops=$(PackagesTransferDirectory)\\$(ConfigurationGroup)\"", - "workingFolder": "corefx", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "build-tests.cmd", - "timeoutInMinutes": 0, - "task": { - "id": "bfc8bf76-e7ac-4a8c-9a55-a944a9f632fd", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "$(build.SourcesDirectory)/corefx/build-tests.cmd", - "arguments": "-BuildTestsAgainstPackages -$(ConfigurationGroup) -SkipTests -target-os=$(TargetOS) -OuterLoop -- /p:\"PackagesDrops=$(PackagesTransferDirectory)\\$(ConfigurationGroup)\" /p:\"ArchiveTests=true\" /p:\"Performance=$(Performance)\" /p:\"FuncTestsDisabled=$(FuncTestsDisabled)\" /p:\"TestNugetRuntimeId=$(TestNugetRuntimeId)\" /p:XunitTraitOptions=\\\"-notrait category=requireselevation\\\" /flp:v=detailed", - "modifyEnvironment": "false", - "workingFolder": "$(build.SourcesDirectory)/corefx", - "failOnStandardError": "false" - } - }, - { - "enabled": false, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Compress packages dir for Helix", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "msbuild", - "arguments": "src\\post.builds /t:CompressPackagesDir /p:\"EnableCloudTest=true\"", - "workingFolder": "$(build.SourcesDirectory)/corefx", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Push to Helix", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "$(Build.SourcesDirectory)\\corefx\\tools\\msbuild.cmd", - "arguments": "src\\post.builds /t:CloudBuild /p:\"BuildTestsAgainstPackages=true\" /p:\"ConfigurationGroup=$(ConfigurationGroup)\" /p:\"OfficialBuildId=$(OfficialBuildId)\" /p:\"ArchiveTests=true\" /p:\"EnableCloudTest=true\" /p:\"BuildMoniker=$(OfficialBuildId)\" /p:\"TargetQueue=$(TargetQueue)\" /p:\"TestProduct=corefx\" /p:\"Branch=$(HelixBranch)\" /p:\"CloudDropAccountName=$(OutputCloudDropAccountName)\" /p:\"CloudResultsAccountName=$(OutputCloudResultsAccountName)\" /p:\"CloudDropAccessToken=$(OutputCloudDropAccessToken)\" /p:\"CloudResultsAccessToken=$(OutputCloudResultsAccessToken)\" /p:\"BuildCompleteConnection=$(BuildCompleteConnection)\" /p:\"BuildIsOfficialConnection=$(BuildOfficialConnection)\" /p:\"Outerloop=true\" /p:\"TestNugetRuntimeId=$(TestNugetRuntimeId)\" /p:\"FilterToOSGroup=$(FilterToOsGroup)\" /p:\"TimeoutInSeconds=1200\" /p:\"TargetOS=$(TargetOS)\" /p:\"HelixApiAccessKey=$(HelixApiAccessKey)\" /p:\"Creator=$(Creator)\" /p:\"CloudTestContainerSuffix=$(TestContainerSuffix)-2\" /p:\"OverwriteOnUpload=true\" /p:\"TargetsWindows=$(TargetsWindows)\" /flp:\"LogFile=pushtohelix-diag.log;Verbosity=diagnostic\" /p:HelixApiEndpoint=$(HelixApiEndpoint)", - "workingFolder": "$(build.SourcesDirectory)/corefx", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Run $(build.SourcesDirectory)/corefx/publish-packages.cmd", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "$(build.SourcesDirectory)/corefx/publish-packages.cmd", - "arguments": "-AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -Container=$(Label)-$(TestContainerSuffix)-test -- /p:OverwriteOnPublish=true /p:PublishPattern=$(Build.SourcesDirectory)\\corefx\\bin\\tests\\*\\archive\\**\\*.zip", - "workingFolder": "$(build.SourcesDirectory)/corefx", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": true, - "alwaysRun": false, - "displayName": "Final clean to remove lingering processes", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "$(Build.SourcesDirectory)\\corefx\\clean.cmd", - "arguments": "", - "workingFolder": "corefx", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": true, - "displayName": "Copy Publish Artifact: Detailed build logs", - "timeoutInMinutes": 0, - "task": { - "id": "1d341bb0-2106-458c-8422-d00bcea6512a", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "CopyRoot": "", - "Contents": "*.log\ncorefx\\*.log\ncorefx\\src\\*.log", - "ArtifactName": "Detailed build logs", - "ArtifactType": "Container", - "TargetPath": "\\\\my\\share\\$(Build.DefinitionName)\\$(Build.BuildNumber)" - } - }, - { - "enabled": true, - "continueOnError": true, - "alwaysRun": true, - "displayName": "Build solution corefx\\Tools\\scripts\\vstsagent\\cleanupagent.proj", - "timeoutInMinutes": 0, - "task": { - "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "solution": "corefx\\Tools\\scripts\\vstsagent\\cleanupagent.proj", - "platform": "", - "configuration": "", - "msbuildArguments": "/p:AgentDirectory=$(Agent.HomeDirectory) /p:DoClean=$(CleanAgent)", - "clean": "false", - "maximumCpuCount": "false", - "restoreNugetPackages": "false", - "logProjectEvents": "false", - "createLogFile": "false", - "msbuildLocationMethod": "version", - "msbuildVersion": "14.0", - "msbuildArchitecture": "x86", - "msbuildLocation": "" - } - } - ], - "options": [ - { - "enabled": false, - "definition": { - "id": "7c555368-ca64-4199-add6-9ebaf0b0137d" - }, - "inputs": { - "multipliers": "[]", - "parallel": "false", - "continueOnError": "true", - "additionalFields": "{}" - } - }, - { - "enabled": false, - "definition": { - "id": "a9db38f9-9fdc-478c-b0f9-464221e58316" - }, - "inputs": { - "workItemType": "234347", - "assignToRequestor": "true", - "additionalFields": "{}" - } - }, - { - "enabled": false, - "definition": { - "id": "57578776-4c22-4526-aeb0-86b6da17ee9c" - }, - "inputs": { - "additionalFields": "{}" - } - } - ], - "variables": { - "ConfigurationGroup": { - "value": "Release", - "allowOverride": true - }, - "SyncToSha": { - "value": "HEAD", - "allowOverride": true - }, - "CloudDropAccountName": { - "value": "dotnetbuildoutput" - }, - "CloudDropAccessToken": { - "value": null, - "isSecret": true - }, - "PackagesTransferDirectory": { - "value": "$(Build.SourcesDirectory)\\corefx\\Packages\\AzureTransfer" - }, - "Release": { - "value": "rc3", - "allowOverride": true - }, - "Repo": { - "value": "corefx", - "allowOverride": true - }, - "OfficialBuildId": { - "value": "$(Build.BuildNumber)", - "allowOverride": true - }, - "Label": { - "value": "$(Build.BuildNumber)", - "allowOverride": true - }, - "OutputCloudDropAccountName": { - "value": "dotnetbuilddrops" - }, - "OutputCloudResultsAccountName": { - "value": "dotnetjobresults" - }, - "OutputCloudDropAccessToken": { - "value": null, - "isSecret": true - }, - "OutputCloudResultsAccessToken": { - "value": null, - "isSecret": true - }, - "HelixApiAccessKey": { - "value": null, - "isSecret": true - }, - "TargetOS": { - "value": "Windows_NT", - "allowOverride": true - }, - "TestContainerSuffix": { - "value": "windows10", - "allowOverride": true - }, - "TargetQueue": { - "value": "Windows.10.Amd64", - "allowOverride": true - }, - "TestNuGetRuntimeId": { - "value": "win10-x64", - "allowOverride": true - }, - "TargetsWindows": { - "value": null, - "isSecret": true - }, - "Creator": { - "value": "corbvt" - }, - "Performance": { - "value": "false" - }, - "FuncTestsDisabled": { - "value": "false" - }, - "HelixBranch": { - "value": "master" - }, - "HelixApiEndpoint": { - "value": "https://helix.dot.net/api/2016-06-28/jobs" - }, - "VsoAccountName": { - "value": "dn-bot" - }, - "VsoPassword": { - "value": null, - "isSecret": true - }, - "VsoRepositoryName": { - "value": "DotNet-CoreFX-Trusted", - "allowOverride": true - }, - "VsoCorefxGitUrl": { - "value": "https://$(VsoAccountName):$(VsoPassword)@devdiv.visualstudio.com/DevDiv/_git/$(VsoRepositoryName)/" - }, - "SourceVersion": { - "value": "master", - "allowOverride": true - }, - "BuildMoniker": { - "value": "$(OfficialBuildId)", - "allowOverride": true - }, - "FilterToOSGroup": { - "value": "Windows_NT", - "allowOverride": true - }, - "ContainerName": { - "value": "" - }, - "Git": { - "value": "$(ProgramFiles)\\Git\\cmd\\git.exe" - }, - "CleanAgent": { - "value": "true" - } - }, - "retentionRules": [ - { - "branches": [ - "+refs/heads/*" - ], - "artifacts": [ - "build.SourceLabel" - ], - "artifactTypesToDelete": [], - "daysToKeep": 10, - "minimumToKeep": 1, - "deleteBuildRecord": true, - "deleteTestResults": true - } - ], - "buildNumberFormat": "$(date:yyyyMMdd)$(rev:-rr)", - "jobAuthorizationScope": "projectCollection", - "jobTimeoutInMinutes": 180, - "repository": { - "properties": { - "labelSources": "0", - "reportBuildStatus": "true", - "fetchDepth": "0", - "gitLfsSupport": "false", - "skipSyncSource": "false", - "cleanOptions": "0" - }, - "id": "0a2b2664-c1be-429c-9b40-8a24dee27a4a", - "type": "TfsGit", - "name": "DotNet-BuildPipeline", - "url": "https://devdiv.visualstudio.com/DevDiv/_git/DotNet-BuildPipeline", - "defaultBranch": "refs/heads/master", - "clean": "false", - "checkoutSubmodules": false - }, - "quality": "definition", - "defaultBranch": "refs/heads/master", - "queue": { - "pool": { - "id": 39, - "name": "DotNet-Build" - }, - "id": 36, - "name": "DotNet-Build" - }, - "path": "\\", - "type": "build", - "id": 1064, - "name": "DotNet-CoreFx-Trusted-Windows-Build-Test", - "project": { - "id": "0bdbc590-a062-4c3f-b0f6-9383f67865ee", - "name": "DevDiv", - "description": "Visual Studio and DevDiv team project for git source code repositories. Work items will be added for Adams, Dev14 work items are tracked in vstfdevdiv. ", - "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/projects/0bdbc590-a062-4c3f-b0f6-9383f67865ee", - "state": "wellFormed", - "revision": 418097423 - } -}
\ No newline at end of file diff --git a/buildpipeline/DotNet-CoreFx-Trusted-Windows-Native.json b/buildpipeline/DotNet-CoreFx-Trusted-Windows-Native.json deleted file mode 100644 index 509c4e5aff..0000000000 --- a/buildpipeline/DotNet-CoreFx-Trusted-Windows-Native.json +++ /dev/null @@ -1,511 +0,0 @@ -{ - "build": [ - { - "enabled": true, - "continueOnError": false, - "alwaysRun": true, - "displayName": "Delete 'corefx'", - "timeoutInMinutes": 0, - "task": { - "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "scriptType": "inlineScript", - "scriptName": "", - "arguments": "-path $(build.SourcesDirectory)\\corefx", - "inlineScript": "param($path)\n\nif (Test-Path $path){\n # this will print out an error each time a file can't be deleted.\n Remove-Item -Recurse -Force $path\n }\n\nif (Test-Path $path){\n # this will print out an error each time a file can't be deleted.\n .\\diag_tools\\handle.exe -accepteula $path\n }", - "workingFolder": "", - "failOnStandardError": "true" - } - }, - { - "enabled": false, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Delete files from $(build.SourcesDirectory)", - "timeoutInMinutes": 0, - "task": { - "id": "b7e8b412-0437-4065-9371-edc5881de25b", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "SourceFolder": "$(build.SourcesDirectory)", - "Contents": "corefx\\**\ncorefx" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "git clone", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "$(Git)", - "arguments": "clone $(VsoCorefxGitUrl) corefx", - "workingFolder": "", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "git checkout", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "$(Git)", - "arguments": "checkout $(SourceVersion)", - "workingFolder": "corefx", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Install Signing Plugin", - "timeoutInMinutes": 0, - "task": { - "id": "30666190-6959-11e5-9f96-f56098202fef", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "signType": "$(SignType)", - "zipSources": "false", - "version": "", - "feedSource": "https://devdiv.pkgs.visualstudio.com/DefaultCollection/_packaging/MicroBuildToolset/nuget/v3/index.json" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Run $(Build.SourcesDirectory)\\corefx\\clean.cmd", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "$(Build.SourcesDirectory)\\corefx\\clean.cmd", - "arguments": "-all", - "workingFolder": "corefx", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Run $(Build.SourcesDirectory)\\corefx\\sync.cmd", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "$(Build.SourcesDirectory)\\corefx\\sync.cmd", - "arguments": "-p", - "workingFolder": "corefx", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Generate Version Assets", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "$(Build.SourcesDirectory)\\corefx\\build-managed.cmd", - "arguments": "-GenerateVersion -OfficialBuildId=$(OfficialBuildId)", - "workingFolder": "corefx", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Run $(Build.SourcesDirectory)\\corefx\\build-native.cmd", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "$(Build.SourcesDirectory)\\corefx\\build-native.cmd", - "arguments": "-buildArch=$(Platform) -$(ConfigurationGroup) -- toolsetDir=C:\\tools\\clr /p:SignType=$(SignType)", - "workingFolder": "corefx", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Run $(Build.SourcesDirectory)\\corefx\\build-packages.cmd", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "$(Build.SourcesDirectory)\\corefx\\build-packages.cmd", - "arguments": "-$(ConfigurationGroup) -buildArch=$(Platform) -DisableManagedPackage -FilterToOSGroup=Windows_NT", - "workingFolder": "corefx", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Run $(Build.SourcesDirectory)\\corefx\\publish-packages.cmd", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "$(Build.SourcesDirectory)\\corefx\\publish-packages.cmd", - "arguments": "-AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -Container=$(Label) -- /p:OverwriteOnPublish=true", - "workingFolder": "corefx", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": true, - "displayName": "Copy Publish Artifact: BuildLogs", - "timeoutInMinutes": 0, - "task": { - "id": "1d341bb0-2106-458c-8422-d00bcea6512a", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "CopyRoot": "", - "Contents": "*.log\ncorefx\\*.log", - "ArtifactName": "BuildLogs", - "ArtifactType": "Container", - "TargetPath": "\\\\my\\share\\$(Build.DefinitionName)\\$(Build.BuildNumber)" - } - }, - { - "enabled": false, - "continueOnError": true, - "alwaysRun": false, - "displayName": "Publish Artifact: bin", - "timeoutInMinutes": 0, - "task": { - "id": "2ff763a7-ce83-4e1f-bc89-0ae63477cebe", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "PathtoPublish": "corefx/bin", - "ArtifactName": "bin", - "ArtifactType": "Container", - "TargetPath": "\\\\my\\share\\$(Build.DefinitionName)\\$(Build.BuildNumber)" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Publish symbols path: \\\\cpvsbuild\\drops\\DotNetCore\\$(Build.DefinitionName)\\$(Build.BuildNumber)\\symbols", - "timeoutInMinutes": 0, - "task": { - "id": "0675668a-7bba-4ccb-901d-5ad6554ca653", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "SymbolsPath": "\\\\cpvsbuild\\drops\\DotNetCore\\$(Build.DefinitionName)\\$(Build.BuildNumber)\\symbols", - "SearchPattern": "corefx\\bin\\*$(Platform).$(ConfigurationGroup)\\**\\*.pdb", - "SymbolsFolder": "", - "SkipIndexing": "false", - "TreatNotIndexedAsWarning": "false", - "SymbolsMaximumWaitTime": "", - "SymbolsProduct": "", - "SymbolsVersion": "", - "SymbolsArtifactName": "Symbols_$(ConfigurationGroup)" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Index symbols on http://symweb", - "timeoutInMinutes": 0, - "task": { - "id": "af503aa3-9d06-44b6-a549-d063a544a5c5", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "symbolStore": "\\\\cpvsbuild\\drops\\DotNetCore\\$(Build.DefinitionName)\\$(Build.BuildNumber)\\symbols", - "contacts": "jhendrix;mawilkie", - "project": "DDE" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": true, - "displayName": "Execute cleanup tasks", - "timeoutInMinutes": 0, - "task": { - "id": "521a94ea-9e68-468a-8167-6dcf361ea776", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": {} - }, - { - "enabled": false, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Copy Publish Artifact: symbols", - "timeoutInMinutes": 0, - "task": { - "id": "1d341bb0-2106-458c-8422-d00bcea6512a", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "CopyRoot": "", - "Contents": "bin\\*$(Platform).$(ConfigurationGroup)\\**\\*.dll\nbin\\*$(Platform).$(ConfigurationGroup)\\**\\*.pdb", - "ArtifactName": "symbols", - "ArtifactType": "FilePath", - "TargetPath": "\\\\cpvsbuild\\drops\\DotNetCore\\$(Build.DefinitionName)\\$(Build.BuildNumber)\\FullSymbols" - } - }, - { - "enabled": true, - "continueOnError": true, - "alwaysRun": false, - "displayName": "Final clean to remove lingering process", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "$(Build.SourcesDirectory)\\corefx\\clean.cmd", - "arguments": "", - "workingFolder": "corefx", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": true, - "alwaysRun": true, - "displayName": "Report / Clean agent", - "timeoutInMinutes": 0, - "task": { - "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "solution": "corefx\\Tools\\scripts\\vstsagent\\cleanupagent.proj", - "platform": "", - "configuration": "", - "msbuildArguments": "/p:AgentDirectory=$(Agent.HomeDirectory) /p:DoClean=$(CleanAgent)", - "clean": "false", - "maximumCpuCount": "false", - "restoreNugetPackages": "false", - "logProjectEvents": "false", - "createLogFile": "false", - "msbuildLocationMethod": "version", - "msbuildVersion": "14.0", - "msbuildArchitecture": "x86", - "msbuildLocation": "" - } - } - ], - "options": [ - { - "enabled": false, - "definition": { - "id": "7c555368-ca64-4199-add6-9ebaf0b0137d" - }, - "inputs": { - "multipliers": "[]", - "parallel": "false", - "continueOnError": "true", - "additionalFields": "{}" - } - }, - { - "enabled": false, - "definition": { - "id": "a9db38f9-9fdc-478c-b0f9-464221e58316" - }, - "inputs": { - "workItemType": "234347", - "assignToRequestor": "true", - "additionalFields": "{}" - } - }, - { - "enabled": false, - "definition": { - "id": "57578776-4c22-4526-aeb0-86b6da17ee9c" - }, - "inputs": { - "additionalFields": "{}" - } - } - ], - "variables": { - "system.debug": { - "value": "false", - "allowOverride": true - }, - "ConfigurationGroup": { - "value": "Release", - "allowOverride": true - }, - "Platform": { - "value": "x64", - "allowOverride": true - }, - "TeamName": { - "value": "DotNetCore" - }, - "SignType": { - "value": "test", - "allowOverride": true - }, - "CloudDropAccountName": { - "value": "dotnetbuildoutput" - }, - "CloudDropAccessToken": { - "value": null, - "isSecret": true - }, - "OfficialBuildId": { - "value": "$(Build.BuildNumber)", - "allowOverride": true - }, - "Label": { - "value": "$(Build.BuildNumber)", - "allowOverride": true - }, - "SourceVersion": { - "value": "HEAD", - "allowOverride": true - }, - "VsoAccountName": { - "value": "dn-bot" - }, - "VsoPassword": { - "value": null, - "isSecret": true - }, - "VsoRepositoryName": { - "value": "DotNet-CoreFX-Trusted", - "allowOverride": true - }, - "VsoCorefxGitUrl": { - "value": "https://$(VsoAccountName):$(VsoPassword)@devdiv.visualstudio.com/DevDiv/_git/$(VsoRepositoryName)/" - }, - "Git": { - "value": "$(ProgramFiles)\\Git\\cmd\\git.exe" - }, - "CleanAgent": { - "value": "true" - } - }, - "demands": [ - "Agent.OS -equals windows_nt" - ], - "retentionRules": [ - { - "branches": [ - "+refs/heads/*" - ], - "artifacts": [], - "artifactTypesToDelete": [ - "FilePath", - "SymbolStore" - ], - "daysToKeep": 10, - "minimumToKeep": 1, - "deleteBuildRecord": true, - "deleteTestResults": true - } - ], - "buildNumberFormat": "$(date:yyyyMMdd)$(rev:-rr)-$(Platform)", - "jobAuthorizationScope": "projectCollection", - "jobTimeoutInMinutes": 180, - "repository": { - "properties": { - "labelSources": "0", - "reportBuildStatus": "true", - "fetchDepth": "0", - "gitLfsSupport": "false", - "skipSyncSource": "false", - "cleanOptions": "0" - }, - "id": "0a2b2664-c1be-429c-9b40-8a24dee27a4a", - "type": "TfsGit", - "name": "DotNet-BuildPipeline", - "url": "https://devdiv.visualstudio.com/DevDiv/_git/DotNet-BuildPipeline", - "defaultBranch": "refs/heads/master", - "clean": "true", - "checkoutSubmodules": false - }, - "quality": "definition", - "defaultBranch": "refs/heads/master", - "queue": { - "pool": { - "id": 39, - "name": "DotNet-Build" - }, - "id": 36, - "name": "DotNet-Build" - }, - "path": "\\", - "type": "build", - "id": 1476, - "name": "DotNet-CoreFx-Trusted-Windows-Native", - "project": { - "id": "0bdbc590-a062-4c3f-b0f6-9383f67865ee", - "name": "DevDiv", - "description": "Visual Studio and DevDiv team project for git source code repositories. Work items will be added for Adams, Dev14 work items are tracked in vstfdevdiv. ", - "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/projects/0bdbc590-a062-4c3f-b0f6-9383f67865ee", - "state": "wellFormed", - "revision": 418097423 - } -}
\ No newline at end of file diff --git a/buildpipeline/DotNet-CoreFx-Trusted-Windows.json b/buildpipeline/DotNet-CoreFx-Trusted-Windows.json index 0b9575ba55..b95c84bd43 100644 --- a/buildpipeline/DotNet-CoreFx-Trusted-Windows.json +++ b/buildpipeline/DotNet-CoreFx-Trusted-Windows.json @@ -48,8 +48,8 @@ "definitionType": "task" }, "inputs": { - "filename": "$(Git)", - "arguments": "clone $(VsoCorefxGitUrl) corefx", + "filename": "$(PB_Git)", + "arguments": "clone $(PB_VsoCorefxGitUrl) corefx", "workingFolder": "", "failOnStandardError": "false" } @@ -66,7 +66,7 @@ "definitionType": "task" }, "inputs": { - "filename": "$(Git)", + "filename": "$(PB_Git)", "arguments": "checkout $(SourceVersion)", "workingFolder": "corefx", "failOnStandardError": "false" @@ -84,7 +84,7 @@ "definitionType": "task" }, "inputs": { - "signType": "$(SignType)", + "signType": "$(PB_SignType)", "zipSources": "false", "version": "", "feedSource": "https://devdiv.pkgs.visualstudio.com/DefaultCollection/_packaging/MicroBuildToolset/nuget/v3/index.json" @@ -148,7 +148,7 @@ "enabled": true, "continueOnError": false, "alwaysRun": false, - "displayName": "Run $(Build.SourcesDirectory)\\corefx\\build-native.cmd", + "displayName": "Run $(Build.SourcesDirectory)\\corefx\\build.cmd", "timeoutInMinutes": 0, "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", @@ -156,62 +156,8 @@ "definitionType": "task" }, "inputs": { - "filename": "$(Build.SourcesDirectory)\\corefx\\build-native.cmd", - "arguments": "-buildArch=$(Platform) -$(ConfigurationGroup)", - "workingFolder": "corefx", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Run $(Build.SourcesDirectory)\\corefx\\build-managed.cmd", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "$(Build.SourcesDirectory)\\corefx\\build-managed.cmd", - "arguments": "-binaries -buildArch=$(Platform) -$(ConfigurationGroup) -- /p:SignType=$(SignType)", - "workingFolder": "corefx", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Run $(Build.SourcesDirectory)\\corefx\\build-packages.cmd", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "$(Build.SourcesDirectory)\\corefx\\build-packages.cmd", - "arguments": "-$(ConfigurationGroup) -BuildPackageLibraryReferences=false", - "workingFolder": "corefx", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Run $(Build.SourcesDirectory)\\corefx\\publish-packages.cmd", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "$(Build.SourcesDirectory)\\corefx\\publish-packages.cmd", - "arguments": "-AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -Container=$(Label) -- /p:OverwriteOnPublish=true", + "filename": "$(Build.SourcesDirectory)\\corefx\\build.cmd", + "arguments": "-buildArch=$(PB_Platform) -$(PB_ConfigurationGroup) -- /p:SignType=$(PB_SignType)", "workingFolder": "corefx", "failOnStandardError": "false" } @@ -284,7 +230,7 @@ }, "inputs": { "SymbolsPath": "\\\\cpvsbuild\\drops\\DotNetCore\\$(Build.DefinitionName)\\$(Build.BuildNumber)\\symbols", - "SearchPattern": "corefx\\bin\\*$(Platform).$(ConfigurationGroup)\\**\\*.pdb", + "SearchPattern": "corefx\\bin\\*$(PB_Platform).$(PB_ConfigurationGroup)\\**\\*.pdb", "SymbolsFolder": "", "SkipIndexing": "false", "TreatNotIndexedAsWarning": "false", @@ -314,6 +260,28 @@ { "enabled": true, "continueOnError": false, + "alwaysRun": false, + "displayName": "Publish to Symbols to Artifact Services", + "timeoutInMinutes": 0, + "task": { + "id": "29827cd1-5c33-4ff0-a817-abd46970ffc4", + "versionSpec": "0.*", + "definitionType": "task" + }, + "inputs": { + "symbolServiceURI": "https://devdiv.artifacts.visualstudio.com/DefaultCollection", + "requestName": "$(system.teamProject)/$(Build.BuildNumber)/$(Build.BuildId)", + "sourcePath": "$(Build.SourcesDirectory)\\corefx\\bin", + "assemblyPath": "", + "toLowerCase": "true", + "detailedLog": "true", + "expirationInDays": "", + "usePat": "true" + } + }, + { + "enabled": true, + "continueOnError": false, "alwaysRun": true, "displayName": "Execute cleanup tasks", "timeoutInMinutes": 0, @@ -337,7 +305,7 @@ }, "inputs": { "CopyRoot": "", - "Contents": "bin\\*$(Platform).$(ConfigurationGroup)\\**\\*.dll\nbin\\*$(Platform).$(ConfigurationGroup)\\**\\*.pdb", + "Contents": "bin\\*$(PB_Platform).$(PB_ConfigurationGroup)\\**\\*.dll\nbin\\*$(PB_Platform).$(PB_ConfigurationGroup)\\**\\*.pdb", "ArtifactName": "symbols", "ArtifactType": "FilePath", "TargetPath": "\\\\cpvsbuild\\drops\\DotNetCore\\$(Build.DefinitionName)\\$(Build.BuildNumber)\\FullSymbols" @@ -346,33 +314,6 @@ { "enabled": true, "continueOnError": true, - "alwaysRun": true, - "displayName": "Report / Clean agent", - "timeoutInMinutes": 0, - "task": { - "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "solution": "corefx\\Tools\\scripts\\vstsagent\\cleanupagent.proj", - "platform": "", - "configuration": "", - "msbuildArguments": "/p:AgentDirectory=$(Agent.HomeDirectory) /p:DoClean=$(CleanAgent)", - "clean": "false", - "maximumCpuCount": "false", - "restoreNugetPackages": "false", - "logProjectEvents": "false", - "createLogFile": "false", - "msbuildLocationMethod": "version", - "msbuildVersion": "14.0", - "msbuildArchitecture": "x86", - "msbuildLocation": "" - } - }, - { - "enabled": true, - "continueOnError": true, "alwaysRun": false, "displayName": "Final clean to remove any lingering process", "timeoutInMinutes": 0, @@ -428,33 +369,29 @@ "value": "false", "allowOverride": true }, - "ConfigurationGroup": { + "PB_ConfigurationGroup": { "value": "Release", "allowOverride": true }, - "Platform": { + "PB_Platform": { "value": "AnyCPU", "allowOverride": true }, - "TeamName": { - "value": "DotNetCore" - }, - "SignType": { + "PB_SignType": { "value": "test", "allowOverride": true }, - "CloudDropAccountName": { + "PB_CloudDropAccountName": { "value": "dotnetbuildoutput" }, "CloudDropAccessToken": { - "value": null, - "isSecret": true + "value": "PassedViaPipeBuild" }, "OfficialBuildId": { "value": "$(Build.BuildNumber)", "allowOverride": true }, - "Label": { + "PB_Label": { "value": "$(Build.BuildNumber)", "allowOverride": true }, @@ -462,29 +399,31 @@ "value": "HEAD", "allowOverride": true }, - "VsoAccountName": { + "Build.Clean": { + "value": "all" + }, + "PB_VsoAccountName": { "value": "dn-bot" }, "VsoPassword": { - "value": null, - "isSecret": true + "value": "PassedViaPipeBuild" }, - "VsoRepositoryName": { + "PB_VsoRepositoryName": { "value": "DotNet-CoreFX-Trusted", "allowOverride": true }, - "VsoCorefxGitUrl": { - "value": "https://$(VsoAccountName):$(VsoPassword)@devdiv.visualstudio.com/DevDiv/_git/$(VsoRepositoryName)/" + "PB_VsoCorefxGitUrl": { + "value": "https://github.com/dotnet/corefx" }, - "SourceBranch": { + "PB_SourceBranch": { "value": "master", "allowOverride": true }, - "Git": { + "PB_Git": { "value": "$(ProgramFiles)\\Git\\cmd\\git.exe" }, - "CleanAgent": { - "value": "true" + "TeamName": { + "value": "DotNetCore" } }, "demands": [ @@ -529,11 +468,11 @@ "defaultBranch": "refs/heads/master", "queue": { "pool": { - "id": 39, - "name": "DotNet-Build" + "id": 83, + "name": "DotNetCore-Test" }, - "id": 36, - "name": "DotNet-Build" + "id": 159, + "name": "DotNetCore-Test" }, "path": "\\", "type": "build", @@ -545,6 +484,6 @@ "description": "Visual Studio and DevDiv team project for git source code repositories. Work items will be added for Adams, Dev14 work items are tracked in vstfdevdiv. ", "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/projects/0bdbc590-a062-4c3f-b0f6-9383f67865ee", "state": "wellFormed", - "revision": 418097423 + "revision": 418097435 } }
\ No newline at end of file diff --git a/buildpipeline/pipeline.json b/buildpipeline/pipeline.json index cd57c3c1e7..2f3ceb930d 100644 --- a/buildpipeline/pipeline.json +++ b/buildpipeline/pipeline.json @@ -12,146 +12,122 @@ "TreatWarningsAsErrors": "false" }, "BuildParameters": { - "ConfigurationGroup": "Release" + "PB_ConfigurationGroup": "Release" }, "Definitions": [ { - "Name": "DotNet-CoreFx-Trusted-Linux-Native", + "Name": "DotNet-CoreFx-Trusted-Linux", "Parameters": { - "DockerTag": "debian82_prereqs_2" + "PB_DockerTag": "debian82_prereqs_2" }, "ReportingParameters": { "OperatingSystem": "Debian 8.2", - "SubType": "native", "Type": "build/product/", "ConfigurationGroup": "Release" } }, { - "Name": "DotNet-CoreFx-Trusted-Linux-Native", + "Name": "DotNet-CoreFx-Trusted-Linux", "Parameters": { - "DockerTag": "fedora23_prereqs" + "PB_DockerTag": "fedora23_prereqs" }, "ReportingParameters": { "OperatingSystem": "Fedora 2.3", - "SubType": "native", "Type": "build/product/", "ConfigurationGroup": "Release" } }, { - "Name": "DotNet-CoreFx-Trusted-Linux-Native", + "Name": "DotNet-CoreFx-Trusted-Linux", "Parameters": { - "DockerTag": "fedora24_prereqs_v4" + "PB_DockerTag": "fedora24_prereqs_v4" }, "ReportingParameters": { "OperatingSystem": "Fedora 24", - "SubType": "native", "Type": "build/product/", "ConfigurationGroup": "Release" } }, { - "Name": "DotNet-CoreFx-Trusted-Linux-Native", + "Name": "DotNet-CoreFx-Trusted-Linux", "Parameters": { - "DockerTag": "opensuse132_prereqs_v4" + "PB_DockerTag": "opensuse132_prereqs_v4" }, "ReportingParameters": { "OperatingSystem": "openSUSE 13.2", - "SubType": "native", "Type": "build/product/", "ConfigurationGroup": "Release" } }, { - "Name": "DotNet-CoreFx-Trusted-Linux-Native", + "Name": "DotNet-CoreFx-Trusted-Linux", "Parameters": { - "DockerTag": "opensuse421_prereqs_v3" + "PB_DockerTag": "opensuse421_prereqs_v3" }, "ReportingParameters": { "OperatingSystem": "openSUSE 42.1", - "SubType": "native", "Type": "build/product/", "ConfigurationGroup": "Release" } }, { - "Name": "DotNet-CoreFx-Trusted-Linux-Native", + "Name": "DotNet-CoreFx-Trusted-Linux", "Parameters": { - "DockerTag": "rhel7_prereqs_2" + "PB_DockerTag": "rhel7_prereqs_2" }, "ReportingParameters": { "OperatingSystem": "RedHat 7", - "SubType": "native", "Type": "build/product/", "ConfigurationGroup": "Release" } }, { - "Name": "DotNet-CoreFx-Trusted-Linux-Native", + "Name": "DotNet-CoreFx-Trusted-Linux", "Parameters": { - "DockerTag": "ubuntu1404_prereqs_v3" + "PB_DockerTag": "ubuntu1404_prereqs_v3" }, "ReportingParameters": { "OperatingSystem": "Ubuntu 14.04", - "SubType": "native", "Type": "build/product/", "ConfigurationGroup": "Release" } }, { - "Name": "DotNet-CoreFx-Trusted-Linux-Native", + "Name": "DotNet-CoreFx-Trusted-Linux", "Parameters": { - "DockerTag": "ubuntu1604_prereqs" + "PB_DockerTag": "ubuntu1604_prereqs" }, "ReportingParameters": { "OperatingSystem": "Ubuntu 16.04", - "SubType": "native", "Type": "build/product/", "ConfigurationGroup": "Release" } }, { - "Name": "DotNet-CoreFx-Trusted-Linux-Native", + "Name": "DotNet-CoreFx-Trusted-Linux", "Parameters": { - "DockerTag": "ubuntu1610_prereqs_v2" + "PB_DockerTag": "ubuntu1610_prereqs_v2" }, "ReportingParameters": { "OperatingSystem": "Ubuntu 16.10", - "SubType": "native", "Type": "build/product/", "ConfigurationGroup": "Release" } }, { - "Name": "DotNet-CoreFx-Trusted-Linux-Native", + "Name": "DotNet-CoreFx-Trusted-Linux", "Parameters": { - "DockerTag": "alpine_prereqs" + "PB_DockerTag": "alpine_prereqs" }, "ReportingParameters": { "OperatingSystem": "Alpine 3.4.3", - "SubType": "native", - "Type": "build/product/", - "ConfigurationGroup": "Release" - } - }, - { - "Name": "DotNet-CoreFx-Trusted-Linux-Native", - "Parameters": { - "DockerTag": "rhel7_prereqs_2", - "portableLinux": "-portableLinux" - }, - "ReportingParameters": { - "OperatingSystem": "RedHat 7", - "SubType": "native", "Type": "build/product/", "ConfigurationGroup": "Release" } }, { - "Name": "DotNet-CoreFx-Trusted-Mac-Native", + "Name": "DotNet-CoreFx-Trusted-OSX", "ReportingParameters": { - "SubType": "native", "OperatingSystem": "OSX", "Type": "build/product/", "ConfigurationGroup": "Release" @@ -159,20 +135,10 @@ }, { "Name": "DotNet-CoreFx-Trusted-Windows", - "ReportingParameters": { - "SubType": "managed", - "OperatingSystem": "All (Managed)", - "Type": "build/product/", - "ConfigurationGroup": "Release" - } - }, - { - "Name": "DotNet-CoreFx-Trusted-Windows-Native", "Parameters": { - "Platform": "arm" + "PB_Platform": "arm" }, "ReportingParameters": { - "SubType": "native", "OperatingSystem": "Windows", "Type": "build/product/", "Platform": "arm", @@ -180,12 +146,11 @@ } }, { - "Name": "DotNet-CoreFx-Trusted-Windows-Native", + "Name": "DotNet-CoreFx-Trusted-Windows", "Parameters": { - "Platform": "arm64" + "PB_Platform": "arm64" }, "ReportingParameters": { - "SubType": "native", "OperatingSystem": "Windows", "Type": "build/product/", "Platform": "arm64", @@ -193,12 +158,11 @@ } }, { - "Name": "DotNet-CoreFx-Trusted-Windows-Native", + "Name": "DotNet-CoreFx-Trusted-Windows", "Parameters": { - "Platform": "x64" + "PB_Platform": "x64" }, "ReportingParameters": { - "SubType": "native", "OperatingSystem": "Windows", "Type": "build/product/", "Platform": "x64", @@ -206,12 +170,11 @@ } }, { - "Name": "DotNet-CoreFx-Trusted-Windows-Native", + "Name": "DotNet-CoreFx-Trusted-Windows", "Parameters": { - "Platform": "x86" + "PB_Platform": "x86" }, "ReportingParameters": { - "SubType": "native", "OperatingSystem": "Windows", "Type": "build/product/", "Platform": "x86", @@ -226,146 +189,122 @@ "TreatWarningsAsErrors": "false" }, "BuildParameters": { - "ConfigurationGroup": "Debug" + "PB_ConfigurationGroup": "Debug" }, "Definitions": [ { - "Name": "DotNet-CoreFx-Trusted-Linux-Native", + "Name": "DotNet-CoreFx-Trusted-Linux", "Parameters": { - "DockerTag": "debian82_prereqs_2" + "PB_DockerTag": "debian82_prereqs_2" }, "ReportingParameters": { "OperatingSystem": "Debian 8.2", - "SubType": "native", "Type": "build/product/", "ConfigurationGroup": "Debug" } }, { - "Name": "DotNet-CoreFx-Trusted-Linux-Native", + "Name": "DotNet-CoreFx-Trusted-Linux", "Parameters": { - "DockerTag": "fedora23_prereqs" + "PB_DockerTag": "fedora23_prereqs" }, "ReportingParameters": { "OperatingSystem": "Fedora 2.3", - "SubType": "native", "Type": "build/product/", "ConfigurationGroup": "Debug" } }, { - "Name": "DotNet-CoreFx-Trusted-Linux-Native", + "Name": "DotNet-CoreFx-Trusted-Linux", "Parameters": { - "DockerTag": "fedora24_prereqs_v4" + "PB_DockerTag": "fedora24_prereqs_v4" }, "ReportingParameters": { "OperatingSystem": "Fedora 24", - "SubType": "native", "Type": "build/product/", "ConfigurationGroup": "Debug" } }, { - "Name": "DotNet-CoreFx-Trusted-Linux-Native", + "Name": "DotNet-CoreFx-Trusted-Linux", "Parameters": { - "DockerTag": "opensuse132_prereqs_v4" + "PB_DockerTag": "opensuse132_prereqs_v4" }, "ReportingParameters": { "OperatingSystem": "openSUSE 13.2", - "SubType": "native", "Type": "build/product/", "ConfigurationGroup": "Debug" } }, { - "Name": "DotNet-CoreFx-Trusted-Linux-Native", + "Name": "DotNet-CoreFx-Trusted-Linux", "Parameters": { - "DockerTag": "opensuse421_prereqs_v3" + "PB_DockerTag": "opensuse421_prereqs_v3" }, "ReportingParameters": { "OperatingSystem": "openSUSE 42.1", - "SubType": "native", "Type": "build/product/", "ConfigurationGroup": "Debug" } }, { - "Name": "DotNet-CoreFx-Trusted-Linux-Native", + "Name": "DotNet-CoreFx-Trusted-Linux", "Parameters": { - "DockerTag": "rhel7_prereqs_2" + "PB_DockerTag": "rhel7_prereqs_2" }, "ReportingParameters": { "OperatingSystem": "RedHat 7", - "SubType": "native", "Type": "build/product/", "ConfigurationGroup": "Debug" } }, { - "Name": "DotNet-CoreFx-Trusted-Linux-Native", + "Name": "DotNet-CoreFx-Trusted-Linux", "Parameters": { - "DockerTag": "ubuntu1404_prereqs_v3" + "PB_DockerTag": "ubuntu1404_prereqs_v3" }, "ReportingParameters": { "OperatingSystem": "Ubuntu 14.04", - "SubType": "native", "Type": "build/product/", "ConfigurationGroup": "Debug" } }, { - "Name": "DotNet-CoreFx-Trusted-Linux-Native", + "Name": "DotNet-CoreFx-Trusted-Linux", "Parameters": { - "DockerTag": "ubuntu1604_prereqs" + "PB_DockerTag": "ubuntu1604_prereqs" }, "ReportingParameters": { "OperatingSystem": "Ubuntu 16.04", - "SubType": "native", "Type": "build/product/", "ConfigurationGroup": "Debug" } }, { - "Name": "DotNet-CoreFx-Trusted-Linux-Native", + "Name": "DotNet-CoreFx-Trusted-Linux", "Parameters": { - "DockerTag": "ubuntu1610_prereqs_v2" + "PB_DockerTag": "ubuntu1610_prereqs_v2" }, "ReportingParameters": { "OperatingSystem": "Ubuntu 16.10", - "SubType": "native", "Type": "build/product/", "ConfigurationGroup": "Debug" } }, { - "Name": "DotNet-CoreFx-Trusted-Linux-Native", + "Name": "DotNet-CoreFx-Trusted-Linux", "Parameters": { - "DockerTag": "alpine_prereqs" + "PB_DockerTag": "alpine_prereqs" }, "ReportingParameters": { "OperatingSystem": "Alpine 3.4.3", - "SubType": "native", - "Type": "build/product/", - "ConfigurationGroup": "Debug" - } - }, - { - "Name": "DotNet-CoreFx-Trusted-Linux-Native", - "Parameters": { - "DockerTag": "rhel7_prereqs_2", - "portableLinux": "-portableLinux" - }, - "ReportingParameters": { - "OperatingSystem": "RedHat7", - "SubType": "native", "Type": "build/product/", "ConfigurationGroup": "Debug" } }, { - "Name": "DotNet-CoreFx-Trusted-Mac-Native", + "Name": "DotNet-CoreFx-Trusted-OSX", "ReportingParameters": { - "SubType": "native", "OperatingSystem": "OSX", "Type": "build/product/", "ConfigurationGroup": "Debug" @@ -373,20 +312,10 @@ }, { "Name": "DotNet-CoreFx-Trusted-Windows", - "ReportingParameters": { - "SubType": "managed", - "OperatingSystem": "All (Managed)", - "Type": "build/product/", - "ConfigurationGroup": "Debug" - } - }, - { - "Name": "DotNet-CoreFx-Trusted-Windows-Native", "Parameters": { - "Platform": "arm" + "PB_Platform": "arm" }, "ReportingParameters": { - "SubType": "native", "OperatingSystem": "Windows", "Type": "build/product/", "Platform": "arm", @@ -394,12 +323,11 @@ } }, { - "Name": "DotNet-CoreFx-Trusted-Windows-Native", + "Name": "DotNet-CoreFx-Trusted-Windows", "Parameters": { - "Platform": "arm64" + "PB_Platform": "arm64" }, "ReportingParameters": { - "SubType": "native", "OperatingSystem": "Windows", "Type": "build/product/", "Platform": "arm64", @@ -407,12 +335,11 @@ } }, { - "Name": "DotNet-CoreFx-Trusted-Windows-Native", + "Name": "DotNet-CoreFx-Trusted-Windows", "Parameters": { - "Platform": "x64" + "PB_Platform": "x64" }, "ReportingParameters": { - "SubType": "native", "OperatingSystem": "Windows", "Type": "build/product/", "Platform": "x64", @@ -420,12 +347,11 @@ } }, { - "Name": "DotNet-CoreFx-Trusted-Windows-Native", + "Name": "DotNet-CoreFx-Trusted-Windows", "Parameters": { - "Platform": "x86" + "PB_Platform": "x86" }, "ReportingParameters": { - "SubType": "native", "OperatingSystem": "Windows", "Type": "build/product/", "Platform": "x86", @@ -433,746 +359,6 @@ } } ] - }, - { - "Name": "Build-Tests-Windows-Release", - "Parameters": { - "TreatWarningsAsErrors": "false" - }, - "BuildParameters": { - "Branch": "corefx", - "ConfigurationGroup": "Release", - "DownloadTestContainerSuffix": "windows", - "FilterToOSGroup": "Windows_NT", - "InputOSGroup": "Windows_NT", - "PushToHelixOSGroup": "Windows_NT", - "Release": "rtm", - "TargetOS": "Windows_NT", - "TargetsWindows": "true", - "TestNugetRuntimeId": "win7-x64" - }, - "ReportingParameters": { - "Type": "test/functional/cli", - "TargetQueue": {}, - "TargetTestCategory": {} - }, - "Definitions": [ - { - "Name": "DotNet-CoreFx-Trusted-Windows-Build-Test", - "Parameters": { - "TargetQueue": "Windows.10.Amd64", - "TestContainerSuffix": "windows10", - "TargetTestCategory": "Core Tests" - }, - "ReportingParameters": { - "TargetQueue": "Windows.10.Amd64", - "TestContainerSuffix": "windows10", - "TargetTestCategory": "Core Tests", - "Type": "build/tests/", - "ConfigurationGroup": "Release" - } - }, - { - "Name": "DotNet-CoreFx-Trusted-Windows-Build-Test", - "Parameters": { - "TargetQueue": "Windows.10.Core.Amd64", - "TestContainerSuffix": "windows10core" - }, - "ReportingParameters": { - "TargetQueue": "Windows.10.Core.Amd64", - "TestContainerSuffix": "windows10core", - "Type": "build/tests/", - "ConfigurationGroup": "Release" - } - }, - { - "Name": "DotNet-CoreFx-Trusted-Windows-Build-Test", - "Parameters": { - "TargetQueue": "Windows.10.Amd64", - "TestContainerSuffix": "windows10ilc", - "TargetTestCategory": "UWP ILC", - "FilterToTestTFM": "netcore50", - "TestNugetRuntimeId": "win10-x64-aot", - "UseDotNetNativeToolchain": "true", - "EnableCloudTest": "true" - }, - "ReportingParameters": { - "TargetQueue": "Windows.10.Amd64", - "TestContainerSuffix": "windows10ilc", - "TargetTestCategory": "UWP ILC", - "Type": "build/tests/", - "ConfigurationGroup": "Release" - } - }, - { - "Name": "DotNet-CoreFx-Trusted-Windows-Build-Test", - "Parameters": { - "TargetQueue": "Windows.10.Amd64", - "TestContainerSuffix": "windows10uwp", - "TargetTestCategory": "UWP", - "FilterToTestTFM": "netcore50", - "TestNugetRuntimeId": "win10-x64", - "EnableCloudTest": "true" - }, - "ReportingParameters": { - "TargetQueue": "Windows.10.Amd64", - "TestContainerSuffix": "windows10uwp", - "TargetTestCategory": "UWP", - "Type": "build/tests/", - "ConfigurationGroup": "Release" - } - }, - { - "Name": "DotNet-CoreFx-Trusted-Windows-Build-Test", - "Parameters": { - "TargetQueue": "Windows.10.Amd64", - "TestContainerSuffix": "windows10desktop", - "TargetTestCategory": "Full Framework", - "FilterToTestTFM": "net46", - "TestNugetRuntimeId": "win10-x64", - "EnableCloudTest": "true" - }, - "ReportingParameters": { - "TargetQueue": "Windows.10.Amd64", - "TestContainerSuffix": "windows10desktop", - "TargetTestCategory": "Full Framework", - "Type": "build/tests/", - "ConfigurationGroup": "Release" - } - }, - { - "Name": "DotNet-CoreFx-Trusted-Windows-Build-Test", - "Parameters": { - "TargetQueue": "Windows.7.Amd64", - "TestContainerSuffix": "windows7" - }, - "ReportingParameters": { - "TargetQueue": "Windows.7.Amd64", - "TestContainerSuffix": "windows7", - "Type": "build/tests/", - "ConfigurationGroup": "Release" - } - }, - { - "Name": "DotNet-CoreFx-Trusted-Windows-Build-Test", - "Parameters": { - "TargetQueue": "Windows.81.Amd64", - "TestContainerSuffix": "windows81" - }, - "ReportingParameters": { - "TargetQueue": "Windows.81.Amd64", - "TestContainerSuffix": "windows81", - "Type": "build/tests/", - "ConfigurationGroup": "Release" - } - }, - { - "Name": "DotNet-CoreFx-Trusted-Windows-Build-Test", - "Parameters": { - "FuncTestsDisabled": "true", - "Performance": "true", - "TargetQueue": "Windows.81.Amd64.Perf", - "TestContainerSuffix": "windows81perf" - }, - "ReportingParameters": { - "TargetQueue": "Windows.81.Amd64.Perf", - "TestContainerSuffix": "windows81perf", - "Type": "build/tests/", - "ConfigurationGroup": "Release" - } - } - ], - "DependsOn": [ - "Trusted-All-Release" - ] - }, - { - "Name": "Publish-Tests-Windows-Release", - "Parameters": { - "TreatWarningsAsErrors": "false" - }, - "BuildParameters": { - "GitHubRepositoryName": "corefx", - "OSGroup": "AnyOS", - "Platform": "AnyCPU" - }, - "Definitions": [ - { - "Name": "DotNet-Trusted-Tests-Publish", - "Parameters": { - "TestContainerSuffix": "windows10", - "TestTFM": "netcoreapp1.1" - }, - "ReportingParameters": { - "Type": "build/publish/" - } - } - ], - "DependsOn": [ - "Build-Tests-Windows-Release" - ] - }, - { - "Name": "Build-Tests-Linux-Release", - "Parameters": { - "TreatWarningsAsErrors": "false" - }, - "BuildParameters": { - "Branch": "corefx", - "ConfigurationGroup": "Release", - "DownloadTestContainerSuffix": "linux", - "FilterToOSGroup": "Linux", - "InputOSGroup": "Linux", - "PushToHelixOSGroup": "Linux", - "Release": "rtm", - "TargetOS": "Linux", - "TargetsWindows": "false" - }, - "ReportingParameters": { - "Type": "test/functional/cli", - "TargetQueue": {} - }, - "Definitions": [ - { - "Name": "DotNet-CoreFx-Trusted-Windows-Build-Test", - "Parameters": { - "TargetQueue": "Centos.71.Amd64", - "TestContainerSuffix": "centos71", - "TestNugetRuntimeId": "centos.7-x64" - }, - "ReportingParameters": { - "TargetQueue": "Centos.71.Amd64", - "TestContainerSuffix": "centos71", - "TestNugetRuntimeId": "centos.7-x64", - "Type": "build/tests/", - "ConfigurationGroup": "Release" - } - }, - { - "Name": "DotNet-CoreFx-Trusted-Windows-Build-Test", - "Parameters": { - "TargetQueue": "Debian.82.Amd64", - "TestContainerSuffix": "debian82", - "TestNugetRuntimeId": "debian.8-x64" - }, - "ReportingParameters": { - "TargetQueue": "Debian.82.Amd64", - "TestContainerSuffix": "debian82", - "TestNugetRuntimeId": "debian.8-x64", - "Type": "build/tests/", - "ConfigurationGroup": "Release" - } - }, - { - "Name": "DotNet-CoreFx-Trusted-Windows-Build-Test", - "Parameters": { - "TargetQueue": "Redhat.72.Amd64", - "TestContainerSuffix": "redhat72", - "TestNugetRuntimeId": "rhel.7-x64" - }, - "ReportingParameters": { - "TargetQueue": "Redhat.72.Amd64", - "TestContainerSuffix": "redhat72", - "TestNugetRuntimeId": "rhel.7-x64", - "Type": "build/tests/", - "ConfigurationGroup": "Release" - } - }, - { - "Name": "DotNet-CoreFx-Trusted-Windows-Build-Test", - "Parameters": { - "TargetQueue": "Ubuntu.1404.Amd64", - "TestContainerSuffix": "ubuntu1404", - "TestNugetRuntimeId": "ubuntu.14.04-x64" - }, - "ReportingParameters": { - "TargetQueue": "Ubuntu.1404.Amd64", - "TestContainerSuffix": "ubuntu1404", - "TestNugetRuntimeId": "ubuntu.14.04-x64", - "Type": "build/tests/", - "ConfigurationGroup": "Release" - } - }, - { - "Name": "DotNet-CoreFx-Trusted-Windows-Build-Test", - "Parameters": { - "FuncTestsDisabled": "true", - "Performance": "true", - "TargetQueue": "Ubuntu.1404.Amd64.Perf", - "TestContainerSuffix": "ubuntu1404perf", - "TestNugetRuntimeId": "ubuntu.14.04-x64" - }, - "ReportingParameters": { - "TargetQueue": "Ubuntu.1404.Amd64.Perf", - "TestContainerSuffix": "ubuntu1404perf", - "TestNugetRuntimeId": "ubuntu.14.04-x64", - "Type": "build/tests/", - "ConfigurationGroup": "Release" - } - }, - { - "Name": "DotNet-CoreFx-Trusted-Windows-Build-Test", - "Parameters": { - "TargetQueue": "Ubuntu.1604.Amd64", - "TestContainerSuffix": "ubuntu1604", - "TestNugetRuntimeId": "ubuntu.16.04-x64" - }, - "ReportingParameters": { - "TargetQueue": "Ubuntu.1604.Amd64", - "TestContainerSuffix": "ubuntu1604", - "TestNugetRuntimeId": "ubuntu.16.04-x64", - "Type": "build/tests/", - "ConfigurationGroup": "Release" - } - }, - { - "Name": "DotNet-CoreFx-Trusted-Windows-Build-Test", - "Parameters": { - "TargetQueue": "Ubuntu.1610.Amd64", - "TestContainerSuffix": "ubuntu1610", - "TestNugetRuntimeId": "ubuntu.16.10-x64" - }, - "ReportingParameters": { - "TargetQueue": "Ubuntu.1610.Amd64", - "TestContainerSuffix": "ubuntu1610", - "TestNugetRuntimeId": "ubuntu.16.10-x64", - "Type": "build/tests/", - "ConfigurationGroup": "Release" - } - }, - { - "Name": "DotNet-CoreFx-Trusted-Windows-Build-Test", - "Parameters": { - "TargetQueue": "Fedora.23.Amd64", - "TestContainerSuffix": "fedora23", - "TestNugetRuntimeId": "fedora.23-x64" - }, - "ReportingParameters": { - "TargetQueue": "Fedora.23.Amd64", - "TestContainerSuffix": "fedora23", - "TestNugetRuntimeId": "fedora.23-x64", - "Type": "build/tests/", - "ConfigurationGroup": "Release" - } - }, - { - "Name": "DotNet-CoreFx-Trusted-Windows-Build-Test", - "Parameters": { - "TargetQueue": "Suse.132.Amd64", - "TestContainerSuffix": "suse132", - "TestNugetRuntimeId": "opensuse.13.2-x64" - }, - "ReportingParameters": { - "TargetQueue": "Suse.132.Amd64", - "TestContainerSuffix": "suse132", - "TestNugetRuntimeId": "opensuse.13.2-x64", - "Type": "build/tests/", - "ConfigurationGroup": "Release" - } - } - ], - "DependsOn": [ - "Trusted-All-Release" - ] - }, - { - "Name": "Build-Tests-OSX-Release", - "Parameters": { - "TreatWarningsAsErrors": "false" - }, - "Definitions": [ - { - "Name": "DotNet-CoreFx-Trusted-Windows-Build-Test", - "Parameters": { - "Branch": "corefx", - "ConfigurationGroup": "Release", - "DownloadTestContainerSuffix": "osx", - "FilterToOSGroup": "OSX", - "InputOSGroup": "OSX", - "PushToHelixOSGroup": "OSX", - "Release": "rtm", - "TargetOS": "OSX", - "TargetQueue": "OSX.1011.Amd64", - "TargetsWindows": "false", - "TestContainerSuffix": "osx1011", - "TestNugetRuntimeId": "osx.10.10-x64" - }, - "ReportingParameters": { - "TargetQueue": "OSX.1011.Amd64", - "Type": "build/tests/", - "ConfigurationGroup": "Release" - } - } - ], - "DependsOn": [ - "Trusted-All-Release" - ] - }, - { - "Name": "Build-Tests-Windows-Debug", - "Parameters": { - "TreatWarningsAsErrors": "false" - }, - "BuildParameters": { - "Branch": "corefx", - "ConfigurationGroup": "Debug", - "DownloadTestContainerSuffix": "windows", - "FilterToOSGroup": "Windows_NT", - "InputOSGroup": "Windows_NT", - "PushToHelixOSGroup": "Windows_NT", - "Release": "rtm", - "TargetOS": "Windows_NT", - "TargetsWindows": "true", - "TestNugetRuntimeId": "win7-x64" - }, - "ReportingParameters": { - "Type": "test/functional/cli", - "TargetQueue": {}, - "TargetTestCategory": {} - }, - "Definitions": [ - { - "Name": "DotNet-CoreFx-Trusted-Windows-Build-Test", - "Parameters": { - "TargetQueue": "Windows.10.Amd64", - "TestContainerSuffix": "windows10", - "TargetTestCategory": "Core Tests" - }, - "ReportingParameters": { - "TargetQueue": "Windows.10.Amd64", - "TestContainerSuffix": "windows10", - "TargetTestCategory": "Core Tests", - "Type": "build/tests/", - "ConfigurationGroup": "Debug" - } - }, - { - "Name": "DotNet-CoreFx-Trusted-Windows-Build-Test", - "Parameters": { - "TargetQueue": "Windows.10.Core.Amd64", - "TestContainerSuffix": "windows10core" - }, - "ReportingParameters": { - "TargetQueue": "Windows.10.Core.Amd64", - "TestContainerSuffix": "windows10core", - "Type": "build/tests/", - "ConfigurationGroup": "Debug" - } - }, - { - "Name": "DotNet-CoreFx-Trusted-Windows-Build-Test", - "Parameters": { - "TargetQueue": "Windows.10.Amd64", - "TestContainerSuffix": "windows10ilc", - "TargetTestCategory": "UWP ILC", - "FilterToTestTFM": "netcore50", - "TestNugetRuntimeId": "win10-x64-aot", - "UseDotNetNativeToolchain": "true", - "EnableCloudTest": "true" - }, - "ReportingParameters": { - "TargetQueue": "Windows.10.Amd64", - "TestContainerSuffix": "windows10ilc", - "TargetTestCategory": "UWP ILC", - "Type": "build/tests/", - "ConfigurationGroup": "Debug" - } - }, - { - "Name": "DotNet-CoreFx-Trusted-Windows-Build-Test", - "Parameters": { - "TargetQueue": "Windows.10.Amd64", - "TestContainerSuffix": "windows10uwp", - "TargetTestCategory": "UWP", - "FilterToTestTFM": "netcore50", - "TestNugetRuntimeId": "win10-x64", - "EnableCloudTest": "true" - }, - "ReportingParameters": { - "TargetQueue": "Windows.10.Amd64", - "TestContainerSuffix": "windows10uwp", - "TargetTestCategory": "UWP", - "Type": "build/tests/", - "ConfigurationGroup": "Debug" - } - }, - { - "Name": "DotNet-CoreFx-Trusted-Windows-Build-Test", - "Parameters": { - "TargetQueue": "Windows.10.Amd64", - "TestContainerSuffix": "windows10desktop", - "TargetTestCategory": "Full Framework", - "FilterToTestTFM": "net46", - "TestNugetRuntimeId": "win10-x64", - "EnableCloudTest": "true" - }, - "ReportingParameters": { - "TargetQueue": "Windows.10.Amd64", - "TestContainerSuffix": "windows10desktop", - "TargetTestCategory": "Full Framework", - "Type": "build/tests/", - "ConfigurationGroup": "Debug" - } - }, - { - "Name": "DotNet-CoreFx-Trusted-Windows-Build-Test", - "Parameters": { - "TargetQueue": "Windows.7.Amd64", - "TestContainerSuffix": "windows7" - }, - "ReportingParameters": { - "TargetQueue": "Windows.7.Amd64", - "TestContainerSuffix": "windows7", - "Type": "build/tests/", - "ConfigurationGroup": "Debug" - } - }, - { - "Name": "DotNet-CoreFx-Trusted-Windows-Build-Test", - "Parameters": { - "TargetQueue": "Windows.81.Amd64", - "TestContainerSuffix": "windows81" - }, - "ReportingParameters": { - "TargetQueue": "Windows.81.Amd64", - "TestContainerSuffix": "windows81", - "Type": "build/tests/", - "ConfigurationGroup": "Debug" - } - } - ], - "DependsOn": [ - "Trusted-All-Debug" - ] - }, - { - "Name": "Build-Tests-Linux-Debug", - "Parameters": { - "TreatWarningsAsErrors": "false" - }, - "BuildParameters": { - "Branch": "corefx", - "ConfigurationGroup": "Debug", - "DownloadTestContainerSuffix": "linux", - "FilterToOSGroup": "Linux", - "InputOSGroup": "Linux", - "PushToHelixOSGroup": "Linux", - "Release": "rtm", - "TargetOS": "Linux", - "TargetsWindows": "false" - }, - "Definitions": [ - { - "Name": "DotNet-CoreFx-Trusted-Windows-Build-Test", - "Parameters": { - "TargetQueue": "Centos.71.Amd64", - "TestContainerSuffix": "centos71", - "TestNugetRuntimeId": "centos.7-x64" - }, - "ReportingParameters": { - "TargetQueue": "Centos.71.Amd64", - "TestContainerSuffix": "centos71", - "TestNugetRuntimeId": "centos.7-x64", - "Type": "build/tests/", - "ConfigurationGroup": "Debug" - } - }, - { - "Name": "DotNet-CoreFx-Trusted-Windows-Build-Test", - "Parameters": { - "TargetQueue": "Debian.82.Amd64", - "TestContainerSuffix": "debian82", - "TestNugetRuntimeId": "debian.8-x64" - }, - "ReportingParameters": { - "TargetQueue": "Debian.82.Amd64", - "TestContainerSuffix": "debian82", - "TestNugetRuntimeId": "debian.8-x64", - "Type": "build/tests/", - "ConfigurationGroup": "Debug" - } - }, - { - "Name": "DotNet-CoreFx-Trusted-Windows-Build-Test", - "Parameters": { - "TargetQueue": "Redhat.72.Amd64", - "TestContainerSuffix": "redhat72", - "TestNugetRuntimeId": "rhel.7-x64" - }, - "ReportingParameters": { - "TargetQueue": "Redhat.72.Amd64", - "TestContainerSuffix": "redhat72", - "TestNugetRuntimeId": "rhel.7-x64", - "Type": "build/tests/", - "ConfigurationGroup": "Debug" - } - }, - { - "Name": "DotNet-CoreFx-Trusted-Windows-Build-Test", - "Parameters": { - "TargetQueue": "Ubuntu.1404.Amd64", - "TestContainerSuffix": "ubuntu1404", - "TestNugetRuntimeId": "ubuntu.14.04-x64" - }, - "ReportingParameters": { - "TargetQueue": "Ubuntu.1404.Amd64", - "TestContainerSuffix": "ubuntu1404", - "TestNugetRuntimeId": "ubuntu.14.04-x64", - "Type": "build/tests/", - "ConfigurationGroup": "Debug" - } - }, - { - "Name": "DotNet-CoreFx-Trusted-Windows-Build-Test", - "Parameters": { - "TargetQueue": "Ubuntu.1604.Amd64", - "TestContainerSuffix": "ubuntu1604", - "TestNugetRuntimeId": "ubuntu.16.04-x64" - }, - "ReportingParameters": { - "TargetQueue": "Ubuntu.1604.Amd64", - "TestContainerSuffix": "ubuntu1604", - "TestNugetRuntimeId": "ubuntu.16.04-x64", - "Type": "build/tests/", - "ConfigurationGroup": "Debug" - } - }, - { - "Name": "DotNet-CoreFx-Trusted-Windows-Build-Test", - "Parameters": { - "TargetQueue": "Ubuntu.1610.Amd64", - "TestContainerSuffix": "ubuntu1610", - "TestNugetRuntimeId": "ubuntu.16.10-x64" - }, - "ReportingParameters": { - "TargetQueue": "Ubuntu.1610.Amd64", - "TestContainerSuffix": "ubuntu1610", - "TestNugetRuntimeId": "ubuntu.16.10-x64", - "Type": "build/tests/", - "ConfigurationGroup": "Debug" - } - }, - { - "Name": "DotNet-CoreFx-Trusted-Windows-Build-Test", - "Parameters": { - "TargetQueue": "Fedora.23.Amd64", - "TestContainerSuffix": "fedora23", - "TestNugetRuntimeId": "fedora.23-x64" - }, - "ReportingParameters": { - "TargetQueue": "Fedora.23.Amd64", - "TestContainerSuffix": "fedora23", - "TestNugetRuntimeId": "fedora.23-x64", - "Type": "build/tests/", - "ConfigurationGroup": "Debug" - } - }, - { - "Name": "DotNet-CoreFx-Trusted-Windows-Build-Test", - "Parameters": { - "TargetQueue": "Suse.132.Amd64", - "TestContainerSuffix": "suse132", - "TestNugetRuntimeId": "opensuse.13.2-x64" - }, - "ReportingParameters": { - "TargetQueue": "Suse.132.Amd64", - "TestContainerSuffix": "suse132", - "TestNugetRuntimeId": "opensuse.13.2-x64", - "Type": "build/tests/", - "ConfigurationGroup": "Debug" - } - } - ], - "DependsOn": [ - "Trusted-All-Debug" - ] - }, - { - "Name": "Build-Tests-OSX-Debug", - "Parameters": { - "TreatWarningsAsErrors": "false" - }, - "Definitions": [ - { - "Name": "DotNet-CoreFx-Trusted-Windows-Build-Test", - "Parameters": { - "Branch": "corefx", - "ConfigurationGroup": "Debug", - "DownloadTestContainerSuffix": "osx", - "FilterToOSGroup": "OSX", - "InputOSGroup": "OSX", - "PushToHelixOSGroup": "OSX", - "Release": "rtm", - "TargetOS": "OSX", - "TargetQueue": "OSX.1011.Amd64", - "TargetsWindows": "false", - "TestContainerSuffix": "osx1011", - "TestNugetRuntimeId": "osx.10.10-x64" - }, - "ReportingParameters": { - "TargetQueue": "OSX.1011.Amd64", - "TestContainerSuffix": "osx1011", - "TestNugetRuntimeId": "osx.10.10-x64", - "Type": "build/tests/", - "ConfigurationGroup": "Debug" - } - } - ], - "DependsOn": [ - "Trusted-All-Debug" - ] - }, - { - "Name": "Publish Packages to Feeds - Release", - "Parameters": { - "TreatWarningsAsErrors": "false" - }, - "BuildParameters": { - "ConfigurationGroup": "Release" - }, - "Definitions": [ - { - "Name": "DotNet-Trusted-Publish", - "Parameters": { - "VstsRepositoryName": "DotNet-CoreFX-Trusted", - "GitHubRepositoryName": "corefx" - }, - "ReportingParameters": { - "TaskName": "Package Publish", - "Type": "build/publish/", - "ConfigurationGroup": "Release - Push to MyGet Feed" - } - } - ], - "DependsOn": [ - "Trusted-All-Release" - ] - }, - { - "Name": "Publish Packages to Drop - Debug", - "Parameters": { - "TreatWarningsAsErrors": "false" - }, - "BuildParameters": { - "ConfigurationGroup": "Debug" - }, - "Definitions": [ - { - "Name": "DotNet-Trusted-Publish", - "Parameters": { - "VstsRepositoryName": "DotNet-CoreFX-Trusted", - "GitHubRepositoryName": "corefx" - }, - "ReportingParameters": { - "TaskName": "Package Publish", - "Type": "build/publish/", - "ConfigurationGroup": "Debug - Push to Azure Storage" - } - } - ], - "DependsOn": [ - "Trusted-All-Debug" - ] } ] } diff --git a/buildvertical.targets b/buildvertical.targets new file mode 100644 index 0000000000..87405637f5 --- /dev/null +++ b/buildvertical.targets @@ -0,0 +1,102 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <UsingTask TaskName="FindBestConfiguration" AssemblyFile="$(CoreFxToolsTaskDir)CoreFx.Tools.dll"/> + <PropertyGroup> + <ImportedBuildVerticalTargets>true</ImportedBuildVerticalTargets> + </PropertyGroup> + + <!-- Required for FindBestConfiguration task --> + <Import Project="$(MSBuildThisFileDirectory)src/Tools/GenerateProps/properties.props" /> + + <Target Name="AnnotateProjects" + BeforeTargets="BuildAllProjects" + Condition="!$(MSBuildProjectFullPath.EndsWith('.proj'))"> + <!-- Clear ProjectWithConfiguration to prevent circular dependency --> + <ItemGroup><ProjectWithConfiguration Remove="@(ProjectWithConfiguration)" /></ItemGroup> + <MSBuild Targets="AnnotateProjectsWithConfiguration" + Projects="@(Project)"> + <Output TaskParameter="TargetOutputs" + ItemName="ProjectWithConfiguration" /> + </MSBuild> + <ItemGroup> + <Project Remove="@(Project)" /> + <Project Include="@(ProjectWithConfiguration)" /> + </ItemGroup> + </Target> + + <Target Name="AnnotateProjectsWithConfiguration" + Returns="@(ProjectWithConfiguration)"> + <ItemGroup> + <ProjectWithConfiguration Include="$(MSBuildProjectFullPath)"> + <AdditionalProperties Condition="'$(_BestConfiguration)' != ''">Configuration=$(_BestConfiguration);%(ProjectWithConfiguration.AdditionalProperties)</AdditionalProperties> + <UndefineProperties Condition="'$(_BestConfiguration)' == ''">Configuration;%(ProjectWithConfiguration.UndefineProperties)</UndefineProperties> + </ProjectWithConfiguration> + <ProjectWithConfiguration Remove="@(OmitProject)" /> + </ItemGroup> + </Target> + + <!-- The initial shaking target for trimming down applicable projects for specified vertical --> + <Target Name="DetermineProjectsConfiguration" + Returns="@(OmitProject)" + BeforeTargets="AnnotateProjectsWithConfiguration"> + <!-- Clear the _Configuration item --> + <ItemGroup><_Configuration Remove="@(_Configuration)" /></ItemGroup> + <FindBestConfiguration Properties="@(Property)" + PropertyValues="@(PropertyValue)" + BuildConfigurations="$(BuildConfigurations)" + BuildConfiguration="$(BuildConfiguration)" + Condition="'$(BuildConfigurations)' != ''" + ContinueOnError="true"> + <Output TaskParameter="BestConfiguration" ItemName="_Configuration" /> + </FindBestConfiguration> + + <PropertyGroup> + <_BestConfiguration>%(_Configuration.Identity)</_BestConfiguration> + </PropertyGroup> + + <ItemGroup> + <OmitProject Include="$(MSBuildProjectFullPath)" Condition="'$(BuildConfigurations)' != '' and '$(_BestConfiguration)' == ''" /> + </ItemGroup> + </Target> + + <Target Name="FindBestConfiguration" + Returns="@(_Configuration)"> + <!-- Clear the _Configuration item --> + <ItemGroup><_Configuration Remove="@(_Configuration)" /></ItemGroup> + <FindBestConfiguration Properties="@(Property)" + PropertyValues="@(PropertyValue)" + BuildConfigurations="$(BuildConfigurations)" + BuildConfiguration="$(BuildConfiguration)" + Condition="'$(BuildConfigurations)' != ''" + ContinueOnError="true"> + <Output TaskParameter="BestConfiguration" ItemName="_Configuration" /> + </FindBestConfiguration> + </Target> + + <Target Name="AnnotateProjectReference" + Inputs="%(ProjectReference.Identity)" + Outputs="fake" + BeforeTargets="BeforeResolveReferences"> + <PropertyGroup> + <_ProjectReferenceToAnnotate>%(ProjectReference.Identity)</_ProjectReferenceToAnnotate> + </PropertyGroup> + + <ItemGroup><_Configuration Remove="@(_Configuration)" /></ItemGroup> + <MSBuild Targets="FindBestConfiguration" + Projects="$(_ProjectReferenceToAnnotate)"> + <Output TaskParameter="TargetOutputs" ItemName="_Configuration" /> + </MSBuild> + + <PropertyGroup> + <_BestConfiguration>%(_Configuration.Identity)</_BestConfiguration> + <_AdditionalProperties /> + <_AdditionalProperties Condition="'$(_BestConfiguration)' != ''">Configuration=$(_BestConfiguration)</_AdditionalProperties> + </PropertyGroup> + <ItemGroup> + <ProjectReference> + <AdditionalProperties Condition="'$(_AdditionalProperties)' != ''">$(_AdditionalProperties);%(ProjectReference.AdditionalProperties)</AdditionalProperties> + <UndefineProperties Condition="'$(_AdditionalProperties)' == ''">Configuration;%(ProjectReference.Configuration)</UndefineProperties> + </ProjectReference> + </ItemGroup> + </Target> +</Project>
\ No newline at end of file diff --git a/config.json b/config.json index e2aac398d1..484b77ad3d 100644 --- a/config.json +++ b/config.json @@ -42,8 +42,8 @@ "values": ["True", "False"], "defaultValue": true }, - "TestArchitecture": { - "description": "Sets the architecture value that will be used for testing.", + "ArchGroup": { + "description": "Sets the architecture value that will be used for managed builds.", "valueType": "property", "values": ["AnyCPU", "x86", "arm", "x64", "arm64"], "defaultValue": "x64" @@ -78,12 +78,6 @@ "values": ["True", "False"], "defaultValue": true }, - "BuildTestsAgainstPackages": { - "description": "Allows building tests against product packages.", - "valueType": "property", - "values": ["True", "False"], - "defaultValue": true - }, "Coverage": { "description": "Enables code coverage runs.", "valueType": "property", @@ -198,13 +192,13 @@ "values": [], "defaultValue": "" }, - "BatchGenerateTestProjectJsons": { - "description": "MsBuild target that generates the project.json files to build tests against packages.", - "valueType": "target", + "ToolSetDir": { + "description": "Native toolset directory", + "valueType": "passThrough", "values": [], - "defaultValue": "" + "defaultValue": "toolSetDir=c:\\tools\\clr" }, - "BatchRestorePackages": { + "Sync": { "description": "MsBuild target that restores the packages.", "valueType": "target", "values": [], @@ -275,10 +269,8 @@ "tests": { "description": "Builds the tests that are in the repository, doesn't restore packages.", "settings": { - "RestoreDuringBuild": true, - "BuildTestsAgainstPackages": true, - "RestoreForTestsAgainstPackagesOnly": true, - "BuildTests": true, + "RestoreDuringBuild": "false", + "Project": "tests.builds", "MsBuildLogging":"/flp:v=normal;LogFile=build-tests.log" } }, @@ -299,7 +291,7 @@ "settings": { "OSGroup": "default" } - }, + }, "target-os": { "description": "Sets TargetOS to the OS name where the build is going to run or it is set to the value passed by the user.", "settings": { @@ -328,7 +320,7 @@ "buildArch": { "description": "Passes the value of the test architecture to the respective build-managed script.", "settings": { - "TestArchitecture": "default" + "ArchGroup": "default" } }, "verbose": { @@ -341,7 +333,6 @@ "defaultValues": { "toolName": "msbuild", "settings": { - "OSGroup": "default", "TargetOS": "default", "BuildTests": false, "ConfigurationGroup": "default", @@ -391,8 +382,9 @@ "BuildArchitecture": "default", "CmakeBuildType": "default", "HostOs": "default", - "ProcessorCount": "default", - "AdditionalArgs": "default" + "ProcessorCount": "default", + "AdditionalArgs": "default", + "ToolSetDir": "default" } } }, @@ -475,7 +467,7 @@ "description": "Restores all NuGet packages for repository.", "settings": { "RestoreDuringBuild": true, - "BatchRestorePackages": "default" + "Sync": "default" } }, "ab": { @@ -485,12 +477,10 @@ } }, "t": { - "description": "Generates project.jsons for test projects, restores packages.", + "description": "Deprecated, use sync /p instead.", "settings": { "RestoreDuringBuild": true, - "BuildTestsAgainstPackages": true, - "BatchGenerateTestProjectJsons": "default", - "BatchRestorePackages": "default" + "Sync": "default" } }, "AzureAccount": { @@ -8,6 +8,7 @@ <MajorVersion>4</MajorVersion> <MinorVersion>6</MinorVersion> </PropertyGroup> + <!-- $(OS) is set to Unix/Windows_NT. This comes from an environment variable on Windows and MSBuild on Unix. --> @@ -17,6 +18,8 @@ <OsEnvironment Condition="'$(OsEnvironment)'==''">$(OS)</OsEnvironment> </PropertyGroup> + <Import Condition="Exists('$(MSBuildProjectDirectory)/Configurations.props')" Project="$(MSBuildProjectDirectory)/Configurations.props" /> + <PropertyGroup> <InputOSGroup Condition="'$(InputOSGroup)'==''">$(OSEnvironment)</InputOSGroup> </PropertyGroup> @@ -37,6 +40,7 @@ <!-- Output directories --> <BinDir Condition="'$(BinDir)'==''">$(ProjectDir)bin/</BinDir> + <ObjDir Condition="'$(ObjDir)'==''">$(BinDir)obj/</ObjDir> <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'==''">$(ObjDir)</BaseIntermediateOutputPath> <TestWorkingDir Condition="'$(TestWorkingDir)'==''">$(BinDir)tests/</TestWorkingDir> @@ -59,6 +63,9 @@ <CodeAnalysisRuleset>$(MSBuildThisFileDirectory)CodeAnalysis.ruleset</CodeAnalysisRuleset> </PropertyGroup> + <!-- Temporarily enable local build of tools --> + <Import Project="$(SourceDir)Tools\corefxTools.props" /> + <Import Project="$(ToolRuntimePath)BuildVersion.targets" Condition="Exists('$(ToolRuntimePath)BuildVersion.targets')" /> <PropertyGroup> @@ -68,6 +75,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> @@ -152,11 +161,6 @@ <DnuRestoreCommand Condition="'$(BuildTestsAgainstPackages)' == 'true' and '$(RestoreForTestsAgainstPackagesOnly)' == 'true'">$(DnuRestoreCommandForBuildTestsAgainstPackages)</DnuRestoreCommand> </PropertyGroup> - <PropertyGroup Condition="'$(BuildAllProjects)'=='true'"> - <!-- When we do a traversal build we get all packages up front, don't restore them again --> - <RestorePackages>false</RestorePackages> - </PropertyGroup> - <PropertyGroup> <!-- By default make all libraries to be AnyCPU but individual projects can override it if they need to --> <Platform>AnyCPU</Platform> @@ -164,64 +168,18 @@ <RunApiCompat>true</RunApiCompat> </PropertyGroup> - <!-- - Projects that have no OS-specific implementations just use Debug and Release for $(Configuration). - Projects that do have OS-specific implementations use OS_Debug and OS_Release, for all OS's we support even - if the code is the same between some OS's (so if you have some project that just calls POSIX APIs, we still have - OSX_[Debug|Release] and Linux_[Debug|Release] configurations. We do this so that we place all the output under - a single binary folder and can have a similar experience between the command line and Visual Studio. - --> - - <!-- - If Configuration is empty that means we are not being built in VS and so folks need to explicitly pass the different - values for $(ConfigurationGroup), $(TargetGroup), or $(OSGroup) or accept the defaults for them. - --> - <PropertyGroup Condition="'$(Configuration)'==''"> - <ConfigurationGroup Condition="'$(ConfigurationGroup)'==''">Debug</ConfigurationGroup> - <Configuration>$(ConfigurationGroup)</Configuration> - <Configuration Condition="'$(TargetGroup)'!=''">$(TargetGroup)_$(Configuration)</Configuration> - <Configuration Condition="'$(OSGroup)'!='' and '$(OSGroup)'!='AnyOS'">$(OSGroup)_$(Configuration)</Configuration> + <PropertyGroup> + <ArchGroup Condition="'$(ArchGroup)'==''">x64</ArchGroup> + <BuildConfiguration_OSGroup>$(OS)</BuildConfiguration_OSGroup> + <BuildConfiguration_OSGroup Condition="'$(OSGroup)' != ''">$(OSGroup)</BuildConfiguration_OSGroup> + <BuildConfiguration_ConfigurationGroup>Debug</BuildConfiguration_ConfigurationGroup> + <BuildConfiguration_ConfigurationGroup Condition="'$(ConfigurationGroup)' != ''">$(ConfigurationGroup)</BuildConfiguration_ConfigurationGroup> + <BuildConfiguration Condition="'$(BuildConfiguration)' == ''">netcoreapp-$(BuildConfiguration_OSGroup)-$(BuildConfiguration_ConfigurationGroup)-$(ArchGroup)</BuildConfiguration> + + <BuildConfigurationImportFile>$(ToolsDir)/configuration/configuration.props</BuildConfigurationImportFile> </PropertyGroup> - <!-- - If Configuration is set then someone explicitly passed it in or we building from VS. In either case - default $(ConfigurationGroup), $(TargetGroup), or $(OSGroup) from the Configuration if they aren't - already explicitly set. - --> - <PropertyGroup Condition="'$(Configuration)'!=''"> - <ConfigurationGroup Condition="'$(ConfigurationGroup)'=='' and $(Configuration.EndsWith('Debug'))">Debug</ConfigurationGroup> - <ConfigurationGroup Condition="'$(ConfigurationGroup)'=='' and $(Configuration.EndsWith('Release'))">Release</ConfigurationGroup> - <ConfigurationGroup Condition="'$(ConfigurationGroup)'==''">Debug</ConfigurationGroup> - - <BuildAllOSGroups Condition="'$(BuildAllOSGroups)' == ''">true</BuildAllOSGroups> - - <OSGroup Condition="'$(OSGroup)'=='' and $(Configuration.StartsWith('Windows'))">Windows_NT</OSGroup> - <OSGroup Condition="'$(OSGroup)'=='' and $(Configuration.StartsWith('Unix'))">Unix</OSGroup> - <OSGroup Condition="'$(OSGroup)'=='' and $(Configuration.StartsWith('Linux'))">Linux</OSGroup> - <OSGroup Condition="'$(OSGroup)'=='' and $(Configuration.StartsWith('OSX'))">OSX</OSGroup> - <OSGroup Condition="'$(OSGroup)'=='' and $(Configuration.StartsWith('FreeBSD'))">FreeBSD</OSGroup> - <OSGroup Condition="'$(OSGroup)'=='' and $(Configuration.StartsWith('NetBSD'))">NetBSD</OSGroup> - <OSGroup Condition="'$(OSGroup)'==''">AnyOS</OSGroup> - - <TargetGroup Condition="'$(TargetGroup)'=='' and $(Configuration.Contains('netcore50aot'))">netcore50aot</TargetGroup> - <TargetGroup Condition="'$(TargetGroup)'=='' and $(Configuration.Contains('netstandard13aot'))">netstandard13aot</TargetGroup> - <TargetGroup Condition="'$(TargetGroup)'=='' and $(Configuration.Contains('netstandard15aot'))">netstandard15aot</TargetGroup> - <TargetGroup Condition="'$(TargetGroup)'=='' and $(Configuration.Contains('netstandard1.7'))">netstandard1.7</TargetGroup> - <TargetGroup Condition="'$(TargetGroup)'=='' and $(Configuration.Contains('netcore50'))">netcore50</TargetGroup> - <TargetGroup Condition="'$(TargetGroup)'=='' and $(Configuration.Contains('netcoreapp1.0'))">netcoreapp1.0</TargetGroup> - <TargetGroup Condition="'$(TargetGroup)'=='' and $(Configuration.Contains('netcoreapp1.1'))">netcoreapp1.1</TargetGroup> - <TargetGroup Condition="'$(TargetGroup)'=='' and $(Configuration.Contains('dnxcore50'))">dnxcore50</TargetGroup> - <TargetGroup Condition="'$(TargetGroup)'=='' and $(Configuration.Contains('net463'))">net463</TargetGroup> - <TargetGroup Condition="'$(TargetGroup)'=='' and $(Configuration.Contains('net462'))">net462</TargetGroup> - <TargetGroup Condition="'$(TargetGroup)'=='' and $(Configuration.Contains('net461'))">net461</TargetGroup> - <TargetGroup Condition="'$(TargetGroup)'=='' and $(Configuration.Contains('net46'))">net46</TargetGroup> - <TargetGroup Condition="'$(TargetGroup)'=='' and $(Configuration.Contains('net45'))">net45</TargetGroup> - <TargetGroup Condition="'$(TargetGroup)'=='' and $(Configuration.Contains('net451'))">net451</TargetGroup> - <TargetGroup Condition="'$(TargetGroup)'=='' and $(Configuration.Contains('win8'))">win8</TargetGroup> - <TargetGroup Condition="'$(TargetGroup)'=='' and $(Configuration.Contains('wpa81'))">wpa81</TargetGroup> - <TargetGroup Condition="'$(TargetGroup)'=='' and $(Configuration.Contains('uap101aot'))">uap101aot</TargetGroup> - <TargetGroup Condition="'$(TargetGroup)'=='' and $(Configuration.Contains('uap101'))">uap101</TargetGroup> - </PropertyGroup> + <Import Project="$(BuildConfigurationImportFile)" Condition="Exists('$(BuildConfigurationImportFile)')" /> <!-- Set up Default symbol and optimization for Configuration --> <Choose> @@ -241,287 +199,14 @@ <DefineConstants>$(DefineConstants),TRACE</DefineConstants> </PropertyGroup> </When> - <Otherwise> - <PropertyGroup> - <ConfigurationErrorMsg>$(ConfigurationErrorMsg);Unknown ConfigurationGroup [$(ConfigurationGroup)] specificed in your project.</ConfigurationErrorMsg> - </PropertyGroup> - </Otherwise> - </Choose> - - <!-- initialize all the targets variables to false as they should only be set below --> - <PropertyGroup> - <TargetsWindows>false</TargetsWindows> - <TargetsUnix>false</TargetsUnix> - <TargetsLinux>false</TargetsLinux> - <TargetsOSX>false</TargetsOSX> - <TargetsFreeBSD>false</TargetsFreeBSD> - <TargetsNetBSD>false</TargetsNetBSD> - </PropertyGroup> - - <!-- Setup properties per OSGroup --> - <Choose> - <When Condition="'$(OSGroup)'=='AnyOS'"> - <PropertyGroup> - </PropertyGroup> - </When> - <When Condition="'$(OSGroup)'=='Windows_NT'"> - <PropertyGroup> - <TargetsWindows>true</TargetsWindows> - <PackageTargetRuntime>win</PackageTargetRuntime> - <UseWin32Apis>true</UseWin32Apis> - </PropertyGroup> - </When> - <When Condition="'$(OSGroup)'=='Unix'"> - <PropertyGroup> - <TargetsUnix>true</TargetsUnix> - <PackageTargetRuntime>unix</PackageTargetRuntime> - </PropertyGroup> - </When> - <When Condition="'$(OSGroup)'=='Linux'"> - <PropertyGroup> - <TargetsUnix>true</TargetsUnix> - <TargetsLinux>true</TargetsLinux> - <PackageTargetRuntime>linux</PackageTargetRuntime> - </PropertyGroup> - </When> - <When Condition="'$(OSGroup)'=='OSX'"> - <PropertyGroup> - <TargetsUnix>true</TargetsUnix> - <TargetsOSX>true</TargetsOSX> - <PackageTargetRuntime>osx</PackageTargetRuntime> - </PropertyGroup> - </When> - <When Condition="'$(OSGroup)'=='FreeBSD'"> - <PropertyGroup> - <TargetsUnix>true</TargetsUnix> - <TargetsFreeBSD>true</TargetsFreeBSD> - </PropertyGroup> - </When> - <When Condition="'$(OSGroup)'=='NetBSD'"> - <PropertyGroup> - <TargetsUnix>true</TargetsUnix> - <TargetsNetBSD>true</TargetsNetBSD> - </PropertyGroup> - </When> - <Otherwise> - <PropertyGroup> - <ConfigurationErrorMsg>$(ConfigurationErrorMsg);Unknown OSGroup [$(OSGroup)] specificed in your project.</ConfigurationErrorMsg> - </PropertyGroup> - </Otherwise> - </Choose> - - <PropertyGroup> - <TargetsUnknownUnix Condition="'$(TargetsUnix)' == 'true' AND '$(OSGroup)' != 'Unix' AND '$(OSGroup)' != 'FreeBSD' AND '$(OSGroup)' != 'Linux' AND '$(OSGroup)' != 'NetBSD' AND '$(OSGroup)' != 'OSX'">true</TargetsUnknownUnix> - </PropertyGroup> - - <!-- Setup properties per TargetGroup --> - <Choose> - <When Condition="'$(TargetGroup)'==''"> - <PropertyGroup> - </PropertyGroup> - </When> - <When Condition="'$(TargetGroup)'=='netcore50'"> - <PropertyGroup> - <PackageTargetFramework>netcore50</PackageTargetFramework> - <TargetingPackNugetPackageId>Microsoft.TargetingPack.Private.NetNative</TargetingPackNugetPackageId> - <NuGetTargetMoniker>.NETCore,Version=v5.0</NuGetTargetMoniker> - </PropertyGroup> - </When> - <When Condition="'$(TargetGroup)'=='netcore50aot'"> - <PropertyGroup> - <PackageTargetFramework>netcore50</PackageTargetFramework> - <PackageTargetRuntime>aot</PackageTargetRuntime> - <TargetingPackNugetPackageId>Microsoft.TargetingPack.Private.NetNative</TargetingPackNugetPackageId> - <NuGetTargetMoniker>.NETCore,Version=v5.0</NuGetTargetMoniker> - </PropertyGroup> - </When> - <When Condition="'$(TargetGroup)'=='netstandard1.0'"> - <PropertyGroup> - <PackageTargetFramework>netstandard1.0</PackageTargetFramework> - <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker> - </PropertyGroup> - </When> - <When Condition="'$(TargetGroup)'=='netstandard1.1'"> - <PropertyGroup> - <PackageTargetFramework>netstandard1.1</PackageTargetFramework> - <NuGetTargetMoniker>.NETStandard,Version=v1.1</NuGetTargetMoniker> - </PropertyGroup> - </When> - <When Condition="'$(TargetGroup)'=='netstandard1.2'"> - <PropertyGroup> - <PackageTargetFramework>netstandard1.2</PackageTargetFramework> - <NuGetTargetMoniker>.NETStandard,Version=v1.2</NuGetTargetMoniker> - </PropertyGroup> - </When> - <When Condition="'$(TargetGroup)'=='netstandard1.3'"> - <PropertyGroup> - <PackageTargetFramework>netstandard1.3</PackageTargetFramework> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> - </PropertyGroup> - </When> - <When Condition="'$(TargetGroup)'=='netstandard1.4'"> - <PropertyGroup> - <PackageTargetFramework>netstandard1.4</PackageTargetFramework> - <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> - </PropertyGroup> - </When> - <When Condition="'$(TargetGroup)'=='netstandard1.5'"> - <PropertyGroup> - <PackageTargetFramework>netstandard1.5</PackageTargetFramework> - <NuGetTargetMoniker>.NETStandard,Version=v1.5</NuGetTargetMoniker> - </PropertyGroup> - </When> - <When Condition="'$(TargetGroup)'=='netstandard1.6'"> - <PropertyGroup> - <PackageTargetFramework>netstandard1.6</PackageTargetFramework> - <NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker> - </PropertyGroup> - </When> - <When Condition="'$(TargetGroup)'=='netstandard1.7'"> - <PropertyGroup> - <PackageTargetFramework>netstandard1.7</PackageTargetFramework> - <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> - </PropertyGroup> - </When> - <When Condition="'$(TargetGroup)'=='netstandard13aot'"> - <PropertyGroup> - <PackageTargetFramework>netstandard1.3</PackageTargetFramework> - <PackageTargetRuntime>aot</PackageTargetRuntime> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> - </PropertyGroup> - </When> - <When Condition="'$(TargetGroup)'=='netstandard15aot'"> - <PropertyGroup> - <PackageTargetFramework>netstandard1.5</PackageTargetFramework> - <PackageTargetRuntime>aot</PackageTargetRuntime> - <NuGetTargetMoniker>.NETStandard,Version=v1.5</NuGetTargetMoniker> - </PropertyGroup> - </When> - <When Condition="'$(TargetGroup)'=='netcoreapp1.0'"> - <PropertyGroup> - <PackageTargetFramework>netcoreapp1.0</PackageTargetFramework> - <NuGetTargetMoniker>.NETCoreApp,Version=v1.0</NuGetTargetMoniker> - </PropertyGroup> - </When> - <When Condition="'$(TargetGroup)'=='netcoreapp1.1'"> - <PropertyGroup> - <PackageTargetFramework>netcoreapp1.1</PackageTargetFramework> - <NuGetTargetMoniker>.NETCoreApp,Version=v1.1</NuGetTargetMoniker> - </PropertyGroup> - </When> - <When Condition="'$(TargetGroup)'=='netcoreapp1.2'"> - <PropertyGroup> - <PackageTargetFramework>netcoreapp1.2</PackageTargetFramework> - <NuGetTargetMoniker>.NETCoreApp,Version=v1.2</NuGetTargetMoniker> - </PropertyGroup> - </When> - <When Condition="'$(TargetGroup)'=='netcoreapp1.2corert'"> - <PropertyGroup> - <PackageTargetFramework>netcoreapp1.2</PackageTargetFramework> - <PackageTargetRuntime Condition="'$(PackageTargetRuntime)' != ''">$(PackageTargetRuntime)-corert</PackageTargetRuntime> - <PackageTargetRuntime Condition="'$(PackageTargetRuntime)' == ''">corert</PackageTargetRuntime> - <NuGetTargetMoniker>.NETCoreApp,Version=v1.2</NuGetTargetMoniker> - </PropertyGroup> - </When> - <When Condition="'$(TargetGroup)'=='dnxcore50'"> - <PropertyGroup> - <ConfigurationErrorMsg>$(ConfigurationErrorMsg);DNXCore50 has been deprecated. Please use NETStandard1.X or NETCoreApp1.0 instead.</ConfigurationErrorMsg> - </PropertyGroup> - </When> - <When Condition="'$(TargetGroup)'=='net463'"> - <PropertyGroup> - <PackageTargetFramework>net463</PackageTargetFramework> - <TargetingPackNugetPackageId>Microsoft.TargetingPack.NETFramework.v4.6.3</TargetingPackNugetPackageId> - <NuGetTargetMoniker>.NETFramework,Version=v4.6.3</NuGetTargetMoniker> - </PropertyGroup> - </When> - <When Condition="'$(TargetGroup)'=='net462'"> - <PropertyGroup> - <PackageTargetFramework>net462</PackageTargetFramework> - <TargetingPackNugetPackageId>Microsoft.TargetingPack.NETFramework.v4.6.2</TargetingPackNugetPackageId> - <NuGetTargetMoniker>.NETFramework,Version=v4.6.2</NuGetTargetMoniker> - </PropertyGroup> - </When> - <When Condition="'$(TargetGroup)'=='net461'"> - <PropertyGroup> - <PackageTargetFramework>net461</PackageTargetFramework> - <TargetingPackNugetPackageId>Microsoft.TargetingPack.NETFramework.v4.6.1</TargetingPackNugetPackageId> - <NuGetTargetMoniker>.NETFramework,Version=v4.6.1</NuGetTargetMoniker> - </PropertyGroup> - </When> - <When Condition="'$(TargetGroup)'=='net46'"> - <PropertyGroup> - <PackageTargetFramework>net46</PackageTargetFramework> - <TargetingPackNugetPackageId>Microsoft.TargetingPack.NETFramework.v4.6</TargetingPackNugetPackageId> - <NuGetTargetMoniker>.NETFramework,Version=v4.6</NuGetTargetMoniker> - </PropertyGroup> - </When> - <When Condition="'$(TargetGroup)'=='net451'"> - <PropertyGroup> - <PackageTargetFramework>net451</PackageTargetFramework> - <TargetingPackNugetPackageId>Microsoft.TargetingPack.NETFramework.v4.5.1</TargetingPackNugetPackageId> - <NuGetTargetMoniker>.NETFramework,Version=v4.5.1</NuGetTargetMoniker> - </PropertyGroup> - </When> - <When Condition="'$(TargetGroup)'=='net45'"> - <PropertyGroup> - <PackageTargetFramework>net45</PackageTargetFramework> - <TargetingPackNugetPackageId>Microsoft.TargetingPack.NETFramework.v4.5</TargetingPackNugetPackageId> - <NuGetTargetMoniker>.NETFramework,Version=v4.5</NuGetTargetMoniker> - </PropertyGroup> - </When> - <When Condition="'$(TargetGroup)'=='win8'"> - <PropertyGroup> - <PackageTargetFramework>win8</PackageTargetFramework> - <NuGetTargetMoniker>Windows,Version=v8.0</NuGetTargetMoniker> - </PropertyGroup> - </When> - <When Condition="'$(TargetGroup)'=='wpa81'"> - <PropertyGroup> - <PackageTargetFramework>wpa81</PackageTargetFramework> - <NuGetTargetMoniker>WindowsPhoneApp,Version=v8.1</NuGetTargetMoniker> - </PropertyGroup> - </When> - <When Condition="'$(TargetGroup)'=='uap101aot'"> - <PropertyGroup> - <PackageTargetFramework>uap10.1</PackageTargetFramework> - <PackageTargetRuntime>aot</PackageTargetRuntime> - <NuGetTargetMoniker>UAP,Version=v10.1</NuGetTargetMoniker> - </PropertyGroup> - </When> - <When Condition="'$(TargetGroup)'=='uap101'"> - <PropertyGroup> - <PackageTargetFramework>uap10.1</PackageTargetFramework> - <NuGetTargetMoniker>UAP,Version=v10.1</NuGetTargetMoniker> - </PropertyGroup> - </When> - <When Condition="'$(TargetGroup)'=='portable-net45+win8+sl5'"> - <PropertyGroup> - <PackageTargetFramework>portable-net45+win8+sl5</PackageTargetFramework> - <NuGetTargetMoniker>.NETPortable,Version=v0.0,Profile=Profile47</NuGetTargetMoniker> - </PropertyGroup> - <ItemGroup> - <Compile Include="$(CommonPath)\System\Reflection\AssemblyMetadataAttribute.cs"> - <Link>System\Reflection\AssemblyMetadataAttribute.cs</Link> - </Compile> - </ItemGroup> - </When> - <When Condition="'$(TargetGroup)'=='portable-net40+sl4+win8+wp8'"> + <When Condition="'$(ConfigurationGroup)' == 'Release'"> <PropertyGroup> - <PackageTargetFramework>portable-net40+sl4+win8+wp8</PackageTargetFramework> - <NuGetTargetMoniker>.NETPortable,Version=v0.0,Profile=Profile36</NuGetTargetMoniker> + <DebugSymbols Condition="'$(DebugSymbols)' == ''">true</DebugSymbols> + <Optimize Condition="'$(Optimize)' == ''">true</Optimize> + <DebugType Condition="'$(DebugType)' == ''">pdbonly</DebugType> + <DefineConstants>$(DefineConstants),TRACE</DefineConstants> </PropertyGroup> - <ItemGroup> - <Compile Include="$(CommonPath)\System\Reflection\AssemblyMetadataAttribute.cs"> - <Link>System\Reflection\AssemblyMetadataAttribute.cs</Link> - </Compile> - </ItemGroup> </When> - <Otherwise> - <PropertyGroup> - <ConfigurationErrorMsg>$(ConfigurationErrorMsg);Unknown TargetGroup [$(TargetGroup)] specificed in your project.</ConfigurationErrorMsg> - </PropertyGroup> - </Otherwise> </Choose> <!-- Default Test platform to deploy the netstandard compiled tests to --> @@ -558,6 +243,7 @@ <NoExplicitReferenceToStdLib>true</NoExplicitReferenceToStdLib> <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences> <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute> + <CopyNuGetImplementations>false</CopyNuGetImplementations> </PropertyGroup> <!-- Set up handling of build warnings --> @@ -580,13 +266,18 @@ <TestTargetOutputRelPath Condition="'$(TestTargetOutputRelPath)'=='' And '$(TargetGroup)'=='' And '$(TestTFM)'!=''">default.$(TestTFM)/</TestTargetOutputRelPath> <BaseOutputPath Condition="'$(BaseOutputPath)'==''">$(BinDir)</BaseOutputPath> + <OutputPathSubfolder Condition="'$(IsCompatAssembly)'=='true'">/Compat</OutputPathSubfolder> <OutputPath Condition="'$(OutputPath)'==''">$(BaseOutputPath)$(OSPlatformConfig)/$(MSBuildProjectName)/$(TargetOutputRelPath)$(OutputPathSubfolder)</OutputPath> <IntermediateOutputRootPath Condition="'$(IntermediateOutputRootPath)' == ''">$(BaseIntermediateOutputPath)$(OSPlatformConfig)/</IntermediateOutputRootPath> <IntermediateOutputPath Condition="'$(IntermediateOutputPath)' == ''">$(IntermediateOutputRootPath)$(MSBuildProjectName)/$(TargetOutputRelPath)</IntermediateOutputPath> - <TestPath Condition="'$(TestPath)'==''">$(TestWorkingDir)$(OSPlatformConfig)/$(MSBuildProjectName)/$(TestTargetOutputRelPath)</TestPath> + <RuntimePath Condition="'$(RuntimePath)' == ''">$(BinDir)runtime/$(BuildConfiguration)/</RuntimePath> + <RefRootPath>$(BinDir)ref/</RefRootPath> + <!-- TODO: We need to compute this based on the TargetGroup of the BuildConfiguration --> + <RefPath>$(RefRootPath)netcoreapp/</RefPath> + <NetStandardRefPath>$(RefRootPath)netstandard/</NetStandardRefPath> <PackagesBasePath Condition="'$(PackagesBasePath)'==''">$(BinDir)$(OSPlatformConfig)</PackagesBasePath> <PackageOutputPath Condition="'$(PackageOutputPath)'==''">$(PackageOutputRoot)$(ConfigurationGroup)/</PackageOutputPath> diff --git a/dir.targets b/dir.targets index 4d13487106..eb49097f02 100644 --- a/dir.targets +++ b/dir.targets @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" InitialTargets="CheckForBuildTools" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - + <Target Name="CheckForBuildTools"> <Error Condition="!Exists('$(ToolsDir)') and '$(OverrideToolsDir)'=='true'" Text="The tools directory [$(ToolsDir)] does not exist. Please run sync in your enlistment to ensure the tools are installed before attempting to build an individual project." /> @@ -12,45 +12,30 @@ <Target Name="BuildAndTest" DependsOnTargets="Build;Test" /> <Target Name="RebuildAndTest" DependsOnTargets="Rebuild;Test" /> <Target Name="Test" /> - - <!-- Targets will be always be imported from buildagainstpackages.targets unless $(SkipBuildAgainstPackages) is specified--> - <Target Name="GenerateTestProjectJson" /> - <Target Name="GenerateAllTestProjectJsons" /> - <Target Name="UndefineTestTFM" BeforeTargets="AssignProjectConfiguration"> + <!-- build vertical requires the FindBestConfiguration task which is currently in CoreFx.Tools.dll --> + <Import Project="buildvertical.targets" Condition="Exists('$(CoreFxToolsTaskDir)CoreFx.Tools.dll')" /> + + <Target Name="UndefineTestTFM" + BeforeTargets="AssignProjectConfiguration"> <ItemGroup> - <ProjectReference> - <!-- + <!-- Always undefine TestTFM and FilterToTestTFM for all project reference as not needed for compilation and avoid bin clash tool to fail --> + <ProjectReference> <UndefineProperties>%(ProjectReference.UndefineProperties);TestTFM;FilterToTestTFM</UndefineProperties> </ProjectReference> </ItemGroup> </Target> - - <PropertyGroup> - <CommonTestProjectJson>$(MSBuildThisFileDirectory)src/Common/test-runtime/project.json</CommonTestProjectJson> - <CommonTestProjectLockJson>$(MSBuildThisFileDirectory)src/Common/test-runtime/project.lock.json</CommonTestProjectLockJson> - <CommonOutputTestProjectJson>$(GeneratedProjectJsonDir)/project.json</CommonOutputTestProjectJson> - <CommonOutputTestProjectLockJson>$(GeneratedProjectJsonDir)/project.lock.json</CommonOutputTestProjectLockJson> - </PropertyGroup> - - <PropertyGroup Condition="'$(IsTestProject)' == 'true'"> - <CommonTestProjectJson Condition="'$(BuildTestsAgainstPackages)'=='true'">$(CommonOutputTestProjectJson)</CommonTestProjectJson> - <CommonTestProjectLockJson Condition="'$(BuildTestsAgainstPackages)'=='true'">$(CommonOutputTestProjectLockJson)</CommonTestProjectLockJson> - <ProjectJson Condition="'$(ProjectJson)'=='' and Exists('$(MSBuildProjectDirectory)/project.json')">$(MSBuildProjectDirectory)/project.json</ProjectJson> - <!-- If project specific project.json exists then don't skip generating test project.json files --> - <SkipGenerateTestProjectJson Condition="'$(ProjectJson)'==''" >true</SkipGenerateTestProjectJson> - <ProjectJson Condition="'$(ProjectJson)'==''">$(CommonTestProjectJson)</ProjectJson> - <ProjectLockJson Condition="'$(ProjectJson)'=='$(CommonTestProjectJson)'">$(CommonTestProjectLockJson)</ProjectLockJson> - </PropertyGroup> <Import Project="$(ToolsDir)/Build.Common.targets" Condition="Exists('$(ToolsDir)/Build.Common.targets')" /> <!-- 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). --> @@ -65,16 +50,6 @@ <PackageTargetFramework Condition="'$(IsTestProject)' == 'true'"></PackageTargetFramework> </PropertyGroup> - <!-- - add the test-runtime project.json to the list of supplemental test data so it will get included - in the test archive; the stress test build system depends on it when building test mixes. - --> - <ItemGroup Condition="'$(IsTestProject)'=='true'"> - <SupplementalTestData Include="$(SourceDir)Common/test-runtime/project.json"> - <DestinationDir>test-runtime/</DestinationDir> - </SupplementalTestData> - </ItemGroup> - <ItemGroup Condition="'$(NuGetTargetMoniker)'=='.NETStandard,Version=v1.7'"> <!-- Temporarily suppress the message until we get a nuget version that knows about the mapping between netstandard1.7 and uap10.1 --> <SuppressPackageTargetFrameworkCompatibility Include="uap10.1" /> @@ -87,4 +62,11 @@ </ItemGroup> </Target> + <Target Name="ReportConfigurationErrorMessage" + BeforeTargets="AssignProjectConfiguration" + Condition="'$(BuildConfigurations)' != ''" > + <Message Importance="Low" Text="$(MSBuildProjectFullPath), C: $(Configuration) BC: $(BuildConfiguration) BCs: $(BuildConfigurations)" /> + <Message Importance="High" Condition="'$(ConfigurationErrorMsg)' != ''" Text="$(MSBuildProjectFullPath) ConfigurationErrorMessage: $(ConfigurationErrorMsg)" /> + </Target> + </Project> diff --git a/dir.traversal.targets b/dir.traversal.targets index 9a810f73a9..8f1af0291c 100644 --- a/dir.traversal.targets +++ b/dir.traversal.targets @@ -1,90 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Target Name="FilterProjects"> - <PropertyGroup> - <FilterToOSGroup Condition="'$(FilterToOSGroup)'=='' and '$(OSGroup)'!='' and '$(OSGroup)'!='AnyOS'">$(OSGroup)</FilterToOSGroup> - </PropertyGroup> - - <ItemGroup> - <!-- list each append as a seperate item to force re-evaluation of AdditionalProperties metadata --> - <Project> - <AdditionalProperties Condition="'%(Project.TargetGroup)'!=''">TargetGroup=%(Project.TargetGroup);%(Project.AdditionalProperties)</AdditionalProperties> - </Project> - <Project> - <FilterToTargetGroup Condition="'$(FilterToTargetGroup)'!=''">$(FilterToTargetGroup)</FilterToTargetGroup> - </Project> - <Project> - <FilterToOSGroup Condition="'$(FilterToOSGroup)'!=''">$(FilterToOSGroup)</FilterToOSGroup> - </Project> - <Project> - <AdditionalProperties Condition="'%(Project.OSGroup)'!=''">OSGroup=%(Project.OSGroup);%(Project.AdditionalProperties)</AdditionalProperties> - </Project> - <Project> - <AdditionalProperties Condition="'%(Project.Platform)'!=''">Platform=%(Project.Platform);%(Project.AdditionalProperties)</AdditionalProperties> - </Project> - <Project> - <AdditionalProperties Condition="'%(Project.FilterToOSGroup)'!=''">FilterToOSGroup=%(Project.FilterToOSGroup);%(Project.AdditionalProperties)</AdditionalProperties> - </Project> - <Project> - <AdditionalProperties Condition="'%(Project.FilterToTargetGroup)'!=''">FilterToTargetGroup=%(Project.FilterToTargetGroup);%(Project.AdditionalProperties)</AdditionalProperties> - </Project> - <Project> - <AdditionalProperties Condition="'%(Project.InputOSGroup)' != ''">InputOSGroup=%(Project.InputOSGroup);%(Project.AdditionalProperties)</AdditionalProperties> - </Project> - <Project> - <AdditionalProperties Condition="'%(Project.BuildAllOSGroups)' != ''">BuildAllOSGroups=%(Project.BuildAllOSGroups);%(Project.AdditionalProperties)</AdditionalProperties> - </Project> - <Project> - <!-- If a project isn't setting the OSGroup via metadata then undefine it so that the globally set OSGroup doesn't override empty OSGroup --> - <UndefineProperties Condition="'%(Project.OSGroup)'==''">%(Project.UndefineProperties);OSGroup</UndefineProperties> - </Project> - <Project> - <UndefineProperties Condition="'%(Project.Extension)'!='.builds' and '%(Project.Extension)'!='.proj'">%(Project.UndefineProperties);TestTFMs;FilterToOSGroup;FilterToTestTFM;DefaultBuildAllTarget;SerializeProjects;BuildAllOSGroups</UndefineProperties> - </Project> - </ItemGroup> - - <!-- If we have enabled code coverage and set the projects to be serialized we need to pass that property down to the childe projects --> - <ItemGroup Condition="'$(CodeCoverageEnabled)'=='true' and '$(SerializeProjects)'=='true'"> - <Project> - <AdditionalProperties>SerializeProjects=true;%(Project.AdditionalProperties)</AdditionalProperties> - </Project> - </ItemGroup> - - <PropertyGroup> - <OSGroupList>AnyOS;$(FilterToOSGroup);</OSGroupList> - <OSGroupList Condition="'$(FilterToOSGroup)'=='OSX'">$(OSGroupList);Unix;</OSGroupList> - <OSGroupList Condition="'$(FilterToOSGroup)'=='Linux'">$(OSGroupList);Unix;</OSGroupList> - <OSGroupList Condition="'$(FilterToOSGroup)'=='FreeBSD'">$(OSGroupList);Unix;</OSGroupList> - <OSGroupList Condition="'$(FilterToOSGroup)'=='NetBSD'">$(OSGroupList);Unix;</OSGroupList> - </PropertyGroup> - - <ItemGroup Condition="'$(FilterToOSGroup)'!='' and '$(BuildAllOSGroups)' != 'true'"> - <ProjectsToBuild Include="@(Project)" Condition="$(OSGroupList.Contains('%(Project.OSGroup);'))" /> - - <Project Remove="@(Project)" /> - <Project Include="@(ProjectsToBuild)" /> - </ItemGroup> - - <PropertyGroup> - <TargetGroupList>;$(FilterToTargetGroup);</TargetGroupList> - <TargetGroupList Condition="'$(FilterToTargetGroup)'=='net46'">$(TargetGroupList)net461;net462;</TargetGroupList> - <TargetGroupList Condition="'$(FilterToTargetGroup)'=='net461'">$(TargetGroupList)net462;</TargetGroupList> - </PropertyGroup> - - <ItemGroup Condition="'$(FilterToTargetGroup)'!=''"> - <FilteredProjectsToBuild Include="@(Project)" Condition="$(TargetGroupList.Contains(';%(Project.TargetGroup);')) Or '%(Project.Extension)' == '.proj' Or '%(Project.Extension)' == '.builds'" /> - - <Project Remove="@(Project)" /> - <Project Include="@(FilteredProjectsToBuild)" /> - </ItemGroup> - </Target> - - <Target Name="DumpTargets" DependsOnTargets="FilterProjects"> - <MSBuild Targets="$(DefaultBuildAllTarget)" - Projects="@(Project)" - Properties="DefaultBuildAllTarget=$(DefaultBuildAllTarget);BuildAllProjects=true" - ContinueOnError="ErrorAndContinue" /> - </Target> <Target Name="ProducesPackageId" Returns="@(PackageIds)" @@ -112,7 +27,10 @@ <Message Text="%(PackageIds.Identity)" Importance="High" /> </Target> - <Target Name="BuildAllProjects" DependsOnTargets="FilterProjects"> + <!-- build vertical requires the FindBestConfiguration task which is currently in CoreFx.Tools.dll --> + <Import Project="buildvertical.targets" Condition="'$(ImportedBuildVerticalTargets)' != 'true' and Exists('$(CoreFxToolsTaskDir)CoreFx.Tools.dll')" /> + + <Target Name="BuildAllProjects"> <PropertyGroup> <DefaultBuildAllTarget Condition="'$(DefaultBuildAllTarget)'==''">$(MSBuildProjectDefaultTargets)</DefaultBuildAllTarget> </PropertyGroup> @@ -122,15 +40,15 @@ <MSBuild Targets="$(DefaultBuildAllTarget)" Projects="@(Project)" Condition="'$(SerializeProjects)'=='true' AND '%(Identity)' != ''" - Properties="DefaultBuildAllTarget=$(DefaultBuildAllTarget);BuildAllProjects=true" - ContinueOnError="ErrorAndContinue" /> + Properties="DefaultBuildAllTarget=$(DefaultBuildAllTarget);BuildAllProjects=true;BuildConfiguration=$(BuildConfiguration)" + ContinueOnError="ErrorAndStop" /> <MSBuild Targets="$(DefaultBuildAllTarget)" Projects="@(Project)" Condition="'$(SerializeProjects)'!='true'" - Properties="DefaultBuildAllTarget=$(DefaultBuildAllTarget);BuildAllProjects=true" + Properties="DefaultBuildAllTarget=$(DefaultBuildAllTarget);BuildAllProjects=true;BuildConfiguration=$(BuildConfiguration);%(Project.AdditionalProperties)" BuildInParallel="true" - ContinueOnError="ErrorAndContinue" /> + ContinueOnError="ErrorAndStop" /> <!-- Given we ErrorAndContinue we need to propagate the error if the overall task failed --> <Error Condition="'$(MSBuildLastTaskResult)'=='false'" /> @@ -139,7 +57,7 @@ <!-- FilterProjectsToTest will filter the project list according to the FilterToTestTFM value --> <Target Name="FilterProjectsToTest" BeforeTargets="TestAllProjects" - Condition="$(MSBuildProjectName.EndsWith('.Tests'))"> + Condition="$(MSBuildProjectName.EndsWith('tests'))"> <ItemGroup> <Project> @@ -152,7 +70,7 @@ </Project> <!-- Include all projects which have TestTFM from the supported set --> - <ProjectsToTest Include="@(Project)" Condition="'%(Project.Extension)'=='.csproj' And $([System.String]::new('%(Project.TestTFMs)').Contains(';$(FilterToTestTFM);'))"> + <ProjectsToTest Include="@(Project)" Condition="'%(Project.Extension)'=='.csproj' And $([System.String]::new('%(Project.Identity)').Contains('.Tests'))"> <TestTFM>$(FilterToTestTFM)</TestTFM> </ProjectsToTest> @@ -174,7 +92,7 @@ <!-- TestAllProjects will run all tests according to TestTFM value we are filtering with --> <Target Name="TestAllProjects" AfterTargets="BuildAllProjects" - Condition="$(MSBuildProjectName.EndsWith('.Tests'))"> + Condition="$(MSBuildProjectName.EndsWith('tests'))"> <!-- To Serialize we use msbuild's batching functionality '%' to force it to batch all similar projects with the same identity however since the project names are unique it will essentially force each to run in its own batch --> @@ -330,5 +248,5 @@ <!-- Target will be overridden if buildagainstpackages.targets is imported. --> <Target Name="GenerateTestProjectJson" /> - <Import Condition="'$(_BuildAgainstPackages)' == 'true'" Project="$(ToolsDir)/buildagainstpackages.targets" /> + <Import Condition="'$(_BuildAgainstPackages)' == 'true'" Project="$(ToolsDir)/buildagainstpackages.targets" /> </Project> diff --git a/external/coreclr/coreclr.depproj b/external/coreclr/coreclr.depproj new file mode 100644 index 0000000000..628520a117 --- /dev/null +++ b/external/coreclr/coreclr.depproj @@ -0,0 +1,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> + <OutputPath>$(RuntimePath)</OutputPath> + </PropertyGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project>
\ No newline at end of file diff --git a/external/coreclr/project.json.template b/external/coreclr/project.json.template new file mode 100644 index 0000000000..4cc99a4b1c --- /dev/null +++ b/external/coreclr/project.json.template @@ -0,0 +1,15 @@ +{ + "frameworks": { + "{TFM}": { + "dependencies": { + "Microsoft.NETCore.Platforms": "1.2.0-beta-24721-02", + "Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24904-03", + "Microsoft.NETCore.TestHost": "1.2.0-beta-24904-03", + "runtime.native.System.Data.SqlClient.sni": "4.4.0-beta-24814-01", + } + } + }, + "runtimes": { + "{RID}": { }, + } +} diff --git a/external/dir.proj b/external/dir.proj new file mode 100644 index 0000000000..c9cb772e3a --- /dev/null +++ b/external/dir.proj @@ -0,0 +1,12 @@ +<Project ToolsVersion="14.0" DefaultTargets="BuildAndTest" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="../dir.props" /> + + <!-- Build for all configurations --> + <ItemGroup> + <Project Include="coreclr/coreclr.depproj" /> + <Project Include="netstandard20/netstandard20.depproj" /> + <Project Include="test-runtime/XUnit.Runtime.depproj" /> + </ItemGroup> + + <Import Project="../dir.traversal.targets" /> +</Project> diff --git a/external/dir.props b/external/dir.props new file mode 100644 index 0000000000..6523d6f11d --- /dev/null +++ b/external/dir.props @@ -0,0 +1,13 @@ +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\dir.props" /> + <PropertyGroup> + <!-- HACK to work around binplacing issue right now for depproj's --> + <IsRuntimeAssembly>false</IsRuntimeAssembly> + </PropertyGroup> + <PropertyGroup> + <ProjectJsonTemplate>$(MSBuildThisProjectDirectory)project.json.template</ProjectJsonTemplate> + <ProjectJson Condition="Exists('$(ProjectJsonTemplate)')">$(IntermediateOutputPath)project.json</ProjectJson> + <ProjectLockJson Condition="Exists('$(ProjectJsonTemplate)')">$(IntermediateOutputPath)project.lock.json</ProjectLockJson> + <NugetRuntimeIdentifier>$(RuntimeOS)-$(ArchGroup)</NugetRuntimeIdentifier> + </PropertyGroup> +</Project> diff --git a/external/dir.targets b/external/dir.targets new file mode 100644 index 0000000000..1559405717 --- /dev/null +++ b/external/dir.targets @@ -0,0 +1,28 @@ +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\dir.targets" /> + + <PropertyGroup> + <RestorePackages>true</RestorePackages> + <PrereleaseResolveNuGetPackages>true</PrereleaseResolveNuGetPackages> + </PropertyGroup> + + <Target + Name="GenerateProjectJsonFromTemplates" + BeforeTargets="RestorePackages" + Inputs="$(ProjectJsonTemplate)" + Outputs="$(ProjectJson)" + Condition="Exists('$(ProjectJsonTemplate)')" + > + <!-- Update project.json template --> + <WriteLinesToFile + File="$(ProjectJson)" + Lines="$([System.IO.File]::ReadAllText('project.json.template').Replace('{RID}', $(NuGetRuntimeIdentifier)).Replace('{TFM}', $(NuGetTargetMoniker)))" + Overwrite="true" + /> + <ItemGroup> + <FileWrites Include="$(ProjectJson)" /> + </ItemGroup> + + </Target> + +</Project> diff --git a/external/netstandard20/netstandard20.depproj b/external/netstandard20/netstandard20.depproj new file mode 100644 index 0000000000..5c027aeec5 --- /dev/null +++ b/external/netstandard20/netstandard20.depproj @@ -0,0 +1,11 @@ +<?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> + <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem> + <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> + <NugetRuntimeIdentifier>None</NugetRuntimeIdentifier> + <OutputPath>$(NetStandardRefPath)</OutputPath> + </PropertyGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project>
\ No newline at end of file diff --git a/external/netstandard20/project.json.template b/external/netstandard20/project.json.template new file mode 100644 index 0000000000..8829840ed8 --- /dev/null +++ b/external/netstandard20/project.json.template @@ -0,0 +1,9 @@ +{ + "frameworks": { + "{TFM}": { + "dependencies": { + "NETStandard.Library2": "2.0.0-beta-24815-05" + } + } + } +} diff --git a/external/test-runtime/XUnit.Runtime.depproj b/external/test-runtime/XUnit.Runtime.depproj new file mode 100644 index 0000000000..1a70b92a78 --- /dev/null +++ b/external/test-runtime/XUnit.Runtime.depproj @@ -0,0 +1,32 @@ +<?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> + <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> + <IsRuntimeAssembly>false</IsRuntimeAssembly> + <!-- Given that xunit packages bring with them part of the framework, we need to specify a runtime in order to get the assets + This RID value doesn't really matter, since the assets we are copying are not RID specific, so defaulting to Windows here + --> + <NugetRuntimeIdentifier>win7-x64</NugetRuntimeIdentifier> + <OutputPath>$(RuntimePath)</OutputPath> + </PropertyGroup> + <ItemGroup> + <None Include="project.json" /> + </ItemGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> + <Target Name="FilterNugetPackage" AfterTargets="ResolveNuGetPackages"> + <!-- Filter down to just xunit assets --> + <ItemGroup> + <ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)" Condition="'%(ReferenceCopyLocalPaths.NuGetPackageId)'!='xunit.abstractions' And + '%(ReferenceCopyLocalPaths.NuGetPackageId)'!='xunit.assert' And + '%(ReferenceCopyLocalPaths.NuGetPackageId)'!='xunit.extensibility.core' And + '%(ReferenceCopyLocalPaths.NuGetPackageId)'!='xunit.extensibility.execution' And + '%(ReferenceCopyLocalPaths.NuGetPackageId)'!='xunit.console.netcore' And + '%(ReferenceCopyLocalPaths.NuGetPackageId)'!='xunit.runner.utility' And + '%(ReferenceCopyLocalPaths.NuGetPackageId)'!='Microsoft.xunit.netcore.extensions' And + '%(ReferenceCopyLocalPaths.NuGetPackageId)'!='Microsoft.DotNet.xunit.performance.run.core' And + '%(ReferenceCopyLocalPaths.NuGetPackageId)'!='Newtonsoft.Json' + " /> + </ItemGroup> + </Target> +</Project> diff --git a/external/test-runtime/project.json b/external/test-runtime/project.json new file mode 100644 index 0000000000..ea38f07560 --- /dev/null +++ b/external/test-runtime/project.json @@ -0,0 +1,29 @@ +{ + "dependencies": { + "xunit.console.netcore": "1.0.3-prerelease-00921-01", + "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04", + "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04", + "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0040", + "Microsoft.DotNet.xunit.performance.analysis.cli": "1.0.0-alpha-build0040", + "Microsoft.DotNet.xunit.performance.runner.cli": "1.0.0-alpha-build0040", + "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0040", + "Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24728-02", + "Microsoft.NETCore.TestHost": "1.2.0-beta-24728-02", + "Newtonsoft.Json": "9.0.1", + "coveralls.io": "1.4", + "OpenCover": "4.6.519", + "ReportGenerator": "2.5.0", + + // Supplemental test data + "System.IO.Compression.TestData": "1.0.4-prerelease", + "System.IO.Packaging.TestData": "1.0.0-prerelease", + "System.Security.Cryptography.X509Certificates.TestData": "1.0.2-prerelease", + "System.Net.TestData": "1.0.0-prerelease", + }, + "frameworks": { + "netstandard1.7": {} + }, + "runtimes": { + "win7-x64": {} + } +} 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/layout/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.builds b/layout/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.builds deleted file mode 100644 index b02e789e68..0000000000 --- a/layout/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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" /> - - <Import Project="$(MSBuildProjectName).props" /> - - <ItemGroup> - <!-- identity project, runtime specific projects are included by props above --> - <Project Include="$(MSBuildProjectName).pkgproj" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project>
\ No newline at end of file diff --git a/layout/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj b/layout/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj deleted file mode 100644 index b96b2dbcab..0000000000 --- a/layout/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj +++ /dev/null @@ -1,76 +0,0 @@ -<?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" /> - - <Import Project="$(MSBuildProjectName).props" /> - - <!-- Add path globs specific to native binaries to exclude unnecessary files from packages. --> - <Choose> - <When Condition="$(PackageTargetRuntime.StartsWith('win'))"/> - <When Condition="$(PackageTargetRuntime.StartsWith('osx'))"> - <PropertyGroup> - <LibraryFileExtension>.dylib</LibraryFileExtension> - <SymbolFileExtension>.dwarf</SymbolFileExtension> - </PropertyGroup> - </When> - <Otherwise> - <PropertyGroup> - <LibraryFileExtension>.so</LibraryFileExtension> - <SymbolFileExtension>.dbg</SymbolFileExtension> - </PropertyGroup> - </Otherwise> - </Choose> - <ItemGroup> - <AdditionalLibPackageExcludes Condition="'$(SymbolFileExtension)' != ''" Include="%2A%2A\%2A$(SymbolFileExtension)" /> - <AdditionalSymbolPackageExcludes Condition="'$(LibraryFileExtension)' != ''" Include="%2A%2A\%2A.a;%2A%2A\%2A$(LibraryFileExtension)" /> - </ItemGroup> - - <PropertyGroup> - <IsLineupPackage Condition="'$(PackageTargetRuntime)' == ''">true</IsLineupPackage> - <TargetFramework>netcoreapp1.1</TargetFramework> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <SkipValidatePackage>true</SkipValidatePackage> - </PropertyGroup> - - <ItemGroup Condition="'$(PackageTargetRuntime)' == ''"> - <ProjectReference Include="@(Project)" /> - - <!-- Include refs --> - <File Include="$(PackageLayoutDir)ref/$(TargetFramework)/*.*"> - <TargetPath>ref/$(TargetFramework)</TargetPath> - </File> - - <FilePackageDependency Include="Microsoft.NETCore.Platforms"> - <Version>$(PlatformPackageVersion)</Version> - </FilePackageDependency> - </ItemGroup> - - <ItemGroup Condition="'$(PackageTargetRuntime)' != ''"> - <!-- Include lib --> - <File Include="$(PackageLayoutDir)runtimes/$(PackageTargetRuntime)/lib/$(TargetFramework)/*.*"> - <TargetPath>runtimes/$(PackageTargetRuntime)/lib/$(TargetFramework)</TargetPath> - </File> - - <!-- Include native --> - <File Include="$(PackageLayoutDir)runtimes/$(PackageTargetRuntime)/native/*.*"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - - <IgnoredReference Include="System.Private.CoreLib" /> - </ItemGroup> - - <Target Name="VerifyClosure" AfterTargets="Build"> - <VerifyClosure Sources="@(File)" - IgnoredReferences="@(IgnoredReference)" /> - </Target> - - <Target Name="GetSymbolPackageFiles" BeforeTargets="GetPackageFiles"> - <ItemGroup> - <File> - <IsSymbolFile Condition="'%(Extension)' == '.pdb'">true</IsSymbolFile> - <IsSymbolFile Condition="'$(SymbolFileExtension)' != '' AND'%(Extension)' == '$(SymbolFileExtension)'">true</IsSymbolFile> - </File> - </ItemGroup> - </Target> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> diff --git a/layout/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.props b/layout/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.props deleted file mode 100644 index 4f950cda74..0000000000 --- a/layout/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.props +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <BuildOSGroup Include="alpine.3.4.3" /> - <BuildOSGroup Include="debian.8" /> - <BuildOSGroup Include="fedora.23" /> - <BuildOSGroup Include="fedora.24" /> - <BuildOSGroup Include="opensuse.13.2" /> - <BuildOSGroup Include="opensuse.42.1" /> - <BuildOSGroup Include="osx.10.10" /> - <BuildOSGroup Include="rhel.7" /> - <BuildOSGroup Include="ubuntu.14.04" /> - <BuildOSGroup Include="ubuntu.16.04" /> - <BuildOSGroup Include="ubuntu.16.10" /> - <BuildOSGroup Include="Windows_NT"> - <Platform>x86</Platform> - <PackageTargetRuntime>win7-x86</PackageTargetRuntime> - </BuildOSGroup> - <BuildOSGroup Include="Windows_NT"> - <Platform>amd64</Platform> - <PackageTargetRuntime>win7-x64</PackageTargetRuntime> - </BuildOSGroup> - <BuildOSGroup Include="Windows_NT"> - <Platform>arm64</Platform> - <PackageTargetRuntime>win10-arm64</PackageTargetRuntime> - </BuildOSGroup> - </ItemGroup> - - <ItemGroup> - <_project Include="@(BuildOSGroup)"> - <OSGroup>%(Identity)</OSGroup> - <Platform Condition="'%(Platform)' == ''">amd64</Platform> - <PackageTargetRuntime Condition="'%(PackageTargetRuntime)' == ''">%(Identity)-x64</PackageTargetRuntime> - <AdditionalProperties>PackageTargetRuntime=%(PackageTargetRuntime)</AdditionalProperties> - </_project> - - <Project Include="@(_project->'$(MSBuildProjectName).pkgproj')" /> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/layout/netstandard20/netstandard20.depproj b/layout/netstandard20/netstandard20.depproj deleted file mode 100644 index 08ac89c10c..0000000000 --- a/layout/netstandard20/netstandard20.depproj +++ /dev/null @@ -1,19 +0,0 @@ -<?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> - <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem> - <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> - <OutputPath>$(RestoredRefRootPath)netstandard20</OutputPath> - </PropertyGroup> - <ItemGroup> - <None Include="project.json" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <Target Name="FilterNugetPackage" AfterTargets="ResolveNuGetPackages"> - <!-- Filter down to just netstandard ref --> - <ItemGroup> - <Reference Remove="@(Reference)" Condition="'%(Filename)' != 'netstandard'" /> - </ItemGroup> - </Target> -</Project>
\ No newline at end of file diff --git a/layout/netstandard20/project.json b/layout/netstandard20/project.json deleted file mode 100644 index aa43004a04..0000000000 --- a/layout/netstandard20/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "NETStandard.Library2": "2.0.0-beta-24801-0" - } - } - } -} diff --git a/netci.groovy b/netci.groovy index e0567dde7d..7221be2f41 100644 --- a/netci.groovy +++ b/netci.groovy @@ -187,7 +187,8 @@ def testNugetRuntimeIdConfiguration = ['Debug': 'win7-x86', // Set up standard options. Utilities.addStandardOptions(newTestJob, isPR) // Add the unit test results - Utilities.addXUnitDotNETResults(newTestJob, 'bin/tests/**/testResults.xml') + // TODO: Re-enable test analysis when the build refactoring work allows it. + //Utilities.addXUnitDotNETResults(newTestJob, 'bin/tests/**/testResults.xml') def fullCoreFXTestJobName = projectFolder + '/' + newTestJob.name def newJob = buildFlowJob(Utilities.getFullJobName(project, newJobName, isPR)) { @@ -253,7 +254,8 @@ def testNugetRuntimeIdConfiguration = ['Debug': 'win7-x86', // Set up standard options. Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}") // Add the unit test results - Utilities.addXUnitDotNETResults(newJob, 'bin/tests/**/testResults.xml') + // TODO: Re-enable test analysis when the build refactoring work allows it. + // Utilities.addXUnitDotNETResults(newJob, 'bin/tests/**/testResults.xml') // Add archival for the built data. Utilities.addArchival(newJob, "msbuild.log", '', doNotFailIfNothingArchived=true, archiveOnlyIfSuccessful=false) // Set up appropriate triggers. PR on demand, otherwise nightly @@ -304,62 +306,69 @@ def testNugetRuntimeIdConfiguration = ['Debug': 'win7-x86', // that don't run per PR can be requested via a magic phrase. // ************************** [true, false].each { isPR -> - ['Debug', 'Release'].each { configurationGroup -> - ['Windows_NT', 'Ubuntu14.04', 'Ubuntu16.04', 'Ubuntu16.10', 'Debian8.4', 'CentOS7.1', 'OpenSUSE13.2', 'OpenSUSE42.1', 'Fedora23', 'Fedora24', 'RHEL7.2', 'OSX'].each { osName -> - def osGroup = osGroupMap[osName] - def newJobName = "${osName.toLowerCase()}_${configurationGroup.toLowerCase()}" + ['netcoreapp'].each { targetGroup -> + ['Debug', 'Release'].each { configurationGroup -> + ['Windows_NT', 'Ubuntu14.04', 'Ubuntu16.04', 'Ubuntu16.10', 'Debian8.4', 'CentOS7.1', 'OpenSUSE13.2', 'OpenSUSE42.1', 'Fedora23', 'Fedora24', 'RHEL7.2', 'OSX'].each { osName -> + def osGroup = osGroupMap[osName] + def newJobName = "${osName.toLowerCase()}_${configurationGroup.toLowerCase()}" - def newJob = job(Utilities.getFullJobName(project, newJobName, isPR)) { - // On Windows we use the packer to put together everything. On *nix we use tar - steps { - if (osName == 'Windows 10' || osName == 'Windows 7' || osName == 'Windows_NT') { - batchFile("call \"C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\vcvarsall.bat\" x86 && build.cmd -${configurationGroup} -os:${osGroup} -buildArch:${buildArchConfiguration[configurationGroup]} -TestNugetRuntimeId:${testNugetRuntimeIdConfiguration[configurationGroup]} -- /p:WithoutCategories=IgnoreForCI") - batchFile("C:\\Packer\\Packer.exe .\\bin\\build.pack .\\bin") - } - else { - // Use Server GC for Ubuntu/OSX Debug PR build & test - def useServerGC = (configurationGroup == 'Release' && isPR) ? 'useServerGC' : '' - shell("HOME=\$WORKSPACE/tempHome ./build.sh -${configurationGroup.toLowerCase()} -- ${useServerGC} /p:TestWithLocalNativeLibraries=true /p:TestNugetRuntimeId=${targetNugetRuntimeMap[osName]} /p:WithoutCategories=IgnoreForCI") - // Tar up the appropriate bits. On OSX the tarring is a different syntax for exclusion. - if (osName == 'OSX') { - shell("tar -czf bin/build.tar.gz --exclude *.Tests bin/*.${configurationGroup} bin/ref bin/packages") + def newJob = job(Utilities.getFullJobName(project, newJobName, isPR)) { + // On Windows we use the packer to put together everything. On *nix we use tar + steps { + if (osName == 'Windows 10' || osName == 'Windows 7' || osName == 'Windows_NT') { + batchFile("call \"C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\vcvarsall.bat\" x86 && build.cmd -${configurationGroup} -os:${osGroup} -buildArch:${buildArchConfiguration[configurationGroup]} -TestNugetRuntimeId:${testNugetRuntimeIdConfiguration[configurationGroup]} -- /p:WithoutCategories=IgnoreForCI /p:BuildConfiguration=${targetGroup}-${osGroup}-${configurationGroup}-${buildArchConfiguration[configurationGroup]}") + batchFile("C:\\Packer\\Packer.exe .\\bin\\build.pack .\\bin") } else { - shell("tar -czf bin/build.tar.gz bin/*.${configurationGroup} bin/ref bin/packages --exclude=*.Tests") + // Use Server GC for Ubuntu/OSX Debug PR build & test + def useServerGC = (configurationGroup == 'Release' && isPR) ? 'useServerGC' : '' + shell("HOME=\$WORKSPACE/tempHome ./build.sh -${configurationGroup.toLowerCase()} -- ${useServerGC} /p:TestWithLocalNativeLibraries=true /p:TestNugetRuntimeId=${targetNugetRuntimeMap[osName]} /p:WithoutCategories=IgnoreForCI /p:BuildConfiguration=${targetGroup}-${osGroup}-${configurationGroup}-x64") + // Tar up the appropriate bits. On OSX the tarring is a different syntax for exclusion. + if (osName == 'OSX') { + // TODO: Re-enable package archival when the build refactoring work allows it. + // shell("tar -czf bin/build.tar.gz --exclude *.Tests bin/*.${configurationGroup} bin/ref bin/packages") + shell("tar -czf bin/build.tar.gz --exclude *.Tests bin/*.${configurationGroup} bin/ref") + } + else { + // TODO: Re-enable package archival when the build refactoring work allows it. + // shell("tar -czf bin/build.tar.gz bin/*.${configurationGroup} bin/ref bin/packages --exclude=*.Tests") + shell("tar -czf bin/build.tar.gz bin/*.${configurationGroup} bin/ref --exclude=*.Tests") + } } } } - } - // Set the affinity. - Utilities.setMachineAffinity(newJob, osName, 'latest-or-auto') - // Set up standard options. - Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}") - // Add the unit test results - Utilities.addXUnitDotNETResults(newJob, 'bin/tests/**/testResults.xml') - def archiveContents = "msbuild.log" - if (osName.contains('Windows')) { - // Packer.exe is a .NET Framework application. When we can use it from the tool-runtime, we can archive the ".pack" file here. - archiveContents += ",bin/build.pack" - } - else { - archiveContents += ",bin/build.tar.gz" - } - // Add archival for the built data. - Utilities.addArchival(newJob, archiveContents, '', doNotFailIfNothingArchived=true, archiveOnlyIfSuccessful=false) - // Set up triggers - if (isPR) { - // Set PR trigger, we run Windows_NT, Ubuntu 14.04, CentOS 7.1 and OSX on every PR. - if ( osName == 'Windows_NT' || osName == 'Ubuntu14.04' || osName == 'CentOS7.1' || osName == 'OSX' ) { - Utilities.addGithubPRTriggerForBranch(newJob, branch, "Innerloop ${osName} ${configurationGroup} Build and Test") + // Set the affinity. + Utilities.setMachineAffinity(newJob, osName, 'latest-or-auto') + // Set up standard options. + Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}") + // Add the unit test results + // TODO: Re-enable test analysis when the build refactoring work allows it. + // Utilities.addXUnitDotNETResults(newJob, 'bin/tests/**/testResults.xml') + def archiveContents = "msbuild.log" + if (osName.contains('Windows')) { + // Packer.exe is a .NET Framework application. When we can use it from the tool-runtime, we can archive the ".pack" file here. + archiveContents += ",bin/build.pack" } else { - Utilities.addGithubPRTriggerForBranch(newJob, branch, "Innerloop ${osName} ${configurationGroup} Build and Test", "(?i).*test\\W+innerloop\\W+${osName}\\W+${configurationGroup}.*") + archiveContents += ",bin/build.tar.gz" + } + // Add archival for the built data. + Utilities.addArchival(newJob, archiveContents, '', doNotFailIfNothingArchived=true, archiveOnlyIfSuccessful=false) + // Set up triggers + if (isPR) { + // Set PR trigger, we run Windows_NT, Ubuntu 14.04, CentOS 7.1 and OSX on every PR. + if ( osName == 'Windows_NT' || osName == 'Ubuntu14.04' || osName == 'CentOS7.1' || osName == 'OSX' ) { + Utilities.addGithubPRTriggerForBranch(newJob, branch, "Innerloop ${osName} ${configurationGroup} Build and Test") + } + else { + Utilities.addGithubPRTriggerForBranch(newJob, branch, "Innerloop ${osName} ${configurationGroup} Build and Test", "(?i).*test\\W+innerloop\\W+${osName}\\W+${configurationGroup}.*") + } + } + else { + // Set a push trigger + Utilities.addGithubPushTrigger(newJob) } - } - else { - // Set a push trigger - Utilities.addGithubPushTrigger(newJob) } } } @@ -394,7 +403,9 @@ def testNugetRuntimeIdConfiguration = ['Debug': 'win7-x86', shell(script) // Archive the native and managed binaries - shell("tar -czf bin/build.tar.gz bin/*.${configurationGroup} bin/ref bin/packages --exclude=*.Tests") + // TODO: Re-enable package archival when the build refactoring work allows it. + // shell("tar -czf bin/build.tar.gz bin/*.${configurationGroup} bin/ref bin/packages --exclude=*.Tests") + shell("tar -czf bin/build.tar.gz bin/*.${configurationGroup} bin/ref --exclude=*.Tests") } } diff --git a/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.builds b/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.builds new file mode 100644 index 0000000000..7b457911ce --- /dev/null +++ b/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.builds @@ -0,0 +1,34 @@ +<?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" /> + + <Import Project="$(MSBuildProjectName).props" /> + + <ItemGroup> + <!-- identity project, runtime specific projects are included by props above --> + <Project Include="$(MSBuildProjectName).pkgproj" /> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> + + <PropertyGroup> + <TraversalBuildDependsOn> + FilterProjects; + $(TraversalBuildDependsOn); + </TraversalBuildDependsOn> + </PropertyGroup> + + <Target Name="FilterProjects"> + <Error Condition="'$(PackageRID)' == ''" Text="'PackageRID' property must be specified."/> + + <!-- Only build packages for current RID --> + <ItemGroup> + <_projectsToBuild Include="@(Project)" Condition="'%(Project.PackageTargetRuntime)' == '$(PackageRID)' OR '%(Project.PackageTargetRuntime)' == ''" /> + </ItemGroup> + + <ItemGroup> + <Project Remove="@(Project)" /> + <Project Include="@(_projectsToBuild)" /> + </ItemGroup> + </Target> +</Project>
\ No newline at end of file diff --git a/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj b/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj new file mode 100644 index 0000000000..7ffe5dd367 --- /dev/null +++ b/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj @@ -0,0 +1,126 @@ +<?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" /> + + <Import Project="$(MSBuildProjectName).props" /> + + <!-- Add path globs specific to native binaries to exclude unnecessary files from packages. --> + <Choose> + <When Condition="$(PackageTargetRuntime.StartsWith('win'))"/> + <When Condition="$(PackageTargetRuntime.StartsWith('osx'))"> + <PropertyGroup> + <LibraryFileExtension>.dylib</LibraryFileExtension> + <SymbolFileExtension>.dwarf</SymbolFileExtension> + </PropertyGroup> + </When> + <Otherwise> + <PropertyGroup> + <LibraryFileExtension>.so</LibraryFileExtension> + <SymbolFileExtension>.dbg</SymbolFileExtension> + </PropertyGroup> + </Otherwise> + </Choose> + <ItemGroup> + <AdditionalLibPackageExcludes Condition="'$(SymbolFileExtension)' != ''" Include="%2A%2A\%2A$(SymbolFileExtension)" /> + <AdditionalSymbolPackageExcludes Condition="'$(LibraryFileExtension)' != ''" Include="%2A%2A\%2A.a;%2A%2A\%2A$(LibraryFileExtension)" /> + </ItemGroup> + + <PropertyGroup> + <IsLineupPackage Condition="'$(PackageTargetRuntime)' == ''">true</IsLineupPackage> + <TargetFrameworkName>netcoreapp</TargetFrameworkName> + <TargetFrameworkVersion>1.1</TargetFrameworkVersion> + <TargetFramework>$(TargetFrameworkName)$(TargetFrameworkVersion)</TargetFramework> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <SkipValidatePackage>true</SkipValidatePackage> + + <RefBinDir>$(BinDir)$(TargetFrameworkName)/pkg/ref</RefBinDir> + <LibBinDir>$(BinDir)$(TargetFrameworkName)/pkg/lib</LibBinDir> + <NativeBinDir>$(BinDir)$(OSGroup).$(PackagePlatform).$(ConfigurationGroup)/native</NativeBinDir> + + <NETStandardLibraryPackage>NETStandard.Library2</NETStandardLibraryPackage> + <NETStandardLibraryPackageVersion>2.0.0-beta-24709-0</NETStandardLibraryPackageVersion> + <NETStandardVersion>1.7</NETStandardVersion> + </PropertyGroup> + + <ItemGroup> + <SuppressNETStandardMissingFile Include="mscorlib" /> + <SuppressNETStandardMissingFile Include="netstandard" /> + <SuppressNETStandardMissingFile Include="System.Core" /> + <SuppressNETStandardMissingFile Include="System" /> + <SuppressNETStandardMissingFile Include="System.Drawing" /> + <SuppressNETStandardMissingFile Include="System.Numerics" /> + <SuppressNETStandardMissingFile Include="System.Runtime.Serialization" /> + <SuppressNETStandardMissingFile Include="System.Web" /> + <SuppressNETStandardMissingFile Include="System.Xml" /> + <SuppressNETStandardMissingFile Include="System.Xml.Linq" /> + </ItemGroup> + + <ItemGroup Condition="'$(PackageTargetRuntime)' == ''"> + <ProjectReference Include="@(Project)" /> + + <!-- Include refs --> + <RefFile Include="$(RefBinDir)/*.*"> + <TargetPath>ref/$(TargetFramework)</TargetPath> + </RefFile> + <File Include="@(RefFile)" /> + <!-- force a missing file if ref build is absent --> + <File Include="$(RefBinDir)/MISSING_REF_BUILD" Condition="'@(RefFile)' == ''" /> + + <FilePackageDependency Include="Microsoft.NETCore.Platforms"> + <Version>$(PlatformPackageVersion)</Version> + </FilePackageDependency> + </ItemGroup> + + <ItemGroup Condition="'$(PackageTargetRuntime)' != ''"> + <!-- Include lib --> + <LibFile Include="$(LibBinDir)/*.*"> + <TargetPath>runtimes/$(PackageTargetRuntime)/lib/$(TargetFramework)</TargetPath> + </LibFile> + <File Include="@(LibFile)" /> + <!-- force a missing file if lib build is absent --> + <File Include="$(LibBinDir)/MISSING_LIB_BUILD" Condition="'@(LibFile)' == ''" /> + + <!-- Include native --> + <ExcludeNative Include="$(NativeBinDir)/*.lib" /> + <NativeFile Include="$(NativeBinDir)/*.*" Exclude="@(ExcludeNative)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </NativeFile> + <File Include="@(NativeFile)" /> + <!-- force a missing file if native build is absent --> + <File Include="$(NativeBinDir)/MISSING_NATIVE_BUILD" Condition="'@(NativeFile)' == ''" /> + </ItemGroup> + + <ItemGroup> + <IgnoredReference Include="System.Private.CoreLib" /> + </ItemGroup> + + <Target Name="VerifyClosure" AfterTargets="Build"> + <ItemGroup> + <_fileExisting Include="@(File)" Condition="Exists(%(FullPath))"/> + </ItemGroup> + + <VerifyClosure Sources="@(_fileExisting)" + IgnoredReferences="@(IgnoredReference)" /> + </Target> + + <Target Name="VerifyNETStandard" AfterTargets="Build"> + <ItemGroup> + <_NETStandardFile Include="$(PackagesDir)$(NETStandardLibraryPackage)\$(NETStandardLibraryPackageVersion)\ref\netstandard$(NETStandardVersion)\*.dll" /> + <_NETStandardMissingFile Include="@(_NETStandardFile->'%(FileName)')" Exclude="@(File->'%(FileName)')" /> + <_NETStandardMissingFileError Include="@(_NETStandardMissingFile)" Exclude="@(SuppressNETStandardMissingFile)" /> + <_NETStandardSuppressedMissingFile Include="@(_NETStandardMissingFile)" Exclude="@(_NETStandardMissingFileError)" /> + </ItemGroup> + <Message Condition="'@(_NETStandardSuppressedMissingFile)' != ''" Text="Files'@(_NETStandardSuppressedMissingFile)' are part of '$(NETStandardLibraryPackage)' but missing from this package. This error has been suppressed." /> + <Error Condition="'@(_NETStandardMissingFileError)' != ''" Text="Files '@(_NETStandardMissingFileError)' are part of '$(NETStandardLibraryPackage)' but missing from this package." /> + </Target> + + <Target Name="GetSymbolPackageFiles" BeforeTargets="GetPackageFiles"> + <ItemGroup> + <File> + <IsSymbolFile Condition="'%(Extension)' == '.pdb'">true</IsSymbolFile> + <IsSymbolFile Condition="'$(SymbolFileExtension)' != '' AND'%(Extension)' == '$(SymbolFileExtension)'">true</IsSymbolFile> + </File> + </ItemGroup> + </Target> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project> diff --git a/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.props b/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.props new file mode 100644 index 0000000000..738141221a --- /dev/null +++ b/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.props @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup Condition="'$(PackageRID)' == ''"> + <PackageRID>$(RuntimeOS)-$(ArchGroup)</PackageRID> + <!-- On Windows x86/x64 use Win7 regardless of current RuntimeOS --> + <PackageRID Condition="$(RuntimeOS.StartsWith('win')) AND ('$(ArchGroup)' == 'x86' OR '$(ArchGroup)' == 'x64')">win7-$(ArchGroup)</PackageRID> + </PropertyGroup> + + <ItemGroup> + <OfficialBuildRID Include="alpine.3.4.3-x64" /> + <OfficialBuildRID Include="debian.8-x64" /> + <OfficialBuildRID Include="fedora.23-x64" /> + <OfficialBuildRID Include="fedora.24-x64" /> + <OfficialBuildRID Include="opensuse.13.2-x64" /> + <OfficialBuildRID Include="opensuse.42.1-x64" /> + <OfficialBuildRID Include="osx.10.10-x64"> + <OSGroup>OSX</OSGroup> + </OfficialBuildRID> + <OfficialBuildRID Include="rhel.7-x64" /> + <OfficialBuildRID Include="ubuntu.14.04-x64" /> + <OfficialBuildRID Include="ubuntu.16.04-x64" /> + <OfficialBuildRID Include="ubuntu.16.10-x64" /> + <OfficialBuildRID Include="win7-x86"> + <Platform>x86</Platform> + <OSGroup>Windows_NT</OSGroup> + </OfficialBuildRID> + <OfficialBuildRID Include="win7-x64"> + <OSGroup>Windows_NT</OSGroup> + </OfficialBuildRID> + <OfficialBuildRID Include="win8-arm"> + <Platform>arm</Platform> + <OSGroup>Windows_NT</OSGroup> + </OfficialBuildRID> + <OfficialBuildRID Include="win10-arm64"> + <Platform>arm64</Platform> + <OSGroup>Windows_NT</OSGroup> + </OfficialBuildRID> + + <!-- Ensure we have a RID-specific package for the current build, even if it isn't in our official set --> + <BuildRID Include="@(OfficialBuildRID)" Exclude="$(PackageRID)"/> + <BuildRID Include="$(PackageRID)"> + <Platform Condition="'$(ArchGroup)' == 'x64'">amd64</Platform> + <Platform Condition="'$(ArchGroup)' != 'x64'">$(ArchGroup)</Platform> + <OSGroup>$(BuildConfiguration_OSGroup)</OSGroup> + </BuildRID> + </ItemGroup> + + <ItemGroup> + <_project Include="@(BuildRID)"> + <OSGroup Condition="'%(OSGroup)' == ''">Linux</OSGroup> + <Platform Condition="'%(Platform)' == ''">amd64</Platform> + <PackageTargetRuntime>%(Identity)</PackageTargetRuntime> + <AdditionalProperties>PackageTargetRuntime=%(Identity);OSGroup=%(OSGroup);Platform=%(Platform)</AdditionalProperties> + </_project> + + <Project Include="@(_project->'$(MSBuildProjectName).pkgproj')" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/pkg/baseline/baseline.props b/pkg/baseline/baseline.props index 5dd2fb0844..08bb474e18 100644 --- a/pkg/baseline/baseline.props +++ b/pkg/baseline/baseline.props @@ -5,11 +5,6 @@ <!-- Set PackageIndexFile to point to our local repo's index. This tells the packaging targets which index should be used for updates --> <PackageIndexFile>$(MSBuildThisFileDirectory)..\Microsoft.Private.PackageBaseline\packageIndex.json</PackageIndexFile> - - <!-- set the project.json file for pkgproj's to point to the project.json in this directory - to ensure that PKGProjs will restore harvested packages. --> - <ProjectJson>$(MSBuildThisFileDirectory)\project.json</ProjectJson> - <ProjectLockJson>$(MSBuildThisFileDirectory)\project.lock.json</ProjectLockJson> </PropertyGroup> <!-- make RestorePackages run before HarvestStablePackage to ensure we'll restore the baseline before harvesting --> diff --git a/run-test.sh b/run-test.sh index 0cf9aef1b4..0da216ae0a 100755 --- a/run-test.sh +++ b/run-test.sh @@ -392,7 +392,7 @@ fi if [ "$CoreFxNativeBins" == "" ] then - CoreFxNativeBins="$ProjectRoot/bin/$OS.x64.$ConfigurationGroup/Native" + CoreFxNativeBins="$ProjectRoot/bin/$OS.x64.$ConfigurationGroup/native" fi if [ "$CoreFxPackages" == "" ] diff --git a/src/Common/test-runtime/project.json b/src/Common/test-runtime/project.json deleted file mode 100644 index a410365d4f..0000000000 --- a/src/Common/test-runtime/project.json +++ /dev/null @@ -1,443 +0,0 @@ -{ - "dependencies": { - "coveralls.io": "1.4", - "OpenCover": "4.6.519", - "ReportGenerator": "2.5.0", - "Microsoft.NETCore.TestHost": "1.2.0-beta-24904-03", - "Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24904-03", - "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04", - "xunit.console.netcore": "1.0.3-prerelease-00921-01", - "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04", - "perf": { - "target": "project", - "include": "compile,runtime" - }, - "Microsoft.CSharp": "4.4.0-beta-24904-01", - "Microsoft.VisualBasic": "10.2.0-beta-24904-01", - "Microsoft.Win32.Primitives": "4.4.0-beta-24904-01", - "System.AppContext": "4.4.0-beta-24904-01", - "System.Buffers": "4.4.0-beta-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Collections.Concurrent": "4.4.0-beta-24904-01", - "System.Collections.Immutable": "1.4.0-beta-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Collections.Specialized": "4.4.0-beta-24904-01", - "System.ComponentModel": "4.4.0-beta-24904-01", - "System.ComponentModel.Annotations": "4.4.0-beta-24904-01", - "System.ComponentModel.EventBasedAsync": "4.4.0-beta-24904-01", - "System.ComponentModel.Primitives": "4.4.0-beta-24904-01", - "System.ComponentModel.TypeConverter": "4.4.0-beta-24904-01", - "System.Composition": "1.1.0-beta-24904-01", - "System.Composition.AttributedModel": "1.1.0-beta-24904-01", - "System.Composition.Convention": "1.1.0-beta-24904-01", - "System.Composition.Hosting": "1.1.0-beta-24904-01", - "System.Composition.Runtime": "1.1.0-beta-24904-01", - "System.Composition.TypedParts": "1.1.0-beta-24904-01", - "System.Console": "4.4.0-beta-24904-01", - "System.Data.Common": "4.4.0-beta-24904-01", - "System.Data.SqlClient": "4.4.0-beta-24904-01", - "runtime.native.System.Data.SqlClient.sni": "4.4.0-beta-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.DiagnosticSource": "4.4.0-beta-24904-01", - "System.Diagnostics.FileVersionInfo": "4.4.0-beta-24904-01", - "System.Diagnostics.StackTrace": "4.4.0-beta-24904-01", - "System.Diagnostics.TextWriterTraceListener": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Diagnostics.TraceSource": "4.4.0-beta-24904-01", - "System.Diagnostics.Tracing": "4.4.0-beta-24904-01", - "System.Drawing.Primitives": "4.4.0-beta-24904-01", - "System.Dynamic.Runtime": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.Globalization.Calendars": "4.4.0-beta-24904-01", - "System.Globalization.Extensions": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.Compression": "4.4.0-beta-24904-01", - "runtime.native.System.IO.Compression": "4.4.0-beta-24904-01", - "System.IO.Compression.ZipFile": "4.4.0-beta-24904-01", - "System.IO.Compression.TestData": "1.0.4-prerelease", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24904-01", - "System.IO.MemoryMappedFiles": "4.4.0-beta-24904-01", - "System.IO.Packaging": "4.4.0-beta-24904-01", - "System.IO.Packaging.TestData": "1.0.0-prerelease", - "System.IO.UnmanagedMemoryStream": "4.4.0-beta-24904-01", - "System.Json": "4.4.0-beta-24904-01", - "System.Linq": "4.4.0-beta-24904-01", - "System.Linq.Expressions": "4.4.0-beta-24904-01", - "System.Linq.Parallel": "4.4.0-beta-24904-01", - "System.Linq.Queryable": "4.4.0-beta-24904-01", - "System.Memory": "4.4.0-beta-24904-01", - "System.Net.Http": "4.4.0-beta-24904-01", - "System.Net.NameResolution": "4.4.0-beta-24904-01", - "System.Net.NetworkInformation": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Net.Requests": "4.4.0-beta-24904-01", - "System.Net.Sockets": "4.4.0-beta-24904-01", - "System.Net.WebHeaderCollection": "4.4.0-beta-24904-01", - "System.Net.WebSockets": "4.4.0-beta-24904-01", - "System.Net.WebSockets.Client": "4.4.0-beta-24904-01", - "System.Numerics.Vectors": "4.4.0-beta-24904-01", - "System.ObjectModel": "4.4.0-beta-24904-01", - "System.Private.DataContractSerialization": "4.4.0-beta-24904-01", - "System.Private.Uri": "4.4.0-beta-24904-01", - "System.Private.Xml": "4.4.0-beta-24904-01", - "System.Private.Xml.Linq": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Reflection.Context": "4.4.0-beta-24904-01", - "System.Reflection.DispatchProxy": "4.4.0-beta-24904-01", - "System.Reflection.Extensions": "4.4.0-beta-24904-01", - "System.Reflection.Metadata": "1.5.0-beta-24904-01", - "System.Reflection.Primitives": "4.4.0-beta-24904-01", - "System.Reflection.TypeExtensions": "4.4.0-beta-24904-01", - "System.Resources.Reader": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Resources.Writer": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.CompilerServices.Unsafe": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices.WindowsRuntime": "4.4.0-beta-24904-01", - "System.Runtime.Numerics": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Json": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Primitives": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Xml": "4.4.0-beta-24904-01", - "System.Security.Claims": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Algorithms": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Cng": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Encoding": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Pkcs": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Primitives": "4.4.0-beta-24904-01", - "System.Security.Cryptography.ProtectedData": "4.4.0-beta-24904-01", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24904-01", - "System.Security.Cryptography.X509Certificates.TestData": "1.0.2-prerelease", - "System.Security.Principal": "4.4.0-beta-24904-01", - "System.Security.Principal.Windows": "4.4.0-beta-24904-01", - "System.Security.SecureString": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Text.Encoding.CodePages": "4.4.0-beta-24904-01", - "System.Text.Encoding.Extensions": "4.4.0-beta-24904-01", - "System.Text.Encodings.Web": "4.4.0-beta-24904-01", - "System.Text.RegularExpressions": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Overlapped": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "System.Threading.Tasks.Dataflow": "4.8.0-beta-24904-01", - "System.Threading.Tasks.Extensions": "4.4.0-beta-24904-01", - "System.Threading.Tasks.Parallel": "4.4.0-beta-24904-01", - "System.Threading.Timer": "4.4.0-beta-24904-01", - "System.ValueTuple": "4.4.0-beta-24904-01", - "System.Web.HttpUtility": "4.4.0-beta-24904-01", - "System.Xml.ReaderWriter": "4.4.0-beta-24904-01", - "System.Xml.XDocument": "4.4.0-beta-24904-01", - "System.Xml.XmlDocument": "4.4.0-beta-24904-01", - "System.Xml.XmlSerializer": "4.4.0-beta-24904-01", - "System.Xml.XPath": "4.4.0-beta-24904-01", - "System.Xml.XPath.XDocument": "4.4.0-beta-24904-01", - "System.Xml.XPath.XmlDocument": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.3": { - "dependencies": { - "Microsoft.Win32.Registry": "4.4.0-beta-24904-01", - "Microsoft.Win32.Registry.AccessControl": "4.4.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.IO.FileSystem.AccessControl": "4.4.0-beta-24904-01", - "System.IO.FileSystem.DriveInfo": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Watcher": "4.4.0-beta-24904-01", - "System.IO.Pipes": "4.4.0-beta-24904-01", - "System.IO.Pipes.AccessControl": "4.4.0-beta-24904-01", - "System.Net.Http.WinHttpHandler": "4.4.0-beta-24904-01", - "System.Net.Ping": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Runtime.CompilerServices.VisualC": "4.4.0-beta-24904-01", - "System.Security.AccessControl": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Csp": "4.4.0-beta-24904-01", - "System.Threading.AccessControl": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01", - "System.Reflection.Emit": "4.4.0-beta-24904-01", - "System.Reflection.Emit.ILGeneration": "4.4.0-beta-24904-01", - "System.Reflection.Emit.Lightweight": "4.4.0-beta-24904-01" - } - }, - "netstandard1.4": { - "dependencies": { - "Microsoft.Win32.Registry": "4.4.0-beta-24904-01", - "Microsoft.Win32.Registry.AccessControl": "4.4.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.IO.FileSystem.AccessControl": "4.4.0-beta-24904-01", - "System.IO.FileSystem.DriveInfo": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Watcher": "4.4.0-beta-24904-01", - "System.IO.Pipes": "4.4.0-beta-24904-01", - "System.IO.Pipes.AccessControl": "4.4.0-beta-24904-01", - "System.Net.Http.WinHttpHandler": "4.4.0-beta-24904-01", - "System.Net.Ping": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Runtime.CompilerServices.VisualC": "4.4.0-beta-24904-01", - "System.Security.AccessControl": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Csp": "4.4.0-beta-24904-01", - "System.Threading.AccessControl": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01", - "System.ServiceProcess.ServiceController": "4.4.0-beta-24904-01", - "System.Reflection.Emit": "4.4.0-beta-24904-01", - "System.Reflection.Emit.ILGeneration": "4.4.0-beta-24904-01", - "System.Reflection.Emit.Lightweight": "4.4.0-beta-24904-01" - } - }, - "netstandard1.5": { - "dependencies": { - "Microsoft.Win32.Registry": "4.4.0-beta-24904-01", - "Microsoft.Win32.Registry.AccessControl": "4.4.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.IO.FileSystem.AccessControl": "4.4.0-beta-24904-01", - "System.IO.FileSystem.DriveInfo": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Watcher": "4.4.0-beta-24904-01", - "System.IO.Pipes": "4.4.0-beta-24904-01", - "System.IO.Pipes.AccessControl": "4.4.0-beta-24904-01", - "System.Net.Http.WinHttpHandler": "4.4.0-beta-24904-01", - "System.Net.Ping": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Runtime.CompilerServices.VisualC": "4.4.0-beta-24904-01", - "System.Security.AccessControl": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Csp": "4.4.0-beta-24904-01", - "System.Threading.AccessControl": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01", - "System.ServiceProcess.ServiceController": "4.4.0-beta-24904-01", - "System.Reflection.Emit": "4.4.0-beta-24904-01", - "System.Reflection.Emit.ILGeneration": "4.4.0-beta-24904-01", - "System.Reflection.Emit.Lightweight": "4.4.0-beta-24904-01" - } - }, - "netstandard1.6": { - "dependencies": { - "Microsoft.Win32.Registry": "4.4.0-beta-24904-01", - "Microsoft.Win32.Registry.AccessControl": "4.4.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.IO.FileSystem.AccessControl": "4.4.0-beta-24904-01", - "System.IO.FileSystem.DriveInfo": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Watcher": "4.4.0-beta-24904-01", - "System.IO.Pipes": "4.4.0-beta-24904-01", - "System.IO.Pipes.AccessControl": "4.4.0-beta-24904-01", - "System.Net.Http.WinHttpHandler": "4.4.0-beta-24904-01", - "System.Net.Ping": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Runtime.CompilerServices.VisualC": "4.4.0-beta-24904-01", - "System.Security.AccessControl": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Csp": "4.4.0-beta-24904-01", - "System.Threading.AccessControl": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01", - "System.ServiceProcess.ServiceController": "4.4.0-beta-24904-01", - "System.Security.Cryptography.OpenSsl": "4.4.0-beta-24904-01", - "System.Reflection.Emit": "4.4.0-beta-24904-01", - "System.Reflection.Emit.ILGeneration": "4.4.0-beta-24904-01", - "System.Reflection.Emit.Lightweight": "4.4.0-beta-24904-01" - } - }, - "netstandard1.7": { - "dependencies": { - "Microsoft.Win32.Registry": "4.4.0-beta-24904-01", - "Microsoft.Win32.Registry.AccessControl": "4.4.0-beta-24904-01", - "System.Configuration": "4.4.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.IO.FileSystem.AccessControl": "4.4.0-beta-24904-01", - "System.IO.FileSystem.DriveInfo": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Watcher": "4.4.0-beta-24904-01", - "System.IO.IsolatedStorage": "4.4.0-beta-24904-01", - "System.IO.Pipes": "4.4.0-beta-24904-01", - "System.IO.Pipes.AccessControl": "4.4.0-beta-24904-01", - "System.Net.Http.WinHttpHandler": "4.4.0-beta-24904-01", - "System.Net.HttpListener": "4.4.0-beta-24904-01", - "System.Net.Ping": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Runtime.CompilerServices.VisualC": "4.4.0-beta-24904-01", - "System.Security.AccessControl": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Csp": "4.4.0-beta-24904-01", - "System.Threading.AccessControl": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01", - "System.ServiceProcess.ServiceController": "4.4.0-beta-24904-01", - "System.Security.Cryptography.OpenSsl": "4.4.0-beta-24904-01", - "System.Net.ServicePoint": "4.4.0-beta-24904-01", - "System.Net.WebProxy": "4.4.0-beta-24904-01", - "System.Net.WebClient": "4.4.0-beta-24904-01", - "System.Net.Mail": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Formatters": "4.4.0-beta-24904-01", - "System.Security.Permissions": "4.4.0-beta-24904-01", - "System.Transactions": "4.4.0-beta-24904-01", - "System.Reflection.Emit": "4.4.0-beta-24904-01", - "System.Reflection.Emit.ILGeneration": "4.4.0-beta-24904-01", - "System.Reflection.Emit.Lightweight": "4.4.0-beta-24904-01" - } - }, - "netcoreapp1.0": { - "dependencies": { - "Microsoft.Win32.Registry": "4.4.0-beta-24904-01", - "Microsoft.Win32.Registry.AccessControl": "4.4.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.IO.FileSystem.AccessControl": "4.4.0-beta-24904-01", - "System.IO.FileSystem.DriveInfo": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Watcher": "4.4.0-beta-24904-01", - "System.IO.Pipes": "4.4.0-beta-24904-01", - "System.IO.Pipes.AccessControl": "4.4.0-beta-24904-01", - "System.Net.Http.WinHttpHandler": "4.4.0-beta-24904-01", - "System.Net.Ping": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Runtime.CompilerServices.VisualC": "4.4.0-beta-24904-01", - "System.Security.AccessControl": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Csp": "4.4.0-beta-24904-01", - "System.Threading.AccessControl": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01", - "System.ServiceProcess.ServiceController": "4.4.0-beta-24904-01", - "System.Security.Cryptography.OpenSsl": "4.4.0-beta-24904-01", - "System.Reflection.Emit": "4.4.0-beta-24904-01", - "System.Reflection.Emit.ILGeneration": "4.4.0-beta-24904-01", - "System.Reflection.Emit.Lightweight": "4.4.0-beta-24904-01", - "System.Runtime.Loader": "4.4.0-beta-24904-01" - } - }, - "netcoreapp1.1": { - "dependencies": { - "Microsoft.Win32.Registry": "4.4.0-beta-24904-01", - "Microsoft.Win32.Registry.AccessControl": "4.4.0-beta-24904-01", - "System.Configuration": "4.4.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.IO.FileSystem.AccessControl": "4.4.0-beta-24904-01", - "System.IO.FileSystem.DriveInfo": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Watcher": "4.4.0-beta-24904-01", - "System.IO.IsolatedStorage": "4.4.0-beta-24904-01", - "System.IO.Pipes": "4.4.0-beta-24904-01", - "System.IO.Pipes.AccessControl": "4.4.0-beta-24904-01", - "System.Net.Http.WinHttpHandler": "4.4.0-beta-24904-01", - "System.Net.HttpListener": "4.4.0-beta-24904-01", - "System.Net.Ping": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Runtime.CompilerServices.VisualC": "4.4.0-beta-24904-01", - "System.Security.AccessControl": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Csp": "4.4.0-beta-24904-01", - "System.Threading.AccessControl": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01", - "System.ServiceProcess.ServiceController": "4.4.0-beta-24904-01", - "System.Security.Cryptography.OpenSsl": "4.4.0-beta-24904-01", - "System.Net.ServicePoint": "4.4.0-beta-24904-01", - "System.Net.WebProxy": "4.4.0-beta-24904-01", - "System.Net.WebClient": "4.4.0-beta-24904-01", - "System.Net.Mail": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Formatters": "4.4.0-beta-24904-01", - "System.Security.Permissions": "4.4.0-beta-24904-01", - "System.Transactions": "4.4.0-beta-24904-01", - "System.Runtime.Loader": "4.4.0-beta-24904-01", - "System.Reflection.Emit": "4.4.0-beta-24904-01", - "System.Reflection.Emit.ILGeneration": "4.4.0-beta-24904-01", - "System.Reflection.Emit.Lightweight": "4.4.0-beta-24904-01" - } - }, - "uap10.0": { - "dependencies": { - "System.IO.IsolatedStorage": "4.4.0-beta-24904-01", - "System.Net.Http.Rtc": "4.4.0-beta-24904-01", - "System.Numerics.Vectors.WindowsRuntime": "4.4.0-beta-24904-01", - "System.Runtime.WindowsRuntime": "4.4.0-beta-24904-01", - "System.Runtime.WindowsRuntime.UI.Xaml": "4.4.0-beta-24904-01", - "microsoft.xunit.runner.uwp": "1.0.3-prerelease-00921-01", - "System.Diagnostics.Process": { - "version": "4.4.0-beta-24904-01", - "include": "compile" - } - } - } - }, - "supports": { - "coreFx.Test.net46": { - "net46": [ - "", - "win-x86", - "win-x64" - ] - }, - "coreFx.Test.net461": { - "net461": [ - "", - "win-x86", - "win-x64" - ] - }, - "coreFx.Test.net462": { - "net462": [ - "", - "win-x86", - "win-x64" - ] - }, - "coreFx.Test.net463": { - "net463": [ - "", - "win-x86", - "win-x64" - ] - }, - "coreFx.Test.netcore50": { - "uap10.0": [ - "win10-x86", - "win10-x86-aot", - "win10-x64", - "win10-x64-aot" - ] - }, - "coreFx.Test.netcoreapp1.0": { - "netcoreapp1.0": [ - "win7-x86", - "win7-x64", - "win8-x86", - "win8-x64", - "win81-x86", - "win81-x64", - "win10-x86", - "win10-x64", - "osx.10.10-x64", - "centos.7-x64", - "debian.8-x64", - "rhel.7-x64", - "ubuntu.14.04-x64", - "ubuntu.16.04-x64", - "ubuntu.16.10-x64", - "fedora.23-x64", - "linux-x64", - "opensuse.13.2-x64", - "opensuse.42.1-x64" - ] - }, - "coreFx.Test.netcoreapp1.1": { - "netcoreapp1.1": [ - "win7-x86", - "win7-x64", - "win8-x86", - "win8-x64", - "win81-x86", - "win81-x64", - "win10-x86", - "win10-x64", - "win10-arm64", - "osx.10.10-x64", - "centos.7-x64", - "debian.8-x64", - "rhel.7-x64", - "ubuntu.14.04-x64", - "ubuntu.16.04-x64", - "ubuntu.16.10-x64", - "fedora.23-x64", - "fedora.24-x64", - "linux-x64", - "opensuse.13.2-x64", - "opensuse.42.1-x64" - ] - } - } -} diff --git a/src/Common/tests/Common.Tests.csproj b/src/Common/tests/Common.Tests.csproj index 32ed27a753..7dc8f7c032 100644 --- a/src/Common/tests/Common.Tests.csproj +++ b/src/Common/tests/Common.Tests.csproj @@ -1,16 +1,10 @@ <?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>{C72FD34C-539A-4447-9796-62A229571199}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>Common.Tests</AssemblyName> <TestCategories>InnerLoop;OuterLoop</TestCategories> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'FreeBSD_Debug|AnyCPU'" /> @@ -22,9 +16,6 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Release|AnyCPU'" /> <ItemGroup> - <None Include="project.json" /> - </ItemGroup> - <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> <ItemGroup> diff --git a/src/Common/tests/Configurations.props b/src/Common/tests/Configurations.props new file mode 100644 index 0000000000..0c2d77f6b7 --- /dev/null +++ b/src/Common/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3-Unix; + netstandard1.3-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/Common/tests/System/Diagnostics/RemoteExecutorConsoleApp/RemoteExecutorConsoleApp.csproj b/src/Common/tests/System/Diagnostics/RemoteExecutorConsoleApp/RemoteExecutorConsoleApp.csproj index a5e91655e2..b8b6ea2d43 100644 --- a/src/Common/tests/System/Diagnostics/RemoteExecutorConsoleApp/RemoteExecutorConsoleApp.csproj +++ b/src/Common/tests/System/Diagnostics/RemoteExecutorConsoleApp/RemoteExecutorConsoleApp.csproj @@ -8,7 +8,8 @@ <AssemblyName>RemoteExecutorConsoleApp</AssemblyName> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <CopyNuGetImplementations>false</CopyNuGetImplementations> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> + <IsTestProject>true</IsTestProject> + <NoWarn>0436</NoWarn> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -24,14 +25,5 @@ <Link>Common\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == 'net46'"> - <TargetingPackReference Include="System" /> - <TargetingPackReference Include="System.Threading.Tasks" /> - <TargetingPackReference Include="System.Core" /> - <TargetingPackReference Include="System.Runtime" /> - </ItemGroup> - <ItemGroup> - <None Include="project.json" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/Common/tests/System/Diagnostics/RemoteExecutorConsoleApp/project.json b/src/Common/tests/System/Diagnostics/RemoteExecutorConsoleApp/project.json deleted file mode 100644 index 571d8c16b0..0000000000 --- a/src/Common/tests/System/Diagnostics/RemoteExecutorConsoleApp/project.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "System.Console": "4.3.0", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "test-runtime": { - "target": "project", - "exclude": "compile" - } - }, - "frameworks": { - "netstandard1.3": {} - } -} diff --git a/src/Common/tests/System/Diagnostics/RemoteExecutorTestBase.cs b/src/Common/tests/System/Diagnostics/RemoteExecutorTestBase.cs index c51bc3a05f..da26377ab8 100644 --- a/src/Common/tests/System/Diagnostics/RemoteExecutorTestBase.cs +++ b/src/Common/tests/System/Diagnostics/RemoteExecutorTestBase.cs @@ -15,8 +15,10 @@ namespace System.Diagnostics { /// <summary>The name of the test console app.</summary> protected const string TestConsoleApp = "RemoteExecutorConsoleApp.exe"; - /// <summary>The CoreCLR host used to host the test console app.</summary> - protected static readonly string HostRunner = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "CoreRun.exe" : "corerun"; + /// <summary>The name of the CoreCLR host used to host the test console app.</summary> + protected static readonly string HostRunnerName = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "CoreRun.exe" : "corerun"; + /// <summary>The absolute path to the host runner executable.</summary> + protected static string HostRunner => Path.Combine(AppContext.BaseDirectory, HostRunnerName); /// <summary>A timeout (milliseconds) after which a wait on a remote operation should be considered a failure.</summary> public const int FailWaitTimeoutMilliseconds = 30 * 1000; diff --git a/src/Common/tests/System/Net/Prerequisites/Servers/CoreFxNetCloudService/WebServer/WebServer.csproj b/src/Common/tests/System/Net/Prerequisites/Servers/CoreFxNetCloudService/WebServer/WebServer.csproj index f4b930d831..dd4c5fcad8 100644 --- a/src/Common/tests/System/Net/Prerequisites/Servers/CoreFxNetCloudService/WebServer/WebServer.csproj +++ b/src/Common/tests/System/Net/Prerequisites/Servers/CoreFxNetCloudService/WebServer/WebServer.csproj @@ -206,4 +206,6 @@ <Target Name="AfterBuild"> </Target> --> + <Target Name="AnnotateProjectsWithConfiguration" /> + <Target Name="FindBestConfiguration" /> </Project>
\ No newline at end of file diff --git a/src/Common/tests/System/TypeBuilderExtensions.cs b/src/Common/tests/System/TypeBuilderExtensions.cs new file mode 100644 index 0000000000..4defc57886 --- /dev/null +++ b/src/Common/tests/System/TypeBuilderExtensions.cs @@ -0,0 +1,10 @@ +using System; +using System.Reflection; +using System.Reflection.Emit; + +// This is a temporary workaround for TypeBuilder and EnumBuilder not extending TypeInfo. See https://github.com/dotnet/corefx/issues/14334. +public static class TypeBuilderExtensions +{ + public static Type AsType(this TypeBuilder tb) => tb; + public static Type AsType(this EnumBuilder eb) => eb; +}
\ No newline at end of file diff --git a/src/Common/tests/System/Xml/BaseLibManaged/BaseLibManaged.csproj b/src/Common/tests/System/Xml/BaseLibManaged/BaseLibManaged.csproj index 81f366e0a2..5e11de3909 100644 --- a/src/Common/tests/System/Xml/BaseLibManaged/BaseLibManaged.csproj +++ b/src/Common/tests/System/Xml/BaseLibManaged/BaseLibManaged.csproj @@ -2,13 +2,10 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{42F10363-C2A2-42B5-B7B9-1B5DBB0BC71E}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>BaseLibManaged</AssemblyName> <RootNamespace>WebData.BaseLib</RootNamespace> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> + <IsTestProject>true</IsTestProject> + <NoWarn>0436</NoWarn> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> </PropertyGroup> @@ -20,11 +17,5 @@ <Link>Common\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </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/Common/tests/System/Xml/BaseLibManaged/project.json b/src/Common/tests/System/Xml/BaseLibManaged/project.json deleted file mode 100644 index 1c8390b138..0000000000 --- a/src/Common/tests/System/Xml/BaseLibManaged/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "test-runtime": { - "target": "project", - "exclude": "compile" - } - }, - "frameworks": { - "netstandard1.3": {} - } -} diff --git a/src/Common/tests/System/Xml/ModuleCore/ModuleCore.csproj b/src/Common/tests/System/Xml/ModuleCore/ModuleCore.csproj index 34a0f7cc1c..e30befb8c6 100644 --- a/src/Common/tests/System/Xml/ModuleCore/ModuleCore.csproj +++ b/src/Common/tests/System/Xml/ModuleCore/ModuleCore.csproj @@ -2,13 +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" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{3CF0CC76-4CE0-460A-BA37-657CFED39AB0}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>ModuleCore</AssemblyName> - <RootNamespace>OLEDB.Test.ModuleCore</RootNamespace> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> + <IsTestProject>true</IsTestProject> + <NoWarn>0436</NoWarn> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> </PropertyGroup> @@ -31,11 +27,5 @@ <Link>Common\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </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/Common/tests/System/Xml/ModuleCore/project.json b/src/Common/tests/System/Xml/ModuleCore/project.json deleted file mode 100644 index 7b51fa7208..0000000000 --- a/src/Common/tests/System/Xml/ModuleCore/project.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Console": "4.3.0", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "test-runtime": { - "target": "project", - "exclude": "compile" - } - }, - "frameworks": { - "netstandard1.3": {} - }, - "supports": { - "coreFx.Test.netcore50": {}, - "coreFx.Test.netcoreapp1.0": {}, - "coreFx.Test.net46": {}, - "coreFx.Test.net461": {}, - "coreFx.Test.net462": {}, - "coreFx.Test.net463": {} - } -} diff --git a/src/Common/tests/System/Xml/XmlCoreTest/XmlCoreTest.csproj b/src/Common/tests/System/Xml/XmlCoreTest/XmlCoreTest.csproj index fc415864af..374ada6fe8 100644 --- a/src/Common/tests/System/Xml/XmlCoreTest/XmlCoreTest.csproj +++ b/src/Common/tests/System/Xml/XmlCoreTest/XmlCoreTest.csproj @@ -2,13 +2,11 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{89701565-F68B-46D9-BD78-95B0F052C50B}</ProjectGuid> - <OutputType>Library</OutputType> <AssemblyName>XmlCoreTest</AssemblyName> <RootNamespace>XmlCoreTest.Common</RootNamespace> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> + <IsTestProject>true</IsTestProject> + <NoWarn>0436</NoWarn> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> </PropertyGroup> diff --git a/src/Common/tests/System/Xml/XmlCoreTest/project.json b/src/Common/tests/System/Xml/XmlCoreTest/project.json deleted file mode 100644 index 75e025673f..0000000000 --- a/src/Common/tests/System/Xml/XmlCoreTest/project.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Console": "4.3.0", - "System.IO": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "System.Xml.ReaderWriter": "4.4.0-beta-24904-01", - "test-runtime": { - "target": "project", - "exclude": "compile" - } - }, - "frameworks": { - "netstandard1.3": {} - }, - "supports": { - "coreFx.Test.netcore50": {}, - "coreFx.Test.netcoreapp1.0": {}, - "coreFx.Test.net46": {}, - "coreFx.Test.net461": {}, - "coreFx.Test.net462": {}, - "coreFx.Test.net463": {} - } -} diff --git a/src/Common/tests/System/Xml/XmlDiff/XmlDiff.csproj b/src/Common/tests/System/Xml/XmlDiff/XmlDiff.csproj index e0eecf98bc..e35742c9c3 100644 --- a/src/Common/tests/System/Xml/XmlDiff/XmlDiff.csproj +++ b/src/Common/tests/System/Xml/XmlDiff/XmlDiff.csproj @@ -2,13 +2,11 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{466D87DF-BDEC-4E6C-BACD-317D79B8EDBE}</ProjectGuid> - <OutputType>Library</OutputType> <AssemblyName>XmlDiff</AssemblyName> <RootNamespace>System.Xml.XmlDiff</RootNamespace> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> + <IsTestProject>true</IsTestProject> + <NoWarn>0436</NoWarn> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> </PropertyGroup> diff --git a/src/Common/tests/System/Xml/XmlDiff/project.json b/src/Common/tests/System/Xml/XmlDiff/project.json deleted file mode 100644 index 7ce543619b..0000000000 --- a/src/Common/tests/System/Xml/XmlDiff/project.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Console": "4.3.0", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Xml.ReaderWriter": "4.4.0-beta-24904-01", - "test-runtime": { - "target": "project", - "exclude": "compile" - } - }, - "frameworks": { - "netstandard1.3": {} - }, - "supports": { - "coreFx.Test.netcore50": {}, - "coreFx.Test.netcoreapp1.0": {}, - "coreFx.Test.net46": {}, - "coreFx.Test.net461": {}, - "coreFx.Test.net462": {}, - "coreFx.Test.net463": {} - } -} diff --git a/src/Microsoft.CSharp/dir.props b/src/Microsoft.CSharp/dir.props index 16a766f83b..14527fd4b3 100644 --- a/src/Microsoft.CSharp/dir.props +++ b/src/Microsoft.CSharp/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.0.3.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ No newline at end of file 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 9805c90b7c..0000000000 --- a/src/Microsoft.CSharp/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Dynamic.Runtime": "4.4.0-beta-24904-01", - "System.Linq.Expressions": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/Microsoft.CSharp/src/Configurations.props b/src/Microsoft.CSharp/src/Configurations.props new file mode 100644 index 0000000000..fc9ef9822c --- /dev/null +++ b/src/Microsoft.CSharp/src/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/Microsoft.CSharp/src/Microsoft.CSharp.builds b/src/Microsoft.CSharp/src/Microsoft.CSharp.builds deleted file mode 100644 index 78fe72cc24..0000000000 --- a/src/Microsoft.CSharp/src/Microsoft.CSharp.builds +++ /dev/null @@ -1,9 +0,0 @@ -<?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> - <Project Include="Microsoft.CSharp.csproj" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/Microsoft.CSharp/src/Microsoft.CSharp.csproj b/src/Microsoft.CSharp/src/Microsoft.CSharp.csproj index fbabd92291..e5435e7c8d 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> @@ -7,7 +7,6 @@ <RootNamespace>Microsoft.CSharp</RootNamespace> <!-- dotnet/corefx#3128 tracks removing this exclusion --> <ExcludeLocalizationImport Condition="'$(TargetsWindows)' != 'true'">true</ExcludeLocalizationImport> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -217,7 +216,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 90c5a2c1ca..0000000000 --- a/src/Microsoft.CSharp/src/project.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "dependencies": { - "System.Collections": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Dynamic.Runtime": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.Linq": "4.4.0-beta-24904-01", - "System.Linq.Expressions": "4.4.0-beta-24904-01", - "System.ObjectModel": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Reflection.Extensions": "4.4.0-beta-24904-01", - "System.Reflection.Primitives": "4.4.0-beta-24904-01", - "System.Reflection.TypeExtensions": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/Microsoft.CSharp/tests/Configurations.props b/src/Microsoft.CSharp/tests/Configurations.props new file mode 100644 index 0000000000..98f53209d4 --- /dev/null +++ b/src/Microsoft.CSharp/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj b/src/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj index 0512f74c88..f060516018 100644 --- a/src/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj +++ b/src/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj @@ -3,20 +3,11 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{82B54697-0251-47A1-8546-FC507D0F3B08}</ProjectGuid> - <AssemblyName>Microsoft.CSharp.Tests</AssemblyName> - <RootNamespace>Microsoft.CSharp.Tests</RootNamespace> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <ItemGroup> <Compile Include="CSharpArgumentInfoTests.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\Microsoft.CSharp.pkgproj"> - <Project>{96AA2060-C846-4E56-9509-E8CB9C114C8F}</Project> - <Name>Microsoft.CSharp</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/Microsoft.TargetingPack.Private.CoreCLR/ref/Microsoft.TargetingPack.Private.CoreCLR.depproj b/src/Microsoft.TargetingPack.Private.CoreCLR/ref/Microsoft.TargetingPack.Private.CoreCLR.depproj new file mode 100644 index 0000000000..39b1a43ac9 --- /dev/null +++ b/src/Microsoft.TargetingPack.Private.CoreCLR/ref/Microsoft.TargetingPack.Private.CoreCLR.depproj @@ -0,0 +1,13 @@ +<?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.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" /> +</Project>
\ No newline at end of file diff --git a/src/Microsoft.TargetingPack.Private.CoreCLR/ref/project.json b/src/Microsoft.TargetingPack.Private.CoreCLR/ref/project.json new file mode 100644 index 0000000000..9f1eb5d2fb --- /dev/null +++ b/src/Microsoft.TargetingPack.Private.CoreCLR/ref/project.json @@ -0,0 +1,8 @@ +{ + "dependencies": { + "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24728-02" + }, + "frameworks": { + "netcoreapp1.1": {} + } +} diff --git a/src/Microsoft.TargetingPack.Private.WinRT/ref/Microsoft.TargetingPack.Private.WinRT.depproj b/src/Microsoft.TargetingPack.Private.WinRT/ref/Microsoft.TargetingPack.Private.WinRT.depproj new file mode 100644 index 0000000000..5f01d724a0 --- /dev/null +++ b/src/Microsoft.TargetingPack.Private.WinRT/ref/Microsoft.TargetingPack.Private.WinRT.depproj @@ -0,0 +1,13 @@ +<?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>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> diff --git a/src/Microsoft.TargetingPack.Private.WinRT/ref/project.json b/src/Microsoft.TargetingPack.Private.WinRT/ref/project.json new file mode 100644 index 0000000000..1c4ed39edf --- /dev/null +++ b/src/Microsoft.TargetingPack.Private.WinRT/ref/project.json @@ -0,0 +1,8 @@ +{ + "dependencies": { + "Microsoft.TargetingPack.Private.WinRT": "1.0.3" + }, + "frameworks": { + "netstandard1.0": {} + } +} diff --git a/src/Microsoft.VisualBasic/dir.props b/src/Microsoft.VisualBasic/dir.props index f0f33952bc..e80e25c7f3 100644 --- a/src/Microsoft.VisualBasic/dir.props +++ b/src/Microsoft.VisualBasic/dir.props @@ -1,8 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <PackageVersion>10.2.0</PackageVersion> <AssemblyVersion>10.0.3.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> - +</Project>
\ 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/Configurations.props b/src/Microsoft.VisualBasic/src/Configurations.props new file mode 100644 index 0000000000..f0ebe53119 --- /dev/null +++ b/src/Microsoft.VisualBasic/src/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/Microsoft.VisualBasic/src/Microsoft.VisualBasic.builds b/src/Microsoft.VisualBasic/src/Microsoft.VisualBasic.builds deleted file mode 100644 index bc3cc3d230..0000000000 --- a/src/Microsoft.VisualBasic/src/Microsoft.VisualBasic.builds +++ /dev/null @@ -1,8 +0,0 @@ -<?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> - <Project Include="Microsoft.VisualBasic.vbproj" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> diff --git a/src/Microsoft.VisualBasic/src/Microsoft.VisualBasic.vbproj b/src/Microsoft.VisualBasic/src/Microsoft.VisualBasic.vbproj index 0109345ecb..08d3ded383 100644 --- a/src/Microsoft.VisualBasic/src/Microsoft.VisualBasic.vbproj +++ b/src/Microsoft.VisualBasic/src/Microsoft.VisualBasic.vbproj @@ -14,8 +14,7 @@ <DefineConstants>$(DefineConstants),LATEBINDING=True</DefineConstants> <AssemblyName>Microsoft.VisualBasic</AssemblyName> <NoStdLib>true</NoStdLib> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker> - <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.3;netcore50</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard1.3'">netstandard1.3;netcore50</PackageTargetFramework> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -48,7 +47,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.VisualBasic/tests/Configurations.props b/src/Microsoft.VisualBasic/tests/Configurations.props new file mode 100644 index 0000000000..f0ebe53119 --- /dev/null +++ b/src/Microsoft.VisualBasic/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.csproj b/src/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.csproj index e47b4c9013..ba77126032 100644 --- a/src/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.csproj +++ b/src/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.csproj @@ -3,20 +3,11 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{82B54697-0251-47A1-8546-FC507D0F3B08}</ProjectGuid> - <AssemblyName>Microsoft.VisualBasic.Tests</AssemblyName> - <RootNamespace>Microsoft.VisualBasic.Tests</RootNamespace> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <ItemGroup> <Compile Include="StringsTests.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\Microsoft.VisualBasic.pkgproj"> - <Project>{FE25D593-8029-4726-ABC2-944522B5BE04}</Project> - <Name>Microsoft.VisualBasic</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/Microsoft.Win32.Primitives/dir.props b/src/Microsoft.Win32.Primitives/dir.props index fcc1a7ca5a..bfbc5bd9e0 100644 --- a/src/Microsoft.Win32.Primitives/dir.props +++ b/src/Microsoft.Win32.Primitives/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 f53f8e32db..0000000000 --- a/src/Microsoft.Win32.Primitives/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/Microsoft.Win32.Primitives/src/Configurations.props b/src/Microsoft.Win32.Primitives/src/Configurations.props new file mode 100644 index 0000000000..3bb6330d9e --- /dev/null +++ b/src/Microsoft.Win32.Primitives/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard-Unix; + netstandard-Windows_NT; + net463-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.builds b/src/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.builds deleted file mode 100644 index 2428b716b3..0000000000 --- a/src/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.builds +++ /dev/null @@ -1,17 +0,0 @@ -<?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> - <Project Include="Microsoft.Win32.Primitives.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="Microsoft.Win32.Primitives.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="Microsoft.Win32.Primitives.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj b/src/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj index f9b874367a..3c4ce387ac 100644 --- a/src/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj +++ b/src/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj @@ -1,8 +1,5 @@ -<?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> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{8FFE99C0-22F8-4462-B839-970EAC1B3472}</ProjectGuid> @@ -10,9 +7,8 @@ <AssemblyName>Microsoft.Win32.Primitives</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.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> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> @@ -21,10 +17,10 @@ <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'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="System\ComponentModel\Win32Exception.cs" /> </ItemGroup> - <ItemGroup Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' != 'net463' "> + <ItemGroup Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' == 'netstandard' "> <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs"> <Link>Common\Interop\Windows\Interop.Libraries.cs</Link> </Compile> @@ -33,7 +29,7 @@ </Compile> <Compile Include="System\ComponentModel\Win32Exception.Windows.cs" /> </ItemGroup> - <ItemGroup Condition=" '$(TargetsUnix)' == 'true' And '$(TargetGroup)' != 'net463' "> + <ItemGroup Condition=" '$(TargetsUnix)' == 'true' And '$(TargetGroup)' == 'netstandard' "> <Compile Include="System\ComponentModel\Win32Exception.Unix.cs" /> <Compile Include="$(CommonPath)\Interop\Unix\Interop.Libraries.cs"> <Link>Common\Interop\Unix\Interop.Libraries.cs</Link> @@ -47,7 +43,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 1ed63e2c32..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-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01" - } - } - } -} diff --git a/src/Microsoft.Win32.Primitives/tests/Configurations.props b/src/Microsoft.Win32.Primitives/tests/Configurations.props new file mode 100644 index 0000000000..512c938bad --- /dev/null +++ b/src/Microsoft.Win32.Primitives/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.csproj b/src/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.csproj index 3a186ddb02..e4676389b7 100644 --- a/src/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.csproj +++ b/src/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.csproj @@ -2,22 +2,10 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{3B17C130-FF2C-4B41-82C6-FADF4ED7FDA0}</ProjectGuid> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>Microsoft.Win32.Primitives.Tests</RootNamespace> - <AssemblyName>Microsoft.Win32.Primitives.Tests</AssemblyName> - <DefaultLanguage>en-US</DefaultLanguage> - <FileAlignment>512</FileAlignment> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> - </PropertyGroup> - <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> <ItemGroup> <Compile Include="Win32Exception.cs" /> </ItemGroup> @@ -27,14 +15,5 @@ <Link>Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\Microsoft.Win32.Primitives.pkgproj"> - <Project>{8ffe99c0-22f8-4462-b839-970eac1b3472}</Project> - <Name>Microsoft.Win32.Primitives</Name> - </ProjectReference> - </ItemGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> 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/Configurations.props b/src/Microsoft.Win32.Registry.AccessControl/src/Configurations.props new file mode 100644 index 0000000000..234a60ff3a --- /dev/null +++ b/src/Microsoft.Win32.Registry.AccessControl/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3-Windows_NT; + netstandard1.3-Unix; + net46; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.builds b/src/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.builds deleted file mode 100644 index 3da2ca41f7..0000000000 --- a/src/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.builds +++ /dev/null @@ -1,16 +0,0 @@ -<?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> - <Project Include="Microsoft.Win32.Registry.AccessControl.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="Microsoft.Win32.Registry.AccessControl.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="Microsoft.Win32.Registry.AccessControl.csproj"> - <TargetGroup>net46</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> 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..f8ea6a7d60 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,22 +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"> - <PropertyGroup> - <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <AssemblyName>Microsoft.Win32.Registry.AccessControl</AssemblyName> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net46'">None</ResourcesSourceOutputDirectory> <GeneratePlatformNotSupportedAssembly Condition="'$(TargetsUnix)' == 'true'">true</GeneratePlatformNotSupportedAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' == '' AND '$(TargetsWindows)' == 'true'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard1.3' AND '$(TargetsWindows)' == 'true'"> <Compile Include="Microsoft\Win32\RegistryAclExtensions.cs" /> <Compile Include="System\Security\AccessControl\RegistrySecurity.cs" /> <Compile Include="$(CommonPath)\Interop\Windows\Interop.Errors.cs"> @@ -28,7 +24,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.AccessControl/tests/Configurations.props b/src/Microsoft.Win32.Registry.AccessControl/tests/Configurations.props new file mode 100644 index 0000000000..5d77dc616e --- /dev/null +++ b/src/Microsoft.Win32.Registry.AccessControl/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.csproj b/src/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.csproj index a72b51caca..090c316fa1 100644 --- a/src/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.csproj +++ b/src/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.csproj @@ -3,19 +3,11 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{82B54697-0251-47A1-8546-FC507D0F3B08}</ProjectGuid> - <AssemblyName>Microsoft.Win32.Registry.AccessControl.Tests</AssemblyName> - <RootNamespace>Microsoft.Win32.Registry.AccessControl.Tests</RootNamespace> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <ItemGroup Condition="'$(TargetGroup)' == ''"> <Compile Include="RegistryAclExtensionsTests.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\Microsoft.Win32.Registry.AccessControl.pkgproj"> - <Name>Microsoft.Win32.Registry.AccessControl</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/Microsoft.Win32.Registry/dir.props b/src/Microsoft.Win32.Registry/dir.props index fcc1a7ca5a..8f2003a937 100644 --- a/src/Microsoft.Win32.Registry/dir.props +++ b/src/Microsoft.Win32.Registry/dir.props @@ -3,5 +3,7 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> + <IsNETCoreAppRef>false</IsNETCoreAppRef> </PropertyGroup> </Project>
\ 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 803c8de8f9..0000000000 --- a/src/Microsoft.Win32.Registry/ref/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/Microsoft.Win32.Registry/src/Configurations.props b/src/Microsoft.Win32.Registry/src/Configurations.props new file mode 100644 index 0000000000..743b2ab182 --- /dev/null +++ b/src/Microsoft.Win32.Registry/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard-Windows_NT; + netstandard-Unix; + net463-AnyOS; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.builds b/src/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.builds deleted file mode 100644 index 4941be0a8c..0000000000 --- a/src/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.builds +++ /dev/null @@ -1,17 +0,0 @@ -<?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> - <Project Include="Microsoft.Win32.Registry.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="Microsoft.Win32.Registry.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="Microsoft.Win32.Registry.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj b/src/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj index 0fbded8dc6..48f8cfde31 100644 --- a/src/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj +++ b/src/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj @@ -1,8 +1,5 @@ -<?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> <ProjectGuid>{D3F18ACC-D327-4ABB-BA6C-E9C34A041B2F}</ProjectGuid> @@ -11,7 +8,6 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <DefineConstants>$(DefineConstants);REGISTRY_ASSEMBLY</DefineConstants> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Debug|AnyCPU'" /> @@ -20,7 +16,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.RegistryOptions.cs"> <Link>Common\Interop\Windows\Interop.RegistryOptions.cs</Link> </Compile> @@ -35,7 +31,7 @@ <Compile Include="Microsoft\Win32\SafeHandles\SafeRegistryHandle.cs" /> <Compile Include="System\Security\AccessControl\RegistryRights.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' != 'net463' AND '$(TargetsWindows)' == 'true'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard' AND '$(TargetsWindows)' == 'true'"> <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs"> <Link>Common\Interop\Windows\Interop.Libraries.cs</Link> </Compile> @@ -98,7 +94,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 9de1e33f02..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-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - } - } - } -} diff --git a/src/Microsoft.Win32.Registry/tests/Configurations.props b/src/Microsoft.Win32.Registry/tests/Configurations.props new file mode 100644 index 0000000000..5d77dc616e --- /dev/null +++ b/src/Microsoft.Win32.Registry/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj b/src/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj index 7f97677012..51389388bc 100644 --- a/src/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj +++ b/src/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj @@ -1,17 +1,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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{20A2BA2C-5517-483F-8FFE-643441A59852}</ProjectGuid> - <OutputType>Library</OutputType> - <RootNamespace>Microsoft.Win32.Registry.Tests</RootNamespace> - <AssemblyName>Microsoft.Win32.Registry.Tests</AssemblyName> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -62,11 +53,5 @@ <Compile Include="TestData.cs" /> <Compile Include="XunitAssemblyAttributes.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\Microsoft.Win32.Registry.pkgproj"> - <Project>{d3f18acc-d327-4abb-ba6c-e9c34a041b2f}</Project> - <Name>Microsoft.Win32.Registry</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/Native/build-native.cmd b/src/Native/build-native.cmd index 996989bda1..16a4bb0341 100644 --- a/src/Native/build-native.cmd +++ b/src/Native/build-native.cmd @@ -9,6 +9,7 @@ set __rootDir=%~dp0..\.. set __CMakeBinDir="" set __IntermediatesDir="" set __BuildArch=x64 +set __TargetGroup=netcoreapp set __appContainer="" set __VCBuildArch=x86_amd64 set CMAKE_BUILD_TYPE=Debug @@ -31,6 +32,7 @@ if /i [%1] == [amd64] ( set __BuildArch=x64&&set __VCBuildArch=x86_amd64&& if /i [%1] == [arm64] ( set __BuildArch=arm64&&set __VCBuildArch=arm64&&shift&goto Arg_Loop) if /i [%1] == [toolsetDir] ( set "__ToolsetDir=%2"&&shift&&shift&goto Arg_Loop) +if /i [%1] == [targetGroup] ( set "__TargetGroup=%2"&&shift&&shift&goto Arg_Loop) shift goto :Arg_Loop @@ -69,13 +71,14 @@ echo Commencing build of native components echo. if %__CMakeBinDir% == "" ( - set "__CMakeBinDir=%__binDir%\Windows_NT.%__BuildArch%.%CMAKE_BUILD_TYPE%\Native" + set "__CMakeBinDir=%__binDir%\Windows_NT.%__BuildArch%.%CMAKE_BUILD_TYPE%\native" ) if %__IntermediatesDir% == "" ( - set "__IntermediatesDir=%__binDir%\obj\Windows_NT.%__BuildArch%.%CMAKE_BUILD_TYPE%\Native" + set "__IntermediatesDir=%__binDir%\obj\Windows_NT.%__BuildArch%.%CMAKE_BUILD_TYPE%\native" ) set "__CMakeBinDir=%__CMakeBinDir:\=/%" set "__IntermediatesDir=%__IntermediatesDir:\=/%" +set "__RuntimePath=%__binDir%\runtime\%__TargetGroup%-Windows_NT-%CMAKE_BUILD_TYPE%-%__BuildArch%\" :: Check that the intermediate directory exists so we can place our cmake build tree there if exist "%__IntermediatesDir%" rd /s /q "%__IntermediatesDir%" @@ -122,11 +125,15 @@ call %__rootDir%/run.cmd build-managed -project="%__IntermediatesDir%\install.vc IF ERRORLEVEL 1 ( goto :Failure ) + +:: Copy to vertical runtime directory +xcopy /yqs "%__binDir%\Windows_NT.%__BuildArch%.%CMAKE_BUILD_TYPE%\native\*" "%__RuntimePath%" + echo Done building Native components :BuildNativeAOT -set "__CMakeBinDir=%__binDir%\Windows_NT.%__BuildArch%.%CMAKE_BUILD_TYPE%\Native_aot" -set "__IntermediatesDir=%__binDir%\obj\Windows_NT.%__BuildArch%.%CMAKE_BUILD_TYPE%\Native_aot" +set "__CMakeBinDir=%__binDir%\Windows_NT.%__BuildArch%.%CMAKE_BUILD_TYPE%\native_aot" +set "__IntermediatesDir=%__binDir%\obj\Windows_NT.%__BuildArch%.%CMAKE_BUILD_TYPE%\native_aot" set "__CMakeBinDir=%__CMakeBinDir:\=/%" set "__IntermediatesDir=%__IntermediatesDir:\=/%" if exist "%__IntermediatesDir%" rd /s /q "%__IntermediatesDir%" diff --git a/src/Native/build-native.sh b/src/Native/build-native.sh index a58546a838..4141f6bf3d 100755 --- a/src/Native/build-native.sh +++ b/src/Native/build-native.sh @@ -26,6 +26,7 @@ setup_dirs() mkdir -p "$__BinDir" mkdir -p "$__IntermediatesDir" + mkdir -p "$__RuntimePath" } # Check the system to ensure the right pre-reqs are in place @@ -93,6 +94,12 @@ build_native() fi } +copy_to_vertical_runtime() +{ + echo "Copying native shims to vertical runtime folder." + cp $__BinDir/* "$__RuntimePath" +} + __scriptpath=$(cd "$(dirname "$0")"; pwd -P) __nativeroot=$__scriptpath/Unix __rootRepo="$__scriptpath/../.." @@ -106,6 +113,7 @@ __BuildArch=x64 __BuildType=Debug __CMakeArgs=DEBUG __BuildOS=Linux +__TargetGroup=netcoreapp __NumProc=1 __UnprocessedBuildArgs= __CrossBuild=0 @@ -171,6 +179,10 @@ while :; do osx) __BuildOS=OSX ;; + --targetgroup) + shift + __TargetGroup=$1 + ;; --numproc) shift __NumProc=$1 @@ -258,8 +270,9 @@ case $CPUName in esac # Set the remaining variables based upon the determined build configuration -__IntermediatesDir="$__rootbinpath/obj/$__BuildOS.$__BuildArch.$__BuildType/Native" -__BinDir="$__rootbinpath/$__BuildOS.$__BuildArch.$__BuildType/Native" +__IntermediatesDir="$__rootbinpath/obj/$__BuildOS.$__BuildArch.$__BuildType/native" +__BinDir="$__rootbinpath/$__BuildOS.$__BuildArch.$__BuildType/native" +__RuntimePath="$__rootbinpath/runtime/$__TargetGroup-$__BuildOS-$__BuildType-$__BuildArch" # Make the directories necessary for build if they don't exist setup_dirs @@ -283,3 +296,7 @@ fi # Build the corefx native components. build_native + + # Copy files to vertical runtime folder + + copy_to_vertical_runtime diff --git a/src/Native/pkg/dir.props b/src/Native/pkg/dir.props index 5c967a177d..5fbb801cee 100644 --- a/src/Native/pkg/dir.props +++ b/src/Native/pkg/dir.props @@ -4,14 +4,14 @@ <PropertyGroup> <!-- common properties that point to output of native build. Can be overriden in case of a coordinating build that produces all packages from OS-specific native builds --> - <LinuxNativePath Condition="'$(LinuxNativePath)' == ''">$(BinDir)Linux.$(PackagePlatform).$(ConfigurationGroup)\Native\</LinuxNativePath> - <WinNativeAOTPath Condition="'$(WinNativeAOTPath)' == ''">$(BinDir)Windows_NT.$(PackagePlatform).$(ConfigurationGroup)\Native_aot\</WinNativeAOTPath> - <WinNativePath Condition="'$(WinNativePath)' == ''">$(BinDir)Windows_NT.$(PackagePlatform).$(ConfigurationGroup)\Native\</WinNativePath> + <LinuxNativePath Condition="'$(LinuxNativePath)' == ''">$(BinDir)Linux.$(PackagePlatform).$(ConfigurationGroup)\native\</LinuxNativePath> + <WinNativeAOTPath Condition="'$(WinNativeAOTPath)' == ''">$(BinDir)Windows_NT.$(PackagePlatform).$(ConfigurationGroup)\native_aot\</WinNativeAOTPath> + <WinNativePath Condition="'$(WinNativePath)' == ''">$(BinDir)Windows_NT.$(PackagePlatform).$(ConfigurationGroup)\native\</WinNativePath> <RHELNativePath Condition="'$(RHELNativePath)' == ''">$(LinuxNativePath)</RHELNativePath> <DebianNativePath Condition="'$(DebianNativePath)' == ''">$(LinuxNativePath)</DebianNativePath> <Fedora23NativePath Condition="'$(Fedora23NativePath)' == ''">$(LinuxNativePath)</Fedora23NativePath> <Fedora24NativePath Condition="'$(Fedora24NativePath)' == ''">$(LinuxNativePath)</Fedora24NativePath> - <OSXNativePath Condition="'$(OSXNativePath)' == ''">$(BinDir)OSX.$(PackagePlatform).$(ConfigurationGroup)\Native\</OSXNativePath> + <OSXNativePath Condition="'$(OSXNativePath)' == ''">$(BinDir)OSX.$(PackagePlatform).$(ConfigurationGroup)\native\</OSXNativePath> <OpenSuse132NativePath Condition="'$(OpenSuse132NativePath)' == ''">$(LinuxNativePath)</OpenSuse132NativePath> <OpenSuse421NativePath Condition="'$(OpenSuse421NativePath)' == ''">$(LinuxNativePath)</OpenSuse421NativePath> <Ubuntu1404NativePath Condition="'$(Ubuntu1404NativePath)' == ''">$(LinuxNativePath)</Ubuntu1404NativePath> diff --git a/src/Native/pkg/runtime.native.System.Data.SqlClient.sni/project.json b/src/Native/pkg/runtime.native.System.Data.SqlClient.sni/project.json deleted file mode 100644 index 99634d2045..0000000000 --- a/src/Native/pkg/runtime.native.System.Data.SqlClient.sni/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "frameworks": { - "netstandard1.0": { - "dependencies": { - "runtime.win7-x64.runtime.native.System.Data.SqlClient.sni": "4.4.0-beta-24627-00", - "runtime.win7-x86.runtime.native.System.Data.SqlClient.sni": "4.4.0-beta-24627-00", - "runtime.win10-arm64.runtime.native.System.Data.SqlClient.sni": "4.3.0-beta-24727-00" - } - } - } -}
\ No newline at end of file diff --git a/src/System.AppContext/dir.props b/src/System.AppContext/dir.props index 7bb155c44e..a960cef1a3 100644 --- a/src/System.AppContext/dir.props +++ b/src/System.AppContext/dir.props @@ -1,7 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.2.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.AppContext/ref/4.0.0/project.json b/src/System.AppContext/ref/4.0.0/project.json deleted file mode 100644 index 9e9a12edaf..0000000000 --- a/src/System.AppContext/ref/4.0.0/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.AppContext": "4.3.0" - }, - "frameworks": { - "netstandard1.3": {} - } -}
\ 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/Configurations.props b/src/System.AppContext/src/Configurations.props new file mode 100644 index 0000000000..f20b2fb8af --- /dev/null +++ b/src/System.AppContext/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.AppContext/src/System.AppContext.builds b/src/System.AppContext/src/System.AppContext.builds deleted file mode 100644 index 673466e8e4..0000000000 --- a/src/System.AppContext/src/System.AppContext.builds +++ /dev/null @@ -1,11 +0,0 @@ -<?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> - <Project Include="System.AppContext.csproj" /> - <Project Include="System.AppContext.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project>
\ 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..3795494b0a 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> @@ -10,7 +10,6 @@ <!-- The following line needs to be removed once we have a targeting pack for 4.6.3 --> <TargetingPackNugetPackageId Condition="'$(TargetGroup)'=='net463'">Microsoft.TargetingPack.NETFramework.v4.6.2</TargetingPackNugetPackageId> <ExcludeResourcesImport Condition="'$(IsPartialFacadeAssembly)'=='true'">true</ExcludeResourcesImport> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the options --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -26,7 +25,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/netcore50aot/project.json b/src/System.AppContext/src/netcore50aot/project.json deleted file mode 100644 index ef7832b6f4..0000000000 --- a/src/System.AppContext/src/netcore50aot/project.json +++ /dev/null @@ -1,15 +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.Collections": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0" - } - } - } -}
\ No newline at end of file diff --git a/src/System.AppContext/src/project.json b/src/System.AppContext/src/project.json deleted file mode 100644 index 9f4b1f0445..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-24904-03" - } - }, - "netcore50": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.AppContext/tests/Configurations.props b/src/System.AppContext/tests/Configurations.props new file mode 100644 index 0000000000..f0ebe53119 --- /dev/null +++ b/src/System.AppContext/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.AppContext/tests/System.AppContext.Tests.csproj b/src/System.AppContext/tests/System.AppContext.Tests.csproj index 781c15140a..909e3e36a6 100644 --- a/src/System.AppContext/tests/System.AppContext.Tests.csproj +++ b/src/System.AppContext/tests/System.AppContext.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{82B54697-0251-47A1-8546-FC507D0F3B08}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.AppContext.Tests</AssemblyName> - <RootNamespace>System.AppContext.Tests</RootNamespace> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> @@ -16,8 +10,5 @@ <Compile Include="AppContext.Switch.cs" /> <Compile Include="AppContext.Switch.Validation.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.AppContext.pkgproj" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Buffers/dir.props b/src/System.Buffers/dir.props index ba7c08a94c..cfbc7971a2 100644 --- a/src/System.Buffers/dir.props +++ b/src/System.Buffers/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.0.2.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ No newline at end of file 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 414536ed12..0000000000 --- a/src/System.Buffers/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.1": {} - } -} diff --git a/src/System.Buffers/src/Configurations.props b/src/System.Buffers/src/Configurations.props new file mode 100644 index 0000000000..e133d875b2 --- /dev/null +++ b/src/System.Buffers/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.1; + netcoreapp; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Buffers/src/System.Buffers.builds b/src/System.Buffers/src/System.Buffers.builds deleted file mode 100644 index bb1aba4911..0000000000 --- a/src/System.Buffers/src/System.Buffers.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.Buffers.csproj" /> - <Project Include="System.Buffers.csproj"> - <TargetGroup>netstandard1.1</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Buffers/src/System.Buffers.csproj b/src/System.Buffers/src/System.Buffers.csproj index 80fb3ccb9c..324682e12f 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> @@ -6,24 +6,23 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile> <UseOpenKey Condition="'$(UseOpenKey)'==''">true</UseOpenKey> - <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == ''">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETCoreApp,Version=v1.1</NuGetTargetMoniker> + <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netcoreapp'">true</IsPartialFacadeAssembly> </PropertyGroup> <!-- Default configurations to help VS understand the options --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' != ''"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard1.1'"> <Compile Include="System\Buffers\ArrayPool.cs" /> <Compile Include="System\Buffers\ArrayPoolEventSource.cs" /> <Compile Include="System\Buffers\DefaultArrayPool.cs" /> <Compile Include="System\Buffers\DefaultArrayPoolBucket.cs" /> <Compile Include="System\Buffers\Utilities.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == ''"> + <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'"> <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 c6f7a2a9d9..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-24904-03" - } - } - } -} diff --git a/src/System.Buffers/tests/Configurations.props b/src/System.Buffers/tests/Configurations.props new file mode 100644 index 0000000000..f0ebe53119 --- /dev/null +++ b/src/System.Buffers/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Buffers/tests/System.Buffers.Tests.csproj b/src/System.Buffers/tests/System.Buffers.Tests.csproj index b93553f4fd..ddedd4d4cf 100644 --- a/src/System.Buffers/tests/System.Buffers.Tests.csproj +++ b/src/System.Buffers/tests/System.Buffers.Tests.csproj @@ -2,22 +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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{62E2AD5F-C8D0-45FB-B6A5-AED2C77F198C}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Buffers.Tests</AssemblyName> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <ItemGroup> <Compile Include="ArrayPool\UnitTests.cs" /> <Compile Include="$(CommonTestPath)\System\Diagnostics\Tracing\TestEventListener.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Buffers.pkgproj"> - <Name>System.Buffers</Name> - <Project>{2ADDB484-6F57-4D71-A3FE-A57EC6329A2B}</Project> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file 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 5f066114de..0000000000 --- a/src/System.CodeDom/ref/project.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "dependencies": { - "System.Collections.Specialized": "4.4.0-beta-24904-01", - "System.ComponentModel.TypeConverter": "4.4.0-beta-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Security.Permissions": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.CodeDom/src/Configurations.props b/src/System.CodeDom/src/Configurations.props new file mode 100644 index 0000000000..32bba83db7 --- /dev/null +++ b/src/System.CodeDom/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net461; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.CodeDom/src/System.CodeDom.builds b/src/System.CodeDom/src/System.CodeDom.builds deleted file mode 100644 index f5242a5a85..0000000000 --- a/src/System.CodeDom/src/System.CodeDom.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.CodeDom.csproj" /> - <Project Include="System.CodeDom.csproj"> - <TargetGroup>net461</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.CodeDom/src/System.CodeDom.csproj b/src/System.CodeDom/src/System.CodeDom.csproj index c9247b795a..5067732408 100644 --- a/src/System.CodeDom/src/System.CodeDom.csproj +++ b/src/System.CodeDom/src/System.CodeDom.csproj @@ -1,18 +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> <ProjectGuid>{53D09AF4-0C13-4197-B8AD-9746F0374E88}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net461'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the options --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.7_Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.7_Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard_Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard_Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net461_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net461_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' != 'net461'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="Microsoft\CSharp\CSharpCodeGenerator.cs" /> <Compile Include="Microsoft\CSharp\CSharpCodeProvider.cs" /> <Compile Include="Microsoft\CSharp\CSharpMemberAttributeConverter.cs" /> @@ -134,7 +133,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 295a458c5b..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-24904-01", - "System.Collections.Specialized": "4.4.0-beta-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.ComponentModel.TypeConverter": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Diagnostics.Tracing": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.Globalization.Extensions": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Security.Permissions": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Text.RegularExpressions": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - } - }, - "net461": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.1": "1.0.1" - } - } - } -} diff --git a/src/System.CodeDom/tests/Configurations.props b/src/System.CodeDom/tests/Configurations.props new file mode 100644 index 0000000000..98f53209d4 --- /dev/null +++ b/src/System.CodeDom/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.CodeDom/tests/System.CodeDom.Tests.csproj b/src/System.CodeDom/tests/System.CodeDom.Tests.csproj index 79446c3535..a3732f1d71 100644 --- a/src/System.CodeDom/tests/System.CodeDom.Tests.csproj +++ b/src/System.CodeDom/tests/System.CodeDom.Tests.csproj @@ -2,8 +2,6 @@ <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>{0D1E2954-A5C7-4B8C-932A-31EB4A96A726}</ProjectGuid> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'netstandard1.7_Debug|AnyCPU' " /> @@ -109,14 +107,5 @@ <Link>Common\System\Collections\TestBase.NonGeneric.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.CodeDom.pkgproj"> - <Name>System.CodeDom</Name> - <Project>{53D09AF4-0C13-4197-B8AD-9746F0374E88}</Project> - </ProjectReference> - </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.Collections.Concurrent/dir.props b/src/System.Collections.Concurrent/dir.props index fa177afe16..eeb9f31f5a 100644 --- a/src/System.Collections.Concurrent/dir.props +++ b/src/System.Collections.Concurrent/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.0.14.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Collections.Concurrent/ref/Configurations.props b/src/System.Collections.Concurrent/ref/Configurations.props new file mode 100644 index 0000000000..84eaf1100d --- /dev/null +++ b/src/System.Collections.Concurrent/ref/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard; + netcoreapp; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Collections.Concurrent/ref/System.Collections.Concurrent.builds b/src/System.Collections.Concurrent/ref/System.Collections.Concurrent.builds deleted file mode 100644 index b7e0dd2352..0000000000 --- a/src/System.Collections.Concurrent/ref/System.Collections.Concurrent.builds +++ /dev/null @@ -1,8 +0,0 @@ -<?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> - <Project Include="System.Collections.Concurrent.csproj" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> diff --git a/src/System.Collections.Concurrent/ref/System.Collections.Concurrent.csproj b/src/System.Collections.Concurrent/ref/System.Collections.Concurrent.csproj index 75d394dfc4..0ac08d61ea 100644 --- a/src/System.Collections.Concurrent/ref/System.Collections.Concurrent.csproj +++ b/src/System.Collections.Concurrent/ref/System.Collections.Concurrent.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> - <AssemblyVersion>4.0.10.0</AssemblyVersion> - <OutputType>Library</OutputType> - <NuGetTargetMoniker Condition="'$(TargetGroup)'==''">.NETCoreApp,Version=v1.1</NuGetTargetMoniker> <DefineConstants Condition="'$(TargetGroup)'==''">$(DefineConstants);netcoreapp11</DefineConstants> </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 20485a5526..0000000000 --- a/src/System.Collections.Concurrent/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.3.0", - "System.Threading.Tasks": "4.3.0" - }, - "frameworks": { - "netstandard1.3": {}, - "netcoreapp1.1": {} - } -}
\ No newline at end of file diff --git a/src/System.Collections.Concurrent/src/Configurations.props b/src/System.Collections.Concurrent/src/Configurations.props new file mode 100644 index 0000000000..fc9ef9822c --- /dev/null +++ b/src/System.Collections.Concurrent/src/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Collections.Concurrent/src/System.Collections.Concurrent.builds b/src/System.Collections.Concurrent/src/System.Collections.Concurrent.builds deleted file mode 100644 index e9329e04ec..0000000000 --- a/src/System.Collections.Concurrent/src/System.Collections.Concurrent.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.Collections.Concurrent.csproj" /> - <!-- Net46 facade is currently inbox - <Project Include="System.Collections.Concurrent.csproj"> - <TargetGroup>net46</TargetGroup> - </Project> --> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project>
\ 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 51de2d7294..200dc03479 100644 --- a/src/System.Collections.Concurrent/src/System.Collections.Concurrent.csproj +++ b/src/System.Collections.Concurrent/src/System.Collections.Concurrent.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> <ProjectGuid>{96AA2060-C846-4E56-9509-E8CB9C114C8F}</ProjectGuid> <AssemblyName>System.Collections.Concurrent</AssemblyName> <RootNamespace>System.Collections.Concurrent</RootNamespace> - <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' != 'net46'"> + <ItemGroup> <Compile Include="System\Collections\Concurrent\BlockingCollection.cs" /> <Compile Include="System\Collections\Concurrent\CDSCollectionETWBCLProvider.cs" /> <Compile Include="System\Collections\Concurrent\ConcurrentBag.cs" /> @@ -26,12 +22,17 @@ <Compile Include="System\Collections\Concurrent\PartitionerStatic.cs" /> <Compile Include="System\Collections\Concurrent\PlatformHelper.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == 'net46'"> - <TargetingPackReference Include="mscorlib" /> - <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 ffd3296173..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-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Diagnostics.Tracing": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - } - }, - "net46": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Collections.Concurrent/tests/Configurations.props b/src/System.Collections.Concurrent/tests/Configurations.props new file mode 100644 index 0000000000..512c938bad --- /dev/null +++ b/src/System.Collections.Concurrent/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj b/src/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj index 06ce9fc170..feea24aead 100644 --- a/src/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj +++ b/src/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj @@ -2,20 +2,12 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Collections.Concurrent.Tests</AssemblyName> - <RootNamespace>System.Collections.Concurrent.Tests</RootNamespace> <DefineConstants Condition="'$(TargetGroup)'==''">$(DefineConstants);netstandard17</DefineConstants> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> <ItemGroup> <!-- Common Collections tests --> <Compile Include="$(CommonTestPath)\System\Collections\CollectionAsserts.cs"> @@ -86,15 +78,15 @@ <Link>Common\System\Diagnostics\DebuggerAttributes.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' != 'netcoreapp1.1'"> + <ItemGroup Condition="'$(TargetGroup)' != 'netstandard1.7"> <Compile Include="ConcurrentDictionary\ConcurrentDictionaryExtensions.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)'!='' and '$(TargetGroup)'!='netcoreapp1.1'"> + <ItemGroup Condition="'$(TargetGroup)'!='netstandard1.7'"> <Compile Include="$(CommonPath)\System\SerializableAttribute.cs"> <Link>Common\System\SerializableAttribute.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)'==''"> + <ItemGroup Condition="'$(TargetGroup)'=='netstandard1.7'"> <Compile Include="$(CommonTestPath)\System\Collections\IEnumerable.NonGeneric.Serialization.Tests.cs"> <Link>Common\System\Collections\IEnumerable.NonGeneric.Serialization.Tests.cs</Link> </Compile> @@ -102,11 +94,5 @@ <Link>Common\System\Collections\IEnumerable.Generic.Serialization.Tests.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Collections.Concurrent.pkgproj"> - <Project>{96AA2060-C846-4E56-9509-E8CB9C114C8F}</Project> - <Name>System.Collections.Concurrent</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Collections.Immutable/dir.props b/src/System.Collections.Immutable/dir.props index 432e03c0f6..3074a6b9a0 100644 --- a/src/System.Collections.Immutable/dir.props +++ b/src/System.Collections.Immutable/dir.props @@ -1,8 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <PackageVersion>1.4.0</PackageVersion> <AssemblyVersion>1.2.2</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Collections.Immutable/src/Configurations.props b/src/System.Collections.Immutable/src/Configurations.props new file mode 100644 index 0000000000..2ec0365c0d --- /dev/null +++ b/src/System.Collections.Immutable/src/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.0; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Collections.Immutable/src/System.Collections.Immutable.builds b/src/System.Collections.Immutable/src/System.Collections.Immutable.builds deleted file mode 100644 index 115c349038..0000000000 --- a/src/System.Collections.Immutable/src/System.Collections.Immutable.builds +++ /dev/null @@ -1,9 +0,0 @@ -<?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> - <Project Include="System.Collections.Immutable.csproj" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Collections.Immutable/src/System.Collections.Immutable.csproj b/src/System.Collections.Immutable/src/System.Collections.Immutable.csproj index 675581c91f..43321cc649 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> @@ -10,8 +10,7 @@ <FileAlignment>512</FileAlignment> <DocumentationFile>$(OutputPath)System.Collections.Immutable.xml</DocumentationFile> <GenerateAppxPackageOnBuild>False</GenerateAppxPackageOnBuild> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.0</NuGetTargetMoniker> - <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.0;portable-net45+win8+wp8+wpa81</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard1.0'">netstandard1.0;portable-net45+win8+wp8+wpa81</PackageTargetFramework> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <Optimize>false</Optimize> @@ -90,15 +89,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.Immutable/tests/Configurations.props b/src/System.Collections.Immutable/tests/Configurations.props new file mode 100644 index 0000000000..f0ebe53119 --- /dev/null +++ b/src/System.Collections.Immutable/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj b/src/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj index a31faf62af..be35a331ba 100644 --- a/src/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj +++ b/src/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj @@ -2,16 +2,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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>System.Collections.Immutable.Test</RootNamespace> - <AssemblyName>System.Collections.Immutable.Tests</AssemblyName> - <FileAlignment>512</FileAlignment> - <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> + <NoWarn>0436</NoWarn> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -107,16 +99,6 @@ <None Include="ClassDiagram1.cd" /> <Compile Include="ImmutableArray\ImmutableArray.Generic.Tests.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Collections.Immutable.pkgproj"> - <Project>{1dd0ff15-6234-4bd6-850a-317f05479554}</Project> - <Name>System.Collections.Immutable</Name> - <Private>true</Private> - </ProjectReference> - </ItemGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> <ItemGroup /> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Collections.NonGeneric/dir.props b/src/System.Collections.NonGeneric/dir.props index 503cf86a87..bfbc5bd9e0 100644 --- a/src/System.Collections.NonGeneric/dir.props +++ b/src/System.Collections.NonGeneric/dir.props @@ -1,7 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> - +</Project>
\ 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 6826a2bcc5..68f469d1cd 100644 --- a/src/System.Collections.NonGeneric/ref/System.Collections.NonGeneric.csproj +++ b/src/System.Collections.NonGeneric/ref/System.Collections.NonGeneric.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.NonGeneric.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> <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 e0e9cf3cdc..0000000000 --- a/src/System.Collections.NonGeneric/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Collections.NonGeneric/src/Configurations.props b/src/System.Collections.NonGeneric/src/Configurations.props new file mode 100644 index 0000000000..9c336c0be9 --- /dev/null +++ b/src/System.Collections.NonGeneric/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Collections.NonGeneric/src/System.Collections.NonGeneric.builds b/src/System.Collections.NonGeneric/src/System.Collections.NonGeneric.builds deleted file mode 100644 index 3b02f06aa1..0000000000 --- a/src/System.Collections.NonGeneric/src/System.Collections.NonGeneric.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.Collections.NonGeneric.csproj" /> - <Project Include="System.Collections.NonGeneric.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj b/src/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj index 66b8a93c2a..0a412d3d92 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> @@ -6,16 +6,15 @@ <RootNamespace>System.Collections.NonGeneric</RootNamespace> <AssemblyName>System.Collections.NonGeneric</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.7_Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.7_Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard_Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard_Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="System\Collections\CaseInsensitiveComparer.cs" /> <Compile Include="System\Collections\CaseInsensitiveHashCodeProvider.cs" /> <Compile Include="System\Collections\CollectionBase.cs" /> @@ -35,7 +34,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 def72f050c..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-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Collections.NonGeneric/tests/Configurations.props b/src/System.Collections.NonGeneric/tests/Configurations.props new file mode 100644 index 0000000000..512c938bad --- /dev/null +++ b/src/System.Collections.NonGeneric/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Collections.NonGeneric/tests/Performance/System.Collections.NonGeneric.Performance.Tests.csproj b/src/System.Collections.NonGeneric/tests/Performance/System.Collections.NonGeneric.Performance.Tests.csproj index 5d96ef47c1..2f2200ba3c 100644 --- a/src/System.Collections.NonGeneric/tests/Performance/System.Collections.NonGeneric.Performance.Tests.csproj +++ b/src/System.Collections.NonGeneric/tests/Performance/System.Collections.NonGeneric.Performance.Tests.csproj @@ -2,10 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <RootNamespace>System.Collections.NonGeneric.Performance.Tests</RootNamespace> - <AssemblyName>System.Collections.NonGeneric.Performance.Tests</AssemblyName> <IncludePerformanceTests>true</IncludePerformanceTests> - <NugetTargetMoniker>.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> @@ -16,12 +13,5 @@ <Link>Common\System\PerfUtils.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\pkg\System.Collections.NonGeneric.pkgproj"> - <Name>System.Collections.NonGeneric</Name> - </ProjectReference> - <!-- Do not remove this P2P reference since part of the implementation of NonGeneric has moved to Runtime.Extensions --> - <ProjectReference Include="..\..\..\System.Runtime.Extensions\pkg\System.Runtime.Extensions.pkgproj" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.csproj b/src/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.csproj index 6b9cf500d9..95b6925778 100644 --- a/src/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.csproj +++ b/src/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.csproj @@ -2,20 +2,12 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <RootNamespace>System.Collections.NonGeneric.Tests</RootNamespace> - <AssemblyName>System.Collections.NonGeneric.Tests</AssemblyName> <ProjectGuid>{EE95AE39-845A-42D3-86D0-8065DBE56612}</ProjectGuid> - <DefineConstants Condition="'$(TargetGroup)'==''">$(DefineConstants);netstandard17</DefineConstants> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> + <DefineConstants Condition="'$(TargetGroup)'=='netstandard1.7'">$(DefineConstants);netstandard17</DefineConstants> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> <ItemGroup> <!-- Common Collections tests --> <Compile Include="$(CommonTestPath)\System\Collections\ICollection.NonGeneric.Tests.cs"> @@ -56,23 +48,16 @@ <Link>Common\System\Diagnostics\DebuggerAttributes.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)'!=''"> + <ItemGroup Condition="'$(TargetGroup)'!='netstandard1.7'"> <Compile Include="$(CommonPath)\System\SerializableAttribute.cs"> <Link>Common\System\SerializableAttribute.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)'==''"> + <ItemGroup Condition="'$(TargetGroup)'=='netstandard1.7'"> <Compile Include="CaseInsensitiveHashCodeProviderTests.cs" /> <Compile Include="$(CommonTestPath)\System\Collections\IEnumerable.NonGeneric.Serialization.Tests.cs"> <Link>Common\System\Collections\IEnumerable.NonGeneric.Serialization.Tests.cs</Link> </Compile> - <!-- Do not remove this P2P reference since part of the implementation of NonGeneric has moved to Runtime.Extensions --> - <ProjectReference Include="..\..\System.Runtime.Extensions\pkg\System.Runtime.Extensions.pkgproj" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Collections.NonGeneric.pkgproj"> - <Name>System.Collections.NonGeneric</Name> - </ProjectReference> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Collections.Specialized/dir.props b/src/System.Collections.Specialized/dir.props index 503cf86a87..bfbc5bd9e0 100644 --- a/src/System.Collections.Specialized/dir.props +++ b/src/System.Collections.Specialized/dir.props @@ -1,7 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> - +</Project>
\ 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 19485b980f..0000000000 --- a/src/System.Collections.Specialized/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Collections.Specialized/src/Configurations.props b/src/System.Collections.Specialized/src/Configurations.props new file mode 100644 index 0000000000..9c336c0be9 --- /dev/null +++ b/src/System.Collections.Specialized/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Collections.Specialized/src/System.Collections.Specialized.builds b/src/System.Collections.Specialized/src/System.Collections.Specialized.builds deleted file mode 100644 index 4dfe56fce5..0000000000 --- a/src/System.Collections.Specialized/src/System.Collections.Specialized.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.Collections.Specialized.csproj" /> - <Project Include="System.Collections.Specialized.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Collections.Specialized/src/System.Collections.Specialized.csproj b/src/System.Collections.Specialized/src/System.Collections.Specialized.csproj index 847fbf5fe7..3da9aa699d 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> @@ -6,16 +6,15 @@ <RootNamespace>System.Collections.Specialized</RootNamespace> <AssemblyName>System.Collections.Specialized</AssemblyName> <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net463'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.7_Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.7_Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard_Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard_Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="System\Collections\Specialized\BitVector32.cs" /> <Compile Include="System\Collections\Specialized\HybridDictionary.cs" /> <Compile Include="System\Collections\Specialized\IOrderedDictionary.cs" /> @@ -34,7 +33,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 6deb48c54a..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-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.Globalization.Extensions": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Collections.Specialized/tests/Configurations.props b/src/System.Collections.Specialized/tests/Configurations.props new file mode 100644 index 0000000000..512c938bad --- /dev/null +++ b/src/System.Collections.Specialized/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.csproj b/src/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.csproj index 2a073a8635..4034840e39 100644 --- a/src/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.csproj +++ b/src/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.csproj @@ -2,19 +2,11 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <RootNamespace>System.Collections.Specialized.Tests</RootNamespace> - <AssemblyName>System.Collections.Specialized.Tests</AssemblyName> <ProjectGuid>{7F5F5134-00FE-4DE8-B20C-3DA8BA2EBA68}</ProjectGuid> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> <ItemGroup> <!-- Common Collections tests --> <Compile Include="$(CommonTestPath)\System\Collections\CollectionAsserts.cs"> @@ -92,23 +84,17 @@ <Compile Include="StringDictionary\StringDictionary.ValuesTests.cs" /> <Compile Include="StringDictionary\StringDictionaryClearTests.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)'!=''"> + <ItemGroup Condition="'$(TargetGroup)'!='netstandard1.7'"> <Compile Include="$(CommonPath)\System\SerializableAttribute.cs"> <Link>Common\System\SerializableAttribute.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)'==''"> + <ItemGroup Condition="'$(TargetGroup)'=='netstandard1.7'"> <Compile Include="$(CommonTestPath)\System\Collections\IEnumerable.NonGeneric.Serialization.Tests.cs"> <Link>Common\System\Collections\IEnumerable.NonGeneric.Serialization.Tests.cs</Link> </Compile> <Compile Include="NameObjectCollectionBase\NameObjectCollectionBase.ConstructorTests.cs" /> <Compile Include="NameObjectCollectionBase\MyNameObjectCollection.netstandard1.7.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Collections.Specialized.pkgproj"> - <Project>{63634289-90d7-4947-8bf3-dbbe98d76c85}</Project> - <Name>System.Collections.Specialized</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Collections/dir.props b/src/System.Collections/dir.props index 503cf86a87..bfbc5bd9e0 100644 --- a/src/System.Collections/dir.props +++ b/src/System.Collections/dir.props @@ -1,7 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Collections/ref/Configurations.props b/src/System.Collections/ref/Configurations.props new file mode 100644 index 0000000000..33dc67c6d9 --- /dev/null +++ b/src/System.Collections/ref/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netcoreapp; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Collections/ref/System.Collections.cs b/src/System.Collections/ref/System.Collections.cs index b46b7eb141..7a445894df 100644 --- a/src/System.Collections/ref/System.Collections.cs +++ b/src/System.Collections/ref/System.Collections.cs @@ -179,7 +179,7 @@ namespace System.Collections.Generic public partial class HashSet<T> : System.Collections.Generic.ICollection<T>, System.Collections.Generic.IEnumerable<T>, System.Collections.Generic.IReadOnlyCollection<T>, System.Collections.Generic.ISet<T>, System.Collections.IEnumerable, System.Runtime.Serialization.IDeserializationCallback, System.Runtime.Serialization.ISerializable { public HashSet() { } -#if netcoreapp11 +#if netcoreapp public HashSet(int capacity) { } public HashSet(int capacity, System.Collections.Generic.IEqualityComparer<T> comparer) { } #endif @@ -379,7 +379,7 @@ namespace System.Collections.Generic System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; } public T[] ToArray() { throw null; } public void TrimExcess() { } -#if netcoreapp11 +#if netcoreapp public bool TryDequeue(out T result) { result = default(T); return default(bool); } public bool TryPeek(out T result) { result = default(T); return default(bool); } #endif @@ -625,7 +625,7 @@ namespace System.Collections.Generic System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; } public T[] ToArray() { throw null; } public void TrimExcess() { } -#if netcoreapp11 +#if netcoreapp public bool TryPeek(out T result) { result = default(T); return default(bool); } public bool TryPop(out T result) { result = default(T); return default(bool); } #endif diff --git a/src/System.Collections/ref/System.Collections.csproj b/src/System.Collections/ref/System.Collections.csproj index edc718f1c6..41c0a98842 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> + <DefineConstants Condition="'$(TargetGroup)' == 'netcoreapp'">$(DefineConstants);netcoreapp</DefineConstants> </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/ref/project.json b/src/System.Collections/ref/project.json deleted file mode 100644 index 2d3e3874a2..0000000000 --- a/src/System.Collections/ref/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {}, - "netcoreapp1.1": {} - } -} diff --git a/src/System.Collections/src/Configurations.props b/src/System.Collections/src/Configurations.props new file mode 100644 index 0000000000..f013d10b8c --- /dev/null +++ b/src/System.Collections/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + uap101aot-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Collections/src/System.Collections.builds b/src/System.Collections/src/System.Collections.builds deleted file mode 100644 index eaa0afcdfe..0000000000 --- a/src/System.Collections/src/System.Collections.builds +++ /dev/null @@ -1,15 +0,0 @@ -<?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> - <Project Include="System.Collections.csproj" /> - <Project Include="System.Collections.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - <Project Include="System.Collections.csproj"> - <TargetGroup>uap101aot</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Collections/src/System.Collections.csproj b/src/System.Collections/src/System.Collections.csproj index 74c95124ed..fd48f56064 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> @@ -8,31 +8,25 @@ <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <!-- 436 is thrown because BitArray conflict with corelib --> <NoWarn>0436</NoWarn> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> - <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.7;uap10.1</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> </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)' == 'net463_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.7_Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.7_Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp1.1_Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp1.1_Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard_Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard_Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp_Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp_Release|AnyCPU'" /> <ItemGroup Condition="'$(TargetGroup)' == 'net463'"> <ContractProject Include="..\ref\System.Collections.csproj"> - <TargetGroup>netstandard1.7</TargetGroup> + <TargetGroup>netstandard</TargetGroup> </ContractProject> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == '' OR '$(TargetGroup)'=='netstandard1.7' OR '$(TargetGroup)'=='netcoreapp1.1'"> - <ProjectReference Include="..\..\System.Runtime\src\System.Runtime.csproj"> - <UndefineProperties>%(ProjectReference.UndefineProperties);TargetGroup</UndefineProperties> - </ProjectReference> - <ProjectReference Include="..\..\System.Diagnostics.Debug\src\System.Diagnostics.Debug.csproj"> - <UndefineProperties>%(ProjectReference.UndefineProperties);TargetGroup</UndefineProperties> - <OSGroup>$(InputOSGroup)</OSGroup> - </ProjectReference> + <ItemGroup Condition="'$(TargetGroup)'=='netstandard' OR '$(TargetGroup)'=='netcoreapp'"> + <ProjectReference Include="..\..\System.Runtime\src\System.Runtime.csproj" /> + <ProjectReference Include="..\..\System.Diagnostics.Debug\src\System.Diagnostics.Debug.csproj" /> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == 'uap101aot'"> <ProjectReference Include="..\..\System.Runtime\src\System.Runtime.csproj"> @@ -42,7 +36,7 @@ <TargetGroup>uap101aot</TargetGroup> </ProjectReference> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard' or '$(TargetGroup)' == 'uap101aot'"> <Compile Include="System\Collections\BitArray.cs" /> <Compile Include="System\Collections\Generic\BitHelper.cs" /> <Compile Include="System\Collections\Generic\ICollectionDebugView.cs" /> @@ -80,11 +74,11 @@ <TargetingPackReference Include="System" /> <TargetingPackReference Include="System.Core" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard' or '$(TargetGroup)' == 'uap101aot'"> <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 4b262606cf..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-24904-03" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - }, - "uap10.1": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24904-00" - } - } - } -} diff --git a/src/System.Collections/src/redist/project.json b/src/System.Collections/src/redist/project.json deleted file mode 100644 index bba2e8654e..0000000000 --- a/src/System.Collections/src/redist/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Targets": "1.1.0", - "System.Collections": "4.3.0" - }, - "frameworks": { - "netcore50": {} - } -}
\ No newline at end of file diff --git a/src/System.Collections/tests/Configurations.props b/src/System.Collections/tests/Configurations.props new file mode 100644 index 0000000000..0b1283dabb --- /dev/null +++ b/src/System.Collections/tests/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netcoreapp1.1; + netstandard1.3; + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Collections/tests/Performance/System.Collections.Performance.Tests.csproj b/src/System.Collections/tests/Performance/System.Collections.Performance.Tests.csproj index 7104ff288b..e3851e4c44 100644 --- a/src/System.Collections/tests/Performance/System.Collections.Performance.Tests.csproj +++ b/src/System.Collections/tests/Performance/System.Collections.Performance.Tests.csproj @@ -2,18 +2,12 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <AssemblyName>System.Collections.Performance.Tests</AssemblyName> - <RootNamespace>System.Collections.Performance.Tests</RootNamespace> <IncludePerformanceTests>true</IncludePerformanceTests> - <NugetTargetMoniker>.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "/> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "/> <ItemGroup> - <ProjectReference Include="..\..\pkg\System.Collections.pkgproj" /> - </ItemGroup> - <ItemGroup> <Compile Include="Perf.Dictionary.cs" /> <Compile Include="Perf.HashSet.cs" /> <Compile Include="Perf.List.cs" /> diff --git a/src/System.Collections/tests/System.Collections.Tests.csproj b/src/System.Collections/tests/System.Collections.Tests.csproj index a04bb6b615..16fee27ea4 100644 --- a/src/System.Collections/tests/System.Collections.Tests.csproj +++ b/src/System.Collections/tests/System.Collections.Tests.csproj @@ -2,24 +2,12 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Collections.Tests</AssemblyName> - <RootNamespace>System.Collections.Tests</RootNamespace> - <DefineConstants Condition="'$(TargetGroup)'==''">$(DefineConstants);netstandard17</DefineConstants> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> + <DefineConstants Condition="'$(TargetGroup)'=='netstandard1.7'">$(DefineConstants);netstandard17</DefineConstants> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - </PropertyGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Collections.pkgproj" /> - <ProjectReference Include="..\..\System.Diagnostics.Debug\pkg\System.Diagnostics.Debug.pkgproj" /> - </ItemGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> <ItemGroup> <!-- Common Collections tests --> <Compile Include="$(CommonTestPath)\System\Collections\CollectionAsserts.cs" > @@ -123,7 +111,7 @@ <Compile Include="Generic\List\List.Generic.Tests.AddRange.cs" /> <Compile Include="Generic\List\List.Generic.Tests.BinarySearch.cs" /> <Compile Include="Generic\List\List.Generic.Tests.Constructor.cs" /> - <Compile Include="Generic\List\List.Generic.Tests.ConvertAll.cs" Condition="'$(TargetGroup)'==''" /> + <Compile Include="Generic\List\List.Generic.Tests.ConvertAll.cs" Condition="'$(TargetGroup)'=='netstandard1.7'" /> <Compile Include="Generic\List\List.Generic.Tests.Find.cs" /> <Compile Include="Generic\List\List.Generic.Tests.Remove.cs" /> <Compile Include="Generic\List\List.Generic.Tests.Sort.cs" /> @@ -152,12 +140,12 @@ <Link>Common\System\Diagnostics\DebuggerAttributes.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)'!='' and '$(TargetGroup)'!='netcoreapp1.1'"> + <ItemGroup Condition="'$(TargetGroup)'!='netstandard1.7' and '$(TargetGroup)'!='netcoreapp1.1'"> <Compile Include="$(CommonPath)\System\SerializableAttribute.cs"> <Link>Common\System\SerializableAttribute.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)'==''"> + <ItemGroup Condition="'$(TargetGroup)'=='netstandard1.7'"> <Compile Include="$(CommonTestPath)\System\Collections\IEnumerable.NonGeneric.Serialization.Tests.cs" > <Link>Common\System\Collections\IEnumerable.NonGeneric.Serialization.Tests.cs</Link> </Compile> diff --git a/src/System.ComponentModel.Annotations/dir.props b/src/System.ComponentModel.Annotations/dir.props index 1af9800f25..a960cef1a3 100644 --- a/src/System.ComponentModel.Annotations/dir.props +++ b/src/System.ComponentModel.Annotations/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.2.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ No newline at end of file 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 7f570db3e1..0000000000 --- a/src/System.ComponentModel.Annotations/ref/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.ComponentModel": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.ComponentModel.Annotations/src/Configurations.props b/src/System.ComponentModel.Annotations/src/Configurations.props new file mode 100644 index 0000000000..9c336c0be9 --- /dev/null +++ b/src/System.ComponentModel.Annotations/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.ComponentModel.Annotations/src/System.ComponentModel.Annotations.builds b/src/System.ComponentModel.Annotations/src/System.ComponentModel.Annotations.builds deleted file mode 100644 index 6df44a9c38..0000000000 --- a/src/System.ComponentModel.Annotations/src/System.ComponentModel.Annotations.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.ComponentModel.Annotations.csproj" /> - <Project Include="System.ComponentModel.Annotations.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.ComponentModel.Annotations/src/System.ComponentModel.Annotations.csproj b/src/System.ComponentModel.Annotations/src/System.ComponentModel.Annotations.csproj index cd676cdae9..125b4ccec7 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> @@ -6,14 +6,13 @@ <RootNamespace>System.ComponentModel.Annotations</RootNamespace> <AssemblyName>System.ComponentModel.Annotations</AssemblyName> <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net463'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </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)' == 'net463_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)'==''"> + <ItemGroup Condition="'$(TargetGroup)'=='netstandard'"> <Compile Include="System\ComponentModel\DataAnnotations\AssociationAttribute.cs" /> <Compile Include="System\ComponentModel\DataAnnotations\CompareAttribute.cs" /> <Compile Include="System\ComponentModel\DataAnnotations\ConcurrencyCheckAttribute.cs" /> @@ -66,7 +65,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 e846d45273..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-24904-01", - "System.ComponentModel": "4.4.0-beta-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.Linq": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Reflection.Extensions": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Text.RegularExpressions": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.1": "1.0.1" - } - } - } -} diff --git a/src/System.ComponentModel.Annotations/tests/Configurations.props b/src/System.ComponentModel.Annotations/tests/Configurations.props new file mode 100644 index 0000000000..98f53209d4 --- /dev/null +++ b/src/System.ComponentModel.Annotations/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.ComponentModel.Annotations/tests/System.ComponentModel.Annotations.Tests.csproj b/src/System.ComponentModel.Annotations/tests/System.ComponentModel.Annotations.Tests.csproj index 4b1ec2fdbf..9aaaf6dfdf 100644 --- a/src/System.ComponentModel.Annotations/tests/System.ComponentModel.Annotations.Tests.csproj +++ b/src/System.ComponentModel.Annotations/tests/System.ComponentModel.Annotations.Tests.csproj @@ -2,19 +2,11 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{6E48765E-D6AC-4A79-9C2E-B5EE67EEDECF}</ProjectGuid> - <OutputType>Library</OutputType> - <RootNamespace>System.ComponentModel.Annotations.Tests</RootNamespace> - <AssemblyName>System.ComponentModel.Annotations.Tests</AssemblyName> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> <ItemGroup> <Compile Include="UIHintAttributeTests.cs" /> <Compile Include="FilterUIHintAttributeTests.cs" /> @@ -49,10 +41,5 @@ <Compile Include="ValidationResultTests.cs" /> <Compile Include="ValidatorTests.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.ComponentModel.Annotations.pkgproj"> - <Name>System.ComponentModel.Annotations</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.ComponentModel.EventBasedAsync/dir.props b/src/System.ComponentModel.EventBasedAsync/dir.props index 041b9b1160..8f2003a937 100644 --- a/src/System.ComponentModel.EventBasedAsync/dir.props +++ b/src/System.ComponentModel.EventBasedAsync/dir.props @@ -3,5 +3,7 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> + <IsNETCoreAppRef>false</IsNETCoreAppRef> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file 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 3d07e0758b..0000000000 --- a/src/System.ComponentModel.EventBasedAsync/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.ComponentModel.Primitives": "4.4.0-beta-24904-01", - "System.ComponentModel": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.ComponentModel.EventBasedAsync/src/Configurations.props b/src/System.ComponentModel.EventBasedAsync/src/Configurations.props new file mode 100644 index 0000000000..9c336c0be9 --- /dev/null +++ b/src/System.ComponentModel.EventBasedAsync/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.ComponentModel.EventBasedAsync/src/System.ComponentModel.EventBasedAsync.builds b/src/System.ComponentModel.EventBasedAsync/src/System.ComponentModel.EventBasedAsync.builds deleted file mode 100644 index 5ae32bb04a..0000000000 --- a/src/System.ComponentModel.EventBasedAsync/src/System.ComponentModel.EventBasedAsync.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.ComponentModel.EventBasedAsync.csproj" /> - <Project Include="System.ComponentModel.EventBasedAsync.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.ComponentModel.EventBasedAsync/src/System.ComponentModel.EventBasedAsync.csproj b/src/System.ComponentModel.EventBasedAsync/src/System.ComponentModel.EventBasedAsync.csproj index 69c70a42db..454ee6d4b2 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> @@ -6,14 +6,13 @@ <RootNamespace>System.ComponentModel.EventBasedAsync</RootNamespace> <AssemblyName>System.ComponentModel.EventBasedAsync</AssemblyName> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="System\ComponentModel\AsyncCompletedEvent.cs" /> <Compile Include="System\ComponentModel\AsyncOperation.cs" /> <Compile Include="System\ComponentModel\AsyncOperationManager.cs" /> @@ -27,7 +26,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 9ce70f7ca1..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-24904-01", - "System.ComponentModel": "4.4.0-beta-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.ComponentModel.EventBasedAsync/tests/Configurations.props b/src/System.ComponentModel.EventBasedAsync/tests/Configurations.props new file mode 100644 index 0000000000..f0ebe53119 --- /dev/null +++ b/src/System.ComponentModel.EventBasedAsync/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.ComponentModel.EventBasedAsync/tests/System.ComponentModel.EventBasedAsync.Tests.csproj b/src/System.ComponentModel.EventBasedAsync/tests/System.ComponentModel.EventBasedAsync.Tests.csproj index 3a08584063..76517e3955 100644 --- a/src/System.ComponentModel.EventBasedAsync/tests/System.ComponentModel.EventBasedAsync.Tests.csproj +++ b/src/System.ComponentModel.EventBasedAsync/tests/System.ComponentModel.EventBasedAsync.Tests.csproj @@ -2,22 +2,14 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <!-- this tests run in multiple AppDomains in full framework, so if an Assert fails we would get a Serialization exception instead of the real failure. adding this xunit so it runs in one AppDomain --> <XunitOptions Condition="'$(TestTFM)'=='net46'">$(XunitOptions) -noappdomain </XunitOptions> <ProjectGuid>{59E9B218-81D0-4A80-A4B7-66C716136D82}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.ComponentModel.EventBasedAsync.Tests</AssemblyName> - <RootNamespace>System.ComponentModel.EventBasedAsync.Tests</RootNamespace> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> <ItemGroup> <Compile Include="AsyncOperationManagerTests.cs" /> <Compile Include="RunWorkerCompletedEventArgsTests.cs" /> @@ -28,11 +20,5 @@ <Compile Include="BackgroundWorkerTests.cs" /> <Compile Include="TestException.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.ComponentModel.EventBasedAsync.pkgproj"> - <Project>{551A6340-8EEF-445E-A2A2-639CC23DBD36}</Project> - <Name>System.ComponentModel.EventBasedAsync</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.ComponentModel.Primitives/dir.props b/src/System.ComponentModel.Primitives/dir.props index 7bb155c44e..a960cef1a3 100644 --- a/src/System.ComponentModel.Primitives/dir.props +++ b/src/System.ComponentModel.Primitives/dir.props @@ -1,7 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.2.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> - +</Project>
\ 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 eb1ef72738..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-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.ComponentModel": "4.4.0-beta-24904-01" - } - } - } -} diff --git a/src/System.ComponentModel.Primitives/src/Configurations.props b/src/System.ComponentModel.Primitives/src/Configurations.props new file mode 100644 index 0000000000..9c336c0be9 --- /dev/null +++ b/src/System.ComponentModel.Primitives/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.ComponentModel.Primitives/src/System.ComponentModel.Primitives.builds b/src/System.ComponentModel.Primitives/src/System.ComponentModel.Primitives.builds deleted file mode 100644 index b4deeb43b3..0000000000 --- a/src/System.ComponentModel.Primitives/src/System.ComponentModel.Primitives.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.ComponentModel.Primitives.csproj" /> - <Project Include="System.ComponentModel.Primitives.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.ComponentModel.Primitives/src/System.ComponentModel.Primitives.csproj b/src/System.ComponentModel.Primitives/src/System.ComponentModel.Primitives.csproj index 0aa9f1d167..c2621cfb63 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> @@ -6,14 +6,13 @@ <RootNamespace>System.ComponentModel.Primitives</RootNamespace> <AssemblyName>System.ComponentModel.Primitives</AssemblyName> <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net463'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net45_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net45_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)'==''"> + <ItemGroup Condition="'$(TargetGroup)'=='netstandard'"> <Compile Include="System\ComponentModel\ISynchronizeInvoke.cs" /> <Compile Include="System\ComponentModel\BrowsableAttribute.cs" /> <Compile Include="System\ComponentModel\CategoryAttribute.cs" /> @@ -41,7 +40,7 @@ <ItemGroup> <Compile Include="FxCopBaseline.cs"/> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)'==''"> + <ItemGroup Condition="'$(TargetGroup)'=='netstandard'"> <Compile Include="System\ComponentModel\Component.cs" /> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)'=='net463'"> @@ -49,7 +48,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> diff --git a/src/System.ComponentModel.Primitives/src/project.json b/src/System.ComponentModel.Primitives/src/project.json deleted file mode 100644 index 025af0604e..0000000000 --- a/src/System.ComponentModel.Primitives/src/project.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.ComponentModel": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.ComponentModel.Primitives/tests/Configurations.props b/src/System.ComponentModel.Primitives/tests/Configurations.props new file mode 100644 index 0000000000..512c938bad --- /dev/null +++ b/src/System.ComponentModel.Primitives/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.csproj b/src/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.csproj index 82109c578c..d9b8fd9920 100644 --- a/src/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.csproj +++ b/src/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.csproj @@ -2,19 +2,11 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> <ProjectGuid>{C9534425-93FB-494F-8DD8-1E4E3E626FDE}</ProjectGuid> - <AssemblyName>System.ComponentModel.Primitives.Tests</AssemblyName> - <RootNamespace>System.ComponentModel.Primitives.Tests</RootNamespace> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> <ItemGroup> <Compile Include="BrowsableAttributeTests.cs" /> <Compile Include="CategoryAttributeTests.cs" /> @@ -36,11 +28,5 @@ <ItemGroup Condition="'$(TargetGroup)'==''"> <Compile Include="EventHandlerListTests.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.ComponentModel.Primitives.pkgproj"> - <Project>{F620F382-30D1-451E-B125-2A612F92068B}</Project> - <Name>System.ComponentModel.Primitives</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.ComponentModel.TypeConverter/dir.props b/src/System.ComponentModel.TypeConverter/dir.props index 7bb155c44e..a960cef1a3 100644 --- a/src/System.ComponentModel.TypeConverter/dir.props +++ b/src/System.ComponentModel.TypeConverter/dir.props @@ -1,7 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.2.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> - +</Project>
\ No newline at end of file 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 0af5375cc2..0000000000 --- a/src/System.ComponentModel.TypeConverter/ref/project.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "dependencies": { - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.ComponentModel": "4.4.0-beta-24904-01", - "System.Drawing.Primitives": "4.4.0-beta-24904-01", - "System.ComponentModel.Primitives": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Resources.Writer": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.ComponentModel.TypeConverter/src/Configurations.props b/src/System.ComponentModel.TypeConverter/src/Configurations.props new file mode 100644 index 0000000000..9c336c0be9 --- /dev/null +++ b/src/System.ComponentModel.TypeConverter/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.builds b/src/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.builds deleted file mode 100644 index da0816da16..0000000000 --- a/src/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.ComponentModel.TypeConverter.csproj" /> - <Project Include="System.ComponentModel.TypeConverter.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj b/src/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj index 70ea97e559..d7932db561 100644 --- a/src/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj +++ b/src/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj @@ -6,14 +6,13 @@ <RootNamespace>System.ComponentModel.TypeConverter</RootNamespace> <AssemblyName>System.ComponentModel.TypeConverter</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.7_Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.7_Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard_Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard_Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)'==''"> + <ItemGroup Condition="'$(TargetGroup)'=='netstandard'"> <Compile Include="System\ComponentModel\ArrayConverter.cs" /> <Compile Include="System\ComponentModel\BaseNumberConverter.cs" /> <Compile Include="System\ComponentModel\BooleanConverter.cs" /> @@ -256,7 +255,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 b24e3ad822..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-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Collections.Specialized": "4.4.0-beta-24904-01", - "System.ComponentModel": "4.4.0-beta-24904-01", - "System.ComponentModel.EventBasedAsync": "4.4.0-beta-24904-01", - "System.ComponentModel.Primitives": "4.4.0-beta-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Diagnostics.TraceSource": "4.4.0-beta-24904-01", - "System.Drawing.Primitives": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.Linq": "4.4.0-beta-24904-01", - "System.Net.WebClient": "4.4.0-beta-24904-01", - "System.ObjectModel": "4.3.0", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Reflection.Extensions": "4.4.0-beta-24904-01", - "System.Reflection.TypeExtensions": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Resources.Writer": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Formatters": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Primitives": "4.4.0-beta-24904-01", - "System.Security.Permissions": "4.4.0-beta-24904-01", - "System.Text.RegularExpressions": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "System.Threading.Timer": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.ComponentModel.TypeConverter/tests/Configurations.props b/src/System.ComponentModel.TypeConverter/tests/Configurations.props new file mode 100644 index 0000000000..b744993779 --- /dev/null +++ b/src/System.ComponentModel.TypeConverter/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.5; + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.ComponentModel.TypeConverter/tests/Performance/System.ComponentModel.TypeConverter.Performance.Tests.csproj b/src/System.ComponentModel.TypeConverter/tests/Performance/System.ComponentModel.TypeConverter.Performance.Tests.csproj index 96300a818f..fd2673a5c8 100644 --- a/src/System.ComponentModel.TypeConverter/tests/Performance/System.ComponentModel.TypeConverter.Performance.Tests.csproj +++ b/src/System.ComponentModel.TypeConverter/tests/Performance/System.ComponentModel.TypeConverter.Performance.Tests.csproj @@ -2,10 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <RootNamespace>System.ComponentModel.TypeConverter.Performance.Tests</RootNamespace> - <AssemblyName>System.ComponentModel.TypeConverter.Performance.Tests</AssemblyName> <IncludePerformanceTests>true</IncludePerformanceTests> - <NugetTargetMoniker>.NETStandard,Version=v1.7</NugetTargetMoniker> <DefineConstants>$(DefineConstants);PERFORMANCE_TESTS</DefineConstants> <ProjectGuid>{89C76728-ECAF-4905-A33F-BD6BFED5E91D}</ProjectGuid> </PropertyGroup> @@ -25,8 +22,5 @@ <Link>Common\System\PerfUtils.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\pkg\System.ComponentModel.TypeConverter.pkgproj" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj b/src/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj index 47962d95b9..13241316e9 100644 --- a/src/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj +++ b/src/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj @@ -2,27 +2,15 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> <ProjectGuid>{3F0326A1-9E19-4A6C-95CE-63E65C9D2030}</ProjectGuid> - <RootNamespace>System.ComponentModel.TypeConverter.Tests</RootNamespace> - <AssemblyName>System.ComponentModel.TypeConverter.Tests</AssemblyName> - <NugetTargetMoniker Condition=" '$(TargetGroup)' == '' ">.NETStandard,Version=v1.7</NugetTargetMoniker> <DefineConstants>$(DefineConstants);FUNCTIONAL_TESTS</DefineConstants> - </PropertyGroup> - <PropertyGroup> <DebugEngines>{2E36F1D4-B23C-435D-AB41-18E608940038}</DebugEngines> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'netstandard1.7_Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'netstandard1.7_Release|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'netstandard1.5_Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'netstandard1.5_Release|AnyCPU' "> - </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'netstandard1.7_Debug|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'netstandard1.7_Release|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'netstandard1.5_Debug|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'netstandard1.5_Release|AnyCPU' " /> <ItemGroup> <Compile Include="ArrayConverterTests.cs" /> <Compile Include="AttributeCollectionTests.cs" /> @@ -71,7 +59,7 @@ <Compile Include="UInt64ConverterTests.cs" /> <Compile Include="UriTypeConverterTests.cs" /> </ItemGroup> - <ItemGroup Condition=" '$(TargetGroup)' == ''"> + <ItemGroup Condition=" '$(TargetGroup)' == 'netstandard1.7'"> <Compile Include="Drawing\ColorConverterTests.cs" /> <Compile Include="Drawing\PointConverterTests.cs" /> <Compile Include="Drawing\RectangleConverterTests.cs" /> @@ -88,8 +76,5 @@ <Compile Include="InstanceDescriptorTests.cs" /> <Compile Include="Security\Authentication\ExtendedProtection\ExtendedProtectionPolicyTypeConverterTests.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.ComponentModel.TypeConverter.pkgproj"/> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.ComponentModel/dir.props b/src/System.ComponentModel/dir.props index 16a766f83b..14527fd4b3 100644 --- a/src/System.ComponentModel/dir.props +++ b/src/System.ComponentModel/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.0.3.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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/ref/project.json b/src/System.ComponentModel/ref/project.json deleted file mode 100644 index e6c2196e0e..0000000000 --- a/src/System.ComponentModel/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.ComponentModel/src/Configurations.props b/src/System.ComponentModel/src/Configurations.props new file mode 100644 index 0000000000..f0ebe53119 --- /dev/null +++ b/src/System.ComponentModel/src/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.ComponentModel/src/System.ComponentModel.builds b/src/System.ComponentModel/src/System.ComponentModel.builds deleted file mode 100644 index f05e5be521..0000000000 --- a/src/System.ComponentModel/src/System.ComponentModel.builds +++ /dev/null @@ -1,13 +0,0 @@ -<?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> - <Project Include="System.ComponentModel.csproj" /> - <!-- Net46 facade is currently inbox for 4.0 - <Project Include="System.ComponentModel.csproj"> - <TargetGroup>net46</TargetGroup> - </Project> --> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.ComponentModel/src/System.ComponentModel.csproj b/src/System.ComponentModel/src/System.ComponentModel.csproj index 95d0e4cc5f..05e14dda20 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> @@ -6,28 +6,22 @@ <RootNamespace>System.ComponentModel</RootNamespace> <AssemblyName>System.ComponentModel</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker> - <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.3;netcore50</PackageTargetFramework> + <PackageTargetFramework>netstandard1.3;netcore50</PackageTargetFramework> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' != 'net46'"> + <ItemGroup> <Compile Include="System\IServiceProvider.cs" /> <Compile Include="System\ComponentModel\CancelEventArgs.cs" /> <Compile Include="System\ComponentModel\IChangeTracking.cs" /> <Compile Include="System\ComponentModel\IEditableObject.cs" /> <Compile Include="System\ComponentModel\IRevertibleChangeTracking.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == 'net46'"> - <TargetingPackReference Include="mscorlib" /> - <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.ComponentModel/tests/Configurations.props b/src/System.ComponentModel/tests/Configurations.props new file mode 100644 index 0000000000..f0ebe53119 --- /dev/null +++ b/src/System.ComponentModel/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.ComponentModel/tests/System.ComponentModel.Tests.csproj b/src/System.ComponentModel/tests/System.ComponentModel.Tests.csproj index 6448b22952..d217e391d2 100644 --- a/src/System.ComponentModel/tests/System.ComponentModel.Tests.csproj +++ b/src/System.ComponentModel/tests/System.ComponentModel.Tests.csproj @@ -2,28 +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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{40C01084-DAB1-4F24-8729-85523BC9F04E}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.ComponentModel.Tests</AssemblyName> - <RootNamespace>System.ComponentModel.Tests</RootNamespace> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> <ItemGroup> <Compile Include="ComponentModelBasicTests.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.ComponentModel.pkgproj"> - <Project>{AF3EBF3B-526A-4B51-9F3D-62B0113CD01F}</Project> - <Name>System.ComponentModel</Name> - <Private>true</Private> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Composition.AttributedModel/src/Configurations.props b/src/System.Composition.AttributedModel/src/Configurations.props new file mode 100644 index 0000000000..2ec0365c0d --- /dev/null +++ b/src/System.Composition.AttributedModel/src/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.0; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Composition.AttributedModel/src/System.Composition.AttributedModel.builds b/src/System.Composition.AttributedModel/src/System.Composition.AttributedModel.builds deleted file mode 100644 index 2ab3839a0d..0000000000 --- a/src/System.Composition.AttributedModel/src/System.Composition.AttributedModel.builds +++ /dev/null @@ -1,9 +0,0 @@ -<?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> - <Project Include="System.Composition.AttributedModel.csproj" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Composition.AttributedModel/src/System.Composition.AttributedModel.csproj b/src/System.Composition.AttributedModel/src/System.Composition.AttributedModel.csproj index 91aa67425b..802da2dfd8 100644 --- a/src/System.Composition.AttributedModel/src/System.Composition.AttributedModel.csproj +++ b/src/System.Composition.AttributedModel/src/System.Composition.AttributedModel.csproj @@ -1,12 +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> <ProjectGuid>{C6257381-C624-494A-A9D9-5586E60856EA}</ProjectGuid> <RootNamespace>System.Composition</RootNamespace> <AssemblyName>System.Composition.AttributedModel</AssemblyName> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.0</NuGetTargetMoniker> - <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.0;portable-net45+win8+wp8+wpa81</PackageTargetFramework> + <PackageTargetFramework>netstandard1.0;portable-net45+win8+wp8+wpa81</PackageTargetFramework> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> @@ -25,5 +24,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/Configurations.props b/src/System.Composition.Convention/src/Configurations.props new file mode 100644 index 0000000000..2ec0365c0d --- /dev/null +++ b/src/System.Composition.Convention/src/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.0; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Composition.Convention/src/System.Composition.Convention.builds b/src/System.Composition.Convention/src/System.Composition.Convention.builds deleted file mode 100644 index 5862d1297f..0000000000 --- a/src/System.Composition.Convention/src/System.Composition.Convention.builds +++ /dev/null @@ -1,9 +0,0 @@ -<?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> - <Project Include="System.Composition.Convention.csproj" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Composition.Convention/src/System.Composition.Convention.csproj b/src/System.Composition.Convention/src/System.Composition.Convention.csproj index 3f2dad1d5c..275e50a8a5 100644 --- a/src/System.Composition.Convention/src/System.Composition.Convention.csproj +++ b/src/System.Composition.Convention/src/System.Composition.Convention.csproj @@ -1,12 +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> <ProjectGuid>{E6592FAD-10B5-4B56-9287-D72DD136992F}</ProjectGuid> <AppDesignerFolder>Properties</AppDesignerFolder> <AssemblyName>System.Composition.Convention</AssemblyName> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.0</NuGetTargetMoniker> - <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.0;portable-net45+win8+wp8+wpa81</PackageTargetFramework> + <PackageTargetFramework>netstandard1.0;portable-net45+win8+wp8+wpa81</PackageTargetFramework> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> @@ -61,5 +60,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 846889fa29..1e1077c03a 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.Convention/tests/Configurations.props b/src/System.Composition.Convention/tests/Configurations.props new file mode 100644 index 0000000000..ec110beba6 --- /dev/null +++ b/src/System.Composition.Convention/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netcoreapp1.0; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Composition.Convention/tests/System.Composition.Convention.Tests.csproj b/src/System.Composition.Convention/tests/System.Composition.Convention.Tests.csproj index b8a8a5f2d7..b828368782 100644 --- a/src/System.Composition.Convention/tests/System.Composition.Convention.Tests.csproj +++ b/src/System.Composition.Convention/tests/System.Composition.Convention.Tests.csproj @@ -25,33 +25,5 @@ <Compile Include="PartBuilderOfTTests.cs" /> <Compile Include="PartBuilderTests.cs" /> </ItemGroup> - <ItemGroup> - <WCFMetadata Include="Service References\" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\System.Composition.AttributedModel\src\System.Composition.AttributedModel.csproj"> - <Project>{c6257381-c624-494a-a9d9-5586e60856ea}</Project> - <Name>System.Composition.AttributedModel</Name> - </ProjectReference> - <ProjectReference Include="..\src\System.Composition.Convention.csproj"> - <Project>{e6592fad-10b5-4b56-9287-d72dd136992f}</Project> - <Name>System.Composition.Convention</Name> - </ProjectReference> - <ProjectReference Include="..\..\System.Composition.Hosting\src\System.Composition.Hosting.csproj"> - <Project>{2b8fecc6-34a1-48fe-ba75-99572d2d6db2}</Project> - <Name>System.Composition.Hosting</Name> - </ProjectReference> - <ProjectReference Include="..\..\System.Composition.Runtime\src\System.Composition.Runtime.csproj"> - <Project>{2711dfd2-8541-4628-bc53-eb784a14cdcf}</Project> - <Name>System.Composition.Runtime</Name> - </ProjectReference> - <ProjectReference Include="..\..\System.Composition.TypedParts\src\System.Composition.TypedParts.csproj"> - <Project>{b4b5e15c-e6b9-48ea-94c2-f067484d4d3e}</Project> - <Name>System.Composition.TypedParts</Name> - </ProjectReference> - </ItemGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Composition.Hosting/src/Configurations.props b/src/System.Composition.Hosting/src/Configurations.props new file mode 100644 index 0000000000..2ec0365c0d --- /dev/null +++ b/src/System.Composition.Hosting/src/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.0; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Composition.Hosting/src/System.Composition.Hosting.builds b/src/System.Composition.Hosting/src/System.Composition.Hosting.builds deleted file mode 100644 index 2e97f77857..0000000000 --- a/src/System.Composition.Hosting/src/System.Composition.Hosting.builds +++ /dev/null @@ -1,9 +0,0 @@ -<?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> - <Project Include="System.Composition.Hosting.csproj" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Composition.Hosting/src/System.Composition.Hosting.csproj b/src/System.Composition.Hosting/src/System.Composition.Hosting.csproj index fe044f9c9f..7d066e4af2 100644 --- a/src/System.Composition.Hosting/src/System.Composition.Hosting.csproj +++ b/src/System.Composition.Hosting/src/System.Composition.Hosting.csproj @@ -1,11 +1,10 @@ -<?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>{2B8FECC6-34A1-48FE-BA75-99572D2D6DB2}</ProjectGuid> <AssemblyName>System.Composition.Hosting</AssemblyName> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.0</NuGetTargetMoniker> - <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.0;portable-net45+win8+wp8+wpa81</PackageTargetFramework> + <PackageTargetFramework>netstandard1.0;portable-net45+win8+wp8+wpa81</PackageTargetFramework> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> @@ -81,5 +80,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/Configurations.props b/src/System.Composition.Runtime/src/Configurations.props new file mode 100644 index 0000000000..2ec0365c0d --- /dev/null +++ b/src/System.Composition.Runtime/src/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.0; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Composition.Runtime/src/System.Composition.Runtime.builds b/src/System.Composition.Runtime/src/System.Composition.Runtime.builds deleted file mode 100644 index 033bea2056..0000000000 --- a/src/System.Composition.Runtime/src/System.Composition.Runtime.builds +++ /dev/null @@ -1,9 +0,0 @@ -<?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> - <Project Include="System.Composition.Runtime.csproj" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Composition.Runtime/src/System.Composition.Runtime.csproj b/src/System.Composition.Runtime/src/System.Composition.Runtime.csproj index 1ea9ba74b2..9cb81ebfd3 100644 --- a/src/System.Composition.Runtime/src/System.Composition.Runtime.csproj +++ b/src/System.Composition.Runtime/src/System.Composition.Runtime.csproj @@ -1,12 +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> <ProjectGuid>{2711DFD2-8541-4628-BC53-EB784A14CDCF}</ProjectGuid> <RootNamespace>System.Composition</RootNamespace> <AssemblyName>System.Composition.Runtime</AssemblyName> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.0</NuGetTargetMoniker> - <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.0;portable-net45+win8+wp8+wpa81</PackageTargetFramework> + <PackageTargetFramework>netstandard1.0;portable-net45+win8+wp8+wpa81</PackageTargetFramework> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> @@ -30,5 +29,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/Configurations.props b/src/System.Composition.TypedParts/src/Configurations.props new file mode 100644 index 0000000000..2ec0365c0d --- /dev/null +++ b/src/System.Composition.TypedParts/src/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.0; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Composition.TypedParts/src/System.Composition.TypedParts.builds b/src/System.Composition.TypedParts/src/System.Composition.TypedParts.builds deleted file mode 100644 index e56adf047c..0000000000 --- a/src/System.Composition.TypedParts/src/System.Composition.TypedParts.builds +++ /dev/null @@ -1,9 +0,0 @@ -<?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> - <Project Include="System.Composition.TypedParts.csproj" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj b/src/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj index 588c6aed36..68dbaea44e 100644 --- a/src/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj +++ b/src/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj @@ -1,12 +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> <ProjectGuid>{B4B5E15C-E6B9-48EA-94C2-F067484D4D3E}</ProjectGuid> <RootNamespace>System.Composition</RootNamespace> <AssemblyName>System.Composition.TypedParts</AssemblyName> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.0</NuGetTargetMoniker> - <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.0;portable-net45+win8+wp8+wpa81</PackageTargetFramework> + <PackageTargetFramework>netstandard1.0;portable-net45+win8+wp8+wpa81</PackageTargetFramework> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> @@ -64,5 +63,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.Composition/demos/Microsoft.Composition.Demos.ExtendedCollectionImports/Microsoft.Composition.Demos.ExtendedCollectionImports.csproj b/src/System.Composition/demos/Microsoft.Composition.Demos.ExtendedCollectionImports/Microsoft.Composition.Demos.ExtendedCollectionImports.csproj index 643b8bfcd2..001e47b2e6 100644 --- a/src/System.Composition/demos/Microsoft.Composition.Demos.ExtendedCollectionImports/Microsoft.Composition.Demos.ExtendedCollectionImports.csproj +++ b/src/System.Composition/demos/Microsoft.Composition.Demos.ExtendedCollectionImports/Microsoft.Composition.Demos.ExtendedCollectionImports.csproj @@ -3,9 +3,8 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{44C7E52C-3873-4C64-875C-8A23A8376D60}</ProjectGuid> - <RootNamespace>Microsoft.Composition.Demos.ExtendedCollectionImports</RootNamespace> - <AssemblyName>Microsoft.Composition.Demos.ExtendedCollectionImports</AssemblyName> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> + <IsTestProject>true</IsTestProject> + <NoWarn>0436</NoWarn> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> diff --git a/src/System.Composition/demos/Microsoft.Composition.Demos.ExtendedCollectionImports/project.json b/src/System.Composition/demos/Microsoft.Composition.Demos.ExtendedCollectionImports/project.json deleted file mode 100644 index 85bbbf45bd..0000000000 --- a/src/System.Composition/demos/Microsoft.Composition.Demos.ExtendedCollectionImports/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Collections": "4.3.0", - "System.Linq": "4.3.0", - "System.Reflection": "4.3.0" - }, - "frameworks": { - "netstandard1.3": {} - } -}
\ No newline at end of file diff --git a/src/System.Composition/scenarios/TestLibrary/TestLibrary.csproj b/src/System.Composition/scenarios/TestLibrary/TestLibrary.csproj index 9414bee5ae..8376f5992c 100644 --- a/src/System.Composition/scenarios/TestLibrary/TestLibrary.csproj +++ b/src/System.Composition/scenarios/TestLibrary/TestLibrary.csproj @@ -3,9 +3,8 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{DA6841A5-0344-4CC7-98B0-89CBEE18DEE3}</ProjectGuid> - <RootNamespace>TestLibrary</RootNamespace> - <AssemblyName>TestLibrary</AssemblyName> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> + <IsTestProject>true</IsTestProject> + <NoWarn>0436,3021</NoWarn> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> diff --git a/src/System.Composition/scenarios/TestLibrary/project.json b/src/System.Composition/scenarios/TestLibrary/project.json deleted file mode 100644 index 63a27a29be..0000000000 --- a/src/System.Composition/scenarios/TestLibrary/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.Composition/tests/Configurations.props b/src/System.Composition/tests/Configurations.props new file mode 100644 index 0000000000..f0ebe53119 --- /dev/null +++ b/src/System.Composition/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Composition/tests/System.Composition.Tests.csproj b/src/System.Composition/tests/System.Composition.Tests.csproj index 9a0eead5d3..24dc7f87e0 100644 --- a/src/System.Composition/tests/System.Composition.Tests.csproj +++ b/src/System.Composition/tests/System.Composition.Tests.csproj @@ -5,7 +5,6 @@ <ProjectGuid>{4852A19F-C05C-478D-BFA0-59FD03DE0E3F}</ProjectGuid> <RootNamespace>System.Composition.Lightweight.UnitTests</RootNamespace> <AssemblyName>System.Composition.Tests</AssemblyName> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> @@ -47,26 +46,6 @@ <Name>Microsoft.Composition.Demos.ExtendedCollectionImports</Name> <KeepProjectReference>true</KeepProjectReference> </ProjectReference> - <ProjectReference Include="..\..\System.Composition.AttributedModel\pkg\System.Composition.AttributedModel.pkgproj"> - <Project>{c6257381-c624-494a-a9d9-5586e60856ea}</Project> - <Name>System.Composition.AttributedModel</Name> - </ProjectReference> - <ProjectReference Include="..\..\System.Composition.Convention\pkg\System.Composition.Convention.pkgproj"> - <Project>{e6592fad-10b5-4b56-9287-d72dd136992f}</Project> - <Name>System.Composition.Convention</Name> - </ProjectReference> - <ProjectReference Include="..\..\System.Composition.Hosting\pkg\System.Composition.Hosting.pkgproj"> - <Project>{2b8fecc6-34a1-48fe-ba75-99572d2d6db2}</Project> - <Name>System.Composition.Hosting</Name> - </ProjectReference> - <ProjectReference Include="..\..\System.Composition.Runtime\pkg\System.Composition.Runtime.pkgproj"> - <Project>{2711dfd2-8541-4628-bc53-eb784a14cdcf}</Project> - <Name>System.Composition.Runtime</Name> - </ProjectReference> - <ProjectReference Include="..\..\System.Composition.TypedParts\pkg\System.Composition.TypedParts.pkgproj"> - <Project>{b4b5e15c-e6b9-48ea-94c2-f067484d4d3e}</Project> - <Name>System.Composition.TypedParts</Name> - </ProjectReference> <ProjectReference Include="..\scenarios\TestLibrary\TestLibrary.csproj"> <Project>{da6841a5-0344-4cc7-98b0-89cbee18dee3}</Project> <Name>TestLibrary</Name> diff --git a/src/System.Configuration/ref/project.json b/src/System.Configuration/ref/project.json deleted file mode 100644 index 832bc1b518..0000000000 --- a/src/System.Configuration/ref/project.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "System.CodeDom": "4.4.0-beta-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Collections.Specialized": "4.4.0-beta-24904-01", - "System.ComponentModel.TypeConverter": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.Net.WebClient": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Algorithms": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Text.Encoding.Extensions": "4.4.0-beta-24904-01", - "System.Text.RegularExpressions": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Xml.ReaderWriter": "4.4.0-beta-24904-01" - } - } - } -} diff --git a/src/System.Configuration/src/project.json b/src/System.Configuration/src/project.json deleted file mode 100644 index 832bc1b518..0000000000 --- a/src/System.Configuration/src/project.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "System.CodeDom": "4.4.0-beta-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Collections.Specialized": "4.4.0-beta-24904-01", - "System.ComponentModel.TypeConverter": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.Net.WebClient": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Algorithms": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Text.Encoding.Extensions": "4.4.0-beta-24904-01", - "System.Text.RegularExpressions": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Xml.ReaderWriter": "4.4.0-beta-24904-01" - } - } - } -} diff --git a/src/System.Console/dir.props b/src/System.Console/dir.props index 503cf86a87..bfbc5bd9e0 100644 --- a/src/System.Console/dir.props +++ b/src/System.Console/dir.props @@ -1,7 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Console/ref/4.0.0/project.json b/src/System.Console/ref/4.0.0/project.json deleted file mode 100644 index 7bb91fcf4d..0000000000 --- a/src/System.Console/ref/4.0.0/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Console": "4.3.0" - }, - "frameworks": { - "netstandard1.3": {} - } -}
\ 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/Configurations.props b/src/System.Console/src/Configurations.props new file mode 100644 index 0000000000..3bb6330d9e --- /dev/null +++ b/src/System.Console/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard-Unix; + netstandard-Windows_NT; + net463-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Console/src/System.Console.builds b/src/System.Console/src/System.Console.builds deleted file mode 100644 index 6712d9f901..0000000000 --- a/src/System.Console/src/System.Console.builds +++ /dev/null @@ -1,17 +0,0 @@ -<?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> - <Project Include="System.Console.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.Console.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.Console.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Console/src/System.Console.csproj b/src/System.Console/src/System.Console.csproj index b633d6f0b1..f4f188cf4c 100644 --- a/src/System.Console/src/System.Console.csproj +++ b/src/System.Console/src/System.Console.csproj @@ -1,8 +1,5 @@ -<?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> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{F9DF2357-81B4-4317-908E-512DA9395583}</ProjectGuid> @@ -10,7 +7,6 @@ <AssemblyName>System.Console</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> @@ -22,7 +18,7 @@ <ItemGroup> <Compile Include="FxCopBaseline.cs"/> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="System\Console.cs" /> <Compile Include="System\ConsoleCancelEventArgs.cs" /> <Compile Include="System\ConsoleColor.cs" /> @@ -44,7 +40,7 @@ </ItemGroup> --> <!-- Windows : Win32 --> - <ItemGroup Condition="'$(TargetsWindows)' == 'true' And '$(TargetGroup)' == ''"> + <ItemGroup Condition="'$(TargetsWindows)' == 'true' And '$(TargetGroup)' == 'netstandard'"> <Compile Include="System\ConsolePal.Windows.cs" /> <Compile Include="$(CommonPath)\System\Text\OSEncoding.Windows.cs"> <Link>Common\System\Text\OSEncoding.Windows.cs</Link> @@ -180,7 +176,7 @@ </Compile> </ItemGroup> <!-- Unix --> - <ItemGroup Condition=" '$(TargetsUnix)' == 'true' And '$(TargetGroup)' == ''"> + <ItemGroup Condition=" '$(TargetsUnix)' == 'true' And '$(TargetGroup)' == 'netstandard'"> <Compile Include="System\ConsolePal.Unix.cs" /> <Compile Include="System\TermInfo.cs" /> <Compile Include="System\IO\StdInReader.cs" /> @@ -280,7 +276,17 @@ <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.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 99551f0b2d..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-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Text.Encoding.Extensions": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Console/tests/Configurations.props b/src/System.Console/tests/Configurations.props new file mode 100644 index 0000000000..f0ebe53119 --- /dev/null +++ b/src/System.Console/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Console/tests/ManualTests/System.Console.Manual.Tests.csproj b/src/System.Console/tests/ManualTests/System.Console.Manual.Tests.csproj index cb54bb60e8..67011ce19f 100644 --- a/src/System.Console/tests/ManualTests/System.Console.Manual.Tests.csproj +++ b/src/System.Console/tests/ManualTests/System.Console.Manual.Tests.csproj @@ -2,14 +2,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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{99E5069D-241F-48A6-8F29-404B4AED72BF}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Console.Manual.Tests</AssemblyName> - <RootNamespace>System.Console.Manual.Tests</RootNamespace> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -17,15 +11,5 @@ <ItemGroup> <Compile Include="ManualTests.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\pkg\System.Console.pkgproj"> - <Project>{F9DF2357-81B4-4317-908E-512DA9395583}</Project> - <Name>System.Console</Name> - <OSGroup>$(InputOSGroup)</OSGroup> - </ProjectReference> - </ItemGroup> - <ItemGroup> - <None Include="project.json" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Console/tests/ManualTests/project.json b/src/System.Console/tests/ManualTests/project.json deleted file mode 100644 index 0f55bf79bb..0000000000 --- a/src/System.Console/tests/ManualTests/project.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "test-runtime": { - "target": "project", - "exclude": "compile" - }, - "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04", - "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04", - "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0040" - }, - "frameworks": { - "netstandard1.3": {} - }, - "supports": { - "coreFx.Test.netcoreapp1.0": {}, - "coreFx.Test.net46": {}, - "coreFx.Test.net461": {}, - "coreFx.Test.net462": {}, - "coreFx.Test.net463": {} - } -} diff --git a/src/System.Console/tests/Performance/System.Console.Performance.Tests.csproj b/src/System.Console/tests/Performance/System.Console.Performance.Tests.csproj index d8c1bfc021..ba2a748553 100644 --- a/src/System.Console/tests/Performance/System.Console.Performance.Tests.csproj +++ b/src/System.Console/tests/Performance/System.Console.Performance.Tests.csproj @@ -2,11 +2,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> - <AssemblyName>System.Console.Performance.Tests</AssemblyName> - <RootNamespace>System.Console.Performance.Tests</RootNamespace> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IncludePerformanceTests>true</IncludePerformanceTests> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -18,16 +15,7 @@ </Compile> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\pkg\System.Console.pkgproj"> - <Project>{F9DF2357-81B4-4317-908E-512DA9395583}</Project> - <Name>System.Console</Name> - <OSGroup>$(InputOSGroup)</OSGroup> - </ProjectReference> - <ProjectReference Include="$(CommonTestPath)\System\Diagnostics\RemoteExecutorConsoleApp\RemoteExecutorConsoleApp.csproj"> - <Project>{69e46a6f-9966-45a5-8945-2559fe337827}</Project> - <Name>RemoteExecutorConsoleApp</Name> - <OSGroup>$(InputOSGroup)</OSGroup> - </ProjectReference> + <ProjectReference Include="$(CommonTestPath)\System\Diagnostics\RemoteExecutorConsoleApp\RemoteExecutorConsoleApp.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Console/tests/System.Console.Tests.csproj b/src/System.Console/tests/System.Console.Tests.csproj index 86949a787b..d2764a428f 100644 --- a/src/System.Console/tests/System.Console.Tests.csproj +++ b/src/System.Console/tests/System.Console.Tests.csproj @@ -2,14 +2,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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{99E5069D-241F-48A6-8F29-404B4AED72BF}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Console.Tests</AssemblyName> - <RootNamespace>System.Console.Tests</RootNamespace> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -51,11 +45,6 @@ <Compile Include="WindowAndCursorProps.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\pkg\System.Console.pkgproj"> - <Project>{F9DF2357-81B4-4317-908E-512DA9395583}</Project> - <Name>System.Console</Name> - <OSGroup>$(InputOSGroup)</OSGroup> - </ProjectReference> <ProjectReference Include="$(CommonTestPath)\System\Diagnostics\RemoteExecutorConsoleApp\RemoteExecutorConsoleApp.csproj"> <Project>{69e46a6f-9966-45a5-8945-2559fe337827}</Project> <Name>RemoteExecutorConsoleApp</Name> 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 87f4148aef..0000000000 --- a/src/System.Data.Common/ref/project.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "dependencies": { - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.ComponentModel": "4.4.0-beta-24904-01", - "System.ComponentModel.Primitives": "4.4.0-beta-24904-01", - "System.ComponentModel.TypeConverter": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.ObjectModel": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Transactions": "4.4.0-beta-24904-01", - "System.Xml.ReaderWriter": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Data.Common/src/Configurations.props b/src/System.Data.Common/src/Configurations.props new file mode 100644 index 0000000000..9c336c0be9 --- /dev/null +++ b/src/System.Data.Common/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Data.Common/src/System.Data.Common.builds b/src/System.Data.Common/src/System.Data.Common.builds deleted file mode 100644 index cc0ed3bd75..0000000000 --- a/src/System.Data.Common/src/System.Data.Common.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.Data.Common.csproj" /> - <Project Include="System.Data.Common.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Data.Common/src/System.Data.Common.csproj b/src/System.Data.Common/src/System.Data.Common.csproj index 178e502ce2..e9c12416ee 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> @@ -6,7 +6,6 @@ <AssemblyName>System.Data.Common</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <PlatformTarget>AnyCPU</PlatformTarget> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> @@ -17,7 +16,7 @@ <Compile Include="System\Data\Common\DbColumn.cs" /> <Compile Include="System\Data\Common\IDbColumnSchemaGenerator.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == ''"> + <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> <Compile Include="System.Data.Common.TypeForwards.cs" /> <Compile Include="System\HResults.cs" /> <Compile Include="System\Xml\TreeIterator.cs" /> @@ -272,10 +271,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)' == ''"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <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 9234f27ecc..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-24904-01", - "System.Collections.Concurrent": "4.4.0-beta-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.ComponentModel": "4.4.0-beta-24904-01", - "System.ComponentModel.Primitives": "4.4.0-beta-24904-01", - "System.ComponentModel.TypeConverter": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Diagnostics.TraceSource": "4.4.0-beta-24904-01", - "System.Diagnostics.Tracing": "4.4.0-beta-24904-01", - "System.Dynamic.Runtime": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.Linq": "4.4.0-beta-24904-01", - "System.ObjectModel": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Numerics": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Formatters": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Text.Encoding.Extensions": "4.4.0-beta-24904-01", - "System.Text.RegularExpressions": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Transactions": "4.4.0-beta-24904-01", - "System.Xml.ReaderWriter": "4.4.0-beta-24904-01", - "System.Xml.XmlSerializer": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.Data.Common/tests/Configurations.props b/src/System.Data.Common/tests/Configurations.props new file mode 100644 index 0000000000..512c938bad --- /dev/null +++ b/src/System.Data.Common/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Data.Common/tests/System.Data.Common.Tests.csproj b/src/System.Data.Common/tests/System.Data.Common.Tests.csproj index 3b78d1f5ca..245ee77a59 100644 --- a/src/System.Data.Common/tests/System.Data.Common.Tests.csproj +++ b/src/System.Data.Common/tests/System.Data.Common.Tests.csproj @@ -3,17 +3,9 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{82B54697-0251-47A1-8546-FC507D0F3B08}</ProjectGuid> - <AssemblyName>System.Data.Common.Tests</AssemblyName> - <RootNamespace>System.Data.Common.Tests</RootNamespace> <DefineConstants Condition="'$(TargetGroup)'==''">$(DefineConstants);netstandard17</DefineConstants> - <NugetTargetMoniker Condition="'$(TargetGroup)'==''">.NETStandard,Version=v1.7</NugetTargetMoniker> <NoWarn>0168,0169,0414,0219,0649</NoWarn> </PropertyGroup> - <ItemGroup> - <TestNugetTargetMoniker Include="$(NugetTargetMoniker)"> - <Folder>netcoreapp1.1</Folder> - </TestNugetTargetMoniker> - </ItemGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <ItemGroup> @@ -116,10 +108,5 @@ <Link>Common\System\Diagnostics\Tracing\TestEventListener.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Data.Common.pkgproj"> - <Name>System.Data.Common</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Data.SqlClient/ref/4.0/project.json b/src/System.Data.SqlClient/ref/4.0/project.json deleted file mode 100644 index 0d3df162b8..0000000000 --- a/src/System.Data.SqlClient/ref/4.0/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "System.Data.SqlClient": "4.3.0", - "System.Data.Common": "4.3.0" - }, - "frameworks": { - "netstandard1.2": {} - } -}
\ 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 4ae1675f67..0000000000 --- a/src/System.Data.SqlClient/ref/project.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "dependencies": { - "System.ComponentModel.Primitives": "4.4.0-beta-24904-01", - "System.ComponentModel.TypeConverter": "4.4.0-beta-24904-01", - "System.Data.Common": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "System.Xml.ReaderWriter": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Data.SqlClient/src/Configurations.props b/src/System.Data.SqlClient/src/Configurations.props new file mode 100644 index 0000000000..3bb6330d9e --- /dev/null +++ b/src/System.Data.SqlClient/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard-Unix; + netstandard-Windows_NT; + net463-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Data.SqlClient/src/System.Data.SqlClient.builds b/src/System.Data.SqlClient/src/System.Data.SqlClient.builds deleted file mode 100644 index 3b4e828bd0..0000000000 --- a/src/System.Data.SqlClient/src/System.Data.SqlClient.builds +++ /dev/null @@ -1,17 +0,0 @@ -<?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> - <Project Include="System.Data.SqlClient.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.Data.SqlClient.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.Data.SqlClient.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj b/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj index 4b27ecdf76..c35afcfaf9 100644 --- a/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj +++ b/src/System.Data.SqlClient/src/System.Data.SqlClient.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"> - <PropertyGroup> - <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{D4550556-4745-457F-BA8F-3EBF3836D6B4}</ProjectGuid> <AssemblyName>System.Data.SqlClient</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <PropertyGroup Condition=" '$(TargetsWindows)' != 'true' "> <DefineConstants>$(DefineConstants);MANAGED_SNI</DefineConstants> @@ -164,8 +160,42 @@ <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> + <ItemGroup Condition="'$(TargetsUnix)' == 'true'"> + <Reference Include="System.IO.Pipes" /> + <Reference Include="System.Security.Principal" /> + <Reference Include="System.Security.Cryptography.X509Certificates" /> + <Reference Include="System.Net.Sockets" /> + <Reference Include="System.Net.Security" /> + <Reference Include="System.Net.Primitives" /> + <Reference Include="System.Net.NameResolution" /> </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 5515ef2a19..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-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Collections.Concurrent": "4.4.0-beta-24904-01", - "System.ComponentModel.Primitives": "4.4.0-beta-24904-01", - "System.ComponentModel.TypeConverter": "4.4.0-beta-24904-01", - "System.Data.Common": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.DiagnosticSource": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.Pipes": "4.4.0-beta-24904-01", - "System.Linq": "4.4.0-beta-24904-01", - "System.Net.NameResolution": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Net.Sockets": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Reflection.TypeExtensions": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-beta-24904-01", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24904-01", - "System.Security.Principal": "4.4.0-beta-24904-01", - "System.Security.Principal.Windows": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Text.Encoding.CodePages": "4.4.0-beta-24904-01", - "System.Text.Encoding.Extensions": "4.4.0-beta-24904-01", - "System.Text.RegularExpressions": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01", - "System.Threading.Timer": "4.4.0-beta-24904-01", - "System.Xml.ReaderWriter": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - }, - "dependencies": {} -} diff --git a/src/System.Data.SqlClient/tests/FunctionalTests/System.Data.SqlClient.Tests.csproj b/src/System.Data.SqlClient/tests/FunctionalTests/System.Data.SqlClient.Tests.csproj index 006ad0bac5..b26b451da2 100644 --- a/src/System.Data.SqlClient/tests/FunctionalTests/System.Data.SqlClient.Tests.csproj +++ b/src/System.Data.SqlClient/tests/FunctionalTests/System.Data.SqlClient.Tests.csproj @@ -3,10 +3,6 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{F3E72F35-0351-4D67-9388-725BCAD807BA}</ProjectGuid> - <OutputType>Library</OutputType> - <RootNamespace>System.Data.SqlClient.Tests</RootNamespace> - <AssemblyName>System.Data.SqlClient.Tests</AssemblyName> - <NugetTargetMoniker>.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Release|AnyCPU'" /> @@ -25,7 +21,6 @@ <Compile Include="SqlConnectionTest.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\pkg\System.Data.SqlClient.pkgproj" /> <ProjectReference Include="..\Tools\TDS\TDS.Servers\TDS.Servers.csproj"> <Name>TDS.Servers</Name> </ProjectReference> diff --git a/src/System.Data.SqlClient/tests/ManualTests/System.Data.SqlClient.ManualTesting.Tests.csproj b/src/System.Data.SqlClient/tests/ManualTests/System.Data.SqlClient.ManualTesting.Tests.csproj index 82a7c08876..2140e3b861 100644 --- a/src/System.Data.SqlClient/tests/ManualTests/System.Data.SqlClient.ManualTesting.Tests.csproj +++ b/src/System.Data.SqlClient/tests/ManualTests/System.Data.SqlClient.ManualTesting.Tests.csproj @@ -3,8 +3,6 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}</ProjectGuid> - <OutputType>Library</OutputType> - <NugetTargetMoniker>.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Release|AnyCPU'" /> @@ -14,9 +12,6 @@ <DefineConstants>$(DefineConstants);MANAGED_SNI</DefineConstants> </PropertyGroup> <ItemGroup> - <ProjectReference Include="..\..\pkg\System.Data.SqlClient.pkgproj" /> - </ItemGroup> - <ItemGroup> <Compile Include="DataCommon\CheckConnStrSetupFactAttribute.cs" /> <Compile Include="SQL\Common\AsyncDebugScope.cs" /> <Compile Include="SQL\Common\ConnectionPoolWrapper.cs" /> @@ -76,7 +71,6 @@ <None Include="ProviderAgnostic\MultipleResultsTest\MultipleResultsTest.bsl"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </None> - <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.Data.SqlClient/tests/StressTests/IMonitorLoader/IMonitorLoader.csproj b/src/System.Data.SqlClient/tests/StressTests/IMonitorLoader/IMonitorLoader.csproj index 320f914d5c..9947b0a25a 100644 --- a/src/System.Data.SqlClient/tests/StressTests/IMonitorLoader/IMonitorLoader.csproj +++ b/src/System.Data.SqlClient/tests/StressTests/IMonitorLoader/IMonitorLoader.csproj @@ -5,8 +5,7 @@ <ProjectGuid>{AF78BA88-6428-47EA-8682-442DAF8E9656}</ProjectGuid> <RootNamespace>Monitoring</RootNamespace> <AssemblyName>Monitoring</AssemblyName> - <OutputType>Library</OutputType> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> + <IsTestProject>true</IsTestProject> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Release|AnyCPU'" /> diff --git a/src/System.Data.SqlClient/tests/StressTests/IMonitorLoader/project.json b/src/System.Data.SqlClient/tests/StressTests/IMonitorLoader/project.json deleted file mode 100644 index 432e42c757..0000000000 --- a/src/System.Data.SqlClient/tests/StressTests/IMonitorLoader/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Collections": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.3": {} - } -} diff --git a/src/System.Data.SqlClient/tests/StressTests/System.Data.SqlClient.Stress.Tests/FilteredDefaultTraceListener.cs b/src/System.Data.SqlClient/tests/StressTests/System.Data.SqlClient.Stress.Tests/FilteredDefaultTraceListener.cs index 151b8cd461..3311abef68 100644 --- a/src/System.Data.SqlClient/tests/StressTests/System.Data.SqlClient.Stress.Tests/FilteredDefaultTraceListener.cs +++ b/src/System.Data.SqlClient/tests/StressTests/System.Data.SqlClient.Stress.Tests/FilteredDefaultTraceListener.cs @@ -139,7 +139,7 @@ namespace Stress.Data.SqlClient // System.Diagnostics.Debug.Assert if (actualCallstack == null) { - actualCallstack = new StackTrace(exception: new InvalidOperationException(), needFileInfo: false); + actualCallstack = new StackTrace(e: new InvalidOperationException(), fNeedFileInfo: false); } StackFrame[] frames = actualCallstack.GetFrames(); diff --git a/src/System.Data.SqlClient/tests/StressTests/System.Data.SqlClient.Stress.Tests/System.Data.SqlClient.Stress.Tests.csproj b/src/System.Data.SqlClient/tests/StressTests/System.Data.SqlClient.Stress.Tests/System.Data.SqlClient.Stress.Tests.csproj index 2ee36f6a94..fe25a7a91b 100644 --- a/src/System.Data.SqlClient/tests/StressTests/System.Data.SqlClient.Stress.Tests/System.Data.SqlClient.Stress.Tests.csproj +++ b/src/System.Data.SqlClient/tests/StressTests/System.Data.SqlClient.Stress.Tests/System.Data.SqlClient.Stress.Tests.csproj @@ -5,8 +5,6 @@ <ProjectGuid>{B94B8E6D-3E41-4046-B758-4A2E281F74EE}</ProjectGuid> <RootNamespace>Stress.Data.SqlClient</RootNamespace> <AssemblyName>System.Data.SqlClient.Stress.Tests</AssemblyName> - <OutputType>Library</OutputType> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Release|AnyCPU'" /> @@ -24,9 +22,5 @@ <Compile Include="HostsFileManager.cs" /> <Compile Include="NetUtils.cs" /> </ItemGroup> - <!--Import the targets--> - <ItemGroup> - <ProjectReference Include="..\..\..\pkg\System.Data.SqlClient.pkgproj" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Data.SqlClient/tests/StressTests/System.Data.StressFramework/System.Data.StressFramework.csproj b/src/System.Data.SqlClient/tests/StressTests/System.Data.StressFramework/System.Data.StressFramework.csproj index 1d6518bd65..3ae29540d2 100644 --- a/src/System.Data.SqlClient/tests/StressTests/System.Data.StressFramework/System.Data.StressFramework.csproj +++ b/src/System.Data.SqlClient/tests/StressTests/System.Data.StressFramework/System.Data.StressFramework.csproj @@ -4,8 +4,7 @@ <PropertyGroup> <ProjectGuid>{518A4E22-0144-4699-80AE-757B744E8E38}</ProjectGuid> <RootNamespace>Stress.Data</RootNamespace> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> - <OutputType>Library</OutputType> + <IsTestProject>true</IsTestProject> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Release|AnyCPU'" /> diff --git a/src/System.Data.SqlClient/tests/StressTests/System.Data.StressFramework/project.json b/src/System.Data.SqlClient/tests/StressTests/System.Data.StressFramework/project.json deleted file mode 100644 index 90589928d4..0000000000 --- a/src/System.Data.SqlClient/tests/StressTests/System.Data.StressFramework/project.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "System.Console": "4.4.0-beta-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Collections.Concurrent": "4.4.0-beta-24904-01", - "System.Data.Common": "4.4.0-beta-24904-01", - "System.Data.SqlClient": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.DiagnosticSource": "4.4.0-beta-24904-01", - "System.Diagnostics.FileVersionInfo": "4.4.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.Diagnostics.TextWriterTraceListener": "4.4.0-beta-24904-01", - "System.Diagnostics.TraceSource": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.Linq": "4.4.0-beta-24904-01", - "System.Linq.Expressions": "4.4.0-beta-24904-01", - "System.Net.NameResolution": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Reflection.Emit": "4.4.0-beta-24904-01", - "System.Reflection.Extensions": "4.4.0-beta-24904-01", - "System.Reflection.TypeExtensions": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Security.Principal": "4.4.0-beta-24904-01", - "System.Security.Principal.Windows": "4.4.0-beta-24904-01", - "System.Text.RegularExpressions": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Timer": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Primitives": "4.3.0", - "System.Xml.ReaderWriter": "4.4.0-beta-24904-01", - "System.Xml.XPath": "4.4.0-beta-24904-01", - "System.Xml.XmlDocument": "4.4.0-beta-24904-01", - "runtime.native.System.Data.SqlClient.sni": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.3": {} - } -} diff --git a/src/System.Data.SqlClient/tests/StressTests/System.Data.StressRunner/System.Data.StressRunner.csproj b/src/System.Data.SqlClient/tests/StressTests/System.Data.StressRunner/System.Data.StressRunner.csproj index 0df9238206..6ffca55320 100644 --- a/src/System.Data.SqlClient/tests/StressTests/System.Data.StressRunner/System.Data.StressRunner.csproj +++ b/src/System.Data.SqlClient/tests/StressTests/System.Data.StressRunner/System.Data.StressRunner.csproj @@ -4,13 +4,13 @@ <PropertyGroup> <ProjectGuid>{529B187A-DE4F-4F4D-9FBB-D3D416FDB683}</ProjectGuid> <RootNamespace>DPStressHarness</RootNamespace> - <AssemblyName>System.Data.StressRunner</AssemblyName> <OutputType>Exe</OutputType> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> <!-- Don't attempt to publish for any runtime. Though this is an EXE it is built as netstandard and will be published for a specific framework/runtime by a referencing project. --> <CopyNuGetImplementations>false</CopyNuGetImplementations> + <IsTestProject>true</IsTestProject> + <NoWarn>3021</NoWarn> </PropertyGroup> <ItemGroup> <ProjectReference Include="..\IMonitorLoader\IMonitorLoader.csproj" /> diff --git a/src/System.Data.SqlClient/tests/StressTests/System.Data.StressRunner/project.json b/src/System.Data.SqlClient/tests/StressTests/System.Data.StressRunner/project.json deleted file mode 100644 index 4c65df594c..0000000000 --- a/src/System.Data.SqlClient/tests/StressTests/System.Data.StressRunner/project.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "System.AppContext": "4.4.0-beta-24904-01", - "System.Console": "4.4.0-beta-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Collections.Concurrent": "4.4.0-beta-24904-01", - "System.Data.Common": "4.4.0-beta-24904-01", - "System.Data.SqlClient": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.DiagnosticSource": "4.4.0-beta-24904-01", - "System.Diagnostics.FileVersionInfo": "4.4.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.Diagnostics.TextWriterTraceListener": "4.4.0-beta-24904-01", - "System.Diagnostics.TraceSource": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.Net.NameResolution": "4.4.0-beta-24904-01", - "System.Security.Principal": "4.4.0-beta-24904-01", - "System.Security.Principal.Windows": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.3.0", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Timer": "4.4.0-beta-24904-01", - "System.Reflection.Extensions": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Reflection.Emit": "4.4.0-beta-24904-01", - "System.Reflection.TypeExtensions": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Text.RegularExpressions": "4.4.0-beta-24904-01", - "System.Xml.ReaderWriter": "4.4.0-beta-24904-01", - "System.Xml.XmlDocument": "4.4.0-beta-24904-01", - "runtime.native.System.Data.SqlClient.sni": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dnxcore50" - ] - }, - "netstandard1.3": {} - } -} diff --git a/src/System.Data.SqlClient/tests/Tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj b/src/System.Data.SqlClient/tests/Tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj index 594336e3c6..24c1df60b6 100644 --- a/src/System.Data.SqlClient/tests/Tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj +++ b/src/System.Data.SqlClient/tests/Tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj @@ -3,12 +3,10 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{1FF891B4-D3DE-4CCE-887C-CB48F5351A45}</ProjectGuid> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>Microsoft.SqlServer.TDS.EndPoint</RootNamespace> <AssemblyName>Microsoft.SqlServer.TDS.EndPoint</AssemblyName> - <NugetTargetMoniker>.NETStandard,Version=v1.7</NugetTargetMoniker> <ClsCompliant>false</ClsCompliant> + <IsTestProject>true</IsTestProject> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Release|AnyCPU'" /> diff --git a/src/System.Data.SqlClient/tests/Tools/TDS/TDS.EndPoint/project.json b/src/System.Data.SqlClient/tests/Tools/TDS/TDS.EndPoint/project.json deleted file mode 100644 index fcf1c97fd1..0000000000 --- a/src/System.Data.SqlClient/tests/Tools/TDS/TDS.EndPoint/project.json +++ /dev/null @@ -1,441 +0,0 @@ -{ - "dependencies": { - "coveralls.io": "1.4", - "OpenCover": "4.6.519", - "ReportGenerator": "2.5.0", - "Microsoft.NETCore.TestHost": "1.2.0-beta-24904-03", - "Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24904-03", - "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04", - "xunit.console.netcore": "1.0.3-prerelease-00921-01", - "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04", - "perf": { - "target": "project", - "include": "compile,runtime" - }, - "Microsoft.CSharp": "4.4.0-beta-24904-01", - "Microsoft.VisualBasic": "10.2.0-beta-24904-01", - "Microsoft.Win32.Primitives": "4.4.0-beta-24904-01", - "System.AppContext": "4.4.0-beta-24904-01", - "System.Buffers": "4.4.0-beta-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Collections.Concurrent": "4.4.0-beta-24904-01", - "System.Collections.Immutable": "1.4.0-beta-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Collections.Specialized": "4.4.0-beta-24904-01", - "System.ComponentModel": "4.4.0-beta-24904-01", - "System.ComponentModel.Annotations": "4.4.0-beta-24904-01", - "System.ComponentModel.EventBasedAsync": "4.4.0-beta-24904-01", - "System.ComponentModel.Primitives": "4.4.0-beta-24904-01", - "System.ComponentModel.TypeConverter": "4.4.0-beta-24904-01", - "System.Composition": "1.1.0-beta-24904-01", - "System.Composition.AttributedModel": "1.1.0-beta-24904-01", - "System.Composition.Convention": "1.1.0-beta-24904-01", - "System.Composition.Hosting": "1.1.0-beta-24904-01", - "System.Composition.Runtime": "1.1.0-beta-24904-01", - "System.Composition.TypedParts": "1.1.0-beta-24904-01", - "System.Console": "4.4.0-beta-24904-01", - "System.Data.Common": "4.4.0-beta-24904-01", - "System.Data.SqlClient": "4.4.0-beta-24904-01", - "runtime.native.System.Data.SqlClient.sni": "4.4.0-beta-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.DiagnosticSource": "4.4.0-beta-24904-01", - "System.Diagnostics.FileVersionInfo": "4.4.0-beta-24904-01", - "System.Diagnostics.StackTrace": "4.4.0-beta-24904-01", - "System.Diagnostics.TextWriterTraceListener": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Diagnostics.TraceSource": "4.4.0-beta-24904-01", - "System.Diagnostics.Tracing": "4.4.0-beta-24904-01", - "System.Drawing.Primitives": "4.4.0-beta-24904-01", - "System.Dynamic.Runtime": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.Globalization.Calendars": "4.4.0-beta-24904-01", - "System.Globalization.Extensions": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.Compression": "4.4.0-beta-24904-01", - "runtime.native.System.IO.Compression": "4.4.0-beta-24904-01", - "System.IO.Compression.ZipFile": "4.4.0-beta-24904-01", - "System.IO.Compression.TestData": "1.0.4-prerelease", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24904-01", - "System.IO.MemoryMappedFiles": "4.4.0-beta-24904-01", - "System.IO.Packaging": "4.4.0-beta-24904-01", - "System.IO.Packaging.TestData": "1.0.0-prerelease", - "System.IO.UnmanagedMemoryStream": "4.4.0-beta-24904-01", - "System.Json": "4.4.0-beta-24904-01", - "System.Linq": "4.4.0-beta-24904-01", - "System.Linq.Expressions": "4.4.0-beta-24904-01", - "System.Linq.Parallel": "4.4.0-beta-24904-01", - "System.Linq.Queryable": "4.4.0-beta-24904-01", - "System.Memory": "4.4.0-beta-24904-01", - "System.Net.Http": "4.4.0-beta-24904-01", - "System.Net.NameResolution": "4.4.0-beta-24904-01", - "System.Net.NetworkInformation": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Net.Requests": "4.4.0-beta-24904-01", - "System.Net.Sockets": "4.4.0-beta-24904-01", - "System.Net.WebHeaderCollection": "4.4.0-beta-24904-01", - "System.Net.WebSockets": "4.4.0-beta-24904-01", - "System.Net.WebSockets.Client": "4.4.0-beta-24904-01", - "System.Numerics.Vectors": "4.4.0-beta-24904-01", - "System.ObjectModel": "4.4.0-beta-24904-01", - "System.Private.DataContractSerialization": "4.4.0-beta-24904-01", - "System.Private.Uri": "4.4.0-beta-24904-01", - "System.Private.Xml": "4.4.0-beta-24904-01", - "System.Private.Xml.Linq": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Reflection.Context": "4.4.0-beta-24904-01", - "System.Reflection.DispatchProxy": "4.4.0-beta-24904-01", - "System.Reflection.Extensions": "4.4.0-beta-24904-01", - "System.Reflection.Metadata": "1.5.0-beta-24904-01", - "System.Reflection.Primitives": "4.4.0-beta-24904-01", - "System.Reflection.TypeExtensions": "4.4.0-beta-24904-01", - "System.Resources.Reader": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Resources.Writer": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.CompilerServices.Unsafe": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices.WindowsRuntime": "4.4.0-beta-24904-01", - "System.Runtime.Numerics": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Json": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Primitives": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Xml": "4.4.0-beta-24904-01", - "System.Security.Claims": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Algorithms": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Cng": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Encoding": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Pkcs": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Primitives": "4.4.0-beta-24904-01", - "System.Security.Cryptography.ProtectedData": "4.4.0-beta-24904-01", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24904-01", - "System.Security.Cryptography.X509Certificates.TestData": "1.0.2-prerelease", - "System.Security.Principal": "4.4.0-beta-24904-01", - "System.Security.Principal.Windows": "4.4.0-beta-24904-01", - "System.Security.SecureString": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Text.Encoding.CodePages": "4.4.0-beta-24904-01", - "System.Text.Encoding.Extensions": "4.4.0-beta-24904-01", - "System.Text.Encodings.Web": "4.4.0-beta-24904-01", - "System.Text.RegularExpressions": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Overlapped": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "System.Threading.Tasks.Dataflow": "4.8.0-beta-24904-01", - "System.Threading.Tasks.Extensions": "4.4.0-beta-24904-01", - "System.Threading.Tasks.Parallel": "4.4.0-beta-24904-01", - "System.Threading.Timer": "4.4.0-beta-24904-01", - "System.ValueTuple": "4.4.0-beta-24904-01", - "System.Web.HttpUtility": "4.4.0-beta-24904-01", - "System.Xml.ReaderWriter": "4.4.0-beta-24904-01", - "System.Xml.XDocument": "4.4.0-beta-24904-01", - "System.Xml.XmlDocument": "4.4.0-beta-24904-01", - "System.Xml.XmlSerializer": "4.4.0-beta-24904-01", - "System.Xml.XPath": "4.4.0-beta-24904-01", - "System.Xml.XPath.XDocument": "4.4.0-beta-24904-01", - "System.Xml.XPath.XmlDocument": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.3": { - "dependencies": { - "Microsoft.Win32.Registry": "4.4.0-beta-24904-01", - "Microsoft.Win32.Registry.AccessControl": "4.4.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.IO.FileSystem.AccessControl": "4.4.0-beta-24904-01", - "System.IO.FileSystem.DriveInfo": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Watcher": "4.4.0-beta-24904-01", - "System.IO.Pipes": "4.4.0-beta-24904-01", - "System.IO.Pipes.AccessControl": "4.4.0-beta-24904-01", - "System.Net.Http.WinHttpHandler": "4.4.0-beta-24904-01", - "System.Net.Ping": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Runtime.CompilerServices.VisualC": "4.4.0-beta-24904-01", - "System.Security.AccessControl": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Csp": "4.4.0-beta-24904-01", - "System.Threading.AccessControl": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01", - "System.Reflection.Emit": "4.4.0-beta-24904-01", - "System.Reflection.Emit.ILGeneration": "4.4.0-beta-24904-01", - "System.Reflection.Emit.Lightweight": "4.4.0-beta-24904-01" - } - }, - "netstandard1.4": { - "dependencies": { - "Microsoft.Win32.Registry": "4.4.0-beta-24904-01", - "Microsoft.Win32.Registry.AccessControl": "4.4.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.IO.FileSystem.AccessControl": "4.4.0-beta-24904-01", - "System.IO.FileSystem.DriveInfo": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Watcher": "4.4.0-beta-24904-01", - "System.IO.Pipes": "4.4.0-beta-24904-01", - "System.IO.Pipes.AccessControl": "4.4.0-beta-24904-01", - "System.Net.Http.WinHttpHandler": "4.4.0-beta-24904-01", - "System.Net.Ping": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Runtime.CompilerServices.VisualC": "4.4.0-beta-24904-01", - "System.Security.AccessControl": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Csp": "4.4.0-beta-24904-01", - "System.Threading.AccessControl": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01", - "System.ServiceProcess.ServiceController": "4.4.0-beta-24904-01", - "System.Reflection.Emit": "4.4.0-beta-24904-01", - "System.Reflection.Emit.ILGeneration": "4.4.0-beta-24904-01", - "System.Reflection.Emit.Lightweight": "4.4.0-beta-24904-01" - } - }, - "netstandard1.5": { - "dependencies": { - "Microsoft.Win32.Registry": "4.4.0-beta-24904-01", - "Microsoft.Win32.Registry.AccessControl": "4.4.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.IO.FileSystem.AccessControl": "4.4.0-beta-24904-01", - "System.IO.FileSystem.DriveInfo": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Watcher": "4.4.0-beta-24904-01", - "System.IO.Pipes": "4.4.0-beta-24904-01", - "System.IO.Pipes.AccessControl": "4.4.0-beta-24904-01", - "System.Net.Http.WinHttpHandler": "4.4.0-beta-24904-01", - "System.Net.Ping": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Runtime.CompilerServices.VisualC": "4.4.0-beta-24904-01", - "System.Security.AccessControl": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Csp": "4.4.0-beta-24904-01", - "System.Threading.AccessControl": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01", - "System.ServiceProcess.ServiceController": "4.4.0-beta-24904-01", - "System.Reflection.Emit": "4.4.0-beta-24904-01", - "System.Reflection.Emit.ILGeneration": "4.4.0-beta-24904-01", - "System.Reflection.Emit.Lightweight": "4.4.0-beta-24904-01" - } - }, - "netstandard1.6": { - "dependencies": { - "Microsoft.Win32.Registry": "4.4.0-beta-24904-01", - "Microsoft.Win32.Registry.AccessControl": "4.4.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.IO.FileSystem.AccessControl": "4.4.0-beta-24904-01", - "System.IO.FileSystem.DriveInfo": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Watcher": "4.4.0-beta-24904-01", - "System.IO.Pipes": "4.4.0-beta-24904-01", - "System.IO.Pipes.AccessControl": "4.4.0-beta-24904-01", - "System.Net.Http.WinHttpHandler": "4.4.0-beta-24904-01", - "System.Net.Ping": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Runtime.CompilerServices.VisualC": "4.4.0-beta-24904-01", - "System.Security.AccessControl": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Csp": "4.4.0-beta-24904-01", - "System.Threading.AccessControl": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01", - "System.ServiceProcess.ServiceController": "4.4.0-beta-24904-01", - "System.Security.Cryptography.OpenSsl": "4.4.0-beta-24904-01", - "System.Reflection.Emit": "4.4.0-beta-24904-01", - "System.Reflection.Emit.ILGeneration": "4.4.0-beta-24904-01", - "System.Reflection.Emit.Lightweight": "4.4.0-beta-24904-01" - } - }, - "netstandard1.7": { - "dependencies": { - "Microsoft.Win32.Registry": "4.4.0-beta-24904-01", - "Microsoft.Win32.Registry.AccessControl": "4.4.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.IO.FileSystem.AccessControl": "4.4.0-beta-24904-01", - "System.IO.FileSystem.DriveInfo": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Watcher": "4.4.0-beta-24904-01", - "System.IO.IsolatedStorage": "4.4.0-beta-24904-01", - "System.IO.Pipes": "4.4.0-beta-24904-01", - "System.IO.Pipes.AccessControl": "4.4.0-beta-24904-01", - "System.Net.Http.WinHttpHandler": "4.4.0-beta-24904-01", - "System.Net.HttpListener": "4.4.0-beta-24904-01", - "System.Net.Ping": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Runtime.CompilerServices.VisualC": "4.4.0-beta-24904-01", - "System.Security.AccessControl": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Csp": "4.4.0-beta-24904-01", - "System.Threading.AccessControl": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01", - "System.ServiceProcess.ServiceController": "4.4.0-beta-24904-01", - "System.Security.Cryptography.OpenSsl": "4.4.0-beta-24904-01", - "System.Net.ServicePoint": "4.4.0-beta-24904-01", - "System.Net.WebProxy": "4.4.0-beta-24904-01", - "System.Net.WebClient": "4.4.0-beta-24904-01", - "System.Net.Mail": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Formatters": "4.4.0-beta-24904-01", - "System.Security.Permissions": "4.4.0-beta-24904-01", - "System.Transactions": "4.4.0-beta-24904-01", - "System.Reflection.Emit": "4.4.0-beta-24904-01", - "System.Reflection.Emit.ILGeneration": "4.4.0-beta-24904-01", - "System.Reflection.Emit.Lightweight": "4.4.0-beta-24904-01" - } - }, - "netcoreapp1.0": { - "dependencies": { - "Microsoft.Win32.Registry": "4.4.0-beta-24904-01", - "Microsoft.Win32.Registry.AccessControl": "4.4.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.IO.FileSystem.AccessControl": "4.4.0-beta-24904-01", - "System.IO.FileSystem.DriveInfo": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Watcher": "4.4.0-beta-24904-01", - "System.IO.Pipes": "4.4.0-beta-24904-01", - "System.IO.Pipes.AccessControl": "4.4.0-beta-24904-01", - "System.Net.Http.WinHttpHandler": "4.4.0-beta-24904-01", - "System.Net.Ping": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Runtime.CompilerServices.VisualC": "4.4.0-beta-24904-01", - "System.Security.AccessControl": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Csp": "4.4.0-beta-24904-01", - "System.Threading.AccessControl": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01", - "System.ServiceProcess.ServiceController": "4.4.0-beta-24904-01", - "System.Security.Cryptography.OpenSsl": "4.4.0-beta-24904-01", - "System.Reflection.Emit": "4.4.0-beta-24904-01", - "System.Reflection.Emit.ILGeneration": "4.4.0-beta-24904-01", - "System.Reflection.Emit.Lightweight": "4.4.0-beta-24904-01", - "System.Runtime.Loader": "4.4.0-beta-24904-01" - } - }, - "netcoreapp1.1": { - "dependencies": { - "Microsoft.Win32.Registry": "4.4.0-beta-24904-01", - "Microsoft.Win32.Registry.AccessControl": "4.4.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.IO.FileSystem.AccessControl": "4.4.0-beta-24904-01", - "System.IO.FileSystem.DriveInfo": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Watcher": "4.4.0-beta-24904-01", - "System.IO.IsolatedStorage": "4.4.0-beta-24904-01", - "System.IO.Pipes": "4.4.0-beta-24904-01", - "System.IO.Pipes.AccessControl": "4.4.0-beta-24904-01", - "System.Net.Http.WinHttpHandler": "4.4.0-beta-24904-01", - "System.Net.HttpListener": "4.4.0-beta-24904-01", - "System.Net.Ping": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Runtime.CompilerServices.VisualC": "4.4.0-beta-24904-01", - "System.Security.AccessControl": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Csp": "4.4.0-beta-24904-01", - "System.Threading.AccessControl": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01", - "System.ServiceProcess.ServiceController": "4.4.0-beta-24904-01", - "System.Security.Cryptography.OpenSsl": "4.4.0-beta-24904-01", - "System.Net.ServicePoint": "4.4.0-beta-24904-01", - "System.Net.WebProxy": "4.4.0-beta-24904-01", - "System.Net.WebClient": "4.4.0-beta-24904-01", - "System.Net.Mail": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Formatters": "4.4.0-beta-24904-01", - "System.Security.Permissions": "4.4.0-beta-24904-01", - "System.Transactions": "4.4.0-beta-24904-01", - "System.Runtime.Loader": "4.4.0-beta-24904-01", - "System.Reflection.Emit": "4.4.0-beta-24904-01", - "System.Reflection.Emit.ILGeneration": "4.4.0-beta-24904-01", - "System.Reflection.Emit.Lightweight": "4.4.0-beta-24904-01" - } - }, - "uap10.0": { - "dependencies": { - "System.IO.IsolatedStorage": "4.4.0-beta-24904-01", - "System.Net.Http.Rtc": "4.4.0-beta-24904-01", - "System.Numerics.Vectors.WindowsRuntime": "4.4.0-beta-24904-01", - "System.Runtime.WindowsRuntime": "4.4.0-beta-24904-01", - "System.Runtime.WindowsRuntime.UI.Xaml": "4.4.0-beta-24904-01", - "microsoft.xunit.runner.uwp": "1.0.3-prerelease-00921-01", - "System.Diagnostics.Process": { - "version": "4.4.0-beta-24904-01", - "include": "compile" - } - } - } - }, - "supports": { - "coreFx.Test.net46": { - "net46": [ - "", - "win-x86", - "win-x64" - ] - }, - "coreFx.Test.net461": { - "net461": [ - "", - "win-x86", - "win-x64" - ] - }, - "coreFx.Test.net462": { - "net462": [ - "", - "win-x86", - "win-x64" - ] - }, - "coreFx.Test.net463": { - "net463": [ - "", - "win-x86", - "win-x64" - ] - }, - "coreFx.Test.netcore50": { - "uap10.0": [ - "win10-x86", - "win10-x86-aot", - "win10-x64", - "win10-x64-aot" - ] - }, - "coreFx.Test.netcoreapp1.0": { - "netcoreapp1.0": [ - "win7-x86", - "win7-x64", - "win8-x86", - "win8-x64", - "win81-x86", - "win81-x64", - "win10-x86", - "win10-x64", - "osx.10.10-x64", - "centos.7-x64", - "debian.8-x64", - "rhel.7-x64", - "ubuntu.14.04-x64", - "ubuntu.16.04-x64", - "ubuntu.16.10-x64", - "fedora.23-x64", - "linux-x64", - "opensuse.13.2-x64", - "opensuse.42.1-x64" - ] - }, - "coreFx.Test.netcoreapp1.1": { - "netcoreapp1.1": [ - "win7-x86", - "win7-x64", - "win8-x86", - "win8-x64", - "win81-x86", - "win81-x64", - "win10-x86", - "win10-x64", - "win10-arm64", - "osx.10.10-x64", - "centos.7-x64", - "debian.8-x64", - "rhel.7-x64", - "ubuntu.14.04-x64", - "ubuntu.16.04-x64", - "ubuntu.16.10-x64", - "fedora.23-x64", - "fedora.24-x64", - "linux-x64", - "opensuse.13.2-x64", - "opensuse.42.1-x64" - ] - } - } -} diff --git a/src/System.Data.SqlClient/tests/Tools/TDS/TDS.Servers/TDS.Servers.csproj b/src/System.Data.SqlClient/tests/Tools/TDS/TDS.Servers/TDS.Servers.csproj index 8d1947843e..57c270e2b5 100644 --- a/src/System.Data.SqlClient/tests/Tools/TDS/TDS.Servers/TDS.Servers.csproj +++ b/src/System.Data.SqlClient/tests/Tools/TDS/TDS.Servers/TDS.Servers.csproj @@ -3,12 +3,10 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{978063D3-FBB5-4E10-8C45-67C90BE1B931}</ProjectGuid> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>Microsoft.SqlServer.TDS.Servers</RootNamespace> <AssemblyName>Microsoft.SqlServer.TDS.Servers</AssemblyName> - <NugetTargetMoniker>.NETStandard,Version=v1.7</NugetTargetMoniker> <ClsCompliant>false</ClsCompliant> + <IsTestProject>true</IsTestProject> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Release|AnyCPU'" /> diff --git a/src/System.Data.SqlClient/tests/Tools/TDS/TDS.Servers/project.json b/src/System.Data.SqlClient/tests/Tools/TDS/TDS.Servers/project.json deleted file mode 100644 index fcf1c97fd1..0000000000 --- a/src/System.Data.SqlClient/tests/Tools/TDS/TDS.Servers/project.json +++ /dev/null @@ -1,441 +0,0 @@ -{ - "dependencies": { - "coveralls.io": "1.4", - "OpenCover": "4.6.519", - "ReportGenerator": "2.5.0", - "Microsoft.NETCore.TestHost": "1.2.0-beta-24904-03", - "Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24904-03", - "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04", - "xunit.console.netcore": "1.0.3-prerelease-00921-01", - "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04", - "perf": { - "target": "project", - "include": "compile,runtime" - }, - "Microsoft.CSharp": "4.4.0-beta-24904-01", - "Microsoft.VisualBasic": "10.2.0-beta-24904-01", - "Microsoft.Win32.Primitives": "4.4.0-beta-24904-01", - "System.AppContext": "4.4.0-beta-24904-01", - "System.Buffers": "4.4.0-beta-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Collections.Concurrent": "4.4.0-beta-24904-01", - "System.Collections.Immutable": "1.4.0-beta-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Collections.Specialized": "4.4.0-beta-24904-01", - "System.ComponentModel": "4.4.0-beta-24904-01", - "System.ComponentModel.Annotations": "4.4.0-beta-24904-01", - "System.ComponentModel.EventBasedAsync": "4.4.0-beta-24904-01", - "System.ComponentModel.Primitives": "4.4.0-beta-24904-01", - "System.ComponentModel.TypeConverter": "4.4.0-beta-24904-01", - "System.Composition": "1.1.0-beta-24904-01", - "System.Composition.AttributedModel": "1.1.0-beta-24904-01", - "System.Composition.Convention": "1.1.0-beta-24904-01", - "System.Composition.Hosting": "1.1.0-beta-24904-01", - "System.Composition.Runtime": "1.1.0-beta-24904-01", - "System.Composition.TypedParts": "1.1.0-beta-24904-01", - "System.Console": "4.4.0-beta-24904-01", - "System.Data.Common": "4.4.0-beta-24904-01", - "System.Data.SqlClient": "4.4.0-beta-24904-01", - "runtime.native.System.Data.SqlClient.sni": "4.4.0-beta-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.DiagnosticSource": "4.4.0-beta-24904-01", - "System.Diagnostics.FileVersionInfo": "4.4.0-beta-24904-01", - "System.Diagnostics.StackTrace": "4.4.0-beta-24904-01", - "System.Diagnostics.TextWriterTraceListener": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Diagnostics.TraceSource": "4.4.0-beta-24904-01", - "System.Diagnostics.Tracing": "4.4.0-beta-24904-01", - "System.Drawing.Primitives": "4.4.0-beta-24904-01", - "System.Dynamic.Runtime": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.Globalization.Calendars": "4.4.0-beta-24904-01", - "System.Globalization.Extensions": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.Compression": "4.4.0-beta-24904-01", - "runtime.native.System.IO.Compression": "4.4.0-beta-24904-01", - "System.IO.Compression.ZipFile": "4.4.0-beta-24904-01", - "System.IO.Compression.TestData": "1.0.4-prerelease", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24904-01", - "System.IO.MemoryMappedFiles": "4.4.0-beta-24904-01", - "System.IO.Packaging": "4.4.0-beta-24904-01", - "System.IO.Packaging.TestData": "1.0.0-prerelease", - "System.IO.UnmanagedMemoryStream": "4.4.0-beta-24904-01", - "System.Json": "4.4.0-beta-24904-01", - "System.Linq": "4.4.0-beta-24904-01", - "System.Linq.Expressions": "4.4.0-beta-24904-01", - "System.Linq.Parallel": "4.4.0-beta-24904-01", - "System.Linq.Queryable": "4.4.0-beta-24904-01", - "System.Memory": "4.4.0-beta-24904-01", - "System.Net.Http": "4.4.0-beta-24904-01", - "System.Net.NameResolution": "4.4.0-beta-24904-01", - "System.Net.NetworkInformation": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Net.Requests": "4.4.0-beta-24904-01", - "System.Net.Sockets": "4.4.0-beta-24904-01", - "System.Net.WebHeaderCollection": "4.4.0-beta-24904-01", - "System.Net.WebSockets": "4.4.0-beta-24904-01", - "System.Net.WebSockets.Client": "4.4.0-beta-24904-01", - "System.Numerics.Vectors": "4.4.0-beta-24904-01", - "System.ObjectModel": "4.4.0-beta-24904-01", - "System.Private.DataContractSerialization": "4.4.0-beta-24904-01", - "System.Private.Uri": "4.4.0-beta-24904-01", - "System.Private.Xml": "4.4.0-beta-24904-01", - "System.Private.Xml.Linq": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Reflection.Context": "4.4.0-beta-24904-01", - "System.Reflection.DispatchProxy": "4.4.0-beta-24904-01", - "System.Reflection.Extensions": "4.4.0-beta-24904-01", - "System.Reflection.Metadata": "1.5.0-beta-24904-01", - "System.Reflection.Primitives": "4.4.0-beta-24904-01", - "System.Reflection.TypeExtensions": "4.4.0-beta-24904-01", - "System.Resources.Reader": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Resources.Writer": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.CompilerServices.Unsafe": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices.WindowsRuntime": "4.4.0-beta-24904-01", - "System.Runtime.Numerics": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Json": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Primitives": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Xml": "4.4.0-beta-24904-01", - "System.Security.Claims": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Algorithms": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Cng": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Encoding": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Pkcs": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Primitives": "4.4.0-beta-24904-01", - "System.Security.Cryptography.ProtectedData": "4.4.0-beta-24904-01", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24904-01", - "System.Security.Cryptography.X509Certificates.TestData": "1.0.2-prerelease", - "System.Security.Principal": "4.4.0-beta-24904-01", - "System.Security.Principal.Windows": "4.4.0-beta-24904-01", - "System.Security.SecureString": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Text.Encoding.CodePages": "4.4.0-beta-24904-01", - "System.Text.Encoding.Extensions": "4.4.0-beta-24904-01", - "System.Text.Encodings.Web": "4.4.0-beta-24904-01", - "System.Text.RegularExpressions": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Overlapped": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "System.Threading.Tasks.Dataflow": "4.8.0-beta-24904-01", - "System.Threading.Tasks.Extensions": "4.4.0-beta-24904-01", - "System.Threading.Tasks.Parallel": "4.4.0-beta-24904-01", - "System.Threading.Timer": "4.4.0-beta-24904-01", - "System.ValueTuple": "4.4.0-beta-24904-01", - "System.Web.HttpUtility": "4.4.0-beta-24904-01", - "System.Xml.ReaderWriter": "4.4.0-beta-24904-01", - "System.Xml.XDocument": "4.4.0-beta-24904-01", - "System.Xml.XmlDocument": "4.4.0-beta-24904-01", - "System.Xml.XmlSerializer": "4.4.0-beta-24904-01", - "System.Xml.XPath": "4.4.0-beta-24904-01", - "System.Xml.XPath.XDocument": "4.4.0-beta-24904-01", - "System.Xml.XPath.XmlDocument": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.3": { - "dependencies": { - "Microsoft.Win32.Registry": "4.4.0-beta-24904-01", - "Microsoft.Win32.Registry.AccessControl": "4.4.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.IO.FileSystem.AccessControl": "4.4.0-beta-24904-01", - "System.IO.FileSystem.DriveInfo": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Watcher": "4.4.0-beta-24904-01", - "System.IO.Pipes": "4.4.0-beta-24904-01", - "System.IO.Pipes.AccessControl": "4.4.0-beta-24904-01", - "System.Net.Http.WinHttpHandler": "4.4.0-beta-24904-01", - "System.Net.Ping": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Runtime.CompilerServices.VisualC": "4.4.0-beta-24904-01", - "System.Security.AccessControl": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Csp": "4.4.0-beta-24904-01", - "System.Threading.AccessControl": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01", - "System.Reflection.Emit": "4.4.0-beta-24904-01", - "System.Reflection.Emit.ILGeneration": "4.4.0-beta-24904-01", - "System.Reflection.Emit.Lightweight": "4.4.0-beta-24904-01" - } - }, - "netstandard1.4": { - "dependencies": { - "Microsoft.Win32.Registry": "4.4.0-beta-24904-01", - "Microsoft.Win32.Registry.AccessControl": "4.4.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.IO.FileSystem.AccessControl": "4.4.0-beta-24904-01", - "System.IO.FileSystem.DriveInfo": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Watcher": "4.4.0-beta-24904-01", - "System.IO.Pipes": "4.4.0-beta-24904-01", - "System.IO.Pipes.AccessControl": "4.4.0-beta-24904-01", - "System.Net.Http.WinHttpHandler": "4.4.0-beta-24904-01", - "System.Net.Ping": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Runtime.CompilerServices.VisualC": "4.4.0-beta-24904-01", - "System.Security.AccessControl": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Csp": "4.4.0-beta-24904-01", - "System.Threading.AccessControl": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01", - "System.ServiceProcess.ServiceController": "4.4.0-beta-24904-01", - "System.Reflection.Emit": "4.4.0-beta-24904-01", - "System.Reflection.Emit.ILGeneration": "4.4.0-beta-24904-01", - "System.Reflection.Emit.Lightweight": "4.4.0-beta-24904-01" - } - }, - "netstandard1.5": { - "dependencies": { - "Microsoft.Win32.Registry": "4.4.0-beta-24904-01", - "Microsoft.Win32.Registry.AccessControl": "4.4.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.IO.FileSystem.AccessControl": "4.4.0-beta-24904-01", - "System.IO.FileSystem.DriveInfo": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Watcher": "4.4.0-beta-24904-01", - "System.IO.Pipes": "4.4.0-beta-24904-01", - "System.IO.Pipes.AccessControl": "4.4.0-beta-24904-01", - "System.Net.Http.WinHttpHandler": "4.4.0-beta-24904-01", - "System.Net.Ping": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Runtime.CompilerServices.VisualC": "4.4.0-beta-24904-01", - "System.Security.AccessControl": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Csp": "4.4.0-beta-24904-01", - "System.Threading.AccessControl": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01", - "System.ServiceProcess.ServiceController": "4.4.0-beta-24904-01", - "System.Reflection.Emit": "4.4.0-beta-24904-01", - "System.Reflection.Emit.ILGeneration": "4.4.0-beta-24904-01", - "System.Reflection.Emit.Lightweight": "4.4.0-beta-24904-01" - } - }, - "netstandard1.6": { - "dependencies": { - "Microsoft.Win32.Registry": "4.4.0-beta-24904-01", - "Microsoft.Win32.Registry.AccessControl": "4.4.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.IO.FileSystem.AccessControl": "4.4.0-beta-24904-01", - "System.IO.FileSystem.DriveInfo": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Watcher": "4.4.0-beta-24904-01", - "System.IO.Pipes": "4.4.0-beta-24904-01", - "System.IO.Pipes.AccessControl": "4.4.0-beta-24904-01", - "System.Net.Http.WinHttpHandler": "4.4.0-beta-24904-01", - "System.Net.Ping": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Runtime.CompilerServices.VisualC": "4.4.0-beta-24904-01", - "System.Security.AccessControl": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Csp": "4.4.0-beta-24904-01", - "System.Threading.AccessControl": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01", - "System.ServiceProcess.ServiceController": "4.4.0-beta-24904-01", - "System.Security.Cryptography.OpenSsl": "4.4.0-beta-24904-01", - "System.Reflection.Emit": "4.4.0-beta-24904-01", - "System.Reflection.Emit.ILGeneration": "4.4.0-beta-24904-01", - "System.Reflection.Emit.Lightweight": "4.4.0-beta-24904-01" - } - }, - "netstandard1.7": { - "dependencies": { - "Microsoft.Win32.Registry": "4.4.0-beta-24904-01", - "Microsoft.Win32.Registry.AccessControl": "4.4.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.IO.FileSystem.AccessControl": "4.4.0-beta-24904-01", - "System.IO.FileSystem.DriveInfo": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Watcher": "4.4.0-beta-24904-01", - "System.IO.IsolatedStorage": "4.4.0-beta-24904-01", - "System.IO.Pipes": "4.4.0-beta-24904-01", - "System.IO.Pipes.AccessControl": "4.4.0-beta-24904-01", - "System.Net.Http.WinHttpHandler": "4.4.0-beta-24904-01", - "System.Net.HttpListener": "4.4.0-beta-24904-01", - "System.Net.Ping": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Runtime.CompilerServices.VisualC": "4.4.0-beta-24904-01", - "System.Security.AccessControl": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Csp": "4.4.0-beta-24904-01", - "System.Threading.AccessControl": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01", - "System.ServiceProcess.ServiceController": "4.4.0-beta-24904-01", - "System.Security.Cryptography.OpenSsl": "4.4.0-beta-24904-01", - "System.Net.ServicePoint": "4.4.0-beta-24904-01", - "System.Net.WebProxy": "4.4.0-beta-24904-01", - "System.Net.WebClient": "4.4.0-beta-24904-01", - "System.Net.Mail": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Formatters": "4.4.0-beta-24904-01", - "System.Security.Permissions": "4.4.0-beta-24904-01", - "System.Transactions": "4.4.0-beta-24904-01", - "System.Reflection.Emit": "4.4.0-beta-24904-01", - "System.Reflection.Emit.ILGeneration": "4.4.0-beta-24904-01", - "System.Reflection.Emit.Lightweight": "4.4.0-beta-24904-01" - } - }, - "netcoreapp1.0": { - "dependencies": { - "Microsoft.Win32.Registry": "4.4.0-beta-24904-01", - "Microsoft.Win32.Registry.AccessControl": "4.4.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.IO.FileSystem.AccessControl": "4.4.0-beta-24904-01", - "System.IO.FileSystem.DriveInfo": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Watcher": "4.4.0-beta-24904-01", - "System.IO.Pipes": "4.4.0-beta-24904-01", - "System.IO.Pipes.AccessControl": "4.4.0-beta-24904-01", - "System.Net.Http.WinHttpHandler": "4.4.0-beta-24904-01", - "System.Net.Ping": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Runtime.CompilerServices.VisualC": "4.4.0-beta-24904-01", - "System.Security.AccessControl": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Csp": "4.4.0-beta-24904-01", - "System.Threading.AccessControl": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01", - "System.ServiceProcess.ServiceController": "4.4.0-beta-24904-01", - "System.Security.Cryptography.OpenSsl": "4.4.0-beta-24904-01", - "System.Reflection.Emit": "4.4.0-beta-24904-01", - "System.Reflection.Emit.ILGeneration": "4.4.0-beta-24904-01", - "System.Reflection.Emit.Lightweight": "4.4.0-beta-24904-01", - "System.Runtime.Loader": "4.4.0-beta-24904-01" - } - }, - "netcoreapp1.1": { - "dependencies": { - "Microsoft.Win32.Registry": "4.4.0-beta-24904-01", - "Microsoft.Win32.Registry.AccessControl": "4.4.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.IO.FileSystem.AccessControl": "4.4.0-beta-24904-01", - "System.IO.FileSystem.DriveInfo": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Watcher": "4.4.0-beta-24904-01", - "System.IO.IsolatedStorage": "4.4.0-beta-24904-01", - "System.IO.Pipes": "4.4.0-beta-24904-01", - "System.IO.Pipes.AccessControl": "4.4.0-beta-24904-01", - "System.Net.Http.WinHttpHandler": "4.4.0-beta-24904-01", - "System.Net.HttpListener": "4.4.0-beta-24904-01", - "System.Net.Ping": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Runtime.CompilerServices.VisualC": "4.4.0-beta-24904-01", - "System.Security.AccessControl": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Csp": "4.4.0-beta-24904-01", - "System.Threading.AccessControl": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01", - "System.ServiceProcess.ServiceController": "4.4.0-beta-24904-01", - "System.Security.Cryptography.OpenSsl": "4.4.0-beta-24904-01", - "System.Net.ServicePoint": "4.4.0-beta-24904-01", - "System.Net.WebProxy": "4.4.0-beta-24904-01", - "System.Net.WebClient": "4.4.0-beta-24904-01", - "System.Net.Mail": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Formatters": "4.4.0-beta-24904-01", - "System.Security.Permissions": "4.4.0-beta-24904-01", - "System.Transactions": "4.4.0-beta-24904-01", - "System.Runtime.Loader": "4.4.0-beta-24904-01", - "System.Reflection.Emit": "4.4.0-beta-24904-01", - "System.Reflection.Emit.ILGeneration": "4.4.0-beta-24904-01", - "System.Reflection.Emit.Lightweight": "4.4.0-beta-24904-01" - } - }, - "uap10.0": { - "dependencies": { - "System.IO.IsolatedStorage": "4.4.0-beta-24904-01", - "System.Net.Http.Rtc": "4.4.0-beta-24904-01", - "System.Numerics.Vectors.WindowsRuntime": "4.4.0-beta-24904-01", - "System.Runtime.WindowsRuntime": "4.4.0-beta-24904-01", - "System.Runtime.WindowsRuntime.UI.Xaml": "4.4.0-beta-24904-01", - "microsoft.xunit.runner.uwp": "1.0.3-prerelease-00921-01", - "System.Diagnostics.Process": { - "version": "4.4.0-beta-24904-01", - "include": "compile" - } - } - } - }, - "supports": { - "coreFx.Test.net46": { - "net46": [ - "", - "win-x86", - "win-x64" - ] - }, - "coreFx.Test.net461": { - "net461": [ - "", - "win-x86", - "win-x64" - ] - }, - "coreFx.Test.net462": { - "net462": [ - "", - "win-x86", - "win-x64" - ] - }, - "coreFx.Test.net463": { - "net463": [ - "", - "win-x86", - "win-x64" - ] - }, - "coreFx.Test.netcore50": { - "uap10.0": [ - "win10-x86", - "win10-x86-aot", - "win10-x64", - "win10-x64-aot" - ] - }, - "coreFx.Test.netcoreapp1.0": { - "netcoreapp1.0": [ - "win7-x86", - "win7-x64", - "win8-x86", - "win8-x64", - "win81-x86", - "win81-x64", - "win10-x86", - "win10-x64", - "osx.10.10-x64", - "centos.7-x64", - "debian.8-x64", - "rhel.7-x64", - "ubuntu.14.04-x64", - "ubuntu.16.04-x64", - "ubuntu.16.10-x64", - "fedora.23-x64", - "linux-x64", - "opensuse.13.2-x64", - "opensuse.42.1-x64" - ] - }, - "coreFx.Test.netcoreapp1.1": { - "netcoreapp1.1": [ - "win7-x86", - "win7-x64", - "win8-x86", - "win8-x64", - "win81-x86", - "win81-x64", - "win10-x86", - "win10-x64", - "win10-arm64", - "osx.10.10-x64", - "centos.7-x64", - "debian.8-x64", - "rhel.7-x64", - "ubuntu.14.04-x64", - "ubuntu.16.04-x64", - "ubuntu.16.10-x64", - "fedora.23-x64", - "fedora.24-x64", - "linux-x64", - "opensuse.13.2-x64", - "opensuse.42.1-x64" - ] - } - } -} diff --git a/src/System.Data.SqlClient/tests/Tools/TDS/TDS/TDS.csproj b/src/System.Data.SqlClient/tests/Tools/TDS/TDS/TDS.csproj index 6324c1d051..d1521f75df 100644 --- a/src/System.Data.SqlClient/tests/Tools/TDS/TDS/TDS.csproj +++ b/src/System.Data.SqlClient/tests/Tools/TDS/TDS/TDS.csproj @@ -3,11 +3,10 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{8DC9D1A0-351B-47BC-A90F-B9DA542550E9}</ProjectGuid> - <OutputType>Library</OutputType> <RootNamespace>Microsoft.SqlServer.TDS</RootNamespace> <AssemblyName>Microsoft.SqlServer.TDS</AssemblyName> - <NugetTargetMoniker>.NETStandard,Version=v1.7</NugetTargetMoniker> <ClsCompliant>false</ClsCompliant> + <IsTestProject>true</IsTestProject> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Release|AnyCPU'" /> diff --git a/src/System.Data.SqlClient/tests/Tools/TDS/TDS/project.json b/src/System.Data.SqlClient/tests/Tools/TDS/TDS/project.json deleted file mode 100644 index fcf1c97fd1..0000000000 --- a/src/System.Data.SqlClient/tests/Tools/TDS/TDS/project.json +++ /dev/null @@ -1,441 +0,0 @@ -{ - "dependencies": { - "coveralls.io": "1.4", - "OpenCover": "4.6.519", - "ReportGenerator": "2.5.0", - "Microsoft.NETCore.TestHost": "1.2.0-beta-24904-03", - "Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24904-03", - "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04", - "xunit.console.netcore": "1.0.3-prerelease-00921-01", - "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04", - "perf": { - "target": "project", - "include": "compile,runtime" - }, - "Microsoft.CSharp": "4.4.0-beta-24904-01", - "Microsoft.VisualBasic": "10.2.0-beta-24904-01", - "Microsoft.Win32.Primitives": "4.4.0-beta-24904-01", - "System.AppContext": "4.4.0-beta-24904-01", - "System.Buffers": "4.4.0-beta-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Collections.Concurrent": "4.4.0-beta-24904-01", - "System.Collections.Immutable": "1.4.0-beta-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Collections.Specialized": "4.4.0-beta-24904-01", - "System.ComponentModel": "4.4.0-beta-24904-01", - "System.ComponentModel.Annotations": "4.4.0-beta-24904-01", - "System.ComponentModel.EventBasedAsync": "4.4.0-beta-24904-01", - "System.ComponentModel.Primitives": "4.4.0-beta-24904-01", - "System.ComponentModel.TypeConverter": "4.4.0-beta-24904-01", - "System.Composition": "1.1.0-beta-24904-01", - "System.Composition.AttributedModel": "1.1.0-beta-24904-01", - "System.Composition.Convention": "1.1.0-beta-24904-01", - "System.Composition.Hosting": "1.1.0-beta-24904-01", - "System.Composition.Runtime": "1.1.0-beta-24904-01", - "System.Composition.TypedParts": "1.1.0-beta-24904-01", - "System.Console": "4.4.0-beta-24904-01", - "System.Data.Common": "4.4.0-beta-24904-01", - "System.Data.SqlClient": "4.4.0-beta-24904-01", - "runtime.native.System.Data.SqlClient.sni": "4.4.0-beta-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.DiagnosticSource": "4.4.0-beta-24904-01", - "System.Diagnostics.FileVersionInfo": "4.4.0-beta-24904-01", - "System.Diagnostics.StackTrace": "4.4.0-beta-24904-01", - "System.Diagnostics.TextWriterTraceListener": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Diagnostics.TraceSource": "4.4.0-beta-24904-01", - "System.Diagnostics.Tracing": "4.4.0-beta-24904-01", - "System.Drawing.Primitives": "4.4.0-beta-24904-01", - "System.Dynamic.Runtime": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.Globalization.Calendars": "4.4.0-beta-24904-01", - "System.Globalization.Extensions": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.Compression": "4.4.0-beta-24904-01", - "runtime.native.System.IO.Compression": "4.4.0-beta-24904-01", - "System.IO.Compression.ZipFile": "4.4.0-beta-24904-01", - "System.IO.Compression.TestData": "1.0.4-prerelease", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24904-01", - "System.IO.MemoryMappedFiles": "4.4.0-beta-24904-01", - "System.IO.Packaging": "4.4.0-beta-24904-01", - "System.IO.Packaging.TestData": "1.0.0-prerelease", - "System.IO.UnmanagedMemoryStream": "4.4.0-beta-24904-01", - "System.Json": "4.4.0-beta-24904-01", - "System.Linq": "4.4.0-beta-24904-01", - "System.Linq.Expressions": "4.4.0-beta-24904-01", - "System.Linq.Parallel": "4.4.0-beta-24904-01", - "System.Linq.Queryable": "4.4.0-beta-24904-01", - "System.Memory": "4.4.0-beta-24904-01", - "System.Net.Http": "4.4.0-beta-24904-01", - "System.Net.NameResolution": "4.4.0-beta-24904-01", - "System.Net.NetworkInformation": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Net.Requests": "4.4.0-beta-24904-01", - "System.Net.Sockets": "4.4.0-beta-24904-01", - "System.Net.WebHeaderCollection": "4.4.0-beta-24904-01", - "System.Net.WebSockets": "4.4.0-beta-24904-01", - "System.Net.WebSockets.Client": "4.4.0-beta-24904-01", - "System.Numerics.Vectors": "4.4.0-beta-24904-01", - "System.ObjectModel": "4.4.0-beta-24904-01", - "System.Private.DataContractSerialization": "4.4.0-beta-24904-01", - "System.Private.Uri": "4.4.0-beta-24904-01", - "System.Private.Xml": "4.4.0-beta-24904-01", - "System.Private.Xml.Linq": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Reflection.Context": "4.4.0-beta-24904-01", - "System.Reflection.DispatchProxy": "4.4.0-beta-24904-01", - "System.Reflection.Extensions": "4.4.0-beta-24904-01", - "System.Reflection.Metadata": "1.5.0-beta-24904-01", - "System.Reflection.Primitives": "4.4.0-beta-24904-01", - "System.Reflection.TypeExtensions": "4.4.0-beta-24904-01", - "System.Resources.Reader": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Resources.Writer": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.CompilerServices.Unsafe": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices.WindowsRuntime": "4.4.0-beta-24904-01", - "System.Runtime.Numerics": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Json": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Primitives": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Xml": "4.4.0-beta-24904-01", - "System.Security.Claims": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Algorithms": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Cng": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Encoding": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Pkcs": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Primitives": "4.4.0-beta-24904-01", - "System.Security.Cryptography.ProtectedData": "4.4.0-beta-24904-01", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24904-01", - "System.Security.Cryptography.X509Certificates.TestData": "1.0.2-prerelease", - "System.Security.Principal": "4.4.0-beta-24904-01", - "System.Security.Principal.Windows": "4.4.0-beta-24904-01", - "System.Security.SecureString": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Text.Encoding.CodePages": "4.4.0-beta-24904-01", - "System.Text.Encoding.Extensions": "4.4.0-beta-24904-01", - "System.Text.Encodings.Web": "4.4.0-beta-24904-01", - "System.Text.RegularExpressions": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Overlapped": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "System.Threading.Tasks.Dataflow": "4.8.0-beta-24904-01", - "System.Threading.Tasks.Extensions": "4.4.0-beta-24904-01", - "System.Threading.Tasks.Parallel": "4.4.0-beta-24904-01", - "System.Threading.Timer": "4.4.0-beta-24904-01", - "System.ValueTuple": "4.4.0-beta-24904-01", - "System.Web.HttpUtility": "4.4.0-beta-24904-01", - "System.Xml.ReaderWriter": "4.4.0-beta-24904-01", - "System.Xml.XDocument": "4.4.0-beta-24904-01", - "System.Xml.XmlDocument": "4.4.0-beta-24904-01", - "System.Xml.XmlSerializer": "4.4.0-beta-24904-01", - "System.Xml.XPath": "4.4.0-beta-24904-01", - "System.Xml.XPath.XDocument": "4.4.0-beta-24904-01", - "System.Xml.XPath.XmlDocument": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.3": { - "dependencies": { - "Microsoft.Win32.Registry": "4.4.0-beta-24904-01", - "Microsoft.Win32.Registry.AccessControl": "4.4.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.IO.FileSystem.AccessControl": "4.4.0-beta-24904-01", - "System.IO.FileSystem.DriveInfo": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Watcher": "4.4.0-beta-24904-01", - "System.IO.Pipes": "4.4.0-beta-24904-01", - "System.IO.Pipes.AccessControl": "4.4.0-beta-24904-01", - "System.Net.Http.WinHttpHandler": "4.4.0-beta-24904-01", - "System.Net.Ping": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Runtime.CompilerServices.VisualC": "4.4.0-beta-24904-01", - "System.Security.AccessControl": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Csp": "4.4.0-beta-24904-01", - "System.Threading.AccessControl": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01", - "System.Reflection.Emit": "4.4.0-beta-24904-01", - "System.Reflection.Emit.ILGeneration": "4.4.0-beta-24904-01", - "System.Reflection.Emit.Lightweight": "4.4.0-beta-24904-01" - } - }, - "netstandard1.4": { - "dependencies": { - "Microsoft.Win32.Registry": "4.4.0-beta-24904-01", - "Microsoft.Win32.Registry.AccessControl": "4.4.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.IO.FileSystem.AccessControl": "4.4.0-beta-24904-01", - "System.IO.FileSystem.DriveInfo": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Watcher": "4.4.0-beta-24904-01", - "System.IO.Pipes": "4.4.0-beta-24904-01", - "System.IO.Pipes.AccessControl": "4.4.0-beta-24904-01", - "System.Net.Http.WinHttpHandler": "4.4.0-beta-24904-01", - "System.Net.Ping": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Runtime.CompilerServices.VisualC": "4.4.0-beta-24904-01", - "System.Security.AccessControl": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Csp": "4.4.0-beta-24904-01", - "System.Threading.AccessControl": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01", - "System.ServiceProcess.ServiceController": "4.4.0-beta-24904-01", - "System.Reflection.Emit": "4.4.0-beta-24904-01", - "System.Reflection.Emit.ILGeneration": "4.4.0-beta-24904-01", - "System.Reflection.Emit.Lightweight": "4.4.0-beta-24904-01" - } - }, - "netstandard1.5": { - "dependencies": { - "Microsoft.Win32.Registry": "4.4.0-beta-24904-01", - "Microsoft.Win32.Registry.AccessControl": "4.4.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.IO.FileSystem.AccessControl": "4.4.0-beta-24904-01", - "System.IO.FileSystem.DriveInfo": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Watcher": "4.4.0-beta-24904-01", - "System.IO.Pipes": "4.4.0-beta-24904-01", - "System.IO.Pipes.AccessControl": "4.4.0-beta-24904-01", - "System.Net.Http.WinHttpHandler": "4.4.0-beta-24904-01", - "System.Net.Ping": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Runtime.CompilerServices.VisualC": "4.4.0-beta-24904-01", - "System.Security.AccessControl": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Csp": "4.4.0-beta-24904-01", - "System.Threading.AccessControl": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01", - "System.ServiceProcess.ServiceController": "4.4.0-beta-24904-01", - "System.Reflection.Emit": "4.4.0-beta-24904-01", - "System.Reflection.Emit.ILGeneration": "4.4.0-beta-24904-01", - "System.Reflection.Emit.Lightweight": "4.4.0-beta-24904-01" - } - }, - "netstandard1.6": { - "dependencies": { - "Microsoft.Win32.Registry": "4.4.0-beta-24904-01", - "Microsoft.Win32.Registry.AccessControl": "4.4.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.IO.FileSystem.AccessControl": "4.4.0-beta-24904-01", - "System.IO.FileSystem.DriveInfo": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Watcher": "4.4.0-beta-24904-01", - "System.IO.Pipes": "4.4.0-beta-24904-01", - "System.IO.Pipes.AccessControl": "4.4.0-beta-24904-01", - "System.Net.Http.WinHttpHandler": "4.4.0-beta-24904-01", - "System.Net.Ping": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Runtime.CompilerServices.VisualC": "4.4.0-beta-24904-01", - "System.Security.AccessControl": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Csp": "4.4.0-beta-24904-01", - "System.Threading.AccessControl": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01", - "System.ServiceProcess.ServiceController": "4.4.0-beta-24904-01", - "System.Security.Cryptography.OpenSsl": "4.4.0-beta-24904-01", - "System.Reflection.Emit": "4.4.0-beta-24904-01", - "System.Reflection.Emit.ILGeneration": "4.4.0-beta-24904-01", - "System.Reflection.Emit.Lightweight": "4.4.0-beta-24904-01" - } - }, - "netstandard1.7": { - "dependencies": { - "Microsoft.Win32.Registry": "4.4.0-beta-24904-01", - "Microsoft.Win32.Registry.AccessControl": "4.4.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.IO.FileSystem.AccessControl": "4.4.0-beta-24904-01", - "System.IO.FileSystem.DriveInfo": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Watcher": "4.4.0-beta-24904-01", - "System.IO.IsolatedStorage": "4.4.0-beta-24904-01", - "System.IO.Pipes": "4.4.0-beta-24904-01", - "System.IO.Pipes.AccessControl": "4.4.0-beta-24904-01", - "System.Net.Http.WinHttpHandler": "4.4.0-beta-24904-01", - "System.Net.HttpListener": "4.4.0-beta-24904-01", - "System.Net.Ping": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Runtime.CompilerServices.VisualC": "4.4.0-beta-24904-01", - "System.Security.AccessControl": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Csp": "4.4.0-beta-24904-01", - "System.Threading.AccessControl": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01", - "System.ServiceProcess.ServiceController": "4.4.0-beta-24904-01", - "System.Security.Cryptography.OpenSsl": "4.4.0-beta-24904-01", - "System.Net.ServicePoint": "4.4.0-beta-24904-01", - "System.Net.WebProxy": "4.4.0-beta-24904-01", - "System.Net.WebClient": "4.4.0-beta-24904-01", - "System.Net.Mail": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Formatters": "4.4.0-beta-24904-01", - "System.Security.Permissions": "4.4.0-beta-24904-01", - "System.Transactions": "4.4.0-beta-24904-01", - "System.Reflection.Emit": "4.4.0-beta-24904-01", - "System.Reflection.Emit.ILGeneration": "4.4.0-beta-24904-01", - "System.Reflection.Emit.Lightweight": "4.4.0-beta-24904-01" - } - }, - "netcoreapp1.0": { - "dependencies": { - "Microsoft.Win32.Registry": "4.4.0-beta-24904-01", - "Microsoft.Win32.Registry.AccessControl": "4.4.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.IO.FileSystem.AccessControl": "4.4.0-beta-24904-01", - "System.IO.FileSystem.DriveInfo": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Watcher": "4.4.0-beta-24904-01", - "System.IO.Pipes": "4.4.0-beta-24904-01", - "System.IO.Pipes.AccessControl": "4.4.0-beta-24904-01", - "System.Net.Http.WinHttpHandler": "4.4.0-beta-24904-01", - "System.Net.Ping": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Runtime.CompilerServices.VisualC": "4.4.0-beta-24904-01", - "System.Security.AccessControl": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Csp": "4.4.0-beta-24904-01", - "System.Threading.AccessControl": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01", - "System.ServiceProcess.ServiceController": "4.4.0-beta-24904-01", - "System.Security.Cryptography.OpenSsl": "4.4.0-beta-24904-01", - "System.Reflection.Emit": "4.4.0-beta-24904-01", - "System.Reflection.Emit.ILGeneration": "4.4.0-beta-24904-01", - "System.Reflection.Emit.Lightweight": "4.4.0-beta-24904-01", - "System.Runtime.Loader": "4.4.0-beta-24904-01" - } - }, - "netcoreapp1.1": { - "dependencies": { - "Microsoft.Win32.Registry": "4.4.0-beta-24904-01", - "Microsoft.Win32.Registry.AccessControl": "4.4.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.IO.FileSystem.AccessControl": "4.4.0-beta-24904-01", - "System.IO.FileSystem.DriveInfo": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Watcher": "4.4.0-beta-24904-01", - "System.IO.IsolatedStorage": "4.4.0-beta-24904-01", - "System.IO.Pipes": "4.4.0-beta-24904-01", - "System.IO.Pipes.AccessControl": "4.4.0-beta-24904-01", - "System.Net.Http.WinHttpHandler": "4.4.0-beta-24904-01", - "System.Net.HttpListener": "4.4.0-beta-24904-01", - "System.Net.Ping": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Runtime.CompilerServices.VisualC": "4.4.0-beta-24904-01", - "System.Security.AccessControl": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Csp": "4.4.0-beta-24904-01", - "System.Threading.AccessControl": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01", - "System.ServiceProcess.ServiceController": "4.4.0-beta-24904-01", - "System.Security.Cryptography.OpenSsl": "4.4.0-beta-24904-01", - "System.Net.ServicePoint": "4.4.0-beta-24904-01", - "System.Net.WebProxy": "4.4.0-beta-24904-01", - "System.Net.WebClient": "4.4.0-beta-24904-01", - "System.Net.Mail": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Formatters": "4.4.0-beta-24904-01", - "System.Security.Permissions": "4.4.0-beta-24904-01", - "System.Transactions": "4.4.0-beta-24904-01", - "System.Runtime.Loader": "4.4.0-beta-24904-01", - "System.Reflection.Emit": "4.4.0-beta-24904-01", - "System.Reflection.Emit.ILGeneration": "4.4.0-beta-24904-01", - "System.Reflection.Emit.Lightweight": "4.4.0-beta-24904-01" - } - }, - "uap10.0": { - "dependencies": { - "System.IO.IsolatedStorage": "4.4.0-beta-24904-01", - "System.Net.Http.Rtc": "4.4.0-beta-24904-01", - "System.Numerics.Vectors.WindowsRuntime": "4.4.0-beta-24904-01", - "System.Runtime.WindowsRuntime": "4.4.0-beta-24904-01", - "System.Runtime.WindowsRuntime.UI.Xaml": "4.4.0-beta-24904-01", - "microsoft.xunit.runner.uwp": "1.0.3-prerelease-00921-01", - "System.Diagnostics.Process": { - "version": "4.4.0-beta-24904-01", - "include": "compile" - } - } - } - }, - "supports": { - "coreFx.Test.net46": { - "net46": [ - "", - "win-x86", - "win-x64" - ] - }, - "coreFx.Test.net461": { - "net461": [ - "", - "win-x86", - "win-x64" - ] - }, - "coreFx.Test.net462": { - "net462": [ - "", - "win-x86", - "win-x64" - ] - }, - "coreFx.Test.net463": { - "net463": [ - "", - "win-x86", - "win-x64" - ] - }, - "coreFx.Test.netcore50": { - "uap10.0": [ - "win10-x86", - "win10-x86-aot", - "win10-x64", - "win10-x64-aot" - ] - }, - "coreFx.Test.netcoreapp1.0": { - "netcoreapp1.0": [ - "win7-x86", - "win7-x64", - "win8-x86", - "win8-x64", - "win81-x86", - "win81-x64", - "win10-x86", - "win10-x64", - "osx.10.10-x64", - "centos.7-x64", - "debian.8-x64", - "rhel.7-x64", - "ubuntu.14.04-x64", - "ubuntu.16.04-x64", - "ubuntu.16.10-x64", - "fedora.23-x64", - "linux-x64", - "opensuse.13.2-x64", - "opensuse.42.1-x64" - ] - }, - "coreFx.Test.netcoreapp1.1": { - "netcoreapp1.1": [ - "win7-x86", - "win7-x64", - "win8-x86", - "win8-x64", - "win81-x86", - "win81-x64", - "win10-x86", - "win10-x64", - "win10-arm64", - "osx.10.10-x64", - "centos.7-x64", - "debian.8-x64", - "rhel.7-x64", - "ubuntu.14.04-x64", - "ubuntu.16.04-x64", - "ubuntu.16.10-x64", - "fedora.23-x64", - "fedora.24-x64", - "linux-x64", - "opensuse.13.2-x64", - "opensuse.42.1-x64" - ] - } - } -} diff --git a/src/System.Diagnostics.Contracts/dir.props b/src/System.Diagnostics.Contracts/dir.props index 16a766f83b..14527fd4b3 100644 --- a/src/System.Diagnostics.Contracts/dir.props +++ b/src/System.Diagnostics.Contracts/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.0.3.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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/Configurations.props b/src/System.Diagnostics.Contracts/src/Configurations.props new file mode 100644 index 0000000000..21c8c4fda0 --- /dev/null +++ b/src/System.Diagnostics.Contracts/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netcore50aot-Windows_NT; + netstandard1.0; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Diagnostics.Contracts/src/System.Diagnostics.Contracts.builds b/src/System.Diagnostics.Contracts/src/System.Diagnostics.Contracts.builds deleted file mode 100644 index a99f25eb89..0000000000 --- a/src/System.Diagnostics.Contracts/src/System.Diagnostics.Contracts.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.Diagnostics.Contracts.csproj" /> - <Project Include="System.Diagnostics.Contracts.csproj"> - <TargetGroup>netcore50aot</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Diagnostics.Contracts/src/System.Diagnostics.Contracts.csproj b/src/System.Diagnostics.Contracts/src/System.Diagnostics.Contracts.csproj index 65f31b3089..e747b9bd47 100644 --- a/src/System.Diagnostics.Contracts/src/System.Diagnostics.Contracts.csproj +++ b/src/System.Diagnostics.Contracts/src/System.Diagnostics.Contracts.csproj @@ -1,10 +1,9 @@ -<?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> <AssemblyName>System.Diagnostics.Contracts</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.0</NuGetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -13,10 +12,10 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcore50aot_Release|AnyCPU'" /> <ItemGroup> <TargetingPackReference Include="mscorlib" Condition="'$(TargetGroup)' == 'net46'" /> - <TargetingPackReference Include="System.Private.CoreLib" Condition="'$(TargetGroup)' != 'net46'" /> + <TargetingPackReference Include="System.Private.CoreLib" Condition="'$(TargetGroup)' == 'netstandard1.0'" /> </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 c25cd5d794..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-24904-03" - } - }, - "netcore50": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24904-00" - } - } - } -} diff --git a/src/System.Diagnostics.Contracts/tests/Configurations.props b/src/System.Diagnostics.Contracts/tests/Configurations.props new file mode 100644 index 0000000000..f0ebe53119 --- /dev/null +++ b/src/System.Diagnostics.Contracts/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.csproj b/src/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.csproj index a42e85af55..6a3835497e 100644 --- a/src/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.csproj +++ b/src/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.csproj @@ -2,12 +2,7 @@ <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> - <Platform Condition="'$(Platform)' == ''">AnyCPU</Platform> <ProjectGuid>{0C4E7FF1-54C6-49B7-9700-18F5F3EB8E65}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Diagnostics.Contracts.Tests</AssemblyName> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> diff --git a/src/System.Diagnostics.Debug/dir.props b/src/System.Diagnostics.Debug/dir.props index fcc1a7ca5a..bfbc5bd9e0 100644 --- a/src/System.Diagnostics.Debug/dir.props +++ b/src/System.Diagnostics.Debug/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ No newline at end of file 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/Configurations.props b/src/System.Diagnostics.Debug/src/Configurations.props new file mode 100644 index 0000000000..3bb6330d9e --- /dev/null +++ b/src/System.Diagnostics.Debug/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard-Unix; + netstandard-Windows_NT; + net463-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Diagnostics.Debug/src/System.Diagnostics.Debug.builds b/src/System.Diagnostics.Debug/src/System.Diagnostics.Debug.builds deleted file mode 100644 index ff221a8009..0000000000 --- a/src/System.Diagnostics.Debug/src/System.Diagnostics.Debug.builds +++ /dev/null @@ -1,17 +0,0 @@ -<?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> - <Project Include="System.Diagnostics.Debug.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.Diagnostics.Debug.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.Diagnostics.Debug.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj b/src/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj index d00de58f52..cb0f0deddd 100644 --- a/src/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj +++ b/src/System.Diagnostics.Debug/src/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"> - <PropertyGroup> - <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{E7E8DE8A-9EC1-46A8-A6EE-727DB32DBEB8}</ProjectGuid> <AssemblyName>System.Diagnostics.Debug</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' != ''">None</ResourcesSourceOutputDirectory> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> + <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net463'">None</ResourcesSourceOutputDirectory> </PropertyGroup> <PropertyGroup Condition=" '$(TargetsUnix)' == 'true' "> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> @@ -21,7 +17,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' == ''"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="Properties\InternalsVisibleTo.cs" /> <Compile Include="System\Diagnostics\Debug.Public.cs" /> <Compile Include="System\Diagnostics\DebuggerStepperBoundaryAttribute.cs" /> @@ -30,7 +26,7 @@ <Link>System\Diagnostics\Debug.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' == ''"> + <ItemGroup Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' == 'netstandard'"> <Compile Include="$(CommonPath)\System\Diagnostics\Debug.Windows.cs"> <Link>System\Diagnostics\Debug.Windows.cs</Link> </Compile> @@ -89,11 +85,11 @@ <TargetingPackReference Include="mscorlib" /> <TargetingPackReference Include="System" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <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 07dc654055..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-24904-03" - } - }, - "netcore50": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24904-00" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Diagnostics.Debug/tests/Configurations.props b/src/System.Diagnostics.Debug/tests/Configurations.props new file mode 100644 index 0000000000..90648972ae --- /dev/null +++ b/src/System.Diagnostics.Debug/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7-Unix; + netstandard1.7-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj b/src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj index 7f92fe91d2..43115a46c9 100644 --- a/src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj +++ b/src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj @@ -1,22 +1,14 @@ <?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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{56F67E92-E606-435E-A00F-003CBFB26945}</ProjectGuid> - <OutputType>Library</OutputType> <AssemblyName>System.Diagnostics.Debug.Tests</AssemblyName> <RootNamespace>System.Diagnostics.Tests</RootNamespace> <IgnoreArchitectureMismatches>true</IgnoreArchitectureMismatches> - <PostFilterNugetReferences>true</PostFilterNugetReferences> + <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch> <NoWarn>1685</NoWarn> - <!-- Don't allow project reference to package dependency conversion --> - <KeepAllProjectReferences>true</KeepAllProjectReferences> - <NugetTargetMoniker>.NETStandard,Version=v1.7</NugetTargetMoniker> + <NoTargetingPackReferences>true</NoTargetingPackReferences> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> @@ -24,20 +16,16 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Release|AnyCPU'" /> <ItemGroup> - <ProjectReference Include="..\src\System.Diagnostics.Debug.csproj"> - <Project>{E7E8DE8A-9EC1-46A8-A6EE-727DB32DBEB8}</Project> - <Name>System.Diagnostics.Debug</Name> - </ProjectReference> - <ProjectReference Include="..\..\System.Runtime\src\System.Runtime.csproj" /> - <ProjectReference Include="..\..\System.Runtime.Extensions\src\System.Runtime.Extensions.csproj" /> - <TargetingPackReference Include="System.Private.CoreLib" /> - </ItemGroup> - <ItemGroup> - <None Include="project.json" /> + <ReferenceFromRuntime Include="System.Diagnostics.Debug" /> + <ReferenceFromRuntime Include="System.Runtime" /> + <ReferenceFromRuntime Include="System.Runtime.Extensions" /> + <ReferenceFromRuntime Include="System.Private.CoreLib" /> + <ReferenceFromRuntime Include="System.Threading.Tasks" /> + <ReferenceFromRuntime Include="System.Runtime.InteropServices.RuntimeInformation" /> </ItemGroup> <ItemGroup> <Compile Include="AttributeTests.cs" /> - <Compile Include="DebuggerTests.cs" Condition="'$(TargetGroup)'==''"/> + <Compile Include="DebuggerTests.cs" Condition="'$(TargetGroup)'=='netstandard1.7'"/> <Compile Include="DebugTests.cs" /> <Compile Include="XunitAssemblyAttributes.cs" /> </ItemGroup> diff --git a/src/System.Diagnostics.Debug/tests/project.json b/src/System.Diagnostics.Debug/tests/project.json deleted file mode 100644 index 9c565df5f0..0000000000 --- a/src/System.Diagnostics.Debug/tests/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03", - "System.Linq.Expressions": "4.4.0-beta-24904-01", - "System.ObjectModel": "4.4.0-beta-24904-01", - "System.Text.RegularExpressions": "4.4.0-beta-24904-01", - "test-runtime": { - "target": "project", - "exclude": "compile" - }, - "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04", - "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04" - }, - "frameworks": { - "netstandard1.7": {} - }, - "supports": { - "coreFx.Test.netcoreapp1.1": {}, - "coreFx.Test.net463": {} - } -} diff --git a/src/System.Diagnostics.DiagnosticSource/dir.props b/src/System.Diagnostics.DiagnosticSource/dir.props index ba7c08a94c..cfbc7971a2 100644 --- a/src/System.Diagnostics.DiagnosticSource/dir.props +++ b/src/System.Diagnostics.DiagnosticSource/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.0.2.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ No newline at end of file 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/Configurations.props b/src/System.Diagnostics.DiagnosticSource/src/Configurations.props new file mode 100644 index 0000000000..ad6ccc8341 --- /dev/null +++ b/src/System.Diagnostics.DiagnosticSource/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.1; + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.builds b/src/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.builds deleted file mode 100644 index 184530ce6d..0000000000 --- a/src/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.builds +++ /dev/null @@ -1,11 +0,0 @@ -<?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> - <Project Include="System.Diagnostics.DiagnosticSource.csproj"/> - <Project Include="System.Diagnostics.DiagnosticSource.csproj"> - <TargetGroup>netstandard1.1</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> diff --git a/src/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj b/src/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj index e611384d8d..b07fdcbd49 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> @@ -8,9 +8,8 @@ <UseOpenKey Condition="'$(UseOpenKey)'==''">true</UseOpenKey> <!-- unset PackageTargetFramework we'll use PackageDestination instead --> <PackageTargetFramework /> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker> <!-- duplicate in net46 folder so older nuget clients can consume --> - <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.3;net46</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard1.3'">netstandard1.3;net46</PackageTargetFramework> <!-- To allow this library to work on V4.5 runtimes and other old platforms we also have a separate complilation of this DLL that works for V4.5 (which is netstandard1.1). Again we duplicate in a portable-* folder @@ -34,7 +33,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.DiagnosticSource/tests/Configurations.props b/src/System.Diagnostics.DiagnosticSource/tests/Configurations.props new file mode 100644 index 0000000000..f0ebe53119 --- /dev/null +++ b/src/System.Diagnostics.DiagnosticSource/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj b/src/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj index ba06e82ed0..98ba7f4a91 100644 --- a/src/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj +++ b/src/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj @@ -2,27 +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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{82B54697-0251-47A1-8546-FC507D0F3B08}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Diagnostics.DiagnosticSource.Tests</AssemblyName> - <RootNamespace>System.Diagnostics.DiagnosticSource.Tests</RootNamespace> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'"> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <ItemGroup> <Compile Include="DiagnosticSourceEventSourceBridgeTests.cs" /> <Compile Include="DiagnosticSourceTests.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Diagnostics.DiagnosticSource.pkgproj"> - <Project>{F24D3391-2928-4E83-AADE-B34423498750}</Project> - <Name>System.Diagnostics.DiagnosticSource</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.FileVersionInfo/dir.props b/src/System.Diagnostics.FileVersionInfo/dir.props index ba7c08a94c..cfbc7971a2 100644 --- a/src/System.Diagnostics.FileVersionInfo/dir.props +++ b/src/System.Diagnostics.FileVersionInfo/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.0.2.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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/Configurations.props b/src/System.Diagnostics.FileVersionInfo/src/Configurations.props new file mode 100644 index 0000000000..1eebe65a78 --- /dev/null +++ b/src/System.Diagnostics.FileVersionInfo/src/Configurations.props @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netcore50-Windows_NT; + net46-Windows_NT; + netstandard1.3-Unix; + netstandard1.3-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.builds b/src/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.builds deleted file mode 100644 index 74e777a32e..0000000000 --- a/src/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.builds +++ /dev/null @@ -1,22 +0,0 @@ -<?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> - <Project Include="System.Diagnostics.FileVersionInfo.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.Diagnostics.FileVersionInfo.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.Diagnostics.FileVersionInfo.csproj"> - <OSGroup>Windows_NT</OSGroup> - <TargetGroup>netcore50</TargetGroup> - </Project> - <Project Include="System.Diagnostics.FileVersionInfo.csproj"> - <OSGroup>Windows_NT</OSGroup> - <TargetGroup>net46</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj b/src/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj index d750ad0478..01bbb870f3 100644 --- a/src/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj +++ b/src/System.Diagnostics.FileVersionInfo/src/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" 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>{00EDA5FD-E802-40D3-92D5-56C27612D36D}</ProjectGuid> <AssemblyName>System.Diagnostics.FileVersionInfo</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> @@ -18,10 +14,10 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' != 'net46'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netcore50' or '$(TargetGroup)' == 'netstandard1.3'"> <Compile Include="System\Diagnostics\FileVersionInfo.cs" /> </ItemGroup> - <ItemGroup Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' == ''"> + <ItemGroup Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' == 'netstandard1.3'"> <Compile Include="System\Diagnostics\FileVersionInfo.Windows.cs" /> <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs"> <Link>Common\Interop\Windows\Interop.Libraries.cs</Link> @@ -48,7 +44,7 @@ <Link>Common\Interop\Windows\Interop.VSFixedFileInfo.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition="('$(TargetsUnix)' == 'true' And '$(TargetGroup)' == '') OR '$(TargetGroup)' == 'netcore50'"> + <ItemGroup Condition="('$(TargetsUnix)' == 'true' And '$(TargetGroup)' == 'netstandard1.3') OR '$(TargetGroup)' == 'netcore50'"> <Compile Include="System\Diagnostics\FileVersionInfo.Metadata.cs" /> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == 'net46'"> @@ -56,7 +52,17 @@ <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" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetsUnix)' == 'true'"> + <ProjectReference Include="../../System.Reflection.Metadata/src/System.Reflection.Metadata.csproj" /> + <Reference Include="System.Collections.Immutable" /> + <Reference Include="System.IO" /> + <Reference Include="System.Runtime.Extensions" /> </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.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.TestAssembly/System.Diagnostics.FileVersionInfo.TestAssembly.csproj b/src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.TestAssembly/System.Diagnostics.FileVersionInfo.TestAssembly.csproj index 627585657a..177480b2c1 100644 --- a/src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.TestAssembly/System.Diagnostics.FileVersionInfo.TestAssembly.csproj +++ b/src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.TestAssembly/System.Diagnostics.FileVersionInfo.TestAssembly.csproj @@ -5,12 +5,10 @@ </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion> <AssemblyName>System.Diagnostics.FileVersionInfo.TestAssembly</AssemblyName> - <NuGetPackageImportStamp>62805582</NuGetPackageImportStamp> <ProjectGuid>{28EB14BE-3BC9-4543-ABA6-A932424DFBD0}</ProjectGuid> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> + <IsTestProject>true</IsTestProject> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Debug|AnyCPU'" /> diff --git a/src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.TestAssembly/project.json b/src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.TestAssembly/project.json deleted file mode 100644 index f64551ebc0..0000000000 --- a/src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.TestAssembly/project.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "test-runtime": { - "target": "project", - "exclude": "compile" - } - }, - "frameworks": { - "netstandard1.3": {} - }, - "supports": { - "coreFx.Test.netcore50": {}, - "coreFx.Test.netcoreapp1.0": {}, - "coreFx.Test.net46": {}, - "coreFx.Test.net461": {}, - "coreFx.Test.net462": {}, - "coreFx.Test.net463": {} - } -} diff --git a/src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj b/src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj index 5d02f8bb38..f4c8c165b4 100644 --- a/src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj +++ b/src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj @@ -5,12 +5,8 @@ </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion> - <AppDesignerFolder>Properties</AppDesignerFolder> <AssemblyName>System.Diagnostics.FileVersionInfo.Tests</AssemblyName> <ProjectGuid>{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}</ProjectGuid> - <NuGetPackageImportStamp>2fda0f27</NuGetPackageImportStamp> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -43,19 +39,10 @@ </ItemGroup> <!-- References used --> <ItemGroup> - <ProjectReference Include="..\..\pkg\System.Diagnostics.FileVersionInfo.pkgproj"> - <Project>{00eda5fd-e802-40d3-92d5-56c27612d36d}</Project> - <Name>System.Diagnostics.FileVersionInfo</Name> - </ProjectReference> <ProjectReference Include="..\System.Diagnostics.FileVersionInfo.TestAssembly\System.Diagnostics.FileVersionInfo.TestAssembly.csproj"> <Project>{28eb14be-3bc9-4543-aba6-a932424dfbd0}</Project> <Name>System.Diagnostics.FileVersionInfo.TestAssembly</Name> </ProjectReference> </ItemGroup> - <!-- Automatically added by VS --> - <ItemGroup> - <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" /> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> 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/dir.props b/src/System.Diagnostics.Process/dir.props index 83d2841dcf..a960cef1a3 100644 --- a/src/System.Diagnostics.Process/dir.props +++ b/src/System.Diagnostics.Process/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.2.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> +</Project>
\ 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 23bcb1383e..0000000000 --- a/src/System.Diagnostics.Process/ref/project.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "dependencies": { - "System.ComponentModel.Primitives": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Collections.Specialized": "4.4.0-beta-24904-01", - "System.Diagnostics.FileVersionInfo": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Diagnostics.Process/src/Configurations.props b/src/System.Diagnostics.Process/src/Configurations.props new file mode 100644 index 0000000000..d192a53e46 --- /dev/null +++ b/src/System.Diagnostics.Process/src/Configurations.props @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard-Linux; + netstandard-OSX; + netstandard-Windows_NT; + net463-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Diagnostics.Process/src/System.Diagnostics.Process.builds b/src/System.Diagnostics.Process/src/System.Diagnostics.Process.builds deleted file mode 100644 index a9ef6c245f..0000000000 --- a/src/System.Diagnostics.Process/src/System.Diagnostics.Process.builds +++ /dev/null @@ -1,19 +0,0 @@ -<?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> - <Project Include="System.Diagnostics.Process.csproj"> - <OSGroup>Linux</OSGroup> - </Project> - <Project Include="System.Diagnostics.Process.csproj"> - <OSGroup>OSX</OSGroup> - </Project> - <Project Include="System.Diagnostics.Process.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.Diagnostics.Process.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> diff --git a/src/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj b/src/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj index d7c376b62b..dac54e23a2 100644 --- a/src/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj +++ b/src/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj @@ -1,18 +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"> - <PropertyGroup> - <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Windows_Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{63634289-90D7-4947-8BF3-DBBE98D76C85}</ProjectGuid> <RootNamespace>System.Diagnostics.Process</RootNamespace> <AssemblyName>System.Diagnostics.Process</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net463'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <PropertyGroup Condition=" '$(TargetsFreeBSD)' == 'true' OR '$(TargetsUnknownUnix)' == 'true' "> <!-- Suppress unused field warnings when using PlatformNotSupportedException stubs --> @@ -384,7 +379,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 fc63ba8fcf..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-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.ComponentModel.Primitives": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Diagnostics.FileVersionInfo": "4.4.0-beta-24904-01", - "System.Text.Encoding.Extensions": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Collections.Specialized": "4.4.0-beta-24904-01", - "Microsoft.Win32.Primitives": "4.4.0-beta-24904-01", - "System.ComponentModel.TypeConverter": "4.4.0-beta-24904-01", - "Microsoft.Win32.Registry": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.Diagnostics.Process/tests/Configurations.props b/src/System.Diagnostics.Process/tests/Configurations.props new file mode 100644 index 0000000000..27a5735619 --- /dev/null +++ b/src/System.Diagnostics.Process/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.4; + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Diagnostics.Process/tests/Performance/System.Diagnostics.Process.Performance.Tests.csproj b/src/System.Diagnostics.Process/tests/Performance/System.Diagnostics.Process.Performance.Tests.csproj index 6130ea8a5b..3dd17e63f2 100644 --- a/src/System.Diagnostics.Process/tests/Performance/System.Diagnostics.Process.Performance.Tests.csproj +++ b/src/System.Diagnostics.Process/tests/Performance/System.Diagnostics.Process.Performance.Tests.csproj @@ -2,12 +2,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> - <RootNamespace>System.Diagnostics.Process.Performance.Tests</RootNamespace> - <AssemblyName>System.Diagnostics.Process.Performance.Tests</AssemblyName> - <NuGetPackageImportStamp>b62eec4b</NuGetPackageImportStamp> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IncludePerformanceTests>true</IncludePerformanceTests> - <NugetTargetMoniker>.NETStandard,Version=v1.4</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -26,22 +22,11 @@ </Compile> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\pkg\System.Diagnostics.Process.pkgproj"> - <Project>{63634289-90d7-4947-8bf3-dbbe98d76c85}</Project> - <Name>System.Diagnostics.Process</Name> - <OSGroup>$(InputOSGroup)</OSGroup> - </ProjectReference> <ProjectReference Include="$(CommonTestPath)\System\Diagnostics\RemoteExecutorConsoleApp\RemoteExecutorConsoleApp.csproj"> <Project>{69e46a6f-9966-45a5-8945-2559fe337827}</Project> <Name>RemoteExecutorConsoleApp</Name> <OSGroup>$(InputOSGroup)</OSGroup> </ProjectReference> </ItemGroup> - <!-- <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <ItemGroup> - <WCFMetadata Include="Service References\" /> - </ItemGroup> --> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Diagnostics.Process/tests/ProcessTests.cs b/src/System.Diagnostics.Process/tests/ProcessTests.cs index 4c89dbb281..a583dffd9d 100644 --- a/src/System.Diagnostics.Process/tests/ProcessTests.cs +++ b/src/System.Diagnostics.Process/tests/ProcessTests.cs @@ -181,7 +181,7 @@ namespace System.Diagnostics.Tests } else { - IEnumerable<int> testProcessIds = Process.GetProcessesByName(HostRunner).Select(p => p.Id); + IEnumerable<int> testProcessIds = Process.GetProcessesByName(HostRunnerName).Select(p => p.Id); Assert.Contains(_process.Id, testProcessIds); } } diff --git a/src/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj b/src/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj index a2e7930651..9510db322e 100644 --- a/src/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj +++ b/src/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj @@ -2,15 +2,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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{E1114510-844C-4BB2-BBAD-8595BD16E24B}</ProjectGuid> - <OutputType>Library</OutputType> - <RootNamespace>System.Diagnostics.Process.Tests</RootNamespace> - <AssemblyName>System.Diagnostics.Process.Tests</AssemblyName> - <NuGetPackageImportStamp>b62eec4b</NuGetPackageImportStamp> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NugetTargetMoniker Condition="'$(TargetGroup)'==''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -40,27 +33,16 @@ <Compile Include="ProcessWaitingTests.cs" /> <Compile Include="XunitAssemblyAttributes.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)'==''"> + <ItemGroup Condition="'$(TargetGroup)'=='netstandard1.7'"> <Compile Include="ProcessTests.netstandard1.7.cs" /> <Compile Include="ProcessStartInfoTests.netstandard1.7.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\pkg\System.Diagnostics.Process.pkgproj"> - <Project>{63634289-90d7-4947-8bf3-dbbe98d76c85}</Project> - <Name>System.Diagnostics.Process</Name> - <OSGroup>$(InputOSGroup)</OSGroup> - </ProjectReference> <ProjectReference Include="$(CommonTestPath)\System\Diagnostics\RemoteExecutorConsoleApp\RemoteExecutorConsoleApp.csproj"> <Project>{69e46a6f-9966-45a5-8945-2559fe337827}</Project> <Name>RemoteExecutorConsoleApp</Name> <OSGroup>$(InputOSGroup)</OSGroup> </ProjectReference> </ItemGroup> - <!-- <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <ItemGroup> - <WCFMetadata Include="Service References\" /> - </ItemGroup> --> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Diagnostics.StackTrace/dir.props b/src/System.Diagnostics.StackTrace/dir.props index fcc1a7ca5a..8f2003a937 100644 --- a/src/System.Diagnostics.StackTrace/dir.props +++ b/src/System.Diagnostics.StackTrace/dir.props @@ -3,5 +3,7 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> + <IsNETCoreAppRef>false</IsNETCoreAppRef> </PropertyGroup> </Project>
\ No newline at end of file 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 314fc3008d..0000000000 --- a/src/System.Diagnostics.StackTrace/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Diagnostics.StackTrace/src/Configurations.props b/src/System.Diagnostics.StackTrace/src/Configurations.props new file mode 100644 index 0000000000..f013d10b8c --- /dev/null +++ b/src/System.Diagnostics.StackTrace/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + uap101aot-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.builds b/src/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.builds deleted file mode 100644 index 13acffa935..0000000000 --- a/src/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.builds +++ /dev/null @@ -1,15 +0,0 @@ -<?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> - <Project Include="System.Diagnostics.StackTrace.csproj" /> - <Project Include="System.Diagnostics.StackTrace.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - <Project Include="System.Diagnostics.StackTrace.csproj"> - <TargetGroup>uap101aot</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj b/src/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj index 886947db68..65c44eac9c 100644 --- a/src/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj +++ b/src/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj @@ -1,13 +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> <AssemblyName>System.Diagnostics.StackTrace</AssemblyName> <ProjectGuid>{02304469-722E-4723-92A1-820B9A37D275}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <IsPartialFacadeAssembly Condition="'$(TargetGroup)'!='uap101aot'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> - <PackageTargetFramework Condition="'$(TargetGroup)'==''">netstandard1.7;uap10.1</PackageTargetFramework> + <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='netstandard' or '$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> + <PackageTargetFramework Condition="'$(TargetGroup)'=='netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> <!-- Disable 1685 (aka multiple type definitions) warning so it doesn't turn into an error --> <NoWarn>$(NoWarn);1685</NoWarn> </PropertyGroup> @@ -28,7 +27,7 @@ <ItemGroup> <Compile Include="System\Diagnostics\StackFrameExtensions.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard' or '$(TargetGroup)' == 'uap101aot'"> <Compile Include="System\Diagnostics\SymbolStore\ISymbolBinder.cs" /> <Compile Include="System\Diagnostics\SymbolStore\ISymbolDocument.cs" /> <Compile Include="System\Diagnostics\SymbolStore\ISymbolMethod.cs" /> @@ -43,13 +42,19 @@ <Compile Include="System\Diagnostics\SymbolStore\SymLanguageType.cs" /> <Compile Include="System\Diagnostics\SymbolStore\SymLanguageVendor.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == ''"> + <ItemGroup Condition="'$(TargetGroup)'=='netstandard'"> <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'"> + <ItemGroup Condition="'$(TargetGroup)'=='netstandard' or '$(TargetGroup)' == 'net463'"> <Compile Include="System\Diagnostics\StackFrameExtensions.CoreCLR.cs" /> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)'=='uap101aot'"> @@ -59,7 +64,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 96b7c419c8..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-24904-03", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.Reflection.Metadata": "1.5.0-beta-24904-01" - } - }, - "uap10.1": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24904-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 15c370cd08..0000000000 --- a/src/System.Diagnostics.TextWriterTraceListener/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.Diagnostics.TraceSource": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Diagnostics.TextWriterTraceListener/src/Configurations.props b/src/System.Diagnostics.TextWriterTraceListener/src/Configurations.props new file mode 100644 index 0000000000..9c336c0be9 --- /dev/null +++ b/src/System.Diagnostics.TextWriterTraceListener/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Diagnostics.TextWriterTraceListener/src/System.Diagnostics.TextWriterTraceListener.builds b/src/System.Diagnostics.TextWriterTraceListener/src/System.Diagnostics.TextWriterTraceListener.builds deleted file mode 100644 index 24f038e003..0000000000 --- a/src/System.Diagnostics.TextWriterTraceListener/src/System.Diagnostics.TextWriterTraceListener.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.Diagnostics.TextWriterTraceListener.csproj" /> - <Project Include="System.Diagnostics.TextWriterTraceListener.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Diagnostics.TextWriterTraceListener/src/System.Diagnostics.TextWriterTraceListener.csproj b/src/System.Diagnostics.TextWriterTraceListener/src/System.Diagnostics.TextWriterTraceListener.csproj index e02f1c3030..42653528ff 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> @@ -6,7 +6,6 @@ <AssemblyName>System.Diagnostics.TextWriterTraceListener</AssemblyName> <ProjectGuid>{315929D9-D76E-47E9-BE82-C787FB3A7876}</ProjectGuid> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -16,7 +15,7 @@ <ItemGroup> <Compile Include="FxCopBaseline.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="System\Diagnostics\DelimitedListTraceListener.cs" /> <Compile Include="System\Diagnostics\TextWriterTraceListener.cs" /> </ItemGroup> @@ -25,7 +24,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> diff --git a/src/System.Diagnostics.TextWriterTraceListener/src/project.json b/src/System.Diagnostics.TextWriterTraceListener/src/project.json deleted file mode 100644 index 704374cf90..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-24904-01", - "System.Diagnostics.TraceSource": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.Diagnostics.TextWriterTraceListener/tests/Configurations.props b/src/System.Diagnostics.TextWriterTraceListener/tests/Configurations.props new file mode 100644 index 0000000000..512c938bad --- /dev/null +++ b/src/System.Diagnostics.TextWriterTraceListener/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Diagnostics.TextWriterTraceListener/tests/System.Diagnostics.TextWriterTraceListener.Tests.csproj b/src/System.Diagnostics.TextWriterTraceListener/tests/System.Diagnostics.TextWriterTraceListener.Tests.csproj index bd18c07590..3d154609d5 100644 --- a/src/System.Diagnostics.TextWriterTraceListener/tests/System.Diagnostics.TextWriterTraceListener.Tests.csproj +++ b/src/System.Diagnostics.TextWriterTraceListener/tests/System.Diagnostics.TextWriterTraceListener.Tests.csproj @@ -2,19 +2,11 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <RootNamespace>System.Diagnostics.TextWriterTraceListener.Tests</RootNamespace> - <AssemblyName>System.Diagnostics.TextWriterTraceListener.Tests</AssemblyName> <ProjectGuid>{92A9467A-9F7E-4294-A7D5-7B59F2E54ABE}</ProjectGuid> - <NugetTargetMoniker>.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> <ItemGroup> <Compile Include="TestTraceFilter.cs" /> <Compile Include="CommonUtilities.cs" /> @@ -23,11 +15,5 @@ <Compile Include="CtorsStreamTests.cs" /> <Compile Include="DelimiterWriteMethodTests.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Diagnostics.TextWriterTraceListener.pkgproj"> - <Project>{315929D9-D76E-47E9-BE82-C787FB3A7876}</Project> - <Name>System.Diagnostics.TextWriterTraceListener</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Diagnostics.Tools/dir.props b/src/System.Diagnostics.Tools/dir.props index 503cf86a87..bfbc5bd9e0 100644 --- a/src/System.Diagnostics.Tools/dir.props +++ b/src/System.Diagnostics.Tools/dir.props @@ -1,7 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> - +</Project>
\ 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/Configurations.props b/src/System.Diagnostics.Tools/src/Configurations.props new file mode 100644 index 0000000000..9c336c0be9 --- /dev/null +++ b/src/System.Diagnostics.Tools/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Diagnostics.Tools/src/System.Diagnostics.Tools.builds b/src/System.Diagnostics.Tools/src/System.Diagnostics.Tools.builds deleted file mode 100644 index 4f6ecca6b7..0000000000 --- a/src/System.Diagnostics.Tools/src/System.Diagnostics.Tools.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.Diagnostics.Tools.csproj" /> - <Project Include="System.Diagnostics.Tools.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Diagnostics.Tools/src/System.Diagnostics.Tools.csproj b/src/System.Diagnostics.Tools/src/System.Diagnostics.Tools.csproj index b826e1c95d..1c5ebd7611 100644 --- a/src/System.Diagnostics.Tools/src/System.Diagnostics.Tools.csproj +++ b/src/System.Diagnostics.Tools/src/System.Diagnostics.Tools.csproj @@ -1,11 +1,10 @@ -<?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>{0B68298B-4672-4CA0-AD25-2F9ABEA1FF95}</ProjectGuid> <AssemblyName>System.Diagnostics.Tools</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -16,17 +15,17 @@ <TargetingPackReference Include="mscorlib" /> <TargetingPackReference Include="System" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <TargetingPackReference Include="System.Private.CoreLib" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="System\CodeDom\Compiler\GeneratedCodeAttribute.cs" /> </ItemGroup> <ItemGroup> <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 4ba699b0b8..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-24904-03" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Diagnostics.Tools/tests/Configurations.props b/src/System.Diagnostics.Tools/tests/Configurations.props new file mode 100644 index 0000000000..512c938bad --- /dev/null +++ b/src/System.Diagnostics.Tools/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Diagnostics.Tools/tests/System.Diagnostics.Tools.Tests.csproj b/src/System.Diagnostics.Tools/tests/System.Diagnostics.Tools.Tests.csproj index c65e41499c..4d49a00fc1 100644 --- a/src/System.Diagnostics.Tools/tests/System.Diagnostics.Tools.Tests.csproj +++ b/src/System.Diagnostics.Tools/tests/System.Diagnostics.Tools.Tests.csproj @@ -2,13 +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" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{41BF89E4-8C67-45A6-8044-13009E363220}</ProjectGuid> - <OutputType>Library</OutputType> <RootNamespace>System</RootNamespace> <AssemblyName>System.Diagnostics.Tools.Tests</AssemblyName> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -20,10 +16,5 @@ <ItemGroup Condition="'$(TargetGroup)'==''"> <Compile Include="System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttributeTests.cs" /> </ItemGroup> - <ItemGroup> - <!-- Compile tests against the contract, but copy our local-built implementation for testing --> - <ProjectReference Include="..\pkg\System.Diagnostics.Tools.pkgproj"> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.TraceSource/dir.props b/src/System.Diagnostics.TraceSource/dir.props index fcc1a7ca5a..8f2003a937 100644 --- a/src/System.Diagnostics.TraceSource/dir.props +++ b/src/System.Diagnostics.TraceSource/dir.props @@ -3,5 +3,7 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> + <IsNETCoreAppRef>false</IsNETCoreAppRef> </PropertyGroup> </Project>
\ No newline at end of file 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 091bf48e38..0000000000 --- a/src/System.Diagnostics.TraceSource/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Collections.Specialized": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Diagnostics.TraceSource/src/Configurations.props b/src/System.Diagnostics.TraceSource/src/Configurations.props new file mode 100644 index 0000000000..3bb6330d9e --- /dev/null +++ b/src/System.Diagnostics.TraceSource/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard-Unix; + netstandard-Windows_NT; + net463-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.builds b/src/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.builds deleted file mode 100644 index 603a235058..0000000000 --- a/src/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.builds +++ /dev/null @@ -1,17 +0,0 @@ -<?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> - <Project Include="System.Diagnostics.TraceSource.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.Diagnostics.TraceSource.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.Diagnostics.TraceSource.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj b/src/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj index 320e042c13..13a7d2c84f 100644 --- a/src/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj +++ b/src/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj @@ -1,8 +1,5 @@ -<?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> <RootNamespace>System.Diagnostics.TraceSource</RootNamespace> @@ -10,8 +7,7 @@ <DefineConstants>$(DefineConstants);TRACE</DefineConstants> <ProjectGuid>{5380420C-EB1D-4C53-9CFC-916578C18334}</ProjectGuid> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> - <PackageTargetFramework Condition="'$(TargetGroup)'==''">netstandard1.7;uap10.1</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)'=='netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> @@ -23,7 +19,7 @@ <ItemGroup> <Compile Include="FxCopBaseline.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="System\Diagnostics\BooleanSwitch.cs" /> <Compile Include="System\Diagnostics\CorrelationManager.cs" /> <Compile Include="System\Diagnostics\DefaultTraceListener.cs" /> @@ -47,7 +43,7 @@ <Compile Include="System\Diagnostics\SwitchAttribute.cs" /> <Compile Include="System\Diagnostics\SwitchLevelAttribute.cs" /> </ItemGroup> - <ItemGroup Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' != 'net463'"> + <ItemGroup Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' == 'netstandard'"> <Compile Include="System\Diagnostics\TraceEventCache.Windows.cs" /> <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs"> <Link>Common\Interop\Windows\Interop.Libraries.cs</Link> @@ -56,7 +52,7 @@ <Link>Common\Interop\Windows\Interop.GetCurrentProcessId.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition=" '$(TargetsUnix)' == 'true' And '$(TargetGroup)' != 'net463'"> + <ItemGroup Condition=" '$(TargetsUnix)' == 'true' And '$(TargetGroup)' == 'netstandard'"> <Compile Include="$(CommonPath)\Interop\Unix\Interop.Libraries.cs"> <Link>Common\Interop\Unix\Interop.Libraries.cs</Link> </Compile> @@ -70,7 +66,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> diff --git a/src/System.Diagnostics.TraceSource/src/project.json b/src/System.Diagnostics.TraceSource/src/project.json deleted file mode 100644 index 1ae475d605..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-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Collections.Specialized": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.Diagnostics.TraceSource/tests/Configurations.props b/src/System.Diagnostics.TraceSource/tests/Configurations.props new file mode 100644 index 0000000000..90648972ae --- /dev/null +++ b/src/System.Diagnostics.TraceSource/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7-Unix; + netstandard1.7-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Diagnostics.TraceSource/tests/System.Diagnostics.TraceSource.Tests.csproj b/src/System.Diagnostics.TraceSource/tests/System.Diagnostics.TraceSource.Tests.csproj index d392b778da..6a3103c80f 100644 --- a/src/System.Diagnostics.TraceSource/tests/System.Diagnostics.TraceSource.Tests.csproj +++ b/src/System.Diagnostics.TraceSource/tests/System.Diagnostics.TraceSource.Tests.csproj @@ -1,23 +1,14 @@ <?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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> <RootNamespace>System.Diagnostics.TraceSourceTests</RootNamespace> <AssemblyName>System.Diagnostics.TraceSource.Tests</AssemblyName> <ProjectGuid>{7B32D24D-969A-4F7F-8461-B43E15E5D553}</ProjectGuid> - <NugetTargetMoniker>.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> <ItemGroup> <Compile Include="AssemblyInfo.cs" /> <Compile Include="BooleanSwitchClassTests.cs" /> @@ -39,11 +30,5 @@ <Compile Include="TraceTestHelper.cs" /> <Compile Include="CorrelationManagerTests.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Diagnostics.TraceSource.pkgproj"> - <Project>{5380420C-EB1D-4C53-9CFC-916578C18334}</Project> - <Name>System.Diagnostics.TraceSource</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Diagnostics.Tracing/dir.props b/src/System.Diagnostics.Tracing/dir.props index 1af9800f25..a960cef1a3 100644 --- a/src/System.Diagnostics.Tracing/dir.props +++ b/src/System.Diagnostics.Tracing/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.2.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 f53f8e32db..0000000000 --- a/src/System.Diagnostics.Tracing/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Diagnostics.Tracing/src/Configurations.props b/src/System.Diagnostics.Tracing/src/Configurations.props new file mode 100644 index 0000000000..53b62c64fe --- /dev/null +++ b/src/System.Diagnostics.Tracing/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net461-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Diagnostics.Tracing/src/System.Diagnostics.Tracing.builds b/src/System.Diagnostics.Tracing/src/System.Diagnostics.Tracing.builds deleted file mode 100644 index 83cacbb0cd..0000000000 --- a/src/System.Diagnostics.Tracing/src/System.Diagnostics.Tracing.builds +++ /dev/null @@ -1,11 +0,0 @@ -<?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> - <Project Include="System.Diagnostics.Tracing.csproj" /> - <Project Include="System.Diagnostics.Tracing.csproj"> - <TargetGroup>net461</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.Tracing/src/System.Diagnostics.Tracing.csproj b/src/System.Diagnostics.Tracing/src/System.Diagnostics.Tracing.csproj index b109a09279..723b63d398 100644 --- a/src/System.Diagnostics.Tracing/src/System.Diagnostics.Tracing.csproj +++ b/src/System.Diagnostics.Tracing/src/System.Diagnostics.Tracing.csproj @@ -1,27 +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> <AssemblyName>System.Diagnostics.Tracing</AssemblyName> <ProjectGuid>{EB880FDC-326D-42B3-A3FD-0CD3BA29A7F4}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> - <GenFacadesArgs Condition="'$(TargetGroup)'=='net461'">$(GenFacadesArgs) -ignoreMissingTypes</GenFacadesArgs> - </PropertyGroup> - <PropertyGroup Condition="'$(TargetGroup)'!='netcore50aot'"> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> </PropertyGroup> - <PropertyGroup Condition="'$(TargetGroup)'=='netcore50aot'"> - <DefineConstants>$(DefineConstants);PROJECTN;FEATURE_SERIALIZATION</DefineConstants> - <!-- Need to remove reference to System.Reflection.TypeExtensions - which is included transitively via System.Reflection --> - <OmitTransitiveCompileReferences>true</OmitTransitiveCompileReferences> - </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)' == 'netcore50aot_Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcore50aot_Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net461_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net461_Release|AnyCPU'" /> <ItemGroup> @@ -31,85 +19,14 @@ <ProjectReference Include="..\..\System.Runtime\src\System.Runtime.csproj" /> <Compile Include="System\Diagnostics\Tracing\EventCounter.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)'=='netcore50aot'"> - <Compile Include="System\Diagnostics\Tracing\ActivityTracker.cs" /> - <Compile Include="System\Diagnostics\Tracing\EventActivityOptions.cs" /> - <Compile Include="System\Diagnostics\Tracing\EventDescriptor.cs" /> - <Compile Include="System\Diagnostics\Tracing\EventProvider.cs" /> - <Compile Include="System\Diagnostics\Tracing\EventSource.cs" /> - <Compile Include="System\Diagnostics\Tracing\EventSource_ProjectN.cs" /> - <Compile Include="System\Diagnostics\Tracing\EventSourceException.cs" /> - <Compile Include="System\Diagnostics\Tracing\StubEnvironment.cs" /> - <Compile Include="System\Diagnostics\Tracing\UnsafeNativeMethods.cs" /> - <Compile Include="System\Diagnostics\Tracing\TraceLogging\PropertyValue.cs" /> - <Compile Include="System\Diagnostics\Tracing\Winmeta.cs" /> - <Compile Include="System\Diagnostics\Tracing\TraceLogging\ArrayTypeInfo.cs" /> - <Compile Include="System\Diagnostics\Tracing\TraceLogging\ConcurrentSet.cs" /> - <Compile Include="System\Diagnostics\Tracing\TraceLogging\ConcurrentSetItem.cs" /> - <Compile Include="System\Diagnostics\Tracing\TraceLogging\DataCollector.cs" /> - <Compile Include="System\Diagnostics\Tracing\TraceLogging\EmptyStruct.cs" /> - <Compile Include="System\Diagnostics\Tracing\TraceLogging\EnumerableTypeInfo.cs" /> - <Compile Include="System\Diagnostics\Tracing\TraceLogging\EnumHelper.cs" /> - <Compile Include="System\Diagnostics\Tracing\TraceLogging\EventDataAttribute.cs" /> - <Compile Include="System\Diagnostics\Tracing\TraceLogging\EventFieldAttribute.cs" /> - <Compile Include="System\Diagnostics\Tracing\TraceLogging\EventFieldFormat.cs" /> - <Compile Include="System\Diagnostics\Tracing\TraceLogging\EventIgnoreAttribute.cs" /> - <Compile Include="System\Diagnostics\Tracing\TraceLogging\EventPayload.cs" /> - <Compile Include="System\Diagnostics\Tracing\TraceLogging\EventSourceActivity.cs" /> - <Compile Include="System\Diagnostics\Tracing\TraceLogging\EventSourceOptions.cs" /> - <Compile Include="System\Diagnostics\Tracing\TraceLogging\FieldMetadata.cs" /> - <Compile Include="System\Diagnostics\Tracing\TraceLogging\InvokeTypeInfo.cs" /> - <Compile Include="System\Diagnostics\Tracing\TraceLogging\NameInfo.cs" /> - <Compile Include="System\Diagnostics\Tracing\TraceLogging\PropertyAnalysis.cs" /> - <Compile Include="System\Diagnostics\Tracing\TraceLogging\SimpleEventTypes.cs" /> - <Compile Include="System\Diagnostics\Tracing\TraceLogging\SimpleTypeInfos.cs" /> - <Compile Include="System\Diagnostics\Tracing\TraceLogging\Statics.cs" /> - <Compile Include="System\Diagnostics\Tracing\TraceLogging\TraceLoggingDataCollector.cs" /> - <Compile Include="System\Diagnostics\Tracing\TraceLogging\TraceLoggingDataType.cs" /> - <Compile Include="System\Diagnostics\Tracing\TraceLogging\TraceLoggingEventSource.cs" /> - <Compile Include="System\Diagnostics\Tracing\TraceLogging\TraceLoggingEventTraits.cs" /> - <Compile Include="System\Diagnostics\Tracing\TraceLogging\TraceLoggingEventTypes.cs" /> - <Compile Include="System\Diagnostics\Tracing\TraceLogging\TraceLoggingMetadataCollector.cs" /> - <Compile Include="System\Diagnostics\Tracing\TraceLogging\TraceLoggingTypeInfo.cs" /> - <Compile Include="System\Diagnostics\Tracing\TraceLogging\TypeAnalysis.cs" /> - <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs"> - <Link>Common\Interop\Interop.Libraries.cs</Link> - </Compile> - <Compile Include="$(CommonPath)\Interop\Windows\Interop.Errors.cs"> - <Link>Common\Interop\mincore\Interop.Errors.cs</Link> - </Compile> - <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetCurrentProcessId.cs"> - <Link>Common\Interop\Interop.GetCurrentProcessId.cs</Link> - </Compile> - <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetCurrentThreadId.cs"> - <Link>Common\Interop\Interop.GetCurrentThreadId.cs</Link> - </Compile> - <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.EventRegister.cs"> - <Link>Common\Interop\Interop.EventRegister.cs</Link> - </Compile> - <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.EventUnregister.cs"> - <Link>Common\Interop\Interop.EventUnregister.cs</Link> - </Compile> - <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.EventWrite.cs"> - <Link>Common\Interop\Interop.EventWrite.cs</Link> - </Compile> - <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.FormatMessage.cs"> - <Link>Common\Interop\Interop.FormatMessage.cs</Link> - </Compile> - <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.EventSetInformation.cs"> - <Link>Common\Interop\Interop.EventSetInformation.cs</Link> - </Compile> - <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.EventWriteTransfer.cs"> - <Link>Common\Interop\Interop.EventWriteTransfer.cs</Link> - </Compile> - <EmbeddedResource Include="$(MsBuildThisFileDirectory)Resources\$(AssemblyName).rd.xml" /> - </ItemGroup> <ItemGroup Condition="'$(IsPartialFacadeAssembly)'=='true'"> <TargetingPackReference Include="mscorlib" Condition="'$(TargetGroup)' == 'net461'" /> - <TargetingPackReference Include="System.Private.CoreLib" Condition="'$(TargetGroup)' != 'net461'" /> + <TargetingPackReference Include="System.Private.CoreLib" Condition="'$(TargetGroup)' == 'netstandard'" /> </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> diff --git a/src/System.Diagnostics.Tracing/src/project.json b/src/System.Diagnostics.Tracing/src/project.json deleted file mode 100644 index b32b228df7..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-24904-03" - } - }, - "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" - } - }, - "net461": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.1": "1.0.1" - } - } - } -} diff --git a/src/System.Diagnostics.Tracing/tests/Configurations.props b/src/System.Diagnostics.Tracing/tests/Configurations.props new file mode 100644 index 0000000000..b744993779 --- /dev/null +++ b/src/System.Diagnostics.Tracing/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.5; + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj b/src/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj index c247ee2710..d1190694ee 100644 --- a/src/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj +++ b/src/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj @@ -2,20 +2,11 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{7E0E1B11-FF70-461E-99F7-C0AF252C0C60}</ProjectGuid> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>System.Diagnostics.Tracing.Tests</RootNamespace> - <AssemblyName>System.Diagnostics.Tracing.Tests</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> <ItemGroup> <Compile Include="BasicEventSourceTest\Harness\EventTestHarness.cs" /> <Compile Include="BasicEventSourceTest\FuzzyTests.cs" /> @@ -43,11 +34,5 @@ <Compile Include="CustomEventSources\UseAbstractEventSource.cs" /> <Compile Include="CustomEventSources\UseInterfaceEventSource.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Diagnostics.Tracing.pkgproj" /> - </ItemGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.DirectoryServices.AccountManagement/ref/project.json b/src/System.DirectoryServices.AccountManagement/ref/project.json deleted file mode 100644 index 2a80797aeb..0000000000 --- a/src/System.DirectoryServices.AccountManagement/ref/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.DirectoryServices.AccountManagement/src/project.json b/src/System.DirectoryServices.AccountManagement/src/project.json deleted file mode 100644 index 199335ad02..0000000000 --- a/src/System.DirectoryServices.AccountManagement/src/project.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.4.0-beta-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.IO.FileSystem.AccessControl": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Security.AccessControl": "4.4.0-beta-24904-01", - "System.Security.Permissions": "4.4.0-beta-24904-01", - "System.Security.Principal": "4.4.0-beta-24904-01", - "System.Security.Principal.Windows": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.DirectoryServices.Protocols/ref/project.json b/src/System.DirectoryServices.Protocols/ref/project.json deleted file mode 100644 index 2a80797aeb..0000000000 --- a/src/System.DirectoryServices.Protocols/ref/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.DirectoryServices.Protocols/src/project.json b/src/System.DirectoryServices.Protocols/src/project.json deleted file mode 100644 index 199335ad02..0000000000 --- a/src/System.DirectoryServices.Protocols/src/project.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.4.0-beta-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.IO.FileSystem.AccessControl": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Security.AccessControl": "4.4.0-beta-24904-01", - "System.Security.Permissions": "4.4.0-beta-24904-01", - "System.Security.Principal": "4.4.0-beta-24904-01", - "System.Security.Principal.Windows": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.DirectoryServices/ref/project.json b/src/System.DirectoryServices/ref/project.json deleted file mode 100644 index 2a80797aeb..0000000000 --- a/src/System.DirectoryServices/ref/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.DirectoryServices/src/project.json b/src/System.DirectoryServices/src/project.json deleted file mode 100644 index 199335ad02..0000000000 --- a/src/System.DirectoryServices/src/project.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.4.0-beta-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.IO.FileSystem.AccessControl": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Security.AccessControl": "4.4.0-beta-24904-01", - "System.Security.Permissions": "4.4.0-beta-24904-01", - "System.Security.Principal": "4.4.0-beta-24904-01", - "System.Security.Principal.Windows": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.Drawing.Primitives/dir.props b/src/System.Drawing.Primitives/dir.props index 88a66556db..8f2003a937 100644 --- a/src/System.Drawing.Primitives/dir.props +++ b/src/System.Drawing.Primitives/dir.props @@ -1,7 +1,9 @@ -<?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="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> + <IsNETCoreAppRef>false</IsNETCoreAppRef> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file 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 f53f8e32db..0000000000 --- a/src/System.Drawing.Primitives/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Drawing.Primitives/src/Configurations.props b/src/System.Drawing.Primitives/src/Configurations.props new file mode 100644 index 0000000000..9c336c0be9 --- /dev/null +++ b/src/System.Drawing.Primitives/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Drawing.Primitives/src/System.Drawing.Primitives.builds b/src/System.Drawing.Primitives/src/System.Drawing.Primitives.builds deleted file mode 100644 index 2446852c20..0000000000 --- a/src/System.Drawing.Primitives/src/System.Drawing.Primitives.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.Drawing.Primitives.csproj" /> - <Project Include="System.Drawing.Primitives.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj b/src/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj index 17f597a10b..b293efcc08 100644 --- a/src/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj +++ b/src/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj @@ -1,24 +1,27 @@ -<?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> - <Configuration Condition=" '$(Configuration)' == '' ">netstandard1.7_Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <OutputType>Library</OutputType> <RootNamespace>System.Drawing</RootNamespace> <AssemblyName>System.Drawing.Primitives</AssemblyName> <ProjectGuid>{F9DF2357-81B4-4317-908E-512DA9395583}</ProjectGuid> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.7_Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.7_Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard_Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard_Release|AnyCPU'" /> <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'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="System\Drawing\Point.cs" /> <Compile Include="System\Drawing\PointF.cs" /> <Compile Include="System\Drawing\Rectangle.cs" /> diff --git a/src/System.Drawing.Primitives/src/project.json b/src/System.Drawing.Primitives/src/project.json deleted file mode 100644 index 37dd6ec1a3..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-24904-01", - "System.Reflection.Primitives": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Drawing.Primitives/tests/Configurations.props b/src/System.Drawing.Primitives/tests/Configurations.props new file mode 100644 index 0000000000..512c938bad --- /dev/null +++ b/src/System.Drawing.Primitives/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj b/src/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj index c76b59df45..52fcbcff74 100644 --- a/src/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj +++ b/src/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj @@ -2,12 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion> - <OutputType>Library</OutputType> - <RootNamespace>System.Drawing.Primitives.Tests</RootNamespace> - <AssemblyName>System.Drawing.Primitives.Tests</AssemblyName> <ProjectGuid>{297A9116-1005-499D-A895-2063D03E4C94}</ProjectGuid> - <NugetTargetMoniker Condition="'$(TargetGroup)'==''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'netstandard1.7_Debug|AnyCPU' "> @@ -19,12 +14,6 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU' "> </PropertyGroup> <ItemGroup> - <ProjectReference Include="..\pkg\System.Drawing.Primitives.pkgproj"> - <Project>{F9DF2357-81B4-4317-908E-512DA9395583}</Project> - <Name>System.Drawing.Primitives</Name> - </ProjectReference> - </ItemGroup> - <ItemGroup> <Compile Include="PointFTests.cs" /> <Compile Include="PointTests.cs" /> <Compile Include="RectangleFTests.cs" /> diff --git a/src/System.Dynamic.Runtime/dir.props b/src/System.Dynamic.Runtime/dir.props index fcc1a7ca5a..bfbc5bd9e0 100644 --- a/src/System.Dynamic.Runtime/dir.props +++ b/src/System.Dynamic.Runtime/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 6e5b07cc50..0000000000 --- a/src/System.Dynamic.Runtime/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.ObjectModel": "4.4.0-beta-24904-01", - "System.Linq.Expressions": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Dynamic.Runtime/src/Configurations.props b/src/System.Dynamic.Runtime/src/Configurations.props new file mode 100644 index 0000000000..9c336c0be9 --- /dev/null +++ b/src/System.Dynamic.Runtime/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Dynamic.Runtime/src/System.Dynamic.Runtime.builds b/src/System.Dynamic.Runtime/src/System.Dynamic.Runtime.builds deleted file mode 100644 index 3e02d525e6..0000000000 --- a/src/System.Dynamic.Runtime/src/System.Dynamic.Runtime.builds +++ /dev/null @@ -1,18 +0,0 @@ -<?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> - <Project Include="System.Dynamic.Runtime.csproj" /> - <Project Include="System.Dynamic.Runtime.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - <!-- NETCore50 must redistribute binaries due to shared library - <Project Include="System.Dynamic.Runtime.csproj"> - <TargetGroup>netcore50</TargetGroup> - </Project> - <Project Include="System.Dynamic.Runtime.csproj"> - <TargetGroup>netcore50aot</TargetGroup> - </Project> --> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project>
\ No newline at end of file diff --git a/src/System.Dynamic.Runtime/src/System.Dynamic.Runtime.csproj b/src/System.Dynamic.Runtime/src/System.Dynamic.Runtime.csproj index 8557ca993b..aee857e18f 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> @@ -6,15 +6,15 @@ <AssemblyName>System.Dynamic.Runtime</AssemblyName> <RootNamespace>System.Dynamic.Runtime</RootNamespace> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> - <None Include="project.json" /> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> + <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 032bab3167..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-24904-01", - "System.ObjectModel": "4.4.0-beta-24904-01", - "System.Linq.Expressions": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Dynamic.Runtime/tests/Configurations.props b/src/System.Dynamic.Runtime/tests/Configurations.props new file mode 100644 index 0000000000..98f53209d4 --- /dev/null +++ b/src/System.Dynamic.Runtime/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Dynamic.Runtime/tests/System.Dynamic.Runtime.Tests.csproj b/src/System.Dynamic.Runtime/tests/System.Dynamic.Runtime.Tests.csproj index 543d12423e..09d21e0fa0 100644 --- a/src/System.Dynamic.Runtime/tests/System.Dynamic.Runtime.Tests.csproj +++ b/src/System.Dynamic.Runtime/tests/System.Dynamic.Runtime.Tests.csproj @@ -2,21 +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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{0BFD6D9F-DF9E-4B17-8ED4-29437AE5B04A}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Dynamic.Runtime.Tests</AssemblyName> - <RootNamespace>System.Dynamic.Runtime.Tests</RootNamespace> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <NoWarn>67,168,219,414,162,184,458,464,78,169,114,693,108,1981,649,109,1066,3021,3026,3002,3014,3022,660,661,429</NoWarn> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> <ItemGroup> <Compile Include="CallInfoTests.cs" /> <Compile Include="Dynamic.Context\Common.cs" /> @@ -165,13 +157,5 @@ <Link>Common\System\PlatformDetection.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Dynamic.Runtime.pkgproj"> - <Project>{C4E89B8C-07DB-40CA-8C99-82A23E8F5F39}</Project> - <Name>System.Dynamic.Runtime</Name> - </ProjectReference> - <!-- Do not remove this P2P reference. System.Dynamic.Runtime is now a facade that type-forwards to System.Linq.Expressions. --> - <ProjectReference Include="..\..\System.Linq.Expressions\pkg\System.Linq.Expressions.pkgproj" Condition="'$(TargetGroup)'==''" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Globalization.Calendars/dir.props b/src/System.Globalization.Calendars/dir.props index 503cf86a87..bfbc5bd9e0 100644 --- a/src/System.Globalization.Calendars/dir.props +++ b/src/System.Globalization.Calendars/dir.props @@ -1,7 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> - +</Project>
\ No newline at end of file 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 e8a3aad0ed..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-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Globalization.Calendars/src/Configurations.props b/src/System.Globalization.Calendars/src/Configurations.props new file mode 100644 index 0000000000..9c336c0be9 --- /dev/null +++ b/src/System.Globalization.Calendars/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Globalization.Calendars/src/System.Globalization.Calendars.builds b/src/System.Globalization.Calendars/src/System.Globalization.Calendars.builds deleted file mode 100644 index d40b4cab5e..0000000000 --- a/src/System.Globalization.Calendars/src/System.Globalization.Calendars.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.Globalization.Calendars.csproj" /> - <Project Include="System.Globalization.Calendars.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Globalization.Calendars/src/System.Globalization.Calendars.csproj b/src/System.Globalization.Calendars/src/System.Globalization.Calendars.csproj index f60029928e..5c74604542 100644 --- a/src/System.Globalization.Calendars/src/System.Globalization.Calendars.csproj +++ b/src/System.Globalization.Calendars/src/System.Globalization.Calendars.csproj @@ -1,10 +1,9 @@ -<?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> <AssemblyName>System.Globalization.Calendars</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -13,10 +12,10 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> <ItemGroup> <TargetingPackReference Include="mscorlib" Condition="'$(TargetGroup)' == 'net463'" /> - <TargetingPackReference Include="System.Private.CoreLib" Condition="'$(TargetGroup)' != 'net463'" /> + <TargetingPackReference Include="System.Private.CoreLib" Condition="'$(TargetGroup)' == 'netstandard'" /> </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/netcore50aot/project.json b/src/System.Globalization.Calendars/src/netcore50aot/project.json deleted file mode 100644 index e0b980805d..0000000000 --- a/src/System.Globalization.Calendars/src/netcore50aot/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "frameworks": { - "netcore50": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24904-00" - } - } - } -} diff --git a/src/System.Globalization.Calendars/src/project.json b/src/System.Globalization.Calendars/src/project.json deleted file mode 100644 index 4ba699b0b8..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-24904-03" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Globalization.Calendars/tests/Configurations.props b/src/System.Globalization.Calendars/tests/Configurations.props new file mode 100644 index 0000000000..512c938bad --- /dev/null +++ b/src/System.Globalization.Calendars/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.csproj b/src/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.csproj index 8070e8abeb..14ef89a7c7 100644 --- a/src/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.csproj +++ b/src/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Globalization.Calendars.Tests</AssemblyName> - <RootNamespace>System.Globalization.Calendars.Tests</RootNamespace> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -133,8 +127,5 @@ <TargetingPackReference Include="System.Core" /> <TargetingPackReference Include="System.Runtime" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Globalization.Calendars.pkgproj" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Globalization.Extensions/dir.props b/src/System.Globalization.Extensions/dir.props index 503cf86a87..bfbc5bd9e0 100644 --- a/src/System.Globalization.Extensions/dir.props +++ b/src/System.Globalization.Extensions/dir.props @@ -1,7 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> - +</Project>
\ No newline at end of file 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 e0e9cf3cdc..0000000000 --- a/src/System.Globalization.Extensions/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Globalization.Extensions/src/Configurations.props b/src/System.Globalization.Extensions/src/Configurations.props new file mode 100644 index 0000000000..0decf0d6c0 --- /dev/null +++ b/src/System.Globalization.Extensions/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard-Unix; + netstandard-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Globalization.Extensions/src/System.Globalization.Extensions.builds b/src/System.Globalization.Extensions/src/System.Globalization.Extensions.builds deleted file mode 100644 index 7a769d21ec..0000000000 --- a/src/System.Globalization.Extensions/src/System.Globalization.Extensions.builds +++ /dev/null @@ -1,18 +0,0 @@ -<?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> - <Project Include="System.Globalization.Extensions.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.Globalization.Extensions.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.Globalization.Extensions.csproj"> - <TargetGroup>net463</TargetGroup> - <OSGroup>Windows_NT</OSGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj b/src/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj index 1aaa040fc1..6d1d9e7e81 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> @@ -8,14 +8,15 @@ <AssemblyName>System.Globalization.Extensions</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <ProjectGuid>{2B96AA10-84C0-4927-8611-8D2474B990E8}</ProjectGuid> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.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> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> <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 +24,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 4c9532a4ae..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-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Globalization.Extensions/tests/Configurations.props b/src/System.Globalization.Extensions/tests/Configurations.props new file mode 100644 index 0000000000..512c938bad --- /dev/null +++ b/src/System.Globalization.Extensions/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Globalization.Extensions/tests/System.Globalization.Extensions.Tests.csproj b/src/System.Globalization.Extensions/tests/System.Globalization.Extensions.Tests.csproj index c1b1621b7c..4bac4b1d75 100644 --- a/src/System.Globalization.Extensions/tests/System.Globalization.Extensions.Tests.csproj +++ b/src/System.Globalization.Extensions/tests/System.Globalization.Extensions.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <RootNamespace>System.Globalization.Extensions.Tests</RootNamespace> - <AssemblyName>System.Globalization.Extensions.Tests</AssemblyName> <ProjectGuid>{BC439554-4AB4-4C94-8E28-C00EDE4FD1C7}</ProjectGuid> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> @@ -48,13 +42,5 @@ <TargetingPackReference Include="System.Runtime" /> <TargetingPackReference Include="System.Threading.Tasks" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Globalization.Extensions.pkgproj"> - <Project>{2b96aa10-84c0-4927-8611-8d2474b990e8}</Project> - <Name>System.Globalization.Extensions</Name> - </ProjectReference> - <ProjectReference Include="..\..\System.Runtime\pkg\System.Runtime.pkgproj" /> - <ProjectReference Include="..\..\System.Runtime.Extensions\pkg\System.Runtime.Extensions.pkgproj" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Globalization/dir.props b/src/System.Globalization/dir.props index 503cf86a87..bfbc5bd9e0 100644 --- a/src/System.Globalization/dir.props +++ b/src/System.Globalization/dir.props @@ -1,7 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> - +</Project>
\ No newline at end of file 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 f53f8e32db..0000000000 --- a/src/System.Globalization/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Globalization/src/Configurations.props b/src/System.Globalization/src/Configurations.props new file mode 100644 index 0000000000..f013d10b8c --- /dev/null +++ b/src/System.Globalization/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + uap101aot-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Globalization/src/System.Globalization.builds b/src/System.Globalization/src/System.Globalization.builds deleted file mode 100644 index 312cbf9de0..0000000000 --- a/src/System.Globalization/src/System.Globalization.builds +++ /dev/null @@ -1,15 +0,0 @@ -<?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> - <Project Include="System.Globalization.csproj" /> - <Project Include="System.Globalization.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - <Project Include="System.Globalization.csproj"> - <TargetGroup>uap101aot</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Globalization/src/System.Globalization.csproj b/src/System.Globalization/src/System.Globalization.csproj index 35a07fbbcd..0259579b3d 100644 --- a/src/System.Globalization/src/System.Globalization.csproj +++ b/src/System.Globalization/src/System.Globalization.csproj @@ -1,11 +1,10 @@ -<?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> <AssemblyName>System.Globalization</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> - <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.7;uap10.1</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -16,10 +15,10 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> <ItemGroup> <TargetingPackReference Include="mscorlib" Condition="'$(TargetGroup)' == 'net463'" /> - <TargetingPackReference Include="System.Private.CoreLib" Condition="'$(TargetGroup)' != 'net463'" /> + <TargetingPackReference Include="System.Private.CoreLib" Condition="'$(TargetGroup)' == 'netstandard' or '$(TargetGroup)' == 'uap101aot'" /> </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 3826031beb..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-24904-03" - } - }, - "uap10.1": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24904-00" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.Globalization/tests/Configurations.props b/src/System.Globalization/tests/Configurations.props new file mode 100644 index 0000000000..512c938bad --- /dev/null +++ b/src/System.Globalization/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Globalization/tests/Performance/System.Globalization.Performance.Tests.csproj b/src/System.Globalization/tests/Performance/System.Globalization.Performance.Tests.csproj index 599e669b7d..bf2f1cafab 100644 --- a/src/System.Globalization/tests/Performance/System.Globalization.Performance.Tests.csproj +++ b/src/System.Globalization/tests/Performance/System.Globalization.Performance.Tests.csproj @@ -2,11 +2,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> - <RootNamespace>System.Globalization.Performance.Tests</RootNamespace> - <AssemblyName>System.Globalization.Performance.Tests</AssemblyName> <IncludePerformanceTests>true</IncludePerformanceTests> <DefineConstants Condition="'$(TargetGroup)' == 'net46'">$(DefineConstants);net46</DefineConstants> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> diff --git a/src/System.Globalization/tests/System.Globalization.Tests.csproj b/src/System.Globalization/tests/System.Globalization.Tests.csproj index 9d64e8c99d..32a871ee60 100644 --- a/src/System.Globalization/tests/System.Globalization.Tests.csproj +++ b/src/System.Globalization/tests/System.Globalization.Tests.csproj @@ -2,14 +2,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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{7F5F5134-00FE-4DE8-B20C-3DA8BA2EBA68}</ProjectGuid> - <OutputType>Library</OutputType> - <RootNamespace>System.Globalization.Tests</RootNamespace> - <AssemblyName>System.Globalization.Tests</AssemblyName> <DefineConstants Condition="'$(TargetGroup)' == 'net46'">$(DefineConstants);net46</DefineConstants> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -147,11 +141,8 @@ <Project>{69e46a6f-9966-45a5-8945-2559fe337827}</Project> <Name>RemoteExecutorConsoleApp</Name> </ProjectReference> - <ProjectReference Include="..\pkg\System.Globalization.pkgproj"> - <Name>System.Globalization</Name> - </ProjectReference> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == ''"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard1.7'"> <Compile Include="CharUnicodeInfo\CharUnicodeInfoTests.netstandard1.7.cs" /> <Compile Include="CompareInfo\CompareInfoTests.netstandard1.7.cs" /> <Compile Include="CultureInfo\CultureInfoTests.netstandard1.7.cs" /> @@ -162,11 +153,6 @@ <Compile Include="StringInfo\StringInfoTests.netstandard1.7.cs" /> <Compile Include="SortVersion\SortVersionTests.netstandard1.7.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\System.Runtime\pkg\System.Runtime.pkgproj"> - <Name>System.Runtime</Name> - </ProjectReference> - </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == 'net46'"> <TargetingPackReference Include="System" /> <TargetingPackReference Include="System.Threading.Tasks" /> @@ -174,9 +160,6 @@ <TargetingPackReference Include="System.Runtime" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> - </ItemGroup> - <ItemGroup> <EmbeddedResource Include="$(CommonTestPath)\Data\UnicodeData.8.0.txt"> <Link>CharUnicodeInfo\UnicodeData8.0.txt</Link> <LogicalName>UnicodeData.8.0.txt</LogicalName> diff --git a/src/System.IO.Compression.ZipFile/dir.props b/src/System.IO.Compression.ZipFile/dir.props index 16a766f83b..14527fd4b3 100644 --- a/src/System.IO.Compression.ZipFile/dir.props +++ b/src/System.IO.Compression.ZipFile/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.0.3.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ No newline at end of file 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/Configurations.props b/src/System.IO.Compression.ZipFile/src/Configurations.props new file mode 100644 index 0000000000..24e575d57f --- /dev/null +++ b/src/System.IO.Compression.ZipFile/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net46-Windows_NT; + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.builds b/src/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.builds deleted file mode 100644 index a2a755e43d..0000000000 --- a/src/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.IO.Compression.ZipFile.csproj" /> - <Project Include="System.IO.Compression.ZipFile.csproj"> - <TargetGroup>net46</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - 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..d19bdf5ac9 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> @@ -7,14 +7,13 @@ <ProjectGuid>{D5FF747F-7A0B-9003-885A-FE9A63E755E5}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker> </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)' == 'net46_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' == ''"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard1.3'"> <Compile Include="System\IO\Compression\ZipFile.cs" /> <Compile Include="System\IO\Compression\ZipFileExtensions.cs" /> <Compile Include="$(CommonPath)\System\IO\PathInternal.CaseSensitivity.cs"> @@ -26,7 +25,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.ZipFile/tests/Configurations.props b/src/System.IO.Compression.ZipFile/tests/Configurations.props new file mode 100644 index 0000000000..f0ebe53119 --- /dev/null +++ b/src/System.IO.Compression.ZipFile/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj b/src/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj index 0f5e6832f6..2674d6f866 100644 --- a/src/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj +++ b/src/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj @@ -2,23 +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> - <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> - <Platform Condition="'$(Platform)' == ''">AnyCPU</Platform> <ProjectGuid>{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.IO.Compression.ZipFile.Tests</AssemblyName> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <ItemGroup> - <ProjectReference Include="..\pkg\System.IO.Compression.ZipFile.pkgproj"> - <Project>{A8CF61F0-56EA-4b5f-9375-0723DF4250C0}</Project> - <Name>System.IO.Compression.ZipFile</Name> - <Private>True</Private> - </ProjectReference> - </ItemGroup> - <ItemGroup> <Compile Include="ZipFileConvenienceMethods.cs" /> <Compile Include="ZipFileInvalidFileTests.cs" /> <Compile Include="ZipFileReadOpenUpdateTests.cs" /> diff --git a/src/System.IO.Compression/dir.props b/src/System.IO.Compression/dir.props index 7bb155c44e..a960cef1a3 100644 --- a/src/System.IO.Compression/dir.props +++ b/src/System.IO.Compression/dir.props @@ -1,7 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.2.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.IO.Compression/ref/4.1.0/System.IO.Compression.depproj b/src/System.IO.Compression/ref/4.1.0/System.IO.Compression.depproj deleted file mode 100644 index 4e2e5fed79..0000000000 --- a/src/System.IO.Compression/ref/4.1.0/System.IO.Compression.depproj +++ /dev/null @@ -1,14 +0,0 @@ -<?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.1.0.0</AssemblyVersion> - <OutputType>Library</OutputType> - <PackageTargetFramework>netstandard1.3</PackageTargetFramework> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> - </PropertyGroup> - <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.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 b1a3fc5872..0000000000 --- a/src/System.IO.Compression/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.IO.Compression/src/Configurations.props b/src/System.IO.Compression/src/Configurations.props new file mode 100644 index 0000000000..3bb6330d9e --- /dev/null +++ b/src/System.IO.Compression/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard-Unix; + netstandard-Windows_NT; + net463-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.IO.Compression/src/System.IO.Compression.builds b/src/System.IO.Compression/src/System.IO.Compression.builds deleted file mode 100644 index 9d9b5d8935..0000000000 --- a/src/System.IO.Compression/src/System.IO.Compression.builds +++ /dev/null @@ -1,17 +0,0 @@ -<?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> - <Project Include="System.IO.Compression.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.IO.Compression.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.IO.Compression.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.IO.Compression/src/System.IO.Compression.csproj b/src/System.IO.Compression/src/System.IO.Compression.csproj index 490a21617b..eefce76ce4 100644 --- a/src/System.IO.Compression/src/System.IO.Compression.csproj +++ b/src/System.IO.Compression/src/System.IO.Compression.csproj @@ -1,8 +1,5 @@ -<?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> <AssemblyName>System.IO.Compression</AssemblyName> @@ -12,10 +9,9 @@ <ProjectGuid>{5471BFE8-8071-466F-838E-5ADAA779E742}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <UseECMAKey>true</UseECMAKey> - <DefineConstants Condition="'$(TargetGroup)' != 'net46' And '$(TargetGroup)' != 'net463'">$(DefineConstants);FEATURE_ZLIB</DefineConstants> + <DefineConstants Condition="'$(TargetGroup)' == 'netstandard'">$(DefineConstants);FEATURE_ZLIB</DefineConstants> <DefineConstants Condition="'$(AssemblyVersion)'!='4.1.2.0'">$(DefineConstants);netstandard17</DefineConstants> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46' Or '$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the options --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> @@ -66,7 +62,7 @@ <Compile Include="System\IO\Compression\PositionPreservingWriteOnlyStreamWrapper.cs" /> </ItemGroup> <!-- Files exclusive to Core --> - <ItemGroup Condition="'$(TargetGroup)' != 'net46' And '$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="System\IO\Compression\CompressionLevel.cs" /> <Compile Include="System\IO\Compression\CompressionMode.cs" /> <Compile Include="System\IO\Compression\GZipStream.cs" /> @@ -79,7 +75,7 @@ <Link>Common\System\IO\StreamHelpers.CopyValidation.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == '' "> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard' "> <Compile Include="System\IO\Compression\ZLibException.Serialization.cs" /> </ItemGroup> <!-- Windows specific files common to both net46 and Core --> @@ -90,7 +86,7 @@ </Compile> </ItemGroup> <!-- Windows specific files exclusive to Core --> - <ItemGroup Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' != 'net46' And '$(TargetGroup)' != 'net463'"> + <ItemGroup Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' == 'netstandard'"> <Compile Include="System\IO\Compression\DeflateZLib\ZLibNative.Windows.cs" /> <Compile Include="Interop\Interop.zlib.Windows.cs" /> <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs"> @@ -120,7 +116,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 590a0c6936..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-24904-01", - "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-24904-01", - "System.Buffers": "4.3.0", - "System.Collections": "4.4.0-beta-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - } - }, - "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" - } - } - } -} diff --git a/src/System.IO.Compression/tests/Configurations.props b/src/System.IO.Compression/tests/Configurations.props new file mode 100644 index 0000000000..981075fcc5 --- /dev/null +++ b/src/System.IO.Compression/tests/Configurations.props @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3-Unix; + netstandard1.3-Windows_NT; + netstandard1.7-Unix; + netstandard1.7-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.IO.Compression/tests/Performance/Configurations.props b/src/System.IO.Compression/tests/Performance/Configurations.props new file mode 100644 index 0000000000..46f6878dcd --- /dev/null +++ b/src/System.IO.Compression/tests/Performance/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netcoreapp1.1; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.IO.Compression/tests/Performance/System.IO.Compression.Performance.Tests.csproj b/src/System.IO.Compression/tests/Performance/System.IO.Compression.Performance.Tests.csproj index cb6a7c5d19..84691bece9 100644 --- a/src/System.IO.Compression/tests/Performance/System.IO.Compression.Performance.Tests.csproj +++ b/src/System.IO.Compression/tests/Performance/System.IO.Compression.Performance.Tests.csproj @@ -1,24 +1,13 @@ <?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> <AssemblyName>System.IO.Compression.Performance.Tests</AssemblyName> <IncludePerformanceTests>true</IncludePerformanceTests> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <ItemGroup> - <ProjectReference Include="..\..\pkg\System.IO.Compression.pkgproj"> - <Project>{5471BFE8-8071-466f-838E-5ADAA779E742}</Project> - <Name>System.IO.Compression</Name> - <Private>True</Private> - </ProjectReference> - </ItemGroup> - <ItemGroup> <Compile Include="..\Utilities\StripHeaderAndFooter.cs" /> <Compile Include="$(CommonTestPath)\System\IO\Compression\LocalMemoryStream.cs"> <Link>Common\System\IO\Compression\LocalMemoryStream.cs</Link> diff --git a/src/System.IO.Compression/tests/System.IO.Compression.Tests.csproj b/src/System.IO.Compression/tests/System.IO.Compression.Tests.csproj index 751a66c4d8..5b08c41411 100644 --- a/src/System.IO.Compression/tests/System.IO.Compression.Tests.csproj +++ b/src/System.IO.Compression/tests/System.IO.Compression.Tests.csproj @@ -1,31 +1,16 @@ <?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> - <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> - <Platform Condition="'$(Platform)' == ''">AnyCPU</Platform> <ProjectGuid>{BC2E1649-291D-412E-9529-EDDA94FA7AD6}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.IO.Compression.Tests</AssemblyName> - <NugetTargetMoniker Condition="'$(TargetGroup)'==''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3_Release|AnyCPU'" /> <ItemGroup> - <ProjectReference Include="..\pkg\System.IO.Compression.pkgproj"> - <Project>{5471BFE8-8071-466f-838E-5ADAA779E742}</Project> - <Name>System.IO.Compression</Name> - <Private>True</Private> - </ProjectReference> - </ItemGroup> - <ItemGroup> <Compile Include="DeflateStreamTests.cs" /> - <Compile Include="DeflateStreamTests.netstandard1.7.cs" Condition="'$(TargetGroup)'==''" /> + <Compile Include="DeflateStreamTests.netstandard1.7.cs" Condition="'$(TargetGroup)'=='netstandard1.7'" /> <Compile Include="GZipStreamTests.cs" /> <Compile Include="XunitAssemblyAttributes.cs" /> <Compile Include="ZipArchive\zip_CreateTests.cs" /> 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/Configurations.props b/src/System.IO.FileSystem.AccessControl/src/Configurations.props new file mode 100644 index 0000000000..a6c74d0e58 --- /dev/null +++ b/src/System.IO.FileSystem.AccessControl/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net46-Windows_NT; + netstandard1.3-Windows_NT; + netstandard1.3-Unix; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.builds b/src/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.builds deleted file mode 100644 index d639f0c8ac..0000000000 --- a/src/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.builds +++ /dev/null @@ -1,18 +0,0 @@ -<?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> - <Project Include="System.IO.FileSystem.AccessControl.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.IO.FileSystem.AccessControl.csproj" > - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.IO.FileSystem.AccessControl.csproj"> - <OSGroup>Windows_NT</OSGroup> - <TargetGroup>net46</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - 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..1c61f6e2f8 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> @@ -7,17 +7,16 @@ <PropertyGroup> <AssemblyName>System.IO.FileSystem.AccessControl</AssemblyName> <ProjectGuid>{D77FBA6C-1AA6-45A4-93E2-97A370672C53}</ProjectGuid> - <AllowUnsafeBlocks Condition="'$(TargetGroup)'==''">true</AllowUnsafeBlocks> + <AllowUnsafeBlocks Condition="'$(TargetGroup)'=='netstandard1.3'">true</AllowUnsafeBlocks> <GeneratePlatformNotSupportedAssembly Condition="'$(TargetsUnix)' == 'true'">true</GeneratePlatformNotSupportedAssembly> <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net46'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker> </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)' == 'net46_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)'!='net46' AND '$(TargetsWindows)'=='true'"> + <ItemGroup Condition="'$(TargetGroup)'=='netstandard1.3' AND '$(TargetsWindows)'=='true'"> <Compile Include="$(CommonPath)\Interop\Windows\Interop.Errors.cs"> <Link>Common\Interop\Windows\Interop.Errors.cs</Link> </Compile> @@ -32,5 +31,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.AccessControl/tests/Configurations.props b/src/System.IO.FileSystem.AccessControl/tests/Configurations.props new file mode 100644 index 0000000000..5d77dc616e --- /dev/null +++ b/src/System.IO.FileSystem.AccessControl/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj b/src/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj index 5d7a63146f..fd855d7b43 100644 --- a/src/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj +++ b/src/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj @@ -3,20 +3,11 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{5915DD11-5D57-45A9-BFB0-56FEB7741E1F}</ProjectGuid> - <AssemblyName>System.IO.FileSystem.AccessControl.Tests</AssemblyName> - <RootNamespace>System.IO.FileSystem.AccessControl.Tests</RootNamespace> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <ItemGroup> <Compile Include="FileSystemAclExtensionsTests.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.IO.FileSystem.AccessControl.pkgproj"> - <Project>{96AA2060-C846-4E56-9509-E8CB9C114C8F}</Project> - <Name>System.IO.FileSystem.AccessControl</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ 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 4ddd966299..0000000000 --- a/src/System.IO.FileSystem.DriveInfo/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.IO.FileSystem.DriveInfo/src/Configurations.props b/src/System.IO.FileSystem.DriveInfo/src/Configurations.props new file mode 100644 index 0000000000..3bb6330d9e --- /dev/null +++ b/src/System.IO.FileSystem.DriveInfo/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard-Unix; + netstandard-Windows_NT; + net463-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.builds b/src/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.builds deleted file mode 100644 index 73d37c9379..0000000000 --- a/src/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.builds +++ /dev/null @@ -1,17 +0,0 @@ -<?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> - <Project Include="System.IO.FileSystem.DriveInfo.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.IO.FileSystem.DriveInfo.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.IO.FileSystem.DriveInfo.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - 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..f987b59de2 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,8 +1,5 @@ -<?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> <RootNamespace>System.IO.FileSystem.DriveInfo</RootNamespace> @@ -10,7 +7,6 @@ <ProjectGuid>{29C14AD7-DC03-45DC-897D-8DACC762707E}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Debug|AnyCPU'" /> @@ -19,7 +15,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="System\IO\DriveInfo.cs" /> <Compile Include="System\IO\DriveNotFoundException.cs" /> <Compile Include="System\IO\DriveType.cs" /> @@ -33,7 +29,7 @@ <Link>Common\System\IO\PathInternal.CaseSensitivity.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' != 'net463' "> + <ItemGroup Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' == 'netstandard' "> <Compile Include="System\IO\Error.cs" /> <Compile Include="System\IO\DriveInfo.Windows.cs" /> <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs"> @@ -79,7 +75,7 @@ <Link>Common\System\IO\PathInternal.Windows.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition=" '$(TargetsUnix)' == 'true' And '$(TargetGroup)' != 'net463' "> + <ItemGroup Condition=" '$(TargetsUnix)' == 'true' And '$(TargetGroup)' == 'netstandard' "> <Compile Include="System\IO\DriveInfo.Unix.cs" /> <Compile Include="$(CommonPath)\Interop\Unix\Interop.Libraries.cs"> <Link>Common\Interop\Unix\Interop.Libraries.cs</Link> @@ -107,7 +103,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 80cb780ece..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-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.IO.FileSystem.DriveInfo/tests/Configurations.props b/src/System.IO.FileSystem.DriveInfo/tests/Configurations.props new file mode 100644 index 0000000000..2a160a39e8 --- /dev/null +++ b/src/System.IO.FileSystem.DriveInfo/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3-Windows_NT; + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj b/src/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj index 4904170a16..19ffca7f20 100644 --- a/src/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj +++ b/src/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj @@ -2,19 +2,11 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <RootNamespace>System.IO.FileSystem.DriveInfo.Tests</RootNamespace> - <AssemblyName>System.IO.FileSystem.DriveInfo.Tests</AssemblyName> <ProjectGuid>{7D9E5F2F-5677-40FC-AD04-FA7D603E4806}</ProjectGuid> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> <ItemGroup> <Compile Include="DriveInfo.Unix.Tests.cs" /> <Compile Include="DriveInfo.Windows.Tests.cs" /> @@ -22,11 +14,5 @@ <Link>Common\System\PlatformDetection.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.IO.FileSystem.DriveInfo.pkgproj"> - <Project>{29c14ad7-dc03-45dc-897d-8dacc762707e}</Project> - <Name>System.IO.FileSystem.DriveInfo</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.IO.FileSystem.Primitives/dir.props b/src/System.IO.FileSystem.Primitives/dir.props index fcc1a7ca5a..bfbc5bd9e0 100644 --- a/src/System.IO.FileSystem.Primitives/dir.props +++ b/src/System.IO.FileSystem.Primitives/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ No newline at end of file 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 6a888fa15b..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,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.IO.FileSystem.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.IO.FileSystem.Primitives/ref/project.json b/src/System.IO.FileSystem.Primitives/ref/project.json deleted file mode 100644 index f53f8e32db..0000000000 --- a/src/System.IO.FileSystem.Primitives/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.IO.FileSystem.Primitives/src/Configurations.props b/src/System.IO.FileSystem.Primitives/src/Configurations.props new file mode 100644 index 0000000000..9c336c0be9 --- /dev/null +++ b/src/System.IO.FileSystem.Primitives/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.IO.FileSystem.Primitives/src/System.IO.FileSystem.Primitives.builds b/src/System.IO.FileSystem.Primitives/src/System.IO.FileSystem.Primitives.builds deleted file mode 100644 index c4ba07a0df..0000000000 --- a/src/System.IO.FileSystem.Primitives/src/System.IO.FileSystem.Primitives.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.IO.FileSystem.Primitives.csproj" /> - <Project Include="System.IO.FileSystem.Primitives.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - 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 358e6f0022..e98920dba5 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,21 +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> <ProjectGuid>{6C05678E-394C-4CFF-B453-A18E28C8F2C3}</ProjectGuid> <AssemblyName>System.IO.FileSystem.Primitives</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.7_Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.7_Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard_Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard_Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> <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 ac13f931ff..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-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.IO.FileSystem.Primitives/tests/Configurations.props b/src/System.IO.FileSystem.Primitives/tests/Configurations.props new file mode 100644 index 0000000000..98f53209d4 --- /dev/null +++ b/src/System.IO.FileSystem.Primitives/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.IO.FileSystem.Primitives/tests/System.IO.FileSystem.Primitives.Tests.csproj b/src/System.IO.FileSystem.Primitives/tests/System.IO.FileSystem.Primitives.Tests.csproj index 7c242cb7f0..02b34d731d 100644 --- a/src/System.IO.FileSystem.Primitives/tests/System.IO.FileSystem.Primitives.Tests.csproj +++ b/src/System.IO.FileSystem.Primitives/tests/System.IO.FileSystem.Primitives.Tests.csproj @@ -2,29 +2,10 @@ <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> - <Platform Condition="'$(Platform)' == ''">AnyCPU</Platform> <ProjectGuid>{2EF7EFA5-F171-4CAB-8A29-32833949FD87}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.IO.FileSystem.Primitives.Tests</AssemblyName> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> - <DebugSymbols>true</DebugSymbols> - <PlatformTarget>AnyCPU</PlatformTarget> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'"> - <PlatformTarget>AnyCPU</PlatformTarget> - </PropertyGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.IO.FileSystem.Primitives.pkgproj"> - <Project>{6c05678e-394c-4cff-b453-a18e28c8f2c3}</Project> - <Name>System.IO.FileSystem.Primitives</Name> - </ProjectReference> - </ItemGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <ItemGroup> <Compile Include="FileAccessTests.cs" /> <Compile Include="FileAttributesTests.cs" /> diff --git a/src/System.IO.FileSystem.Watcher/dir.props b/src/System.IO.FileSystem.Watcher/dir.props index 503cf86a87..bfbc5bd9e0 100644 --- a/src/System.IO.FileSystem.Watcher/dir.props +++ b/src/System.IO.FileSystem.Watcher/dir.props @@ -1,7 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> - +</Project>
\ No newline at end of file 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 9b637834c2..0000000000 --- a/src/System.IO.FileSystem.Watcher/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.ComponentModel.Primitives": "4.4.0-beta-24904-01", - "System.ComponentModel.TypeConverter": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.IO.FileSystem.Watcher/src/Configurations.props b/src/System.IO.FileSystem.Watcher/src/Configurations.props new file mode 100644 index 0000000000..d192a53e46 --- /dev/null +++ b/src/System.IO.FileSystem.Watcher/src/Configurations.props @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard-Linux; + netstandard-OSX; + netstandard-Windows_NT; + net463-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.builds b/src/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.builds deleted file mode 100644 index 750900fe3e..0000000000 --- a/src/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.builds +++ /dev/null @@ -1,20 +0,0 @@ -<?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> - <Project Include="System.IO.FileSystem.Watcher.csproj"> - <OSGroup>Linux</OSGroup> - </Project> - <Project Include="System.IO.FileSystem.Watcher.csproj"> - <OSGroup>OSX</OSGroup> - </Project> - <Project Include="System.IO.FileSystem.Watcher.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.IO.FileSystem.Watcher.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - 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..bc31517994 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,14 +1,10 @@ -<?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>{77E702D9-C6D8-4CE4-9941-D3056C3CCBED}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Debug|AnyCPU'" /> @@ -19,7 +15,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'OSX_Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> - <ItemGroup Condition=" '$(TargetGroup)' != 'net463' "> + <ItemGroup Condition=" '$(TargetGroup)' == 'netstandard' "> <Compile Include="System\HResults.cs" /> <Compile Include="System\IO\ErrorEventArgs.cs" /> <Compile Include="System\IO\ErrorEventHandler.cs" /> @@ -40,7 +36,7 @@ <Link>Common\System\IO\PathInternal.CaseSensitivity.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' != 'net463' "> + <ItemGroup Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' == 'netstandard' "> <Compile Include="$(CommonPath)\System\IO\PathInternal.Windows.cs"> <Link>Common\System\IO\PathInternal.Windows.cs</Link> </Compile> @@ -64,7 +60,7 @@ </Compile> <Compile Include="System\IO\FileSystemWatcher.Win32.cs" /> </ItemGroup> - <ItemGroup Condition=" '$(TargetsUnix)' == 'true' And '$(TargetGroup)' != 'net463' "> + <ItemGroup Condition=" '$(TargetsUnix)' == 'true' And '$(TargetGroup)' == 'netstandard' "> <Compile Include="$(CommonPath)\Interop\Unix\Interop.Libraries.cs"> <Link>Common\Interop\Unix\Interop.Libraries.cs</Link> </Compile> @@ -84,7 +80,7 @@ <Link>Common\Interop\Unix\Interop.PathConf.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition=" '$(TargetsLinux)' == 'true' And '$(TargetGroup)' != 'net463' "> + <ItemGroup Condition=" '$(TargetsLinux)' == 'true' And '$(TargetGroup)' == 'netstandard' "> <Compile Include="System\IO\FileSystemWatcher.Linux.cs" /> <Compile Include="$(CommonPath)\Interop\Linux\System.Native\Interop.INotify.cs"> <Link>Common\Interop\Linux\Interop.inotify.cs</Link> @@ -96,7 +92,7 @@ <Link>Common\Interop\Unix\Interop.Stat.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition=" '$(TargetsOSX)' == 'true' And '$(TargetGroup)' != 'net463' "> + <ItemGroup Condition=" '$(TargetsOSX)' == 'true' And '$(TargetGroup)' == 'netstandard' "> <Compile Include="System\IO\FileSystemWatcher.OSX.cs" /> <Compile Include="$(CommonPath)\Interop\OSX\Interop.EventStream.cs"> <Link>Common\Interop\OSX\Interop.EventStream.cs</Link> @@ -123,7 +119,7 @@ <Link>Common\Microsoft\Win32\SafeHandles\SafeEventStreamHandle.OSX.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition=" ('$(TargetsFreeBSD)' == 'true' OR '$(TargetsUnknownUnix)' == 'true') And '$(TargetGroup)' != 'net463' "> + <ItemGroup Condition=" ('$(TargetsFreeBSD)' == 'true' OR '$(TargetsUnknownUnix)' == 'true') And '$(TargetGroup)' == 'netstandard' "> <Compile Include="System\IO\FileSystemWatcher.UnknownUnix.cs" /> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == 'net463'"> @@ -131,7 +127,26 @@ <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> + <ItemGroup Condition="'$(TargetsOSX)' == 'true'"> + <Reference Include="System.Threading.Thread" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetsUnix)' == 'true'"> + <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.IO.FileSystem.Watcher/src/project.json b/src/System.IO.FileSystem.Watcher/src/project.json deleted file mode 100644 index 03126c714d..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-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.ComponentModel.Primitives": "4.4.0-beta-24904-01", - "System.ComponentModel.TypeConverter": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Overlapped": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.IO.FileSystem.Watcher/tests/Configurations.props b/src/System.IO.FileSystem.Watcher/tests/Configurations.props new file mode 100644 index 0000000000..df25450ab0 --- /dev/null +++ b/src/System.IO.FileSystem.Watcher/tests/Configurations.props @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3-Linux; + netstandard1.3-OSX; + netstandard1.3-Windows_NT; + netstandard1.7-Linux; + netstandard1.7-OSX; + netstandard1.7-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj b/src/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj index 04baed0cab..54020a3fb2 100644 --- a/src/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj +++ b/src/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj @@ -1,26 +1,11 @@ <?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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{20411A66-C7A4-4941-8FA2-66308365FD22}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.IO.FileSystem.Watcher.Tests</AssemblyName> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> - <ItemGroup> - <ProjectReference Include="..\pkg\System.IO.FileSystem.Watcher.pkgproj"> - <Project>{77E702D9-C6D8-4CE4-9941-D3056C3CCBED}</Project> - <Name>System.IO.FileSystem.Watcher</Name> - <Private>True</Private> - </ProjectReference> - </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == ''"> <Compile Include="FileSystemWatcher.netstandard17.cs" /> <Compile Include="InternalBufferOverflowException.cs" /> @@ -63,8 +48,5 @@ <Link>Common\System\PlatformDetection.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.IO.FileSystem/dir.props b/src/System.IO.FileSystem/dir.props index 503cf86a87..bfbc5bd9e0 100644 --- a/src/System.IO.FileSystem/dir.props +++ b/src/System.IO.FileSystem/dir.props @@ -1,7 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.IO.FileSystem/ref/4.0.1/project.json b/src/System.IO.FileSystem/ref/4.0.1/project.json deleted file mode 100644 index 2fd05e15e4..0000000000 --- a/src/System.IO.FileSystem/ref/4.0.1/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.IO.FileSystem": "4.3.0" - }, - "frameworks": { - "netstandard1.3": {} - } -}
\ 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 7e936421ce..949503ef1f 100644 --- a/src/System.IO.FileSystem/ref/System.IO.FileSystem.csproj +++ b/src/System.IO.FileSystem/ref/System.IO.FileSystem.csproj @@ -1,15 +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" /> </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.Runtime.Handles\ref\System.Runtime.Handles.csproj" /> + <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> + <ProjectReference Include="..\..\System.IO.FileSystem.Primitives\ref\System.IO.FileSystem.Primitives.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.FileSystem/ref/project.json b/src/System.IO.FileSystem/ref/project.json deleted file mode 100644 index 8256acc61c..0000000000 --- a/src/System.IO.FileSystem/ref/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.IO.FileSystem/src/Configurations.props b/src/System.IO.FileSystem/src/Configurations.props new file mode 100644 index 0000000000..3bb6330d9e --- /dev/null +++ b/src/System.IO.FileSystem/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard-Unix; + netstandard-Windows_NT; + net463-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.IO.FileSystem/src/System.IO.FileSystem.builds b/src/System.IO.FileSystem/src/System.IO.FileSystem.builds deleted file mode 100644 index 8e979b76e7..0000000000 --- a/src/System.IO.FileSystem/src/System.IO.FileSystem.builds +++ /dev/null @@ -1,17 +0,0 @@ -<?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> - <Project Include="System.IO.FileSystem.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.IO.FileSystem.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.IO.FileSystem.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.IO.FileSystem/src/System.IO.FileSystem.csproj b/src/System.IO.FileSystem/src/System.IO.FileSystem.csproj index 8a57606adc..b2a5307669 100644 --- a/src/System.IO.FileSystem/src/System.IO.FileSystem.csproj +++ b/src/System.IO.FileSystem/src/System.IO.FileSystem.csproj @@ -1,8 +1,5 @@ -<?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> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{879C23DC-D828-4DFB-8E92-ABBC11B71035}</ProjectGuid> @@ -15,15 +12,10 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net463'">None</ResourcesSourceOutputDirectory> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <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'" /> @@ -35,7 +27,7 @@ <TargetingPackReference Include="Windows" /> <ProjectReference Include="$(SourceDir)/mscorlib.WinRT-Facade/mscorlib.WinRT-Facade.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="System\IO\Error.cs" /> <Compile Include="System\IO\Directory.cs" /> <Compile Include="System\IO\DirectoryInfo.cs" /> @@ -76,7 +68,7 @@ </Compile> </ItemGroup> <!-- Windows --> - <ItemGroup Condition="'$(TargetsWindows)' == 'true' and '$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetsWindows)' == 'true' and '$(TargetGroup)' == 'netstandard'"> <Compile Include="Microsoft\Win32\SafeHandles\SafeFindHandle.Windows.cs" /> <Compile Include="System\IO\DirectoryInfo.Windows.cs" /> <Compile Include="System\IO\FileInfo.Windows.cs" /> @@ -203,7 +195,7 @@ </Compile> </ItemGroup> <!-- Windows : Win32 only --> - <ItemGroup Condition="'$(TargetsWindows)' == 'true' and '$(EnableWinRT)' != 'true' and '$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetsWindows)' == 'true' and '$(EnableWinRT)' != 'true' and '$(TargetGroup)' == 'netstandard'"> <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.UnsafeCreateFile.cs"> <Link>Common\Interop\Windows\Interop.UnsafeCreateFile.cs</Link> </Compile> @@ -384,7 +376,19 @@ <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.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> + <ItemGroup Condition="'$(TargetsUnix)' == 'true'"> + <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.IO.FileSystem/src/netcore50/project.json b/src/System.IO.FileSystem/src/netcore50/project.json deleted file mode 100644 index c09d56aca3..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-24904-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 aa87f6febf..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-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Text.Encoding.Extensions": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} 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 8241145630..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-24904-01", - "System.Buffers": "4.4.0-beta-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Text.Encoding.Extensions": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Overlapped": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {}, - "netstandard1.3": {} - } -} diff --git a/src/System.IO.FileSystem/tests/Configurations.props b/src/System.IO.FileSystem/tests/Configurations.props new file mode 100644 index 0000000000..981075fcc5 --- /dev/null +++ b/src/System.IO.FileSystem/tests/Configurations.props @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3-Unix; + netstandard1.3-Windows_NT; + netstandard1.7-Unix; + netstandard1.7-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.IO.FileSystem/tests/Performance/System.IO.FileSystem.Performance.Tests.csproj b/src/System.IO.FileSystem/tests/Performance/System.IO.FileSystem.Performance.Tests.csproj index 29539b44c0..1298befd0e 100644 --- a/src/System.IO.FileSystem/tests/Performance/System.IO.FileSystem.Performance.Tests.csproj +++ b/src/System.IO.FileSystem/tests/Performance/System.IO.FileSystem.Performance.Tests.csproj @@ -5,28 +5,11 @@ </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <AssemblyName>System.IO.FileSystem.Performance.Tests</AssemblyName> <TestCategories>InnerLoop;OuterLoop</TestCategories> <IncludePerformanceTests>true</IncludePerformanceTests> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> - <DebugSymbols>true</DebugSymbols> - <PlatformTarget>AnyCPU</PlatformTarget> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'"> - <PlatformTarget>AnyCPU</PlatformTarget> - </PropertyGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\pkg\System.IO.FileSystem.pkgproj"> - <Project>{879c23dc-d828-4dfb-8e92-abbc11b71035}</Project> - <Name>System.IO.FileSystem</Name> - <Private>True</Private> - </ProjectReference> - </ItemGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <ItemGroup> <ProjectReference Include="$(CommonTestPath)\System\Diagnostics\RemoteExecutorConsoleApp\RemoteExecutorConsoleApp.csproj"> <Project>{69e46a6f-9966-45a5-8945-2559fe337827}</Project> diff --git a/src/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj b/src/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj index ab7940f2e4..ae04ed5fcc 100644 --- a/src/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj +++ b/src/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj @@ -1,37 +1,13 @@ <?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> - <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> - <Platform Condition="'$(Platform)' == ''">AnyCPU</Platform> <ProjectGuid>{57E8F8D4-0766-4CC7-B3F9-B243B81DB6A5}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.IO.FileSystem.Tests</AssemblyName> <TestCategories>InnerLoop;OuterLoop</TestCategories> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> - <DebugSymbols>true</DebugSymbols> - <PlatformTarget>AnyCPU</PlatformTarget> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'"> - <PlatformTarget>AnyCPU</PlatformTarget> - </PropertyGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.IO.FileSystem.pkgproj"> - <Project>{879c23dc-d828-4dfb-8e92-abbc11b71035}</Project> - <UndefineProperties>%(ProjectReference.UndefineProperties);TargetGroup</UndefineProperties> - <Name>System.IO.FileSystem</Name> - <Private>True</Private> - </ProjectReference> - </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)'==''"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> + <ItemGroup Condition="'$(TargetGroup)'=='netstandard1.7'"> <Compile Include="FileInfo\Serialization.cs" /> <Compile Include="FileInfo\Replace.cs" /> <Compile Include="FileStream\Handle.cs" /> @@ -180,4 +156,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.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 aec2d308c9..0000000000 --- a/src/System.IO.IsolatedStorage/ref/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "System.IO": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.IO.IsolatedStorage/src/Configurations.props b/src/System.IO.IsolatedStorage/src/Configurations.props new file mode 100644 index 0000000000..53b62c64fe --- /dev/null +++ b/src/System.IO.IsolatedStorage/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net461-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.builds b/src/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.builds deleted file mode 100644 index 06b04ebcd5..0000000000 --- a/src/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.builds +++ /dev/null @@ -1,17 +0,0 @@ -<?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> - <Project Include="System.IO.IsolatedStorage.csproj" /> - <Project Include="System.IO.IsolatedStorage.csproj"> - <TargetGroup>net461</TargetGroup> - </Project> - <!-- Dependent assemblies doesn't support uap10.1 yet, so for now we will use the ns1.7 asset instead. Issue: https://github.com/dotnet/corefx/issues/11551 - <Project Include="System.IO.IsolatedStorage.csproj"> - <TargetGroup>uap101</TargetGroup> - </Project> - --> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj b/src/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj index 7089bba2c5..eeaec53f72 100644 --- a/src/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj +++ b/src/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj @@ -1,9 +1,5 @@ -<?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)' == ''"> - </Configuration> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <AssemblyName>System.IO.IsolatedStorage</AssemblyName> @@ -11,8 +7,7 @@ <EnableWinRT Condition="'$(TargetGroup)' == 'uap101'">true</EnableWinRT> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net461'">true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net461'">None</ResourcesSourceOutputDirectory> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> - <PackageTargetFramework Condition="'$(TargetGroup)'==''">netstandard1.7;uap10.1</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)'=='netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Default configurations to help VS understand the options --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -25,7 +20,7 @@ <ProjectReference Include="$(SourceDir)mscorlib.WinRT-Facade\mscorlib.WinRT-Facade.csproj" /> <TargetingPackReference Include="Windows" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' != 'net461'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="System\IO\IsolatedStorage\IsolatedStorageException.cs" /> <Compile Include="System\IO\IsolatedStorage\IsolatedStorageFile.cs" /> <Compile Include="System\IO\IsolatedStorage\IsolatedStorageFileStream.cs" /> @@ -37,24 +32,37 @@ <Link>Common\System\Security\IdentityHelper.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == ''"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="System\IO\IsolatedStorage\IsolatedStorageException.Serialization.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' != 'net461' and '$(EnableWinRT)' != 'true'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard' and '$(EnableWinRT)' != 'true'"> <Compile Include="System\IO\IsolatedStorage\Helper.Win32.Unix.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' != 'net461' and '$(EnableWinRT)' == 'true'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard' and '$(EnableWinRT)' == 'true'"> <Compile Include="System\IO\IsolatedStorage\Helper.WinRT.cs" /> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == 'net461'"> <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 71d620cd09..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-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.IO.FileSystem.AccessControl": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24904-01", - "System.ObjectModel": "4.4.0-beta-24904-01", - "System.Linq": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Algorithms": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - } - }, - "uap10.1": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24904-00", - "Microsoft.TargetingPack.Private.WinRT": "1.0.3", - "System.Collections": "4.3.0", - "System.IO": "4.4.0-beta-24904-01", - "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-24904-01", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.WindowsRuntime": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.3.0" - } - }, - "net461": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.1": "1.0.1" - } - } - } -} diff --git a/src/System.IO.IsolatedStorage/tests/Configurations.props b/src/System.IO.IsolatedStorage/tests/Configurations.props new file mode 100644 index 0000000000..90648972ae --- /dev/null +++ b/src/System.IO.IsolatedStorage/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7-Unix; + netstandard1.7-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj b/src/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj index 0d1de88331..7ccfbe0950 100644 --- a/src/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj +++ b/src/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj @@ -2,13 +2,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> - <Configuration Condition="'$(Configuration)'==''">Debug</Configuration> - <Platform Condition="'$(Platform)' == ''">AnyCPU</Platform> <ProjectGuid>{BF4F9507-8FBD-45EA-81C9-3ED89C052C91}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.IO.IsolatedStorage.Tests</AssemblyName> <TestCategories>InnerLoop;OuterLoop</TestCategories> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the options --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Debug|AnyCPU'" /> @@ -21,15 +16,6 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <ItemGroup> - <None Include="project.json" /> - </ItemGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.IO.IsolatedStorage.pkgproj" /> - </ItemGroup> - <ItemGroup> <Compile Include="$(CommonTestPath)\System\IO\TempDirectory.cs"> <Link>Common\System\IO\TempDirectory.cs</Link> </Compile> diff --git a/src/System.IO.MemoryMappedFiles/dir.props b/src/System.IO.MemoryMappedFiles/dir.props index fcc1a7ca5a..bfbc5bd9e0 100644 --- a/src/System.IO.MemoryMappedFiles/dir.props +++ b/src/System.IO.MemoryMappedFiles/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ No newline at end of file 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 94b4fd688c..0000000000 --- a/src/System.IO.MemoryMappedFiles/ref/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "dependencies": { - "System.IO": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.IO.UnmanagedMemoryStream": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.IO.MemoryMappedFiles/src/Configurations.props b/src/System.IO.MemoryMappedFiles/src/Configurations.props new file mode 100644 index 0000000000..3bb6330d9e --- /dev/null +++ b/src/System.IO.MemoryMappedFiles/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard-Unix; + netstandard-Windows_NT; + net463-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.builds b/src/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.builds deleted file mode 100644 index 166658e0f6..0000000000 --- a/src/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.builds +++ /dev/null @@ -1,17 +0,0 @@ -<?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> - <Project Include="System.IO.MemoryMappedFiles.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.IO.MemoryMappedFiles.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.IO.MemoryMappedFiles.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj b/src/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj index d726292fdd..08705853ef 100644 --- a/src/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj +++ b/src/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj @@ -1,8 +1,5 @@ -<?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>{16EE5522-F387-4C9E-9EF2-B5134B043F37}</ProjectGuid> @@ -10,7 +7,6 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net463'">None</ResourcesSourceOutputDirectory> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> @@ -22,7 +18,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> <!-- Compiled Source Files --> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="$(CommonPath)\System\IO\Error.cs"> <Link>Common\System\IO\Error.cs</Link> </Compile> @@ -35,7 +31,7 @@ <Compile Include="System\IO\MemoryMappedFiles\MemoryMappedViewStream.cs" /> <Compile Include="System\IO\MemoryMappedFiles\MemoryMappedFileRights.cs" /> </ItemGroup> - <ItemGroup Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' == '' "> + <ItemGroup Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' == 'netstandard' "> <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GlobalMemoryStatusEx.cs"> <Link>Common\Interop\Windows\Interop.GlobalMemoryStatusEx.cs</Link> </Compile> @@ -68,7 +64,7 @@ </Compile> <Compile Include="System\IO\MemoryMappedFiles\Interop.Windows.Uap.cs" /> </ItemGroup> - <ItemGroup Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' != 'net463' "> + <ItemGroup Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' == 'netstandard' "> <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs"> <Link>Common\Interop\Windows\Interop.Libraries.cs</Link> </Compile> @@ -193,7 +189,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 30bb082369..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-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24904-01", - "System.IO.UnmanagedMemoryStream": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.IO.MemoryMappedFiles/tests/Configurations.props b/src/System.IO.MemoryMappedFiles/tests/Configurations.props new file mode 100644 index 0000000000..0c2d77f6b7 --- /dev/null +++ b/src/System.IO.MemoryMappedFiles/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3-Unix; + netstandard1.3-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.IO.MemoryMappedFiles/tests/Performance/System.IO.MemoryMappedFiles.Performance.Tests.csproj b/src/System.IO.MemoryMappedFiles/tests/Performance/System.IO.MemoryMappedFiles.Performance.Tests.csproj index 74e916a8fb..73a7934f33 100644 --- a/src/System.IO.MemoryMappedFiles/tests/Performance/System.IO.MemoryMappedFiles.Performance.Tests.csproj +++ b/src/System.IO.MemoryMappedFiles/tests/Performance/System.IO.MemoryMappedFiles.Performance.Tests.csproj @@ -5,13 +5,8 @@ </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <DefaultLanguage>en-US</DefaultLanguage> - <FileAlignment>512</FileAlignment> - <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IncludePerformanceTests>true</IncludePerformanceTests> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> - <AssemblyName>System.IO.MemoryMappedFiles.Performance.Tests</AssemblyName> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> @@ -32,13 +27,6 @@ </Compile> </ItemGroup> <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\pkg\System.IO.MemoryMappedFiles.pkgproj"> - <Project>{16EE5522-F387-4C9E-9EF2-B5134B043F37}</Project> - <Name>System.IO.MemoryMappedFiles</Name> - </ProjectReference> <ProjectReference Include="$(CommonTestPath)\System\Diagnostics\RemoteExecutorConsoleApp\RemoteExecutorConsoleApp.csproj"> <Project>{69e46a6f-9966-45a5-8945-2559fe337827}</Project> <Name>RemoteExecutorConsoleApp</Name> diff --git a/src/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj b/src/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj index 452dc6c451..a40f8df70f 100644 --- a/src/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj +++ b/src/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj @@ -1,19 +1,9 @@ <?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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <DefaultLanguage>en-US</DefaultLanguage> - <FileAlignment>512</FileAlignment> - <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion> <ProjectGuid>{9D6F6254-B5A3-40FF-8925-68AA8D1CE933}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> @@ -41,13 +31,6 @@ <Compile Include="XunitAssemblyAttributes.cs" /> </ItemGroup> <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.IO.MemoryMappedFiles.pkgproj"> - <Project>{16EE5522-F387-4C9E-9EF2-B5134B043F37}</Project> - <Name>System.IO.MemoryMappedFiles</Name> - </ProjectReference> <ProjectReference Include="$(CommonTestPath)\System\Diagnostics\RemoteExecutorConsoleApp\RemoteExecutorConsoleApp.csproj"> <Project>{69e46a6f-9966-45a5-8945-2559fe337827}</Project> <Name>RemoteExecutorConsoleApp</Name> 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/Configurations.props b/src/System.IO.Packaging/src/Configurations.props new file mode 100644 index 0000000000..24e575d57f --- /dev/null +++ b/src/System.IO.Packaging/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net46-Windows_NT; + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.IO.Packaging/src/System.IO.Packaging.builds b/src/System.IO.Packaging/src/System.IO.Packaging.builds deleted file mode 100644 index 3b1623e6ac..0000000000 --- a/src/System.IO.Packaging/src/System.IO.Packaging.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.IO.Packaging.csproj" /> - <Project Include="System.IO.Packaging.csproj"> - <TargetGroup>net46</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.IO.Packaging/src/System.IO.Packaging.csproj b/src/System.IO.Packaging/src/System.IO.Packaging.csproj index 3274462331..da81d38e0c 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> @@ -7,7 +7,6 @@ <AssemblyName>System.IO.Packaging</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net46'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the options --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -15,9 +14,20 @@ <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)'==''"> + <ItemGroup Condition="'$(TargetGroup)'=='netstandard1.3'"> <Compile Include="System\IO\Packaging\CompressionOption.cs" /> <Compile Include="System\IO\Packaging\ContentType.cs" /> <Compile Include="System\IO\Packaging\EncryptionOption.cs" /> @@ -50,4 +60,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.Packaging/tests/Configurations.props b/src/System.IO.Packaging/tests/Configurations.props new file mode 100644 index 0000000000..f0ebe53119 --- /dev/null +++ b/src/System.IO.Packaging/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.IO.Packaging/tests/System.IO.Packaging.Tests.csproj b/src/System.IO.Packaging/tests/System.IO.Packaging.Tests.csproj index 856b0097b2..b513b747b2 100644 --- a/src/System.IO.Packaging/tests/System.IO.Packaging.Tests.csproj +++ b/src/System.IO.Packaging/tests/System.IO.Packaging.Tests.csproj @@ -2,33 +2,14 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{C92FF1A4-DEA1-4F0F-9AEB-94C9B2561B57}</ProjectGuid> - <OutputType>Library</OutputType> - <RootNamespace>System.IO.Packaging.Tests</RootNamespace> - <AssemblyName>System.IO.Packaging.Tests</AssemblyName> - <FileAlignment>512</FileAlignment> - <NuGetPackageImportStamp>824750ed</NuGetPackageImportStamp> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> <ItemGroup> <Compile Include="Tests.cs" /> </ItemGroup> <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.IO.Packaging.pkgproj"> - <Project>{1f827c19-6023-48d3-909f-9f43ab42faf0}</Project> - <Name>System.IO.Packaging</Name> - </ProjectReference> - </ItemGroup> - <ItemGroup> <SupplementalTestData Include="$(PackagesDir)System.IO.Packaging.TestData\1.0.0-prerelease\content\**\*.*" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> 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/Configurations.props b/src/System.IO.Pipes.AccessControl/src/Configurations.props new file mode 100644 index 0000000000..a6c74d0e58 --- /dev/null +++ b/src/System.IO.Pipes.AccessControl/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net46-Windows_NT; + netstandard1.3-Windows_NT; + netstandard1.3-Unix; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.builds b/src/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.builds deleted file mode 100644 index 8c9c5f2976..0000000000 --- a/src/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.builds +++ /dev/null @@ -1,18 +0,0 @@ -<?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> - <Project Include="System.IO.Pipes.AccessControl.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.IO.Pipes.AccessControl.csproj"> - <OSGroup>Windows_NT</OSGroup> - <TargetGroup>net46</TargetGroup> - </Project> - <Project Include="System.IO.Pipes.AccessControl.csproj"> - <OSGroup>Unix</OSGroup> <!-- Generates a PlatformNotSupported assembly --> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - 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..7e683e22a5 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,23 +1,19 @@ -<?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> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <AssemblyName>System.IO.Pipes.AccessControl</AssemblyName> <ProjectGuid>{D77FBA6C-1AA6-45A4-93E2-97A370672C53}</ProjectGuid> - <AllowUnsafeBlocks Condition="'$(TargetGroup)'==''">true</AllowUnsafeBlocks> + <AllowUnsafeBlocks Condition="'$(TargetGroup)'=='netstandard1.3'">true</AllowUnsafeBlocks> <GeneratePlatformNotSupportedAssembly Condition="'$(TargetsUnix)' == 'true'">true</GeneratePlatformNotSupportedAssembly> <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net46'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker> </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)' == 'net46_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)'!='net46' AND '$(TargetsWindows)'=='true'"> + <ItemGroup Condition="'$(TargetGroup)'=='netstandard1.3' AND '$(TargetsWindows)'=='true'"> <Compile Include="System\IO\PipeSecurity.cs" /> <Compile Include="System\IO\PipeAccessRights.cs" /> <Compile Include="System\IO\PipeAccessRule.cs" /> @@ -30,7 +26,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.AccessControl/tests/Configurations.props b/src/System.IO.Pipes.AccessControl/tests/Configurations.props new file mode 100644 index 0000000000..5d77dc616e --- /dev/null +++ b/src/System.IO.Pipes.AccessControl/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.csproj b/src/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.csproj index 2705858dc5..084fa1e8ca 100644 --- a/src/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.csproj +++ b/src/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.csproj @@ -1,14 +1,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> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{57E8F8D4-0766-4CC7-B3F9-B243B81DB6A5}</ProjectGuid> - <AssemblyName>System.IO.Pipes.AccessControl.Tests</AssemblyName> - <RootNamespace>System.IO.Pipes.AccessControl.Tests</RootNamespace> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> @@ -24,11 +18,5 @@ <Link>Common\System\IO\FileCleanupTestBase.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.IO.Pipes.AccessControl.pkgproj"> - <Project>{96AA2060-C846-4E56-9509-E8CB9C114C8F}</Project> - <Name>System.IO.Pipes.AccessControl</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ 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 70fb287f77..0000000000 --- a/src/System.IO.Pipes/ref/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "System.IO": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Security.Principal": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.IO.Pipes/src/Configurations.props b/src/System.IO.Pipes/src/Configurations.props new file mode 100644 index 0000000000..3bb6330d9e --- /dev/null +++ b/src/System.IO.Pipes/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard-Unix; + netstandard-Windows_NT; + net463-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.IO.Pipes/src/System.IO.Pipes.builds b/src/System.IO.Pipes/src/System.IO.Pipes.builds deleted file mode 100644 index f79e83a354..0000000000 --- a/src/System.IO.Pipes/src/System.IO.Pipes.builds +++ /dev/null @@ -1,17 +0,0 @@ -<?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> - <Project Include="System.IO.Pipes.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.IO.Pipes.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.IO.Pipes.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.IO.Pipes/src/System.IO.Pipes.csproj b/src/System.IO.Pipes/src/System.IO.Pipes.csproj index fea322e90d..803fdff707 100644 --- a/src/System.IO.Pipes/src/System.IO.Pipes.csproj +++ b/src/System.IO.Pipes/src/System.IO.Pipes.csproj @@ -1,8 +1,5 @@ -<?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>{16EE5522-F387-4C9E-9EF2-B5134B043F37}</ProjectGuid> @@ -12,7 +9,6 @@ <OmitTransitiveCompileReferences>true</OmitTransitiveCompileReferences> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net463'">None</ResourcesSourceOutputDirectory> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> @@ -22,7 +18,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> <!-- Compiled Source Files --> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="Microsoft\Win32\SafeHandles\SafePipeHandle.cs" /> <Compile Include="System\IO\Error.cs" /> <Compile Include="System\IO\Pipes\AnonymousPipeClientStream.cs" /> @@ -41,7 +37,7 @@ <Link>Common\System\Threading\Tasks\TaskToApm.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' != 'net463' "> + <ItemGroup Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' == 'netstandard' "> <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs"> <Link>Common\Interop\Windows\Interop.Libraries.cs</Link> </Compile> @@ -247,7 +243,22 @@ <TargetingPackReference Include="System.Core" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Diagnostics.Tools" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Security.Principal" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Threading.Overlapped" /> + <Reference Include="System.Threading.Tasks" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetsUnix)' == 'true'"> + <Reference Include="Microsoft.Win32.Primitives" /> + <Reference Include="System.Net.Primitives" /> + <Reference Include="System.Net.Sockets" /> </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 0dc15c627e..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-24904-01", - "System.Buffers": "4.4.0-beta-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Net.Sockets": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Security.Principal": "4.4.0-beta-24904-01", - "System.Security.Permissions": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Overlapped": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.IO.Pipes/tests/Configurations.props b/src/System.IO.Pipes/tests/Configurations.props new file mode 100644 index 0000000000..981075fcc5 --- /dev/null +++ b/src/System.IO.Pipes/tests/Configurations.props @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3-Unix; + netstandard1.3-Windows_NT; + netstandard1.7-Unix; + netstandard1.7-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.IO.Pipes/tests/Performance/System.IO.Pipes.Performance.Tests.csproj b/src/System.IO.Pipes/tests/Performance/System.IO.Pipes.Performance.Tests.csproj index 67a7d3d426..8815dc6eac 100644 --- a/src/System.IO.Pipes/tests/Performance/System.IO.Pipes.Performance.Tests.csproj +++ b/src/System.IO.Pipes/tests/Performance/System.IO.Pipes.Performance.Tests.csproj @@ -5,13 +5,8 @@ </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion> - <AppDesignerFolder>Properties</AppDesignerFolder> - <AssemblyName>System.IO.Pipes.Performance.Tests</AssemblyName> - <NuGetPackageImportStamp>d2615b94</NuGetPackageImportStamp> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IncludePerformanceTests>true</IncludePerformanceTests> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> @@ -26,22 +21,11 @@ <Link>Common\System\PerfUtils.cs</Link> </Compile> </ItemGroup> - <!-- Automatically added by VS --> - <ItemGroup> - <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" /> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> <ItemGroup> <ProjectReference Include="$(CommonTestPath)\System\Diagnostics\RemoteExecutorConsoleApp\RemoteExecutorConsoleApp.csproj"> <Project>{69e46a6f-9966-45a5-8945-2559fe337827}</Project> <Name>RemoteExecutorConsoleApp</Name> </ProjectReference> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\pkg\System.IO.Pipes.pkgproj"> - <Project>{16ee5522-f387-4c9e-9ef2-b5134b043f37}</Project> - <Name>System.IO.Pipes</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj b/src/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj index af73663d85..1f97fe89a5 100644 --- a/src/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj +++ b/src/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj @@ -1,26 +1,15 @@ <?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> - <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <AssemblyName>System.IO.Pipes.Tests</AssemblyName> <ProjectGuid>{142469EC-D665-4FE2-845A-FDA69F9CC557}</ProjectGuid> - <NuGetPackageImportStamp>d2615b94</NuGetPackageImportStamp> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <!-- Compiled Source Files --> - <ItemGroup Condition="'$(TargetGroup)' == ''"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard1.7'"> <Compile Include="NamedPipeTests\NamedPipeTest.RunAsClient.cs" /> <Compile Include="NamedPipeTests\NamedPipeTest.Read.netstandard17.cs" /> <Compile Include="NamedPipeTests\NamedPipeTest.netstandard17.cs" /> @@ -59,22 +48,11 @@ <Link>Common\System\PlatformDetection.cs</Link> </Compile> </ItemGroup> - <!-- Automatically added by VS --> - <ItemGroup> - <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" /> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> <ItemGroup> <ProjectReference Include="$(CommonTestPath)\System\Diagnostics\RemoteExecutorConsoleApp\RemoteExecutorConsoleApp.csproj"> <Project>{69e46a6f-9966-45a5-8945-2559fe337827}</Project> <Name>RemoteExecutorConsoleApp</Name> </ProjectReference> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.IO.Pipes.pkgproj"> - <Project>{16ee5522-f387-4c9e-9ef2-b5134b043f37}</Project> - <Name>System.IO.Pipes</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.IO.UnmanagedMemoryStream/dir.props b/src/System.IO.UnmanagedMemoryStream/dir.props index fcc1a7ca5a..bfbc5bd9e0 100644 --- a/src/System.IO.UnmanagedMemoryStream/dir.props +++ b/src/System.IO.UnmanagedMemoryStream/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 d0c7e5ca74..0000000000 --- a/src/System.IO.UnmanagedMemoryStream/ref/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.IO.UnmanagedMemoryStream/src/Configurations.props b/src/System.IO.UnmanagedMemoryStream/src/Configurations.props new file mode 100644 index 0000000000..9c336c0be9 --- /dev/null +++ b/src/System.IO.UnmanagedMemoryStream/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.IO.UnmanagedMemoryStream/src/System.IO.UnmanagedMemoryStream.builds b/src/System.IO.UnmanagedMemoryStream/src/System.IO.UnmanagedMemoryStream.builds deleted file mode 100644 index f6bce5e6b7..0000000000 --- a/src/System.IO.UnmanagedMemoryStream/src/System.IO.UnmanagedMemoryStream.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.IO.UnmanagedMemoryStream.csproj" /> - <Project Include="System.IO.UnmanagedMemoryStream.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.IO.UnmanagedMemoryStream/src/System.IO.UnmanagedMemoryStream.csproj b/src/System.IO.UnmanagedMemoryStream/src/System.IO.UnmanagedMemoryStream.csproj index 553b8363ff..c8ad8ba6e6 100644 --- a/src/System.IO.UnmanagedMemoryStream/src/System.IO.UnmanagedMemoryStream.csproj +++ b/src/System.IO.UnmanagedMemoryStream/src/System.IO.UnmanagedMemoryStream.csproj @@ -1,25 +1,24 @@ -<?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> <ProjectGuid>{BCF9255A-4321-4277-AD7D-F5094092C554}</ProjectGuid> <AssemblyName>System.IO.UnmanagedMemoryStream</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' == ''"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <TargetingPackReference Include="System.Private.CoreLib" /> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == 'net463'"> <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 4ba699b0b8..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-24904-03" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.IO.UnmanagedMemoryStream/tests/Configurations.props b/src/System.IO.UnmanagedMemoryStream/tests/Configurations.props new file mode 100644 index 0000000000..512c938bad --- /dev/null +++ b/src/System.IO.UnmanagedMemoryStream/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.IO.UnmanagedMemoryStream/tests/System.IO.UnmanagedMemoryStream.Tests.csproj b/src/System.IO.UnmanagedMemoryStream/tests/System.IO.UnmanagedMemoryStream.Tests.csproj index 4657aa301a..14381bb806 100644 --- a/src/System.IO.UnmanagedMemoryStream/tests/System.IO.UnmanagedMemoryStream.Tests.csproj +++ b/src/System.IO.UnmanagedMemoryStream/tests/System.IO.UnmanagedMemoryStream.Tests.csproj @@ -2,18 +2,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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{55F26FB1-D4AF-48CA-A470-83113AE7BFDB}</ProjectGuid> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>System.IO.UnmanagedMemoryStream.Tests</RootNamespace> - <AssemblyName>System.IO.UnmanagedMemoryStream.Tests</AssemblyName> - <DefaultLanguage>en-US</DefaultLanguage> - <FileAlignment>512</FileAlignment> - <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NugetTargetMoniker Condition=" '$(TargetGroup)' == '' ">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> @@ -37,14 +27,5 @@ <Compile Include="UmsManager.cs" /> <Compile Include="UmsSecurityTest.cs" /> </ItemGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.IO.UnmanagedMemoryStream.pkgproj"> - <Project>{bcf9255a-4321-4277-ad7d-f5094092c554}</Project> - <Name>System.IO.UnmanagedMemoryStream</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.IO/dir.props b/src/System.IO/dir.props index 7bb155c44e..a960cef1a3 100644 --- a/src/System.IO/dir.props +++ b/src/System.IO/dir.props @@ -1,7 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.2.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.IO/ref/System.IO.csproj b/src/System.IO/ref/System.IO.csproj index 1e5d81bf96..b05e5599c5 100644 --- a/src/System.IO/ref/System.IO.csproj +++ b/src/System.IO/ref/System.IO.csproj @@ -1,17 +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> - <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.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 ef320c111e..0000000000 --- a/src/System.IO/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {}, - "netcoreapp1.1": {} - } -} diff --git a/src/System.IO/src/Configurations.props b/src/System.IO/src/Configurations.props new file mode 100644 index 0000000000..d561a2dc29 --- /dev/null +++ b/src/System.IO/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net461-Windows_NT; + uap101aot-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.IO/src/System.IO.builds b/src/System.IO/src/System.IO.builds deleted file mode 100644 index d6c669ac11..0000000000 --- a/src/System.IO/src/System.IO.builds +++ /dev/null @@ -1,14 +0,0 @@ -<?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> - <Project Include="System.IO.csproj" /> - <Project Include="System.IO.csproj"> - <TargetGroup>net461</TargetGroup> - </Project> - <Project Include="System.IO.csproj"> - <TargetGroup>uap101aot</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project>
\ No newline at end of file diff --git a/src/System.IO/src/System.IO.csproj b/src/System.IO/src/System.IO.csproj index 9c7bfd1254..f7ce1ecec7 100644 --- a/src/System.IO/src/System.IO.csproj +++ b/src/System.IO/src/System.IO.csproj @@ -1,14 +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> <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)' != 'net461'">CS0436</NoWarn> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> + <DefineConstants Condition="'$(TargetGroup)'=='netstandard'">$(DefineConstants);netstandard17</DefineConstants> + <NoWarn Condition="'$(TargetGroup)' == 'netstandard' or '$(TargetGroup)' == 'uap101aot'">CS0436</NoWarn> </PropertyGroup> <!-- Default configurations to help VS understand the options --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -30,7 +31,8 @@ <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 04e8579960..0000000000 --- a/src/System.IO/src/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01" - } - }, - "net461": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.1": "1.0.1" - } - }, - "uap10.1": { - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01" - } - } - } -} diff --git a/src/System.IO/tests/Configurations.props b/src/System.IO/tests/Configurations.props new file mode 100644 index 0000000000..c5ec56bec2 --- /dev/null +++ b/src/System.IO/tests/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.5; + netcoreapp1.1; + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.IO/tests/System.IO.Tests.csproj b/src/System.IO/tests/System.IO.Tests.csproj index e1823860bc..bc66c5924f 100644 --- a/src/System.IO/tests/System.IO.Tests.csproj +++ b/src/System.IO/tests/System.IO.Tests.csproj @@ -2,14 +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" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> <RootNamespace>System.IO</RootNamespace> <AssemblyName>System.IO.Tests</AssemblyName> <ProjectGuid>{492EC54D-D2C4-4B3F-AC1F-646B3F7EBB02}</ProjectGuid> - <DefineConstants Condition="'$(TargetGroup)'==''">$(DefineConstants);netstandard17</DefineConstants> - <NugetTargetMoniker Condition="'$(TargetGroup)'==''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -63,9 +58,5 @@ <Link>Common\System\IO\WrappedMemoryStream.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.IO.pkgproj" /> - <ProjectReference Include="..\..\System.Diagnostics.Debug\pkg\System.Diagnostics.Debug.pkgproj" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Json/src/Configurations.props b/src/System.Json/src/Configurations.props new file mode 100644 index 0000000000..2ec0365c0d --- /dev/null +++ b/src/System.Json/src/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.0; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Json/src/System.Json.builds b/src/System.Json/src/System.Json.builds deleted file mode 100644 index 52c1e4d3a4..0000000000 --- a/src/System.Json/src/System.Json.builds +++ /dev/null @@ -1,9 +0,0 @@ -<?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> - <Project Include="System.Json.csproj" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Json/src/System.Json.csproj b/src/System.Json/src/System.Json.csproj index 3565cc6cf5..1e87db0091 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> @@ -10,7 +10,6 @@ <AssemblyVersion>2.0.5.0</AssemblyVersion> <ProjectGuid>{2ADDB484-6F57-4D71-A3FE-A57EC6329A2B}</ProjectGuid> <PackageTargetFramework>netstandard1.0</PackageTargetFramework> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.0</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the options --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -24,7 +23,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.Json/tests/Configurations.props b/src/System.Json/tests/Configurations.props new file mode 100644 index 0000000000..ec110beba6 --- /dev/null +++ b/src/System.Json/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netcoreapp1.0; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Json/tests/System.Json.Tests.csproj b/src/System.Json/tests/System.Json.Tests.csproj index 45f7c6d28d..cfc188db0f 100644 --- a/src/System.Json/tests/System.Json.Tests.csproj +++ b/src/System.Json/tests/System.Json.Tests.csproj @@ -1,16 +1,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)'==''">Debug</Configuration> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{62E2AD5F-C8D0-45FB-B6A5-AED2C77F198C}</ProjectGuid> - <OutputType>Library</OutputType> - <RootNamespace>System.Json.Tests</RootNamespace> - <AssemblyName>System.Json.Tests</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -22,11 +14,5 @@ <Compile Include="JsonPrimitiveTests.cs" /> <Compile Include="JsonValueTests.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Json.pkgproj"> - <Project>{A958BBDD-3238-4E58-AB7F-390AB6D88233}</Project> - <Name>System.Json</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Linq.Expressions/dir.props b/src/System.Linq.Expressions/dir.props index 7bb155c44e..a960cef1a3 100644 --- a/src/System.Linq.Expressions/dir.props +++ b/src/System.Linq.Expressions/dir.props @@ -1,7 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.2.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Linq.Expressions/ref/4.1.0/project.json b/src/System.Linq.Expressions/ref/4.1.0/project.json deleted file mode 100644 index f6f226113a..0000000000 --- a/src/System.Linq.Expressions/ref/4.1.0/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Linq.Expressions": "4.3.0" - }, - "frameworks": { - "netstandard1.6": {} - } -}
\ 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 ee1d179d1a..0000000000 --- a/src/System.Linq.Expressions/ref/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.ObjectModel": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Linq.Expressions/src/Configurations.props b/src/System.Linq.Expressions/src/Configurations.props new file mode 100644 index 0000000000..53b62c64fe --- /dev/null +++ b/src/System.Linq.Expressions/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net461-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Linq.Expressions/src/System.Linq.Expressions.builds b/src/System.Linq.Expressions/src/System.Linq.Expressions.builds deleted file mode 100644 index 017748425a..0000000000 --- a/src/System.Linq.Expressions/src/System.Linq.Expressions.builds +++ /dev/null @@ -1,18 +0,0 @@ -<?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> - <Project Include="System.Linq.Expressions.csproj" /> - <Project Include="System.Linq.Expressions.csproj"> - <TargetGroup>net461</TargetGroup> - </Project> - <!-- NETCore50 must redistribute binaries due to shared library - <Project Include="System.Linq.Expressions.csproj"> - <TargetGroup>netcore50</TargetGroup> - </Project> - <Project Include="System.Linq.Expressions.csproj"> - <TargetGroup>netcore50aot</TargetGroup> - </Project> --> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> diff --git a/src/System.Linq.Expressions/src/System.Linq.Expressions.csproj b/src/System.Linq.Expressions/src/System.Linq.Expressions.csproj index 275425ba32..a1716d2331 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> @@ -16,7 +16,6 @@ <DefineConstants Condition=" '$(FeatureInterpret)' == 'true' ">$(DefineConstants);FEATURE_INTERPRET</DefineConstants> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net461'">true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net461'">None</ResourcesSourceOutputDirectory> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -49,7 +48,7 @@ <Compile Include="$(CommonPath)\System\Collections\Generic\LargeArrayBuilder.cs"> <Link>Common\System\Collections\Generic\LargeArrayBuilder.cs</Link> </Compile> - <Compile Include="$(CommonPath)\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs" Condition="'$(TargetGroup)'!=''"> + <Compile Include="$(CommonPath)\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs" Condition="'$(TargetGroup)'=='net463' or '$(TargetGroup)' == 'netcore50' or '$(TargetGroup)' == 'netcore50aot'"> <Link>Common\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs</Link> </Compile> <Compile Include="$(CommonPath)\System\Dynamic\Utils\CacheDict.cs"> @@ -142,9 +141,25 @@ <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)'==''"> + <ItemGroup Condition="'$(TargetGroup)'=='netstandard'"> <Compile Include="System\Linq\Expressions\DynamicExpressionVisitor.cs" /> <Compile Include="System\Linq\Expressions\DynamicExpression.cs" /> <Compile Include="System\Linq\Expressions\Expression.netstandard1.7.cs" /> @@ -283,4 +298,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/netcore50/project.json b/src/System.Linq.Expressions/src/netcore50/project.json deleted file mode 100644 index 20a9d1448a..0000000000 --- a/src/System.Linq.Expressions/src/netcore50/project.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24904-00", - "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.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" - }, - "frameworks": { - "netcore50": {} - } -} diff --git a/src/System.Linq.Expressions/src/project.json b/src/System.Linq.Expressions/src/project.json deleted file mode 100644 index 42e278ae56..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-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Linq": "4.4.0-beta-24904-01", - "System.ObjectModel": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Reflection.Emit": "4.4.0-beta-24904-01", - "System.Reflection.Emit.ILGeneration": "4.4.0-beta-24904-01", - "System.Reflection.Emit.Lightweight": "4.4.0-beta-24904-01", - "System.Reflection.Extensions": "4.4.0-beta-24904-01", - "System.Reflection.Primitives": "4.4.0-beta-24904-01", - "System.Reflection.TypeExtensions": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - } - }, - "net461": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.1": "1.0.1" - } - } - } -} diff --git a/src/System.Linq.Expressions/tests/Configurations.props b/src/System.Linq.Expressions/tests/Configurations.props new file mode 100644 index 0000000000..98f53209d4 --- /dev/null +++ b/src/System.Linq.Expressions/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj b/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj index 73b8f0ef78..4501155e16 100644 --- a/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj +++ b/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj @@ -6,23 +6,24 @@ <FeatureInterpret>true</FeatureInterpret> </PropertyGroup> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{4B4AA59B-89F9-4A34-B3C3-C97EF531EE00}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Linq.Expressions.Tests</AssemblyName> - <RootNamespace>System.Linq.Expressions.Tests</RootNamespace> <IsInterpreting Condition="'$(PackageTargetFramework)' == 'netcore50'">true</IsInterpreting> <DefineConstants Condition=" '$(IsInterpreting)' != 'true' ">$(DefineConstants);FEATURE_COMPILE</DefineConstants> <DefineConstants Condition=" '$(FeatureInterpret)' == 'true' ">$(DefineConstants);FEATURE_INTERPRET</DefineConstants> - <KeepAllProjectReferences>true</KeepAllProjectReferences> - <NugetTargetMoniker Condition="'$(TargetGroup)'==''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> + <ItemGroup> + <TargetingPackExclusions Include="System.Linq.Expressions" /> + <ReferenceFromRuntime Include="System.Linq.Expressions" /> + </ItemGroup> + + <ItemGroup> + <!-- Remove this when TypeBuilder extends TypeInfo. See https://github.com/dotnet/corefx/issues/14334 --> + <Compile Include="$(CommonTestPath)\System\TypeBuilderExtensions.cs" /> + </ItemGroup> + <ItemGroup> <Compile Include="CompilerTests.cs" /> <Compile Include="DebugViewTests.cs" /> @@ -251,11 +252,5 @@ <Compile Include="ILReader\LocalsSignatureParser.cs" /> <Compile Include="ILReader\SigParser.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\src\System.Linq.Expressions.csproj"> - <Project>{aef718e9-d4fc-418f-a7ae-ed6b2c7b3787}</Project> - <Name>System.Linq.Expressions</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Linq.Expressions/tests/TestExtensions/TestOrderer.cs b/src/System.Linq.Expressions/tests/TestExtensions/TestOrderer.cs index 5168d7733a..35985108d8 100644 --- a/src/System.Linq.Expressions/tests/TestExtensions/TestOrderer.cs +++ b/src/System.Linq.Expressions/tests/TestExtensions/TestOrderer.cs @@ -16,7 +16,7 @@ namespace System.Linq.Expressions.Tests Dictionary<int, List<TTestCase>> queue = new Dictionary<int, List<TTestCase>>(); foreach (TTestCase testCase in testCases) { - Xunit.Abstractions.IAttributeInfo orderAttribute = testCase.TestMethod.Method.GetCustomAttributes(typeof(TestOrderAttribute)).FirstOrDefault(); + Xunit.Abstractions.IAttributeInfo orderAttribute = ReflectionAbstractionExtensions.GetCustomAttributes(testCase.TestMethod.Method, typeof(TestOrderAttribute)).FirstOrDefault(); int order; if (orderAttribute == null || (order = orderAttribute.GetConstructorArguments().Cast<int>().First()) == 0) { diff --git a/src/System.Linq.Parallel/dir.props b/src/System.Linq.Parallel/dir.props index 16a766f83b..14527fd4b3 100644 --- a/src/System.Linq.Parallel/dir.props +++ b/src/System.Linq.Parallel/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.0.3.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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/Configurations.props b/src/System.Linq.Parallel/src/Configurations.props new file mode 100644 index 0000000000..f0ebe53119 --- /dev/null +++ b/src/System.Linq.Parallel/src/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Linq.Parallel/src/System.Linq.Parallel.builds b/src/System.Linq.Parallel/src/System.Linq.Parallel.builds deleted file mode 100644 index 82ba437203..0000000000 --- a/src/System.Linq.Parallel/src/System.Linq.Parallel.builds +++ /dev/null @@ -1,14 +0,0 @@ -<?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> - <Project Include="System.Linq.Parallel.csproj" /> - <!-- Net46 facade is currently inbox for 4.0 - <Project Include="System.Linq.Parallel.csproj"> - <TargetGroup>net46</TargetGroup> - </Project> - --> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Linq.Parallel/src/System.Linq.Parallel.csproj b/src/System.Linq.Parallel/src/System.Linq.Parallel.csproj index a896cd5cc7..6daac7dded 100644 --- a/src/System.Linq.Parallel/src/System.Linq.Parallel.csproj +++ b/src/System.Linq.Parallel/src/System.Linq.Parallel.csproj @@ -1,22 +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> <ProjectGuid>{BE28323E-327A-4E0F-B7F9-16AB7EAB59DD}</ProjectGuid> <AssemblyName>System.Linq.Parallel</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly> - <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net46'">None</ResourcesSourceOutputDirectory> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker> - <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.3;netcore50</PackageTargetFramework> + <PackageTargetFramework>netstandard1.3;netcore50</PackageTargetFramework> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Release|AnyCPU'" /> <!-- Compiled Source Files --> - <ItemGroup Condition="'$(TargetGroup)' != 'net46'"> + <ItemGroup> <Compile Include="System\Linq\Parallel\Channels\AsynchronousChannel.cs" /> <Compile Include="System\Linq\Parallel\Channels\SynchronousChannel.cs" /> <Compile Include="System\Linq\Parallel\Enumerables\AggregationMinMaxHelpers.cs" /> @@ -155,12 +150,19 @@ <Compile Include="System\Linq\Parallel\Utils\Wrapper.cs" /> <Compile Include="System\Linq\Parallel\Utils\WrapperEqualityComparer.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == 'net46'"> - <TargetingPackReference Include="mscorlib" /> - <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.Parallel/tests/Configurations.props b/src/System.Linq.Parallel/tests/Configurations.props new file mode 100644 index 0000000000..3007f723e5 --- /dev/null +++ b/src/System.Linq.Parallel/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.6; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.csproj b/src/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.csproj index 5e0bd7d1c6..9ee1796304 100644 --- a/src/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.csproj +++ b/src/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.csproj @@ -2,22 +2,11 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{A7074928-82C3-4739-88FE-9B528977950C}</ProjectGuid> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>System.Linq.Parallel.Tests</RootNamespace> - <AssemblyName>System.Linq.Parallel.Tests</AssemblyName> - <NuGetPackageImportStamp>8be98411</NuGetPackageImportStamp> - <NugetTargetMoniker>.NETStandard,Version=v1.6</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> <!-- Compiled Source Files --> <ItemGroup> <Compile Include="$(CommonTestPath)\System\Diagnostics\Tracing\TestEventListener.cs"> @@ -93,17 +82,5 @@ <Compile Include="WithCancellationTests.cs" /> <Compile Include="XunitAssemblyAttributes.cs" /> </ItemGroup> - <!-- Common or Common-branched source files --> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Linq.Parallel.pkgproj"> - <Project>{be28323e-327a-4e0f-b7f9-16ab7eab59dd}</Project> - <Name>System.Linq.Parallel</Name> - </ProjectReference> - </ItemGroup> - <!-- Automatically added by VS --> - <ItemGroup> - <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" /> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Linq.Queryable/dir.props b/src/System.Linq.Queryable/dir.props index 16a766f83b..14527fd4b3 100644 --- a/src/System.Linq.Queryable/dir.props +++ b/src/System.Linq.Queryable/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.0.3.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 56328d2c6f..0000000000 --- a/src/System.Linq.Queryable/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Linq.Expressions": "4.4.0-beta-24904-01", - "System.Linq": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Linq.Queryable/src/Configurations.props b/src/System.Linq.Queryable/src/Configurations.props new file mode 100644 index 0000000000..fc9ef9822c --- /dev/null +++ b/src/System.Linq.Queryable/src/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Linq.Queryable/src/System.Linq.Queryable.builds b/src/System.Linq.Queryable/src/System.Linq.Queryable.builds deleted file mode 100644 index 924a3b266a..0000000000 --- a/src/System.Linq.Queryable/src/System.Linq.Queryable.builds +++ /dev/null @@ -1,13 +0,0 @@ -<?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> - <Project Include="System.Linq.Queryable.csproj" /> - <!-- Net46 facade is currently inbox for 4.0 - <Project Include="System.Linq.Queryable.csproj"> - <TargetGroup>net46</TargetGroup> - </Project> --> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Linq.Queryable/src/System.Linq.Queryable.csproj b/src/System.Linq.Queryable/src/System.Linq.Queryable.csproj index 0ed5b7e1af..b7867ec1a7 100644 --- a/src/System.Linq.Queryable/src/System.Linq.Queryable.csproj +++ b/src/System.Linq.Queryable/src/System.Linq.Queryable.csproj @@ -1,20 +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> <ProjectGuid>{BE12B753-C130-4B68-86E3-877F1AEE52C0}</ProjectGuid> <AssemblyName>System.Linq.Queryable</AssemblyName> <RootNamespace>System.Linq.Queryable</RootNamespace> - <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly> - <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net46'">None</ResourcesSourceOutputDirectory> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' != 'net46'"> + <ItemGroup> <Compile Include="System\Linq\CachedReflection.cs" /> <Compile Include="System\Linq\EnumerableExecutor.cs" /> <Compile Include="System\Linq\EnumerableQuery.cs" /> @@ -24,12 +19,13 @@ <Compile Include="System\Linq\Strings.cs" /> <Compile Include="System\Linq\TypeHelper.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == 'net46'"> - <TargetingPackReference Include="mscorlib" /> - <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 b5aae7ba98..0000000000 --- a/src/System.Linq.Queryable/src/project.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Linq": "4.4.0-beta-24904-01", - "System.Linq.Expressions": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Reflection.Extensions": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Linq.Queryable/tests/Configurations.props b/src/System.Linq.Queryable/tests/Configurations.props new file mode 100644 index 0000000000..98f53209d4 --- /dev/null +++ b/src/System.Linq.Queryable/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.csproj b/src/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.csproj index 76b76a4e56..77b11bb873 100644 --- a/src/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.csproj +++ b/src/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.csproj @@ -2,19 +2,11 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{7B88D79B-B799-4116-A7D0-AED572540CD4}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Linq.Queryable.Tests</AssemblyName> - <RootNamespace>System.Linq.Queryable.Tests</RootNamespace> - <NugetTargetMoniker>.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> <ItemGroup> <Compile Include="AggregateTests.cs" /> <Compile Include="AllTests.cs" /> @@ -64,12 +56,5 @@ <Compile Include="WhereTests.cs" /> <Compile Include="ZipTests.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Linq.Queryable.pkgproj"> - <Project>{be12b753-c130-4b68-86e3-877f1aee52c0}</Project> - <Name>System.Linq.Queryable</Name> - <Private>true</Private> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Linq/dir.props b/src/System.Linq/dir.props index 83d2841dcf..a960cef1a3 100644 --- a/src/System.Linq/dir.props +++ b/src/System.Linq/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.2.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Linq/ref/Configurations.props b/src/System.Linq/ref/Configurations.props new file mode 100644 index 0000000000..ea9ea79f78 --- /dev/null +++ b/src/System.Linq/ref/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netcoreapp; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Linq/ref/System.Linq.cs b/src/System.Linq/ref/System.Linq.cs index c82b0dd6e2..f56fa5ee2a 100644 --- a/src/System.Linq/ref/System.Linq.cs +++ b/src/System.Linq/ref/System.Linq.cs @@ -177,7 +177,7 @@ namespace System.Linq public static System.Collections.Generic.Dictionary<TKey, TSource> ToDictionary<TSource, TKey>(this System.Collections.Generic.IEnumerable<TSource> source, System.Func<TSource, TKey> keySelector, System.Collections.Generic.IEqualityComparer<TKey> comparer) { throw null; } public static System.Collections.Generic.Dictionary<TKey, TElement> ToDictionary<TSource, TKey, TElement>(this System.Collections.Generic.IEnumerable<TSource> source, System.Func<TSource, TKey> keySelector, System.Func<TSource, TElement> elementSelector) { throw null; } public static System.Collections.Generic.Dictionary<TKey, TElement> ToDictionary<TSource, TKey, TElement>(this System.Collections.Generic.IEnumerable<TSource> source, System.Func<TSource, TKey> keySelector, System.Func<TSource, TElement> elementSelector, System.Collections.Generic.IEqualityComparer<TKey> comparer) { throw null; } -#if netcoreapp11 +#if netcoreapp public static System.Collections.Generic.HashSet<TSource> ToHashSet<TSource>(this System.Collections.Generic.IEnumerable<TSource> source) { throw null; } public static System.Collections.Generic.HashSet<TSource> ToHashSet<TSource>(this System.Collections.Generic.IEnumerable<TSource> source, System.Collections.Generic.IEqualityComparer<TSource> comparer) { throw null; } #endif diff --git a/src/System.Linq/ref/System.Linq.csproj b/src/System.Linq/ref/System.Linq.csproj index 33ceccf614..78f9a07458 100644 --- a/src/System.Linq/ref/System.Linq.csproj +++ b/src/System.Linq/ref/System.Linq.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> - <AssemblyVersion>4.2.0.0</AssemblyVersion> - <NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker> - <DefineConstants Condition="'$(TargetGroup)' == 'netcoreapp1.1'">$(DefineConstants);netcoreapp11</DefineConstants> + <DefineConstants Condition="'$(TargetGroup)' == 'netcoreapp'">$(DefineConstants);netcoreapp</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/Configurations.props b/src/System.Linq/src/Configurations.props new file mode 100644 index 0000000000..a502feeae3 --- /dev/null +++ b/src/System.Linq/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net461-Windows_NT; + netstandard1.6; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Linq/src/System.Linq.builds b/src/System.Linq/src/System.Linq.builds deleted file mode 100644 index b0fb7cc0d3..0000000000 --- a/src/System.Linq/src/System.Linq.builds +++ /dev/null @@ -1,11 +0,0 @@ -<?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> - <Project Include="System.Linq.csproj" /> - <Project Include="System.Linq.csproj"> - <TargetGroup>net461</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project>
\ No newline at end of file diff --git a/src/System.Linq/src/System.Linq.csproj b/src/System.Linq/src/System.Linq.csproj index a4060f00df..e13cb48f77 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> @@ -9,20 +9,19 @@ <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net461'">true</IsPartialFacadeAssembly> <!-- The following line needs to be removed once we have a targeting pack for 4.6.3 --> <TargetingPackNugetPackageId Condition="'$(TargetGroup)' == 'net461'">Microsoft.TargetingPack.NETFramework.v4.6.1</TargetingPackNugetPackageId> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.6</NuGetTargetMoniker> - <DefineConstants Condition="'$(TargetGroup)' == ''">$(DefineConstants);netcoreapp11</DefineConstants> + <DefineConstants Condition="'$(TargetGroup)' == 'netstandard1.6'">$(DefineConstants);netcoreapp11</DefineConstants> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> </PropertyGroup> - <ItemGroup Condition="'$(TargetGroup)' == ''"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard1.6'"> <ContractProject Include="..\ref\System.Linq.csproj"> - <TargetGroup>netcoreapp1.1</TargetGroup> + <TargetGroup>netcoreapp</TargetGroup> </ContractProject> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == ''"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard1.6'"> <Compile Include="$(CommonPath)\System\Collections\Generic\ArrayBuilder.cs"> <Link>System\Collections\Generic\ArrayBuilder.cs</Link> </Compile> @@ -89,7 +88,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 5a5d296a42..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" - } - }, - "net461": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.1": "1.0.1" - } - } - } -}
\ No newline at end of file diff --git a/src/System.Linq/tests/Configurations.props b/src/System.Linq/tests/Configurations.props new file mode 100644 index 0000000000..094b5230ab --- /dev/null +++ b/src/System.Linq/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netcoreapp1.1; + netstandard1.6; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Linq/tests/Performance/System.Linq.Performance.Tests.csproj b/src/System.Linq/tests/Performance/System.Linq.Performance.Tests.csproj index 7a89793a8c..f8d2f9c73d 100644 --- a/src/System.Linq/tests/Performance/System.Linq.Performance.Tests.csproj +++ b/src/System.Linq/tests/Performance/System.Linq.Performance.Tests.csproj @@ -2,10 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <AssemblyName>System.Linq.Performance.Tests</AssemblyName> - <RootNamespace>System.Linq.Performance.Tests</RootNamespace> <IncludePerformanceTests>true</IncludePerformanceTests> - <NugetTargetMoniker>.NETStandard,Version=v1.6</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -17,12 +14,5 @@ <Link>Common\System\PerfUtils.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\pkg\System.Linq.pkgproj"> - <Project>{ca488507-3b6e-4494-b7be-7b4eeeb2c4d1}</Project> - <Name>System.Linq</Name> - <Private>True</Private> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Linq/tests/System.Linq.Tests.csproj b/src/System.Linq/tests/System.Linq.Tests.csproj index be46865b71..4a3eb15763 100644 --- a/src/System.Linq/tests/System.Linq.Tests.csproj +++ b/src/System.Linq/tests/System.Linq.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{7C70BB15-870B-4946-8098-625DACD645A6}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Linq.Tests</AssemblyName> - <RootNamespace>System.Linq.Tests</RootNamespace> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.6</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -81,12 +75,5 @@ <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp1.1'"> <Compile Include="ToHashSetTests.netcoreapp1.1.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Linq.pkgproj"> - <Project>{ca488507-3b6e-4494-b7be-7b4eeeb2c4d1}</Project> - <Name>System.Linq</Name> - <Private>True</Private> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ 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..d29e499520 100644 --- a/src/System.Memory/ref/System.Memory.csproj +++ b/src/System.Memory/ref/System.Memory.csproj @@ -1,19 +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> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <OutputType>Library</OutputType> <CLSCompliant>false</CLSCompliant> - <AssemblyVersion>4.0.0.0</AssemblyVersion> - <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker> + <AssemblyVersion>4.0.0.0</AssemblyVersion> <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/Configurations.props b/src/System.Memory/src/Configurations.props new file mode 100644 index 0000000000..584c4d47da --- /dev/null +++ b/src/System.Memory/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.0-Windows_NT; + netcoreapp1.1-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Memory/src/System.Memory.builds b/src/System.Memory/src/System.Memory.builds deleted file mode 100644 index d9c54467a6..0000000000 --- a/src/System.Memory/src/System.Memory.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.Memory.csproj" /> - <Project Include="System.Memory.csproj"> - <TargetGroup>netcoreapp1.1</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Memory/src/System.Memory.csproj b/src/System.Memory/src/System.Memory.csproj index e915393f00..4aed71437a 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> @@ -13,7 +13,7 @@ </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> - <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true'"> + <ItemGroup> <Compile Include="System\Pinnable.cs" /> <Compile Include="System\ReadOnlySpan.cs" /> <Compile Include="System\ReadOnlySpanExtensions.cs" /> @@ -22,11 +22,12 @@ <Compile Include="System\SpanHelpers.cs" /> <Compile Include="System\ThrowHelper.cs" /> </ItemGroup> - <ItemGroup Condition="'$(IsPartialFacadeAssembly)' == 'true'"> - <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 749bad5256..0000000000 --- a/src/System.Memory/src/project.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "frameworks": { - "netstandard1.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-24904-01" - } - }, - "netcoreapp1.1": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03" - } - } - } -} diff --git a/src/System.Memory/tests/Configurations.props b/src/System.Memory/tests/Configurations.props new file mode 100644 index 0000000000..2200b4369a --- /dev/null +++ b/src/System.Memory/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netcoreapp1.1-Windows_NT; + netcoreapp1.0-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Memory/tests/System.Memory.Tests.csproj b/src/System.Memory/tests/System.Memory.Tests.csproj index f42c273ff3..dd182719c9 100644 --- a/src/System.Memory/tests/System.Memory.Tests.csproj +++ b/src/System.Memory/tests/System.Memory.Tests.csproj @@ -1,8 +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> - <AssemblyName>System.Memory.Tests</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> @@ -42,11 +41,5 @@ <Compile Include="ReadOnlySpan\TestHelpers.cs" /> <Compile Include="ReadOnlySpan\ToArray.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Memory.pkgproj"> - <Name>Memory</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> - +</Project>
\ 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.Rtc/src/netcore50/project.json b/src/System.Net.Http.Rtc/src/netcore50/project.json deleted file mode 100644 index bc71b0a654..0000000000 --- a/src/System.Net.Http.Rtc/src/netcore50/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "frameworks": { - "netcore50": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.ObjectModel": "4.3.0", - "System.Net.Http": "4.3.0", - "System.Runtime": "4.3.0" - } - } - } -}
\ No newline at end of file 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/Configurations.props b/src/System.Net.Http.WinHttpHandler/src/Configurations.props new file mode 100644 index 0000000000..06bd657a4b --- /dev/null +++ b/src/System.Net.Http.WinHttpHandler/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3-Windows_NT; + netstandard1.3-Unix; + net46-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.builds b/src/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.builds deleted file mode 100644 index 826a8add63..0000000000 --- a/src/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.builds +++ /dev/null @@ -1,17 +0,0 @@ -<?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> - <Project Include="System.Net.Http.WinHttpHandler.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.Net.Http.WinHttpHandler.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.Net.Http.WinHttpHandler.csproj"> - <TargetGroup>net46</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - 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..4cc36d8b85 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,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"> - <PropertyGroup> - <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Windows_Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{F75E3008-0562-42DF-BE72-C1384F12157E}</ProjectGuid> <OutputType>Library</OutputType> @@ -37,7 +33,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.WinHttpHandler/tests/FunctionalTests/Configurations.props b/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/Configurations.props new file mode 100644 index 0000000000..5d77dc616e --- /dev/null +++ b/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/ServerCertificateTest.cs b/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/ServerCertificateTest.cs index 081462b0c5..4572decda2 100644 --- a/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/ServerCertificateTest.cs +++ b/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/ServerCertificateTest.cs @@ -34,7 +34,7 @@ namespace System.Net.Http.WinHttpHandlerFunctional.Tests { var handler = new WinHttpHandler(); using (var client = new HttpClient(handler)) - using (HttpResponseMessage response = await client.GetAsync(Configuration.Http.SecureRemoteEchoServer)) + using (HttpResponseMessage response = await client.GetAsync(System.Net.Test.Common.Configuration.Http.SecureRemoteEchoServer)) { Assert.Equal(HttpStatusCode.OK, response.StatusCode); Assert.False(_validationCallbackHistory.WasCalled); @@ -48,7 +48,7 @@ namespace System.Net.Http.WinHttpHandlerFunctional.Tests var handler = new WinHttpHandler(); handler.ServerCertificateValidationCallback = CustomServerCertificateValidationCallback; using (var client = new HttpClient(handler)) - using (HttpResponseMessage response = await client.GetAsync(Configuration.Http.RemoteEchoServer)) + using (HttpResponseMessage response = await client.GetAsync(System.Net.Test.Common.Configuration.Http.RemoteEchoServer)) { Assert.Equal(HttpStatusCode.OK, response.StatusCode); Assert.False(_validationCallbackHistory.WasCalled); @@ -62,12 +62,12 @@ namespace System.Net.Http.WinHttpHandlerFunctional.Tests var handler = new WinHttpHandler(); handler.ServerCertificateValidationCallback = CustomServerCertificateValidationCallback; using (var client = new HttpClient(handler)) - using (HttpResponseMessage response = await client.GetAsync(Configuration.Http.SecureRemoteEchoServer)) + using (HttpResponseMessage response = await client.GetAsync(System.Net.Test.Common.Configuration.Http.SecureRemoteEchoServer)) { Assert.Equal(HttpStatusCode.OK, response.StatusCode); Assert.True(_validationCallbackHistory.WasCalled); - ConfirmValidCertificate(Configuration.Http.Host); + ConfirmValidCertificate(System.Net.Test.Common.Configuration.Http.Host); } } @@ -75,7 +75,7 @@ namespace System.Net.Http.WinHttpHandlerFunctional.Tests [Fact] public async Task UseCallback_RedirectandValidCertificate_ExpectedValuesDuringCallback() { - Uri uri = Configuration.Http.RedirectUriForDestinationUri(true, 302, Configuration.Http.SecureRemoteEchoServer, 1); + Uri uri = System.Net.Test.Common.Configuration.Http.RedirectUriForDestinationUri(true, 302, System.Net.Test.Common.Configuration.Http.SecureRemoteEchoServer, 1); var handler = new WinHttpHandler(); handler.ServerCertificateValidationCallback = CustomServerCertificateValidationCallback; @@ -85,7 +85,7 @@ namespace System.Net.Http.WinHttpHandlerFunctional.Tests Assert.Equal(HttpStatusCode.OK, response.StatusCode); Assert.True(_validationCallbackHistory.WasCalled); - ConfirmValidCertificate(Configuration.Http.Host); + ConfirmValidCertificate(System.Net.Test.Common.Configuration.Http.Host); } } @@ -99,10 +99,10 @@ namespace System.Net.Http.WinHttpHandlerFunctional.Tests handler.ServerCertificateValidationCallback = CustomServerCertificateValidationCallback; using (var client = new HttpClient(handler)) { - var request = new HttpRequestMessage(HttpMethod.Get, Configuration.Http.SecureRemoteEchoServer); + var request = new HttpRequestMessage(HttpMethod.Get, System.Net.Test.Common.Configuration.Http.SecureRemoteEchoServer); _validationCallbackHistory.ReturnFailure = true; HttpRequestException ex = await Assert.ThrowsAsync<HttpRequestException>(() => - client.GetAsync(Configuration.Http.SecureRemoteEchoServer)); + client.GetAsync(System.Net.Test.Common.Configuration.Http.SecureRemoteEchoServer)); var innerEx = (Win32Exception)ex.InnerException; Assert.Equal(ERROR_WINHTTP_SECURE_FAILURE, innerEx.NativeErrorCode); } @@ -117,7 +117,7 @@ namespace System.Net.Http.WinHttpHandlerFunctional.Tests using (var client = new HttpClient(handler)) { _validationCallbackHistory.ThrowException = true; - await Assert.ThrowsAsync<CustomException>(() => client.GetAsync(Configuration.Http.SecureRemoteEchoServer)); + await Assert.ThrowsAsync<CustomException>(() => client.GetAsync(System.Net.Test.Common.Configuration.Http.SecureRemoteEchoServer)); } } diff --git a/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj b/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj index d3020360fd..d232cd9d05 100644 --- a/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj +++ b/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj @@ -1,16 +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> - <Configuration Condition=" '$(Configuration)' == '' ">Windows_Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Net.Http.WinHttpHandler.Functional.Tests</AssemblyName> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Release|AnyCPU'" /> @@ -25,12 +17,5 @@ <Compile Include="WinHttpHandlerTest.cs" /> <Compile Include="XunitTestAssemblyAtrributes.cs" /> </ItemGroup> - <ItemGroup Condition=" '$(TargetsWindows)' == 'true' "> - <ProjectReference Include="..\..\pkg\System.Net.Http.WinHttpHandler.pkgproj"> - <Project>{F75E3008-0562-42DF-BE72-C1384F12157E}</Project> - <Name>System.Net.Http.WinHttpHandler</Name> - </ProjectReference> - <ProjectReference Include="..\..\..\System.Net.Http\pkg\System.Net.Http.pkgproj" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/WinHttpHandlerTest.cs b/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/WinHttpHandlerTest.cs index d8918c786d..6a99429ccf 100644 --- a/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/WinHttpHandlerTest.cs +++ b/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/WinHttpHandlerTest.cs @@ -38,7 +38,7 @@ namespace System.Net.Http.WinHttpHandlerFunctional.Tests using (var client = new HttpClient(handler)) { // TODO: This is a placeholder until GitHub Issue #2383 gets resolved. - var response = client.GetAsync(Configuration.Http.RemoteEchoServer).Result; + var response = client.GetAsync(System.Net.Test.Common.Configuration.Http.RemoteEchoServer).Result; Assert.Equal(HttpStatusCode.OK, response.StatusCode); var responseContent = response.Content.ReadAsStringAsync().GetAwaiter().GetResult(); _output.WriteLine(responseContent); @@ -54,7 +54,7 @@ namespace System.Net.Http.WinHttpHandlerFunctional.Tests string cookieName, string cookieValue) { - Uri uri = Configuration.Http.RedirectUriForDestinationUri(false, 302, Configuration.Http.RemoteEchoServer, 1); + Uri uri = System.Net.Test.Common.Configuration.Http.RedirectUriForDestinationUri(false, 302, System.Net.Test.Common.Configuration.Http.RemoteEchoServer, 1); var handler = new WinHttpHandler(); handler.WindowsProxyUsePolicy = WindowsProxyUsePolicy.UseWinInetProxy; handler.CookieUsePolicy = cookieUsePolicy; diff --git a/src/System.Net.Http.WinHttpHandler/tests/UnitTests/Configurations.props b/src/System.Net.Http.WinHttpHandler/tests/UnitTests/Configurations.props new file mode 100644 index 0000000000..5d77dc616e --- /dev/null +++ b/src/System.Net.Http.WinHttpHandler/tests/UnitTests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj b/src/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj index e28dedd56f..304e82795f 100644 --- a/src/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj +++ b/src/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj @@ -1,24 +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"> - <PropertyGroup> - <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Windows_Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{A2ECDEDB-12B7-402C-9230-152B7601179F}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Net.Http.WinHttpHandler.Unit.Tests</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> - <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Release|AnyCPU'" /> - + <ItemGroup> + <TargetingPackExclusions Include="System.Net.Http.WinHttpHandler" /> + </ItemGroup> <ItemGroup Condition=" '$(TargetsWindows)' == 'true' "> <Compile Include="$(CommonTestPath)\System\Net\SslProtocolSupport.cs"> <Link>CommonTest\System\Net\SslProtocolSupport.cs</Link> @@ -38,9 +31,6 @@ <Compile Include="$(CommonPath)\Interop\Windows\winhttp\Interop.winhttp_types.cs"> <Link>Common\Interop\Windows\winhttp\Interop.winhttp_types.cs</Link> </Compile> - <Compile Include="$(CommonPath)\Microsoft\Win32\SafeHandles\SafeHandleZeroOrMinusOneIsInvalid.cs"> - <Link>Common\Microsoft\Win32\SafeHandles\SafeHandleZeroOrMinusOneIsInvalid.cs</Link> - </Compile> <Compile Include="$(CommonPath)\System\CharArrayHelpers.cs"> <Link>Common\System\CharArrayHelpers.cs</Link> </Compile> @@ -62,7 +52,7 @@ <Compile Include="$(CommonPath)\System\Net\HttpStatusDescription.cs"> <Link>Common\System\Net\HttpStatusDescription.cs</Link> </Compile> - <Compile Include="$(CommonPath)\System\Net\HttpVersionInternal.cs"> + <Compile Include="$(CommonPath)\System\Net\HttpVersionInternal.cs"> <Link>Common\System\Net\HttpVersionInternal.cs</Link> </Compile> <Compile Include="$(CommonPath)\System\Net\UriScheme.cs"> @@ -149,6 +139,5 @@ <Compile Include="WinHttpResponseStreamTest.cs" /> <Compile Include="XunitTestAssemblyAtrributes.cs" /> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Http.WinHttpHandler/tests/UnitTests/project.json b/src/System.Net.Http.WinHttpHandler/tests/UnitTests/project.json deleted file mode 100644 index 8e014d7214..0000000000 --- a/src/System.Net.Http.WinHttpHandler/tests/UnitTests/project.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "Microsoft.Win32.Primitives": "4.4.0-beta-24904-01", - "System.Buffers": "4.4.0-beta-24904-01", - "System.Diagnostics.DiagnosticSource": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.Compression": "4.4.0-beta-24904-01", - "System.Linq.Expressions": "4.4.0-beta-24904-01", - "System.Net.Http": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.ObjectModel": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Text.RegularExpressions": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "test-runtime": { - "target": "project", - "exclude": "compile" - }, - "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04", - "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04" - }, - "frameworks": { - "netstandard1.3": {} - }, - "supports": { - "coreFx.Test.netcoreapp1.0": {}, - "coreFx.Test.net46": {}, - "coreFx.Test.net461": {}, - "coreFx.Test.net462": {}, - "coreFx.Test.net463": {} - } -} diff --git a/src/System.Net.Http/dir.props b/src/System.Net.Http/dir.props index 1af9800f25..a960cef1a3 100644 --- a/src/System.Net.Http/dir.props +++ b/src/System.Net.Http/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.2.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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..84ad0e1d3b 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)' != 'net46'"> + <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 443e63e144..0000000000 --- a/src/System.Net.Http/ref/project.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {}, - "net46": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Net.Http/src/Configurations.props b/src/System.Net.Http/src/Configurations.props new file mode 100644 index 0000000000..58bd23111d --- /dev/null +++ b/src/System.Net.Http/src/Configurations.props @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + uap101-Windows_NT; + net46-Windows_NT; + netstandard-Unix; + netstandard-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.Http/src/System.Net.Http.builds b/src/System.Net.Http/src/System.Net.Http.builds deleted file mode 100644 index 0d70303b17..0000000000 --- a/src/System.Net.Http/src/System.Net.Http.builds +++ /dev/null @@ -1,22 +0,0 @@ -<?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> - <Project Include="System.Net.Http.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.Net.Http.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.Net.Http.csproj"> - <OSGroup>Windows_NT</OSGroup> - <TargetGroup>uap101</TargetGroup> - </Project> - <Project Include="System.Net.Http.csproj"> - <OSGroup>Windows_NT</OSGroup> - <TargetGroup>net46</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Net.Http/src/System.Net.Http.csproj b/src/System.Net.Http/src/System.Net.Http.csproj index 6577599c58..eca86c5912 100644 --- a/src/System.Net.Http/src/System.Net.Http.csproj +++ b/src/System.Net.Http/src/System.Net.Http.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"> - <PropertyGroup> - <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Windows_Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{1D422B1D-D7C4-41B9-862D-EB3D98DF37DE}</ProjectGuid> <OutputType>Library</OutputType> <AssemblyName>System.Net.Http</AssemblyName> <WindowsRID>win</WindowsRID> <!-- Suppress warnings for type conflicts between SR in partial facade and mscorlib --> <NoWarn>$(NoWarn);0436</NoWarn> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> @@ -135,7 +129,7 @@ <ItemGroup Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' != 'uap101' "> <Compile Include="System\Net\Http\HttpClientHandler.Windows.cs" /> </ItemGroup> - <PropertyGroup Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' == '' "> + <PropertyGroup Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' == 'netstandard'"> <DefineConstants>$(DefineConstants);HTTP_DLL</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' == 'net46' "> @@ -354,7 +348,30 @@ <TargetingPackReference Include="System.Runtime" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Reference Include="Microsoft.Win32.Primitives" /> + <Reference Include="System.Buffers" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Collections.NonGeneric" /> + <Reference Include="System.Diagnostics.Contracts" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Diagnostics.DiagnosticSource" /> + <Reference Include="System.Diagnostics.Tools" /> + <Reference Include="System.Diagnostics.Tracing" /> + <Reference Include="System.IO.Compression" /> + <Reference Include="System.Net.Primitives" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Security.Cryptography.OpenSsl" /> + <Reference Include="System.Security.Cryptography.X509Certificates" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Threading.Tasks" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetsUnix)' == 'true'"> + <Reference Include="System.Security.Cryptography.Algorithms" /> + <Reference Include="System.Security.Cryptography.Encoding" /> + <Reference Include="System.Security.Cryptography.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.Http/src/project.json b/src/System.Net.Http/src/project.json deleted file mode 100644 index 5a3c141ea3..0000000000 --- a/src/System.Net.Http/src/project.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "dependencies": { - "System.Buffers": "4.4.0-beta-24904-01", - "System.Diagnostics.DiagnosticSource": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.Win32.Primitives": "4.4.0-beta-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.Globalization.Extensions": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.IO.Compression": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Security.Cryptography.OpenSsl": "4.4.0-beta-24904-01", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - } - }, - "uap10.1": { - "dependencies": { - "Microsoft.TargetingPack.Private.WinRT": "1.0.3", - "System.Collections": "4.4.0-beta-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Diagnostics.Tracing": "4.4.0-beta-24904-01", - "System.Globalization.Extensions": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Runtime.WindowsRuntime": "4.4.0-beta-24904-01", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Text.Encoding.Extensions": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - } - }, - "net46": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Net.Http/tests/FunctionalTests/Configurations.props b/src/System.Net.Http/tests/FunctionalTests/Configurations.props new file mode 100644 index 0000000000..415c6d276e --- /dev/null +++ b/src/System.Net.Http/tests/FunctionalTests/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7-Windows_NT; + netstandard1.7-Unix; + netstandard1.3-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj b/src/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj index 55b4cc01b0..0e5ca8c161 100644 --- a/src/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj +++ b/src/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj @@ -1,27 +1,9 @@ <?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> - <Configuration Condition=" '$(Configuration)' == '' ">Windows_Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{C85CF035-7804-41FF-9557-48B7C948B58D}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Net.Http.Functional.Tests</AssemblyName> - <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> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Debug|AnyCPU'" /> @@ -111,10 +93,6 @@ <Compile Include="DefaultCredentialsTest.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\pkg\System.Net.Http.pkgproj"> - <Project>{1D422B1D-D7C4-41B9-862D-EB3D98DF37DE}</Project> - <Name>System.Net.Http</Name> - </ProjectReference> <ProjectReference Include="$(CommonTestPath)\System\Diagnostics\RemoteExecutorConsoleApp\RemoteExecutorConsoleApp.csproj"> <Project>{69e46a6f-9966-45a5-8945-2559fe337827}</Project> <Name>RemoteExecutorConsoleApp</Name> @@ -125,4 +103,4 @@ <SupplementalTestData Include="$(PackagesDir)System.Net.TestData\1.0.0-prerelease\content\**\*.*" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Http/tests/FunctionalTests/unix/project.json b/src/System.Net.Http/tests/FunctionalTests/unix/project.json deleted file mode 100644 index f9e8ae6025..0000000000 --- a/src/System.Net.Http/tests/FunctionalTests/unix/project.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "System.Diagnostics.DiagnosticSource": "4.4.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.Diagnostics.Tracing": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.Linq.Expressions": "4.4.0-beta-24904-01", - "System.Net.NetworkInformation": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Net.Sockets": "4.4.0-beta-24904-01", - "System.ObjectModel": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Algorithms": "4.4.0-beta-24904-01", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Text.RegularExpressions": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "System.Threading.Tasks.Parallel": "4.4.0-beta-24904-01", - "test-runtime": { - "target": "project", - "exclude": "compile" - }, - "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04", - "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04" - }, - "frameworks": { - "netstandard1.3": {}, - "netstandard1.7": {} - }, - "supports": { - "coreFx.Test.netcoreapp1.0": {}, - "coreFx.Test.net46": {}, - "coreFx.Test.net461": {}, - "coreFx.Test.net462": {}, - "coreFx.Test.net463": {} - } -} diff --git a/src/System.Net.Http/tests/FunctionalTests/win/project.json b/src/System.Net.Http/tests/FunctionalTests/win/project.json deleted file mode 100644 index d5c2466f1f..0000000000 --- a/src/System.Net.Http/tests/FunctionalTests/win/project.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "System.Diagnostics.DiagnosticSource": "4.4.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.Diagnostics.Tracing": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.Linq.Expressions": "4.4.0-beta-24904-01", - "System.Net.NetworkInformation": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Net.Sockets": "4.4.0-beta-24904-01", - "System.ObjectModel": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Algorithms": "4.4.0-beta-24904-01", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24904-01", - "System.Security.Principal.Windows": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Text.RegularExpressions": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "System.Threading.Tasks.Parallel": "4.4.0-beta-24904-01", - "test-runtime": { - "target": "project", - "exclude": "compile" - }, - "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04", - "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04" - }, - "frameworks": { - "netstandard1.3": {}, - "netstandard1.7": {} - }, - "supports": { - "coreFx.Test.netcoreapp1.0": {}, - "coreFx.Test.net46": {}, - "coreFx.Test.net461": {}, - "coreFx.Test.net462": {}, - "coreFx.Test.net463": {} - } -} diff --git a/src/System.Net.Http/tests/UnitTests/Configurations.props b/src/System.Net.Http/tests/UnitTests/Configurations.props new file mode 100644 index 0000000000..512c938bad --- /dev/null +++ b/src/System.Net.Http/tests/UnitTests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj b/src/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj index 0997cbb12f..05fa4d5642 100644 --- a/src/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj +++ b/src/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj @@ -1,27 +1,21 @@ -<?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> - <Configuration Condition=" '$(Configuration)' == '' ">Windows_Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{5F9C3C9F-652E-461E-B2D6-85D264F5A733}</ProjectGuid> - <OutputType>Library</OutputType> - <RootNamespace>System.Net.Http.Unit.Tests</RootNamespace> - <AssemblyName>System.Net.Http.Unit.Tests</AssemblyName> <StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> - <!-- Help VS understand available configurations --> <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)' == 'Windows_Release|AnyCPU'" /> + <!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. --> + <ItemGroup> + <TargetingPackExclusions Include="System.Net.Http" /> + <TargetingPackExclusions Include="System.Net.Mail" /> + </ItemGroup> <ItemGroup> <Compile Include="$(CommonPath)\System\NotImplemented.cs"> <Link>ProductionCode\Common\System\NotImplemented.cs</Link> @@ -340,7 +334,7 @@ <Compile Include="MockContent.cs" /> <Compile Include="StreamToStreamCopyTest.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' != ''"> + <ItemGroup Condition="'$(TargetGroup)' != 'netstandard1.7'"> <Compile Include="..\..\src\Internal\ICloneable.cs"> <Link>ProductionCode\Internal\ICloneable.cs</Link> </Compile> @@ -348,8 +342,5 @@ <Link>Common\System\SerializableAttribute.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <None Include="project.json" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Http/tests/UnitTests/project.json b/src/System.Net.Http/tests/UnitTests/project.json deleted file mode 100644 index 72aefd02f8..0000000000 --- a/src/System.Net.Http/tests/UnitTests/project.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "System.Buffers": "4.4.0-beta-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Diagnostics.Tracing": "4.4.0-beta-24904-01", - "System.Globalization.Extensions": "4.4.0-beta-24904-01", - "System.Linq": "4.4.0-beta-24904-01", - "System.Linq.Expressions": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.ObjectModel": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Reflection.TypeExtensions": "4.4.0-beta-24904-01", - "System.Text.RegularExpressions": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Net.Http": { - "version": "4.3.0", - "exclude": "compile" - }, - "test-runtime": { - "target": "project", - "exclude": "compile" - }, - "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04", - "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04" - }, - "frameworks": { - "netstandard1.3": {}, - "netstandard1.7": {} - }, - "supports": { - "coreFx.Test.netcore50": {}, - "coreFx.Test.netcoreapp1.0": {}, - "coreFx.Test.net46": {}, - "coreFx.Test.net461": {}, - "coreFx.Test.net462": {}, - "coreFx.Test.net463": {} - } -} 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 053090899b..0000000000 --- a/src/System.Net.HttpListener/ref/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "dependencies": { - "System.Collections.Specialized": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Net.WebHeaderCollection": "4.4.0-beta-24904-01", - "System.Net.WebSockets": "4.4.0-beta-24904-01", - "System.Security.Claims": "4.4.0-beta-24904-01", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24904-01", - "System.Security.Principal": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "Microsoft.Win32.Primitives": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": { - "imports": [ - "dotnet5.8" - ] - } - } -} diff --git a/src/System.Net.HttpListener/src/Configurations.props b/src/System.Net.HttpListener/src/Configurations.props new file mode 100644 index 0000000000..8e79110983 --- /dev/null +++ b/src/System.Net.HttpListener/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard-Windows_NT; + netstandard-Unix; + net461-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.HttpListener/src/System.Net.HttpListener.builds b/src/System.Net.HttpListener/src/System.Net.HttpListener.builds deleted file mode 100644 index 67ced38036..0000000000 --- a/src/System.Net.HttpListener/src/System.Net.HttpListener.builds +++ /dev/null @@ -1,15 +0,0 @@ -<?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> - <Project Include="System.Net.HttpListener.csproj" /> - <Project Include="System.Net.HttpListener.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.Net.HttpListener.csproj"> - <TargetGroup>net461</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Net.HttpListener/src/System.Net.HttpListener.csproj b/src/System.Net.HttpListener/src/System.Net.HttpListener.csproj index f47739b698..ffe610cf02 100644 --- a/src/System.Net.HttpListener/src/System.Net.HttpListener.csproj +++ b/src/System.Net.HttpListener/src/System.Net.HttpListener.csproj @@ -1,14 +1,10 @@ -<?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> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net461'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the options --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> @@ -17,10 +13,37 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net461_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net461_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' != 'net461'"> - <Compile Include="System\Net\AuthenticationTypes.cs" /> - <Compile Include="System\Net\ServiceNameStore.cs" /> - <Compile Include="System\Net\HttpListenerRequestUriBuilder.cs" /> + <ItemGroup> + <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)' == 'netstandard'"> <Compile Include="System\Net\AuthenticationSchemeSelector.cs" /> <Compile Include="System\Net\HttpListener.cs" /> <Compile Include="System\Net\HttpListenerBasicIdentity.cs" /> @@ -39,7 +62,7 @@ <Link>Common\System\Net\HttpKnownHeaderNames.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition="'$(TargetsWindows)' == 'true' AND '$(TargetGroup)' != 'net461'"> + <ItemGroup Condition="'$(TargetsWindows)' == 'true' AND '$(TargetGroup)' == 'netstandard'"> <Compile Include="System\Net\Windows\HttpListenerPrefixCollection.Windows.cs" /> <Compile Include="System\Net\Windows\HttpListener.Windows.cs" /> <Compile Include="System\Net\Windows\HttpListenerContext.Windows.cs" /> @@ -288,7 +311,7 @@ <Link>Common\Interop\Windows\sspicli\SSPIWrapper.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition="'$(TargetsUnix)' == 'true' AND '$(TargetGroup)' != 'net461'"> + <ItemGroup Condition="'$(TargetsUnix)' == 'true' AND '$(TargetGroup)' == 'netstandard'"> <Compile Include="System\Net\Managed\HttpEndPointListener.cs" /> <Compile Include="System\Net\Managed\HttpEndPointManager.cs" /> <Compile Include="System\Net\Managed\HttpConnection.cs" /> @@ -320,4 +343,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/unix/project.json b/src/System.Net.HttpListener/src/unix/project.json deleted file mode 100644 index febc19a171..0000000000 --- a/src/System.Net.HttpListener/src/unix/project.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.4.0-beta-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Collections.Specialized": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tracing": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Net.NameResolution": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Net.Requests": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Net.Sockets": "4.4.0-beta-24904-01", - "System.Net.WebHeaderCollection": "4.4.0-beta-24904-01", - "System.Net.WebSockets": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Security.Claims": "4.4.0-beta-24904-01", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24904-01", - "System.Security.Principal": "4.4.0-beta-24904-01", - "System.Security.Principal.Windows": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Text.Encoding.Extensions": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Overlapped": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01", - "System.Threading.Timer": "4.4.0-beta-24904-01", - "Microsoft.Win32.Primitives": "4.4.0-beta-24904-01" - }, - "imports": [ - "dotnet5.8" - ] - }, - "net461": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.1": "1.0.1" - } - } - } -} diff --git a/src/System.Net.HttpListener/src/win/project.json b/src/System.Net.HttpListener/src/win/project.json deleted file mode 100644 index c89c0e22dc..0000000000 --- a/src/System.Net.HttpListener/src/win/project.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.4.0-beta-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Collections.Specialized": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tracing": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Net.NameResolution": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Net.Requests": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Net.WebHeaderCollection": "4.4.0-beta-24904-01", - "System.Net.WebSockets": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Security.Claims": "4.4.0-beta-24904-01", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24904-01", - "System.Security.Principal": "4.4.0-beta-24904-01", - "System.Security.Principal.Windows": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Text.Encoding.Extensions": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Overlapped": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01", - "System.Threading.Timer": "4.4.0-beta-24904-01", - "Microsoft.Win32.Primitives": "4.4.0-beta-24904-01" - }, - "imports": [ - "dotnet5.8" - ] - }, - "net461": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.1": "1.0.1" - } - } - } -} diff --git a/src/System.Net.HttpListener/tests/Configurations.props b/src/System.Net.HttpListener/tests/Configurations.props new file mode 100644 index 0000000000..98f53209d4 --- /dev/null +++ b/src/System.Net.HttpListener/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj b/src/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj index 1af51674a8..ed1ccb05ee 100644 --- a/src/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj +++ b/src/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj @@ -2,13 +2,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> - <Configuration Condition=" '$(Configuration)' == '' ">Windows_Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{851A40FE-7F07-415D-8592-5FE2096E84D3}</ProjectGuid> - <OutputType>Library</OutputType> - <RootNamespace>System.Net.Tests</RootNamespace> <StringResourcesPath>../src/Resources/Strings.resx</StringResourcesPath> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> @@ -16,13 +11,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Release|AnyCPU'" /> <ItemGroup> - <ProjectReference Include="..\pkg\System.Net.HttpListener.pkgproj"> - <Name>System.Net.HttpListener</Name> - <Project>{53D09AF4-0C13-4197-B8AD-9746F0374E88}</Project> - </ProjectReference> - </ItemGroup> - <ItemGroup> - <Compile Include="AuthenticationTests.cs" /> + <Compile Include="AuthenticationTests.cs" /> <Compile Include="SimpleHttpTest.cs" /> <Compile Include="UrlPrefix.cs" /> <Compile Include="$(CommonTestPath)\System\PlatformDetection.cs"> 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 8429f57a87..0000000000 --- a/src/System.Net.Mail/ref/project.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "dependencies": { - "System.ComponentModel.EventBasedAsync": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Net.ServicePoint": "4.4.0-beta-24904-01", - "System.Collections.Specialized": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Net.Mail/src/Configurations.props b/src/System.Net.Mail/src/Configurations.props new file mode 100644 index 0000000000..4caac7c12c --- /dev/null +++ b/src/System.Net.Mail/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard-Unix; + netstandard-Windows_NT; + net461-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.Mail/src/System.Net.Mail.builds b/src/System.Net.Mail/src/System.Net.Mail.builds deleted file mode 100644 index ee88ec724b..0000000000 --- a/src/System.Net.Mail/src/System.Net.Mail.builds +++ /dev/null @@ -1,17 +0,0 @@ -<?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> - <Project Include="System.Net.Mail.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.Net.Mail.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.Net.Mail.csproj"> - <TargetGroup>net461</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Net.Mail/src/System.Net.Mail.csproj b/src/System.Net.Mail/src/System.Net.Mail.csproj index ea84396fb7..9793d4582d 100644 --- a/src/System.Net.Mail/src/System.Net.Mail.csproj +++ b/src/System.Net.Mail/src/System.Net.Mail.csproj @@ -1,22 +1,21 @@ -<?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> <ProjectGuid>{53D09AF4-0C13-4197-B8AD-9746F0374E88}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net461'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the options --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.7_Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.7_Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard_Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard_Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net461_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net461_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' != 'net461'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="System\Net\Base64Stream.cs" /> <Compile Include="System\Net\Mime\MimePart.cs" /> <Compile Include="System\Net\Mime\Base64WriteStateInfo.cs" /> @@ -168,7 +167,7 @@ </Compile> </ItemGroup> <!-- Unix specific files --> - <ItemGroup Condition="'$(TargetsUnix)'=='true' And '$(TargetGroup)' != 'net461'"> + <ItemGroup Condition="'$(TargetsUnix)'=='true' And '$(TargetGroup)' == 'netstandard'"> <Compile Include="$(CommonPath)\System\Net\ContextAwareResult.Unix.cs"> <Link>Common\System\Net\ContextAwareResult.Unix.cs</Link> </Compile> @@ -207,7 +206,7 @@ </Compile> </ItemGroup> <!-- Windows specific files --> - <ItemGroup Condition="'$(TargetsWindows)'=='true' And '$(TargetGroup)' != 'net461'"> + <ItemGroup Condition="'$(TargetsWindows)'=='true' And '$(TargetGroup)' == 'netstandard'"> <Compile Include="$(CommonPath)\System\Net\Security\SecurityContextTokenHandle.cs"> <Link>Common\System\Net\Security\SecurityContextTokenHandle.cs</Link> </Compile> @@ -294,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 8d2850b058..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-24904-01", - "System.Collections.Specialized": "4.4.0-beta-24904-01", - "System.ComponentModel.EventBasedAsync": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Diagnostics.Tracing": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.Globalization.Extensions": "4.4.0-beta-24904-01", - "System.Net.NetworkInformation": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Net.Requests": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Net.ServicePoint": "4.4.0-beta-24904-01", - "System.Net.Sockets": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24904-01", - "System.Security.Permissions": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "System.Threading.Timer": "4.4.0-beta-24904-01" - } - }, - "net461": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.1": "1.0.1" - } - } - } -} diff --git a/src/System.Net.Mail/tests/Functional/Configurations.props b/src/System.Net.Mail/tests/Functional/Configurations.props new file mode 100644 index 0000000000..98f53209d4 --- /dev/null +++ b/src/System.Net.Mail/tests/Functional/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj b/src/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj index 3d8adfb20a..97529bfc9b 100644 --- a/src/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj +++ b/src/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj @@ -2,8 +2,6 @@ <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>{0D1E2954-A5C7-4B8C-932A-31EB4A96A726}</ProjectGuid> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'netstandard1.7_Debug|AnyCPU' " /> @@ -35,17 +33,10 @@ </Compile> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\pkg\System.Net.Mail.pkgproj"> - <Name>System.Net.Mail</Name> - <Project>{53D09AF4-0C13-4197-B8AD-9746F0374E88}</Project> - </ProjectReference> <ProjectReference Include="$(CommonTestPath)\System\Diagnostics\RemoteExecutorConsoleApp\RemoteExecutorConsoleApp.csproj"> <Project>{69e46a6f-9966-45a5-8945-2559fe337827}</Project> <Name>RemoteExecutorConsoleApp</Name> </ProjectReference> </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.Net.Mail/tests/Unit/Configurations.props b/src/System.Net.Mail/tests/Unit/Configurations.props new file mode 100644 index 0000000000..98f53209d4 --- /dev/null +++ b/src/System.Net.Mail/tests/Unit/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj b/src/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj index 2a87cfc396..6249aad2a2 100644 --- a/src/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj +++ b/src/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj @@ -2,10 +2,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> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath> - <NugetTargetMoniker>.NETStandard,Version=v1.7</NugetTargetMoniker> <ProjectGuid>{2525E37E-0EC1-4374-92FD-D2752BEED978}</ProjectGuid> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'netstandard1.7_Debug|AnyCPU' " /> @@ -29,6 +27,10 @@ <Compile Include="SmtpDateTimeTest.cs" /> <Compile Include="WriteStateInfoTest.cs" /> </ItemGroup> + <!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. --> + <ItemGroup> + <TargetingPackExclusions Include="System.Net.Mail" /> + </ItemGroup> <ItemGroup> <Compile Include="..\..\src\System\Net\Base64Stream.cs"> <Link>ProductionCode\Base64Stream.cs</Link> @@ -175,8 +177,5 @@ <Link>ProductionCode\Common\System\Net\Mail\QuotedStringFormatReader.cs</Link> </Compile> </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.Net.Mail/tests/Unit/project.json b/src/System.Net.Mail/tests/Unit/project.json deleted file mode 100644 index 444db74688..0000000000 --- a/src/System.Net.Mail/tests/Unit/project.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Collections.Specialized": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.Globalization.Extensions": "4.4.0-beta-24904-01", - "System.ObjectModel": "4.4.0-beta-24904-01", - "System.Reflection.TypeExtensions": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Primitives": "4.4.0-beta-24904-01", - "System.Text.RegularExpressions": "4.4.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Reflection.Extensions": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Security.Permissions": "4.4.0-beta-24904-01", - "System.Net.Requests": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "test-runtime": { - "target": "project", - "exclude": "compile" - }, - "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04", - "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04" - }, - "frameworks": { - "netstandard1.7": {} - }, - "supports": { - "coreFx.Test.netcoreapp1.1": {} - } -} diff --git a/src/System.Net.NameResolution/dir.props b/src/System.Net.NameResolution/dir.props index 503cf86a87..bfbc5bd9e0 100644 --- a/src/System.Net.NameResolution/dir.props +++ b/src/System.Net.NameResolution/dir.props @@ -1,7 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> - +</Project>
\ 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/Configurations.props b/src/System.Net.NameResolution/src/Configurations.props new file mode 100644 index 0000000000..17d5314bad --- /dev/null +++ b/src/System.Net.NameResolution/src/Configurations.props @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netcore50-Windows_NT; + netstandard1.3-Windows_NT; + netstandard1.3-Unix; + net46-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.NameResolution/src/System.Net.NameResolution.builds b/src/System.Net.NameResolution/src/System.Net.NameResolution.builds deleted file mode 100644 index 23096df89b..0000000000 --- a/src/System.Net.NameResolution/src/System.Net.NameResolution.builds +++ /dev/null @@ -1,21 +0,0 @@ -<?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> - <Project Include="System.Net.NameResolution.csproj" > - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.Net.NameResolution.csproj" > - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.Net.NameResolution.csproj"> - <TargetGroup>net46</TargetGroup> - </Project> - <Project Include="System.Net.NameResolution.csproj"> - <OSGroup>Windows_NT</OSGroup> - <TargetGroup>netcore50</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Net.NameResolution/src/System.Net.NameResolution.csproj b/src/System.Net.NameResolution/src/System.Net.NameResolution.csproj index 65e45579be..b4664f4e02 100644 --- a/src/System.Net.NameResolution/src/System.Net.NameResolution.csproj +++ b/src/System.Net.NameResolution/src/System.Net.NameResolution.csproj @@ -1,8 +1,5 @@ -<?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.Net.NameResolution</AssemblyName> @@ -11,7 +8,6 @@ <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net46'">None</ResourcesSourceOutputDirectory> <EnableWinRT Condition="'$(TargetGroup)' == 'netcore50'">true</EnableWinRT> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(EnableWinRT)' != 'true'"> <DefineConstants>$(DefineConstants);FEATURE_CORECLR</DefineConstants> @@ -28,7 +24,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcore50_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcore50_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' != 'net46'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard1.3' or '$(TargetGroup)' == 'netcore50'"> <Compile Include="System\Net\DNS.cs" /> <Compile Include="System\Net\IPHostEntry.cs" /> <Compile Include="System\Net\NameResolutionUtilities.cs" /> @@ -50,9 +46,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> @@ -63,7 +56,7 @@ <Link>Common\System\Net\IPEndPointStatics.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition=" '$(TargetsWindows)' == 'true' AND '$(TargetGroup)' != 'net46'"> + <ItemGroup Condition=" '$(TargetsWindows)' == 'true' AND ('$(TargetGroup)' == 'netstandard1.3' or '$(TargetGroup)' == 'netcore50')"> <Compile Include="System\Net\NameResolutionPal.Windows.cs" /> <Compile Include="$(CommonPath)\System\Net\IntPtrHelper.cs"> <Link>Common\System\Net\IntPtrHelper.cs</Link> @@ -72,10 +65,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> @@ -137,7 +126,7 @@ </Compile> </ItemGroup> <!-- Windows : Win32 only --> - <ItemGroup Condition="'$(TargetsWindows)' == 'true' AND '$(EnableWinRT)' != 'true' AND '$(TargetGroup)' != 'net46'"> + <ItemGroup Condition="'$(TargetsWindows)' == 'true' AND '$(EnableWinRT)' != 'true' AND ('$(TargetGroup)' == 'netstandard1.3' or '$(TargetGroup)' == 'netcore50')"> <Compile Include="$(CommonPath)\System\Net\ContextAwareResult.Windows.cs"> <Link>Common\System\Net\ContextAwareResult.Windows.cs</Link> </Compile> @@ -207,7 +196,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/netcore50/project.json b/src/System.Net.NameResolution/src/netcore50/project.json deleted file mode 100644 index 92ad74e639..0000000000 --- a/src/System.Net.NameResolution/src/netcore50/project.json +++ /dev/null @@ -1,26 +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.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.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.Tasks": "4.3.0" - } - } - } -}
\ No newline at end of file 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.NameResolution/tests/FunctionalTests/Configurations.props b/src/System.Net.NameResolution/tests/FunctionalTests/Configurations.props new file mode 100644 index 0000000000..a9c55e67cd --- /dev/null +++ b/src/System.Net.NameResolution/tests/FunctionalTests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3-Windows_NT; + netstandard1.3-Unix; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj b/src/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj index f81d122a8e..f7383fb25e 100644 --- a/src/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj +++ b/src/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj @@ -2,11 +2,7 @@ <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{4FE5ECEE-ACC5-4558-A946-573426599B73}</ProjectGuid> - <OutputType>Library</OutputType> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -21,11 +17,5 @@ <Compile Include="LoggingTest.cs" /> <Compile Include="TestSettings.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\pkg\System.Net.NameResolution.pkgproj"> - <Project>{1714448C-211E-48C1-8B7E-4EE667D336A1}</Project> - <Name>System.Net.NameResolution</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Net.NameResolution/tests/PalTests/Configurations.props b/src/System.Net.NameResolution/tests/PalTests/Configurations.props new file mode 100644 index 0000000000..cc0c0fe061 --- /dev/null +++ b/src/System.Net.NameResolution/tests/PalTests/Configurations.props @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3-Windows_NT; + netstandard1.3-Unix; + netstandard1.7-Windows_NT; + netstandard1.7-Unix; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.NameResolution/tests/PalTests/NameResolutionPalTests.cs b/src/System.Net.NameResolution/tests/PalTests/NameResolutionPalTests.cs index 8168f8d7ae..3620b42f54 100644 --- a/src/System.Net.NameResolution/tests/PalTests/NameResolutionPalTests.cs +++ b/src/System.Net.NameResolution/tests/PalTests/NameResolutionPalTests.cs @@ -70,7 +70,7 @@ namespace System.Net.NameResolution.PalTests [Fact] public void GetHostByName_HostName_GetHostByAddr() { - IPHostEntry hostEntry1 = NameResolutionPal.GetHostByName(Configuration.Http.Http2Host); + IPHostEntry hostEntry1 = NameResolutionPal.GetHostByName(System.Net.Test.Common.Configuration.Http.Http2Host); Assert.NotNull(hostEntry1); IPAddress[] list1 = hostEntry1.AddressList; diff --git a/src/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj b/src/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj index b1957b5727..996fda5932 100644 --- a/src/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj +++ b/src/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj @@ -1,50 +1,41 @@ -<?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> - <OutputType>Library</OutputType> <ProjectGuid>{F6D1C093-081D-46DE-B5A8-516533375FDD}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> - <!-- Help VS understand available configurations --> <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'" /> - + <!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. --> + <ItemGroup> + <TargetingPackExclusions Include="System.Net.NameResolution" /> + </ItemGroup> <ItemGroup> <Compile Include="NameResolutionPalTests.cs" /> <Compile Include="Fakes\DebugThreadTracking.cs" /> - <Compile Include="$(CommonPath)\System\Net\Logging\NetEventSource.Common.cs"> <Link>Common\System\Net\Logging\NetEventSource.cs</Link> </Compile> - - <Compile Include="..\..\src\System\Net\IPHostEntry.cs" > + <Compile Include="..\..\src\System\Net\IPHostEntry.cs"> <Link>ProductionCode\System\Net\IPHostEntry.cs</Link> </Compile> - <Compile Include="..\..\src\System\Net\NameResolutionUtilities.cs" > + <Compile Include="..\..\src\System\Net\NameResolutionUtilities.cs"> <Link>ProductionCode\System\Net\NameResolutionUtilities.cs</Link> </Compile> - - <Compile Include="$(CommonPath)\System\Net\Sockets\ProtocolType.cs"> + <Compile Include="$(CommonPath)\System\Net\Sockets\ProtocolType.cs" Condition="'$(OSGroup)' == 'Windows_NT'"> <Link>Common\System\Net\Sockets\ProtocolType.cs</Link> </Compile> - <Compile Include="$(CommonPath)\System\Net\Sockets\SocketType.cs"> + <Compile Include="$(CommonPath)\System\Net\Sockets\SocketType.cs" Condition="'$(OSGroup)' == 'Windows_NT'"> <Link>Common\System\Net\Sockets\SocketType.cs</Link> </Compile> - <Compile Include="$(CommonPath)\System\Net\IPEndPointStatics.cs"> <Link>Common\System\Net\IPEndPointStatics.cs</Link> </Compile> - <Compile Include="$(CommonTestPath)\System\Net\Configuration.cs"> <Link>Common\System\Net\Configuration.cs</Link> </Compile> @@ -52,12 +43,10 @@ <Link>Common\System\Net\Configuration.Http.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition=" '$(TargetsWindows)' == 'true' "> <Compile Include="..\..\src\System\Net\NameResolutionPal.Windows.cs"> <Link>ProductionCode\System\Net\NameResolutionPal.Windows.cs</Link> </Compile> - <Compile Include="$(CommonPath)\System\Net\InternalException.cs"> <Link>Common\System\Net\InternalException.cs</Link> </Compile> @@ -67,22 +56,18 @@ <Compile Include="$(CommonPath)\System\Net\SocketProtocolSupportPal.Windows.cs"> <Link>System\Net\SocketProtocolSupportPal.Windows</Link> </Compile> - - <!-- Debug only --> + <!-- Debug only --> <Compile Include="$(CommonPath)\System\Net\DebugSafeHandle.cs"> <Link>Common\System\Net\DebugSafeHandle.cs</Link> </Compile> - <!-- Common --> - <Compile Include="$(CommonPath)\Microsoft\Win32\SafeHandles\SafeHandleZeroOrMinusOneIsInvalid.cs"> + <Compile Include="$(CommonPath)\Microsoft\Win32\SafeHandles\SafeHandleZeroOrMinusOneIsInvalid.cs" Condition="'$(TargetGroup)' != 'netstandard1.7'"> <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> </Compile> - <!-- Interop --> <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs"> <Link>Interop\Windows\Interop.Libraries.cs</Link> @@ -110,13 +95,13 @@ </Compile> <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.GetNameInfoW.cs"> <Link>Interop\Windows\Winsock\Interop.GetNameInfoW.cs</Link> - </Compile> + </Compile> <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.GetAddrInfoW.cs"> <Link>Interop\Windows\Winsock\Interop.GetAddrInfoW.cs</Link> - </Compile> + </Compile> <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.freeaddrinfo.cs"> <Link>Interop\Windows\Winsock\Interop.freeaddinfo.cs</Link> - </Compile> + </Compile> <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.WSAStartup.cs"> <Link>Interop\Windows\Winsock\Interop.WSAStartup.cs</Link> </Compile> @@ -130,7 +115,6 @@ <Link>Interop\Windows\Winsock\SafeFreeAddrInfo.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition=" '$(TargetsUnix)' == 'true' "> <Compile Include="$(CommonPath)\System\Net\SocketAddressPal.Unix.cs"> <Link>Common\System\Net\Internals\SocketAddressPal.Unix.cs</Link> @@ -153,11 +137,9 @@ <Compile Include="..\..\src\System\Net\NameResolutionPal.Unix.cs"> <Link>ProductionCode\System\Net\NameResolutionPal.Unix.cs</Link> </Compile> - <Compile Include="$(CommonPath)\System\Net\SocketProtocolSupportPal.Unix.cs"> <Link>System\Net\SocketProtocolSupportPal.Unix.cs</Link> </Compile> - <Compile Include="$(CommonPath)\Interop\Unix\Interop.Errors.cs"> <Link>Interop\Unix\Interop.Errors.cs</Link> </Compile> @@ -186,11 +168,5 @@ <Link>Interop\Unix\System.Native\Interop.SocketAddress.cs</Link> </Compile> </ItemGroup> - - <ItemGroup> - <None Include="project.json" /> - </ItemGroup> - - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Net.NameResolution/tests/PalTests/project.json b/src/System.Net.NameResolution/tests/PalTests/project.json deleted file mode 100644 index a0239e0164..0000000000 --- a/src/System.Net.NameResolution/tests/PalTests/project.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "Microsoft.Win32.Primitives": "4.4.0-beta-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.ComponentModel.EventBasedAsync": "4.4.0-beta-24904-01", - "System.Console": "4.4.0-beta-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tracing": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24904-01", - "System.Linq.Expressions": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.ObjectModel": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Security.Claims": "4.4.0-beta-24904-01", - "System.Text.RegularExpressions": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "System.Net.Sockets": { - "version": "4.3.0", - "exclude": "compile" - }, - "test-runtime": { - "target": "project", - "exclude": "compile" - }, - "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04", - "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04" - }, - "frameworks": { - "netstandard1.3": {} - }, - "supports": { - "coreFx.Test.netcore50": {}, - "coreFx.Test.netcoreapp1.0": {}, - "coreFx.Test.net46": {}, - "coreFx.Test.net461": {}, - "coreFx.Test.net462": {}, - "coreFx.Test.net463": {} - } -} diff --git a/src/System.Net.NameResolution/tests/UnitTests/Configurations.props b/src/System.Net.NameResolution/tests/UnitTests/Configurations.props new file mode 100644 index 0000000000..a9c55e67cd --- /dev/null +++ b/src/System.Net.NameResolution/tests/UnitTests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3-Windows_NT; + netstandard1.3-Unix; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj b/src/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj index c2f7001730..d47bce3fe4 100644 --- a/src/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj +++ b/src/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj @@ -1,23 +1,20 @@ <?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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{239347DB-D566-48C9-9551-28AB3AD12EC3}</ProjectGuid> - <OutputType>Library</OutputType> <StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Release|AnyCPU'" /> + <!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. --> + <ItemGroup> + <TargetingPackExclusions Include="System.Net.NameResolution" /> + </ItemGroup> <ItemGroup> <Compile Include="InitializationTest.cs" /> <Compile Include="XunitTestAssemblyAtrributes.cs" /> @@ -28,7 +25,6 @@ <Compile Include="Fakes\FakeSocketExceptionFactory.cs" /> <Compile Include="Fakes\FakeSocketProtocolSupportPal.cs" /> </ItemGroup> - <!-- Production Code under test--> <ItemGroup> <Compile Include="..\..\src\System\Net\DNS.cs"> @@ -47,8 +43,5 @@ <Link>Common\System\Net\InternalException.cs</Link> </Compile> </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.Net.NameResolution/tests/UnitTests/project.json b/src/System.Net.NameResolution/tests/UnitTests/project.json deleted file mode 100644 index bff3700456..0000000000 --- a/src/System.Net.NameResolution/tests/UnitTests/project.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Diagnostics.Tracing": "4.4.0-beta-24904-01", - "System.Linq": "4.4.0-beta-24904-01", - "System.Linq.Expressions": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.ObjectModel": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Reflection.TypeExtensions": "4.4.0-beta-24904-01", - "System.Text.RegularExpressions": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "test-runtime": { - "target": "project", - "exclude": "compile" - }, - "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04", - "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04" - }, - "frameworks": { - "netstandard1.3": {} - }, - "supports": { - "coreFx.Test.netcore50": {}, - "coreFx.Test.netcoreapp1.0": {}, - "coreFx.Test.net46": {}, - "coreFx.Test.net461": {}, - "coreFx.Test.net462": {}, - "coreFx.Test.net463": {} - } -} 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 6662f193e9..0000000000 --- a/src/System.Net.NetworkInformation/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "Microsoft.Win32.Primitives": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Net.NetworkInformation/src/Configurations.props b/src/System.Net.NetworkInformation/src/Configurations.props new file mode 100644 index 0000000000..f9c85b7dbb --- /dev/null +++ b/src/System.Net.NetworkInformation/src/Configurations.props @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + uap101-Windows_NT; + netstandard-Linux; + netstandard-OSX; + netstandard-Windows_NT; + net463-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.NetworkInformation/src/System.Net.NetworkInformation.builds b/src/System.Net.NetworkInformation/src/System.Net.NetworkInformation.builds deleted file mode 100644 index 65fc905f73..0000000000 --- a/src/System.Net.NetworkInformation/src/System.Net.NetworkInformation.builds +++ /dev/null @@ -1,24 +0,0 @@ -<?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> - <Project Include="System.Net.NetworkInformation.csproj"> - <OSGroup>Linux</OSGroup> - </Project> - <Project Include="System.Net.NetworkInformation.csproj"> - <OSGroup>OSX</OSGroup> - </Project> - <Project Include="System.Net.NetworkInformation.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.Net.NetworkInformation.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - <Project Include="System.Net.NetworkInformation.csproj"> - <OSGroup>Windows_NT</OSGroup> - <TargetGroup>uap101</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj b/src/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj index ccecf99922..464b35c914 100644 --- a/src/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj +++ b/src/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj @@ -1,8 +1,5 @@ -<?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.Net.NetworkInformation</AssemblyName> @@ -11,7 +8,6 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <EnableWinRT Condition="'$(TargetGroup)' == 'uap101'">true</EnableWinRT> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(EnableWinRT)' != 'true'"> <DefineConstants>$(DefineConstants);FEATURE_CORECLR</DefineConstants> @@ -381,9 +377,34 @@ </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == 'uap101'"> <ProjectReference Include="$(SourceDir)/mscorlib.WinRT-Facade/mscorlib.WinRT-Facade.csproj" /> + <!-- ToDo: remove once we have new packages https://github.com/dotnet/corefx/issues/12838 --> + <ProjectReference Include="..\..\System.Security.Principal\ref\System.Security.Principal.csproj" /> </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> + <ItemGroup Condition="'$(TargetsUnix)' == 'true'"> + <Reference Include="System.IO.FileSystem" /> + <Reference Include="System.Linq" /> + <Reference Include="System.Threading.Thread" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetsLinux)' == 'true'"> + <Reference Include="System.Threading.Timer" /> </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 76b81b4dd3..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-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tracing": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.Linq": "4.4.0-beta-24904-01", - "System.Net.Sockets": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Security.Principal.Windows": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Timer": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01", - "System.Threading.Overlapped": "4.4.0-beta-24904-01" - } - }, - "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-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tracing": "4.4.0-beta-24904-01", - "System.Linq": "4.4.0-beta-24904-01", - "System.Net.Sockets": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices.WindowsRuntime": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - } - } - } -} diff --git a/src/System.Net.NetworkInformation/tests/FunctionalTests/Configurations.props b/src/System.Net.NetworkInformation/tests/FunctionalTests/Configurations.props new file mode 100644 index 0000000000..512c938bad --- /dev/null +++ b/src/System.Net.NetworkInformation/tests/FunctionalTests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.NetworkInformation/tests/FunctionalTests/System.Net.NetworkInformation.Functional.Tests.csproj b/src/System.Net.NetworkInformation/tests/FunctionalTests/System.Net.NetworkInformation.Functional.Tests.csproj index c43075c853..269773f0ad 100644 --- a/src/System.Net.NetworkInformation/tests/FunctionalTests/System.Net.NetworkInformation.Functional.Tests.csproj +++ b/src/System.Net.NetworkInformation/tests/FunctionalTests/System.Net.NetworkInformation.Functional.Tests.csproj @@ -1,14 +1,10 @@ -<?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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{DCBB8805-4658-44BF-B5E8-B6714EC8936B}</ProjectGuid> - <OutputType>Library</OutputType> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <ResourcesSourceOutputDirectory>../../src/Resources/</ResourcesSourceOutputDirectory> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -83,12 +79,6 @@ <Compile Include="NetworkInterfaceIPv4Statistics.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\pkg\System.Net.NetworkInformation.pkgproj"> - <Project>{3CA89D6C-F8D1-4813-9775-F8D249686E31}</Project> - <Name>System.Net.NetworkInformation</Name> - </ProjectReference> - </ItemGroup> - <ItemGroup> <Content Include="NetworkFiles\rawint"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> @@ -151,4 +141,4 @@ </Content> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.NetworkInformation/tests/UnitTests/Configurations.props b/src/System.Net.NetworkInformation/tests/UnitTests/Configurations.props new file mode 100644 index 0000000000..512c938bad --- /dev/null +++ b/src/System.Net.NetworkInformation/tests/UnitTests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.NetworkInformation/tests/UnitTests/System.Net.NetworkInformation.WinRT.Unit.Tests.csproj b/src/System.Net.NetworkInformation/tests/UnitTests/System.Net.NetworkInformation.WinRT.Unit.Tests.csproj index cd22ada831..9f5b11ca92 100644 --- a/src/System.Net.NetworkInformation/tests/UnitTests/System.Net.NetworkInformation.WinRT.Unit.Tests.csproj +++ b/src/System.Net.NetworkInformation/tests/UnitTests/System.Net.NetworkInformation.WinRT.Unit.Tests.csproj @@ -1,14 +1,10 @@ -<?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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{2194D6A2-1A35-46B5-8233-AEEBCBD31EF9}</ProjectGuid> - <OutputType>Library</OutputType> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -21,8 +17,10 @@ <Compile Include="Fakes\FakeNetwork.cs" /> <Compile Include="Fakes\FakeWinRT.cs" /> </ItemGroup> + <!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. --> <ItemGroup> - <None Include="project.json" /> + <TargetingPackExclusions Include="System.Net.NetworkInformation" /> + <TargetingPackExclusions Include="Windows" /> </ItemGroup> <ItemGroup> <!-- Production code references --> @@ -47,12 +45,10 @@ <Compile Include="..\..\src\System\Net\NetworkInformation\NetNativeNetworkInterface.cs"> <Link>ProductionCode\System\Net\NetworkInformation\NetNativeNetworkInterface.cs</Link> </Compile> - <!-- Common --> <Compile Include="$(CommonPath)\System\NotImplemented.cs"> <Link>ProductionCode\Common\System\NotImplemented.cs</Link> </Compile> - <!-- Logging --> <Compile Include="$(CommonPath)\System\Net\Shims\TraceSource.cs"> <Link>ProductionCode\Common\System\Net\Shims\TraceSource.cs</Link> @@ -65,4 +61,4 @@ </Compile> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.NetworkInformation/tests/UnitTests/project.json b/src/System.Net.NetworkInformation/tests/UnitTests/project.json deleted file mode 100644 index 1e9ac50806..0000000000 --- a/src/System.Net.NetworkInformation/tests/UnitTests/project.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "dependencies": { - "System.Diagnostics.Tracing": "4.4.0-beta-24904-01", - "System.Linq.Expressions": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.ObjectModel": "4.4.0-beta-24904-01", - "System.Text.RegularExpressions": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "test-runtime": { - "target": "project", - "exclude": "compile" - }, - "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04", - "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04" - }, - "frameworks": { - "netstandard1.3": {}, - "netstandard1.7": {} - }, - "supports": { - "coreFx.Test.netcore50": {}, - "coreFx.Test.netcoreapp1.0": {}, - "coreFx.Test.net46": {}, - "coreFx.Test.net461": {}, - "coreFx.Test.net462": {}, - "coreFx.Test.net463": {} - } -} 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 a11b62ef5f..0000000000 --- a/src/System.Net.Ping/ref/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "System.ComponentModel.EventBasedAsync": "4.4.0-beta-24904-01", - "System.ComponentModel.Primitives": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Net.Ping/src/Configurations.props b/src/System.Net.Ping/src/Configurations.props new file mode 100644 index 0000000000..3bb6330d9e --- /dev/null +++ b/src/System.Net.Ping/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard-Unix; + netstandard-Windows_NT; + net463-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.Ping/src/System.Net.Ping.builds b/src/System.Net.Ping/src/System.Net.Ping.builds deleted file mode 100644 index 27831692ce..0000000000 --- a/src/System.Net.Ping/src/System.Net.Ping.builds +++ /dev/null @@ -1,17 +0,0 @@ -<?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> - <Project Include="System.Net.Ping.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.Net.Ping.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.Net.Ping.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Net.Ping/src/System.Net.Ping.csproj b/src/System.Net.Ping/src/System.Net.Ping.csproj index cd3a5c45b0..b4cbdc2613 100644 --- a/src/System.Net.Ping/src/System.Net.Ping.csproj +++ b/src/System.Net.Ping/src/System.Net.Ping.csproj @@ -1,8 +1,5 @@ -<?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.Net.Ping</AssemblyName> @@ -11,7 +8,6 @@ <DefineConstants>$(DefineConstants);FEATURE_CORECLR</DefineConstants> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net463'">None</ResourcesSourceOutputDirectory> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> @@ -20,7 +16,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="System\Net\NetworkInformation\IPStatus.cs" /> <Compile Include="System\Net\NetworkInformation\NetEventSource.Ping.cs" /> <Compile Include="System\Net\NetworkInformation\Ping.cs" /> @@ -30,7 +26,7 @@ <Compile Include="System\Net\NetworkInformation\PingReply.cs" /> </ItemGroup> <!-- System.Net Common --> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="$(CommonPath)\System\Net\ByteOrder.cs"> <Link>Common\System\Net\ByteOrder.cs</Link> </Compile> @@ -45,7 +41,7 @@ </Compile> </ItemGroup> <!-- Logging --> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="$(CommonPath)\System\Net\Shims\TraceSource.cs"> <Link>Common\System\Net\Shims\TraceSource.cs</Link> </Compile> @@ -57,7 +53,7 @@ </Compile> </ItemGroup> <!-- System.Net.Internals --> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="$(CommonPath)\System\Net\Internals\IPAddressExtensions.cs"> <Link>Common\System\Net\Internals\IPAddressExtensions.cs</Link> </Compile> @@ -99,7 +95,7 @@ <Link>Common\Interop\Unix\System.Native\Interop.SocketAddress.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' != 'net463' "> + <ItemGroup Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' == 'netstandard' "> <Compile Include="System\Net\NetworkInformation\Ping.Windows.cs" /> <!-- System.Net Common --> <Compile Include="$(CommonPath)\System\Net\SocketAddressPal.Windows.cs"> @@ -146,7 +142,25 @@ <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="System.Net.Sockets" /> + <Reference Include="Microsoft.Win32.Primitives" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetsUnix)' == 'true'"> + <Reference Include="System.Diagnostics.Process" /> + <Reference Include="System.IO.FileSystem" /> </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 5359a59be1..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-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.ComponentModel.Primitives": "4.4.0-beta-24904-01", - "System.ComponentModel.EventBasedAsync": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.Diagnostics.Tracing": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.Net.NameResolution": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Net.Sockets": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.Net.Ping/tests/FunctionalTests/Configurations.props b/src/System.Net.Ping/tests/FunctionalTests/Configurations.props new file mode 100644 index 0000000000..4a2b602706 --- /dev/null +++ b/src/System.Net.Ping/tests/FunctionalTests/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7-Unix; + netstandard1.7-Windows_NT; + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj b/src/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj index 276c6a26d3..5be07cfb8e 100644 --- a/src/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj +++ b/src/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj @@ -1,26 +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"> - <PropertyGroup> - <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{43CE20B7-389B-41BB-8390-447521DF3BD4}</ProjectGuid> - <OutputType>Library</OutputType> - <NugetTargetMoniker Condition="'$(TargetGroup)'==''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> - - <!-- Test APIs introduced after 1.0 --> + <!-- Test APIs introduced after 1.0 --> <ItemGroup Condition="'$(TargetGroup)'==''"> - <Compile Include="PingTest.cs" /> - <Compile Include="LoggingTest.cs" /> + <Compile Include="PingTest.cs" /> + <Compile Include="LoggingTest.cs" /> </ItemGroup> - <ItemGroup> <Compile Include="PingExceptionTest.cs" /> <Compile Include="PingOptionsTest.cs" /> @@ -40,11 +31,5 @@ <Link>Common\tests\System\PlatformDetection.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)'==''"> - <ProjectReference Include="..\..\pkg\System.Net.Ping.pkgproj"> - <Project>{85FD05E8-A4B1-4B89-ABED-33AFD200CABD}</Project> - <Name>System.Net.Ping</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Primitives/dir.props b/src/System.Net.Primitives/dir.props index fcc1a7ca5a..bfbc5bd9e0 100644 --- a/src/System.Net.Primitives/dir.props +++ b/src/System.Net.Primitives/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Net.Primitives/ref/Configurations.props b/src/System.Net.Primitives/ref/Configurations.props new file mode 100644 index 0000000000..de35842580 --- /dev/null +++ b/src/System.Net.Primitives/ref/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7; + netcoreapp1.1; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.Primitives/ref/System.Net.Primitives.csproj b/src/System.Net.Primitives/ref/System.Net.Primitives.csproj index f7191f33b0..eb603cb4ea 100644 --- a/src/System.Net.Primitives/ref/System.Net.Primitives.csproj +++ b/src/System.Net.Primitives/ref/System.Net.Primitives.csproj @@ -1,17 +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)' == ''">.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 0f867ced37..0000000000 --- a/src/System.Net.Primitives/ref/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "Microsoft.Win32.Primitives": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {}, - "netcoreapp1.1": {} - } -} diff --git a/src/System.Net.Primitives/src/Configurations.props b/src/System.Net.Primitives/src/Configurations.props new file mode 100644 index 0000000000..277edd8783 --- /dev/null +++ b/src/System.Net.Primitives/src/Configurations.props @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + uap101-Windows_NT; + netstandard-Unix; + netstandard-Windows_NT; + net463-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.Primitives/src/System.Net.Primitives.builds b/src/System.Net.Primitives/src/System.Net.Primitives.builds deleted file mode 100644 index 0971f36fc8..0000000000 --- a/src/System.Net.Primitives/src/System.Net.Primitives.builds +++ /dev/null @@ -1,21 +0,0 @@ -<?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> - <Project Include="System.Net.Primitives.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.Net.Primitives.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.Net.Primitives.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - <Project Include="System.Net.Primitives.csproj"> - <OSGroup>Windows_NT</OSGroup> - <TargetGroup>uap101</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Net.Primitives/src/System.Net.Primitives.csproj b/src/System.Net.Primitives/src/System.Net.Primitives.csproj index fc04f22bfc..b6ec19a1f5 100644 --- a/src/System.Net.Primitives/src/System.Net.Primitives.csproj +++ b/src/System.Net.Primitives/src/System.Net.Primitives.csproj @@ -1,8 +1,6 @@ -<?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.Net.Primitives</AssemblyName> @@ -11,9 +9,8 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <EnableWinRT Condition="'$(TargetGroup)' == 'uap101'">true</EnableWinRT> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> - <PropertyGroup Condition="'$(EnableWinRT)' != 'true' AND '$(TargetGroup)' == ''"> + <PropertyGroup Condition="'$(EnableWinRT)' != 'true' AND '$(TargetGroup)' == 'netstandard'"> <DefineConstants>$(DefineConstants);FEATURE_CORECLR</DefineConstants> </PropertyGroup> <PropertyGroup Condition="'$(EnableWinRT)' == 'true'"> @@ -33,7 +30,7 @@ System.Net.Internals namespace. --> <DefineConstants>$(DefineConstants);SYSTEM_NET_PRIMITIVES_DLL</DefineConstants> </PropertyGroup> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard' or '$(TargetGroup)' == 'uap101'"> <Compile Include="System\Net\AuthenticationSchemes.cs" /> <Compile Include="System\Net\Cookie.cs" /> <Compile Include="System\Net\CookieContainer.cs" /> @@ -55,7 +52,7 @@ <Compile Include="System\Net\NetworkCredential.cs" /> <Compile Include="System\Net\TransportContext.cs" /> <Compile Include="System\Net\SocketException.cs" /> - <Compile Include="System\Net\SocketException.netstandard17.cs" Condition="'$(TargetGroup)' == ''" /> + <Compile Include="System\Net\SocketException.netstandard17.cs" Condition="'$(TargetGroup)' == 'netstandard'" /> <Compile Include="System\Net\SecureProtocols\NegotiateEnumTypes.cs" /> <Compile Include="System\Net\SecureProtocols\SslEnumTypes.cs" /> <Compile Include="System\Net\Security\SslPolicyErrors.cs" /> @@ -116,7 +113,7 @@ <Link>Common\Interop\Windows\Winsock\Interop.ErrorCodes.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition=" '$(TargetsWindows)' == 'true' AND '$(TargetGroup)' != 'net463' "> + <ItemGroup Condition=" '$(TargetsWindows)' == 'true' AND ('$(TargetGroup)' == 'netstandard' or '$(TargetGroup)' == 'uap101')"> <Compile Include="System\Net\IPAddressPal.Windows.cs" /> <Compile Include="System\Net\SocketException.Windows.cs" /> <Compile Include="$(CommonPath)\System\Net\SocketAddressPal.Windows.cs"> @@ -151,7 +148,7 @@ </Compile> </ItemGroup> <!-- Windows : Win32 only --> - <ItemGroup Condition="'$(TargetsWindows)' == 'true' AND '$(EnableWinRT)' != 'true' AND '$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetsWindows)' == 'true' AND '$(EnableWinRT)' != 'true' AND ('$(TargetGroup)' == 'netstandard' or '$(TargetGroup)' == 'uap101')"> <Compile Include="$(CommonPath)\System\Net\NetworkInformation\HostInformationPal.Windows.cs"> <Link>Common\System\Net\NetworkInformation\HostInformationPal.Windows.cs</Link> </Compile> @@ -172,12 +169,12 @@ </Compile> </ItemGroup> <!-- Windows : Win32 + WinRT --> - <ItemGroup Condition="'$(TargetsWindows)' == 'true' AND '$(EnableWinRT)' == 'true' AND '$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetsWindows)' == 'true' AND '$(EnableWinRT)' == 'true' AND ('$(TargetGroup)' == 'netstandard' or '$(TargetGroup)' == 'uap101')"> <Compile Include="$(CommonPath)\System\Net\NetworkInformation\HostInformationPal.Uap.cs"> <Link>Common\System\Net\NetworkInformation\HostInformationPal.Uap.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition=" '$(TargetsUnix)' == 'true' AND '$(TargetGroup)' != 'net463' "> + <ItemGroup Condition=" '$(TargetsUnix)' == 'true' AND ('$(TargetGroup)' == 'netstandard' or '$(TargetGroup)' == 'uap101')"> <Compile Include="System\Net\IPAddressPal.Unix.cs" /> <Compile Include="System\Net\SocketException.Unix.cs" /> <Compile Include="$(CommonPath)\System\Net\SocketAddressPal.Unix.cs"> @@ -220,9 +217,21 @@ </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == 'uap101'"> <ProjectReference Include="$(SourceDir)/mscorlib.WinRT-Facade/mscorlib.WinRT-Facade.csproj" /> + <!-- ToDo: remove once we have new packages https://github.com/dotnet/corefx/issues/12838 --> + <ProjectReference Include="..\..\System.Security.Principal\ref\System.Security.Principal.csproj" /> </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 a60afab945..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-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tracing": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - } - }, - "uap10.1": { - "dependencies": { - "Microsoft.TargetingPack.Private.WinRT": "1.0.3", - "Microsoft.Win32.Primitives": "4.4.0-beta-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tracing": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.ObjectModel": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Runtime.WindowsRuntime": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.Net.Primitives/tests/FunctionalTests/Configurations.props b/src/System.Net.Primitives/tests/FunctionalTests/Configurations.props new file mode 100644 index 0000000000..fa858a20eb --- /dev/null +++ b/src/System.Net.Primitives/tests/FunctionalTests/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7-Unix; + netstandard1.7-Windows_NT; + netstandard1.3-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.Primitives/tests/FunctionalTests/System.Net.Primitives.Functional.Tests.csproj b/src/System.Net.Primitives/tests/FunctionalTests/System.Net.Primitives.Functional.Tests.csproj index 3389b86d7e..474179e2dc 100644 --- a/src/System.Net.Primitives/tests/FunctionalTests/System.Net.Primitives.Functional.Tests.csproj +++ b/src/System.Net.Primitives/tests/FunctionalTests/System.Net.Primitives.Functional.Tests.csproj @@ -1,18 +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"> - <PropertyGroup> - <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{4FE5ECEE-ACC5-4558-A946-573426599B73}</ProjectGuid> - <OutputType>Library</OutputType> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> - </PropertyGroup> - <PropertyGroup Condition="'$(TargetGroup)' == ''"> - <DefineConstants>NetStandard17</DefineConstants> + </PropertyGroup> + <PropertyGroup Condition="'$(TargetGroup)' == 'netstandard1.7'"> + <DefineConstants>NetStandard17</DefineConstants> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> @@ -35,7 +28,7 @@ <Compile Include="NetworkCredentialTest.cs" /> <Compile Include="SocketAddressTest.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == ''"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard1.7'"> <Compile Include="LoggingTest.cs" /> <Compile Include="SerializationTest.cs" /> <Compile Include="RequestCachePolicyTest.cs" /> @@ -55,14 +48,10 @@ </Compile> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\pkg\System.Net.Primitives.pkgproj"> - <Project>{8772BC91-7B55-49B9-94FA-4B1BE5BEAB55}</Project> - <Name>System.Net.Primitives</Name> - </ProjectReference> <ProjectReference Include="$(CommonTestPath)\System\Diagnostics\RemoteExecutorConsoleApp\RemoteExecutorConsoleApp.csproj"> <Project>{69e46a6f-9966-45a5-8945-2559fe337827}</Project> <Name>RemoteExecutorConsoleApp</Name> </ProjectReference> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Primitives/tests/PalTests/Configurations.props b/src/System.Net.Primitives/tests/PalTests/Configurations.props new file mode 100644 index 0000000000..fa858a20eb --- /dev/null +++ b/src/System.Net.Primitives/tests/PalTests/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7-Unix; + netstandard1.7-Windows_NT; + netstandard1.3-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj b/src/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj index 631059eb5b..88aa6ece3e 100644 --- a/src/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj +++ b/src/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj @@ -1,178 +1,162 @@ -<?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> - <Configuration Condition=" '$(Configuration)' == '' ">Windows_Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> <ProjectGuid>{7860A11A-1841-4416-8A30-28EEEB42C6BB}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> - <!-- Help VS understand available configurations --> <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> <!-- SYSTEM_NET_PRIMITIVES_DLL is required to allow source-level code sharing for types defined within the System.Net.Internals namespace. --> <DefineConstants>$(DefineConstants);SYSTEM_NET_PRIMITIVES_DLL</DefineConstants> </PropertyGroup> - + <!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. --> + <ItemGroup> + <TargetingPackExclusions Include="System.Net.Primitives" /> + </ItemGroup> <ItemGroup> <Compile Include="IPAddressPalTest.cs" /> <Compile Include="HostInformationPalTest.cs" /> <Compile Include="SocketAddressPalTest.cs" /> - <Compile Include="Fakes\NetEventSource.cs" /> - <Compile Include="Fakes\Serialization.cs" Condition="'$(TargetGroup)' != ''"/> - - <Compile Include="..\..\src\System\Net\EndPoint.cs" > + <Compile Include="Fakes\Serialization.cs" Condition="'$(TargetGroup)' != 'netstandard1.7'" /> + <Compile Include="..\..\src\System\Net\EndPoint.cs"> <Link>ProductionCode\System\Net\EndPoint.cs</Link> </Compile> - <Compile Include="..\..\src\System\Net\IPAddress.cs" > + <Compile Include="..\..\src\System\Net\IPAddress.cs"> <Link>ProductionCode\System\Net\IPAddress.cs</Link> </Compile> - <Compile Include="..\..\src\System\Net\IPAddressParser.cs" > + <Compile Include="..\..\src\System\Net\IPAddressParser.cs"> <Link>ProductionCode\System\Net\IPAddressParser.cs</Link> </Compile> - <Compile Include="..\..\src\System\Net\IPEndPoint.cs" > + <Compile Include="..\..\src\System\Net\IPEndPoint.cs"> <Link>ProductionCode\System\Net\IPEndPoint.cs</Link> </Compile> - <Compile Include="..\..\src\System\Net\SocketException.cs" > + <Compile Include="..\..\src\System\Net\SocketException.cs"> <Link>ProductionCode\System\Net\SocketException.cs</Link> </Compile> - <Compile Include="..\..\src\System\Net\Sockets\AddressFamily.cs" > + <Compile Include="..\..\src\System\Net\Sockets\AddressFamily.cs"> <Link>ProductionCode\System\Net\Sockets\AddressFamily.cs</Link> </Compile> - <Compile Include="..\..\src\System\Net\Sockets\SocketError.cs" > + <Compile Include="..\..\src\System\Net\Sockets\SocketError.cs"> <Link>ProductionCode\System\Net\Sockets\SocketError.cs</Link> </Compile> - <Compile Include="$(CommonPath)\System\Net\ByteOrder.cs" > + <Compile Include="$(CommonPath)\System\Net\ByteOrder.cs"> <Link>ProductionCode\Common\System\Net\ByteOrder.cs</Link> </Compile> - <Compile Include="$(CommonPath)\System\Net\InternalException.cs" > + <Compile Include="$(CommonPath)\System\Net\InternalException.cs"> <Link>ProductionCode\Common\System\Net\InternalException.cs</Link> </Compile> - <Compile Include="$(CommonPath)\System\Net\IPAddressParserStatics.cs" > + <Compile Include="$(CommonPath)\System\Net\IPAddressParserStatics.cs"> <Link>ProductionCode\Common\System\Net\IPAddressParserStatics.cs</Link> </Compile> - <Compile Include="$(CommonPath)\System\Net\SocketAddress.cs" > + <Compile Include="$(CommonPath)\System\Net\SocketAddress.cs"> <Link>Common\System\Net\SocketAddress.cs</Link> </Compile> - <Compile Include="$(CommonPath)\System\Net\TcpValidationHelpers.cs" > + <Compile Include="$(CommonPath)\System\Net\TcpValidationHelpers.cs"> <Link>ProductionCode\Common\System\Net\TcpValidationHelpers.cs</Link> </Compile> - <Compile Include="$(CommonPath)\System\NotImplemented.cs" > + <Compile Include="$(CommonPath)\System\NotImplemented.cs"> <Link>ProductionCode\Common\System\NotImplemented.cs</Link> </Compile> - - <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.ErrorCodes.cs" > + <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.ErrorCodes.cs"> <Link>ProductionCode\Common\Interop\Windows\Winsock\Interop.ErrorCodes.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition=" '$(TargetsWindows)' == 'true' "> - <Compile Include="..\..\src\System\Net\IPAddressPal.Windows.cs" > + <Compile Include="..\..\src\System\Net\IPAddressPal.Windows.cs"> <Link>ProductionCode\System\Net\IPAddressPal.Windows.cs</Link> </Compile> - <Compile Include="..\..\src\System\Net\SocketException.Windows.cs" > + <Compile Include="..\..\src\System\Net\SocketException.Windows.cs"> <Link>ProductionCode\System\Net\SocketException.Windows.cs</Link> </Compile> - - <Compile Include="$(CommonPath)\Microsoft\Win32\SafeHandles\SafeLocalAllocHandle.cs" > + <Compile Include="$(CommonPath)\Microsoft\Win32\SafeHandles\SafeLocalAllocHandle.cs"> <Link>Common\Microsoft\Win32\SafeHandles\SafeLocalAllocHandle.cs</Link> </Compile> - <Compile Include="$(CommonPath)\System\Net\SocketAddressPal.Windows.cs" > + <Compile Include="$(CommonPath)\System\Net\SocketAddressPal.Windows.cs"> <Link>Common\System\Net\SocketAddressPal.Windows.cs</Link> </Compile> - <Compile Include="$(CommonPath)\System\Net\NetworkInformation\HostInformationPal.Windows.cs" > + <Compile Include="$(CommonPath)\System\Net\NetworkInformation\HostInformationPal.Windows.cs"> <Link>Common\System\Net\NetworkInformation\HostInformationPal.Windows.cs</Link> </Compile> - - <Compile Include="$(CommonPath)\Interop\Windows\IpHlpApi\Interop.ErrorCodes.cs" > + <Compile Include="$(CommonPath)\Interop\Windows\IpHlpApi\Interop.ErrorCodes.cs"> <Link>Common\Interop\Windows\IpHlpApi\Interop.ErrorCodes.cs</Link> </Compile> - <Compile Include="$(CommonPath)\Interop\Windows\IpHlpApi\Interop.FIXED_INFO.cs" > + <Compile Include="$(CommonPath)\Interop\Windows\IpHlpApi\Interop.FIXED_INFO.cs"> <Link>Common\Interop\Windows\IpHlpApi\Interop.FIXED_INFO.cs</Link> </Compile> - <Compile Include="$(CommonPath)\Interop\Windows\IpHlpApi\Interop.GetNetworkParams.cs" > + <Compile Include="$(CommonPath)\Interop\Windows\IpHlpApi\Interop.GetNetworkParams.cs"> <Link>Common\Interop\Windows\IpHlpApi\Interop.GetNetworkParams.cs</Link> </Compile> - <Compile Include="$(CommonPath)\Interop\Windows\IpHlpApi\Interop.IP_ADDR_STRING.cs" > + <Compile Include="$(CommonPath)\Interop\Windows\IpHlpApi\Interop.IP_ADDR_STRING.cs"> <Link>Common\Interop\Windows\IpHlpApi\Interop.IP_ADDR_STRING.cs</Link> </Compile> - <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs" > + <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs"> <Link>ProductionCode\Common\Interop\Windows\Interop.Libraries.cs</Link> </Compile> - <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.LocalAlloc.cs" > + <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.LocalAlloc.cs"> <Link>Common\Interop\Windows\kernel32\Interop.LocalAlloc.cs</Link> </Compile> <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.LocalAlloc.Constants.cs"> <Link>Common\Interop\Windows\kernel32\Interop.LocalAlloc.Constants.cs</Link> </Compile> - <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.LocalFree.cs" > + <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.LocalFree.cs"> <Link>Common\Interop\Windows\kernel32\Interop.LocalFree.cs</Link> </Compile> - <Compile Include="$(CommonPath)\Interop\Windows\NtDll\Interop.NtStatus.cs" > + <Compile Include="$(CommonPath)\Interop\Windows\NtDll\Interop.NtStatus.cs"> <Link>ProductionCode\Common\Interop\Windows\NtDll\Interop.NtStatus.cs</Link> </Compile> - <Compile Include="$(CommonPath)\Interop\Windows\NtDll\Interop.RtlIpv4AddressToStringEx.cs" > + <Compile Include="$(CommonPath)\Interop\Windows\NtDll\Interop.RtlIpv4AddressToStringEx.cs"> <Link>ProductionCode\Common\Interop\Windows\NtDll\Interop.RtlIpv4AddressToStringEx.cs</Link> </Compile> - <Compile Include="$(CommonPath)\Interop\Windows\NtDll\Interop.RtlIpv4StringToAddressEx.cs" > + <Compile Include="$(CommonPath)\Interop\Windows\NtDll\Interop.RtlIpv4StringToAddressEx.cs"> <Link>ProductionCode\Common\Interop\Windows\NtDll\Interop.RtlIpv4StringToAddressEx.cs</Link> </Compile> - <Compile Include="$(CommonPath)\Interop\Windows\NtDll\Interop.RtlIpv6AddressToStringEx.cs" > + <Compile Include="$(CommonPath)\Interop\Windows\NtDll\Interop.RtlIpv6AddressToStringEx.cs"> <Link>ProductionCode\Common\Interop\Windows\NtDll\Interop.RtlIpv6AddressToStringEx.cs</Link> </Compile> - <Compile Include="$(CommonPath)\Interop\Windows\NtDll\Interop.RtlIpv6StringToAddressEx.cs" > + <Compile Include="$(CommonPath)\Interop\Windows\NtDll\Interop.RtlIpv6StringToAddressEx.cs"> <Link>ProductionCode\Common\Interop\Windows\NtDll\Interop.RtlIpv6StringToAddressEx.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition=" '$(TargetsUnix)' == 'true' "> - <Compile Include="..\..\src\System\Net\IPAddressPal.Unix.cs" > + <Compile Include="..\..\src\System\Net\IPAddressPal.Unix.cs"> <Link>ProductionCode\System\Net\IPAddressPal.Unix.cs</Link> </Compile> - <Compile Include="..\..\src\System\Net\SocketException.Unix.cs" > + <Compile Include="..\..\src\System\Net\SocketException.Unix.cs"> <Link>ProductionCode\System\Net\SocketException.Unix.cs</Link> </Compile> - - <Compile Include="$(CommonPath)\System\Net\NetworkInformation\HostInformationPal.Unix.cs" > + <Compile Include="$(CommonPath)\System\Net\NetworkInformation\HostInformationPal.Unix.cs"> <Link>Common\System\Net\NetworkInformation\HostInformationPal.Unix.cs</Link> </Compile> - <Compile Include="$(CommonPath)\System\Net\SocketAddressPal.Unix.cs" > + <Compile Include="$(CommonPath)\System\Net\SocketAddressPal.Unix.cs"> <Link>Common\System\Net\SocketAddressPal.Unix.cs</Link> </Compile> - <Compile Include="$(CommonPath)\System\Net\Sockets\SocketErrorPal.Unix.cs" > + <Compile Include="$(CommonPath)\System\Net\Sockets\SocketErrorPal.Unix.cs"> <Link>Common\System\Net\Sockets\SocketErrorPal.Unix.cs</Link> </Compile> - - <Compile Include="$(CommonPath)\Interop\Interop.CheckedAccess.cs" > + <Compile Include="$(CommonPath)\Interop\Interop.CheckedAccess.cs"> <Link>ProductionCode\Common\Interop\Interop.CheckedAccess.cs</Link> </Compile> - <Compile Include="$(CommonPath)\Interop\Unix\Interop.Errors.cs" > + <Compile Include="$(CommonPath)\Interop\Unix\Interop.Errors.cs"> <Link>ProductionCode\Common\Interop\Unix\Interop.Errors.cs</Link> </Compile> - <Compile Include="$(CommonPath)\Interop\Unix\Interop.Libraries.cs" > + <Compile Include="$(CommonPath)\Interop\Unix\Interop.Libraries.cs"> <Link>ProductionCode\Common\Interop\Unix\Interop.Libraries.cs</Link> </Compile> - <Compile Include="$(CommonPath)\Interop\Unix\System.Native\Interop.GetDomainName.cs" > + <Compile Include="$(CommonPath)\Interop\Unix\System.Native\Interop.GetDomainName.cs"> <Link>ProductionCode\Common\Interop\Unix\System.Native\Interop.GetDomainName.cs</Link> </Compile> - <Compile Include="$(CommonPath)\Interop\Unix\System.Native\Interop.GetHostName.cs" > + <Compile Include="$(CommonPath)\Interop\Unix\System.Native\Interop.GetHostName.cs"> <Link>ProductionCode\Common\Interop\Unix\System.Native\Interop.GetHostName.cs</Link> </Compile> - <Compile Include="$(CommonPath)\Interop\Unix\System.Native\Interop.GetNameInfo.cs" > + <Compile Include="$(CommonPath)\Interop\Unix\System.Native\Interop.GetNameInfo.cs"> <Link>ProductionCode\Common\Interop\Unix\System.Native\Interop.GetNameInfo.cs</Link> </Compile> <Compile Include="$(CommonPath)\Interop\Unix\System.Native\Interop.HostEntry.cs"> @@ -185,10 +169,5 @@ <Link>ProductionCode\Common\Interop\Unix\System.Native\Interop.SocketAddress.cs</Link> </Compile> </ItemGroup> - - <ItemGroup> - <None Include="project.json" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Primitives/tests/PalTests/project.json b/src/System.Net.Primitives/tests/PalTests/project.json deleted file mode 100644 index e2edc0461e..0000000000 --- a/src/System.Net.Primitives/tests/PalTests/project.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "Microsoft.Win32.Primitives": "4.4.0-beta-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.Linq.Expressions": "4.4.0-beta-24904-01", - "System.ObjectModel": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Text.RegularExpressions": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "System.Net.Primitives": { - "version": "4.3.0", - "exclude": "compile" - }, - "test-runtime": { - "target": "project", - "exclude": "compile" - }, - "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04", - "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04" - }, - "frameworks": { - "netstandard1.3": {}, - "netstandard1.7": {} - }, - "supports": { - "coreFx.Test.netcore50": {}, - "coreFx.Test.netcoreapp1.0": {}, - "coreFx.Test.net46": {}, - "coreFx.Test.net461": {}, - "coreFx.Test.net462": {}, - "coreFx.Test.net463": {} - } -} diff --git a/src/System.Net.Primitives/tests/PerformanceTests/Configurations.props b/src/System.Net.Primitives/tests/PerformanceTests/Configurations.props new file mode 100644 index 0000000000..fa858a20eb --- /dev/null +++ b/src/System.Net.Primitives/tests/PerformanceTests/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7-Unix; + netstandard1.7-Windows_NT; + netstandard1.3-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.Primitives/tests/PerformanceTests/System.Net.Primitives.Performance.Tests.csproj b/src/System.Net.Primitives/tests/PerformanceTests/System.Net.Primitives.Performance.Tests.csproj index d4a698a6f7..0ee6eb21d2 100644 --- a/src/System.Net.Primitives/tests/PerformanceTests/System.Net.Primitives.Performance.Tests.csproj +++ b/src/System.Net.Primitives/tests/PerformanceTests/System.Net.Primitives.Performance.Tests.csproj @@ -1,17 +1,9 @@ -<?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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{86256B36-4C78-4A71-A80A-CCA35C4AE758}</ProjectGuid> - <OutputType>Library</OutputType> <IncludePerformanceTests>true</IncludePerformanceTests> - <AssemblyName>System.Net.Primitives.Performance.Tests</AssemblyName> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> @@ -21,11 +13,5 @@ <ItemGroup> <Compile Include="CredentialCacheTests.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\pkg\System.Net.Primitives.pkgproj"> - <Project>{8772BC91-7B55-49B9-94FA-4B1BE5BEAB55}</Project> - <Name>System.Net.Primitives</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Primitives/tests/PerformanceTests/project.json b/src/System.Net.Primitives/tests/PerformanceTests/project.json deleted file mode 100644 index c39b775501..0000000000 --- a/src/System.Net.Primitives/tests/PerformanceTests/project.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Net.Primitives": { - "version": "4.3.0", - "exclude": "compile" - }, - "test-runtime": { - "target": "project", - "exclude": "compile" - }, - "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04", - "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04", - "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0040" - }, - "frameworks": { - "netstandard1.3": {}, - "netstandard1.7": {} - }, - "supports": { - "coreFx.Test.netcoreapp1.0": {}, - "coreFx.Test.net46": {}, - "coreFx.Test.net461": {}, - "coreFx.Test.net462": {}, - "coreFx.Test.net463": {} - } -} diff --git a/src/System.Net.Primitives/tests/UnitTests/Configurations.props b/src/System.Net.Primitives/tests/UnitTests/Configurations.props new file mode 100644 index 0000000000..415c6d276e --- /dev/null +++ b/src/System.Net.Primitives/tests/UnitTests/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7-Windows_NT; + netstandard1.7-Unix; + netstandard1.3-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj b/src/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj index c3b3318894..f3612c5454 100644 --- a/src/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj +++ b/src/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj @@ -1,18 +1,11 @@ <?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> - <Configuration Condition=" '$(Configuration)' == '' ">Windows_Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> <ProjectGuid>{FCFF9C63-CE7A-476E-8241-7B7236FFDBFB}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <NoWarn>169,649</NoWarn> <StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> @@ -24,6 +17,10 @@ System.Net.Internals namespace. --> <DefineConstants>$(DefineConstants);SYSTEM_NET_PRIMITIVES_DLL</DefineConstants> </PropertyGroup> + <!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. --> + <ItemGroup> + <TargetingPackExclusions Include="System.Net.Primitives" /> + </ItemGroup> <ItemGroup> <Compile Include="CookieCollectionTest.cs" /> <Compile Include="CookieContainerTest.cs" /> @@ -31,7 +28,7 @@ <Compile Include="Fakes\HostInformation.cs" /> <Compile Include="Fakes\IPAddressPal.cs" /> <Compile Include="Fakes\CookieException.cs" /> - <Compile Include="Fakes\Serialization.cs" Condition="'$(TargetGroup)' != ''"/> + <Compile Include="Fakes\Serialization.cs" Condition="'$(TargetGroup)' != 'netstandard1.7'" /> <Compile Include="..\..\src\System\Net\Cookie.cs"> <Link>ProductionCode\System\Net\Cookie.cs</Link> </Compile> @@ -118,7 +115,7 @@ <Compile Include="$(CommonPath)\System\Net\SocketAddressPal.Unix.cs"> <Link>Common\System\Net\SocketAddressPal.Unix.cs</Link> </Compile> - <Compile Include="$(CommonPath)\System\Net\Sockets\SocketErrorPal.Unix.cs" > + <Compile Include="$(CommonPath)\System\Net\Sockets\SocketErrorPal.Unix.cs"> <Link>ProductionCode\Common\System\Net\Sockets\SocketErrorPal.Unix.cs</Link> </Compile> <Compile Include="$(CommonPath)\Interop\Unix\Interop.Libraries.cs"> @@ -131,8 +128,5 @@ <Link>ProductionCode\Common\Interop\Unix\System.Native\Interop.SocketAddress.cs</Link> </Compile> </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.Net.Primitives/tests/UnitTests/project.json b/src/System.Net.Primitives/tests/UnitTests/project.json deleted file mode 100644 index a71d831680..0000000000 --- a/src/System.Net.Primitives/tests/UnitTests/project.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "Microsoft.Win32.Primitives": "4.4.0-beta-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tracing": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.Linq.Expressions": "4.4.0-beta-24904-01", - "System.ObjectModel": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Text.RegularExpressions": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "System.Net.Primitives": { - "version": "4.3.0", - "exclude": "compile" - }, - "test-runtime": { - "target": "project", - "exclude": "compile" - }, - "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04", - "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04" - }, - "frameworks": { - "netstandard1.7": {}, - "netstandard1.3": {} - }, - "supports": { - "coreFx.Test.netcore50": {}, - "coreFx.Test.netcoreapp1.0": {}, - "coreFx.Test.net46": {}, - "coreFx.Test.net461": {}, - "coreFx.Test.net462": {}, - "coreFx.Test.net463": {} - } -} diff --git a/src/System.Net.Requests/dir.props b/src/System.Net.Requests/dir.props index 503cf86a87..bfbc5bd9e0 100644 --- a/src/System.Net.Requests/dir.props +++ b/src/System.Net.Requests/dir.props @@ -1,7 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> - +</Project>
\ No newline at end of file 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 01b7c3a50b..0000000000 --- a/src/System.Net.Requests/ref/project.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "dependencies": { - "System.Collections.Specialized": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Net.ServicePoint": "4.4.0-beta-24904-01", - "System.Net.WebHeaderCollection": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24904-01", - "System.Security.Principal": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Net.Requests/src/Configurations.props b/src/System.Net.Requests/src/Configurations.props new file mode 100644 index 0000000000..3bb6330d9e --- /dev/null +++ b/src/System.Net.Requests/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard-Unix; + netstandard-Windows_NT; + net463-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.Requests/src/System.Net.Requests.builds b/src/System.Net.Requests/src/System.Net.Requests.builds deleted file mode 100644 index d4a30888fa..0000000000 --- a/src/System.Net.Requests/src/System.Net.Requests.builds +++ /dev/null @@ -1,17 +0,0 @@ -<?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> - <Project Include="System.Net.Requests.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.Net.Requests.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.Net.Requests.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Net.Requests/src/System.Net.Requests.csproj b/src/System.Net.Requests/src/System.Net.Requests.csproj index 4d2544d641..3900467521 100644 --- a/src/System.Net.Requests/src/System.Net.Requests.csproj +++ b/src/System.Net.Requests/src/System.Net.Requests.csproj @@ -1,8 +1,6 @@ -<?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> <ProjectGuid>{5EE76DCC-9FD5-47FD-AB45-BD0F0857740F}</ProjectGuid> @@ -11,7 +9,6 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net463'">None</ResourcesSourceOutputDirectory> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> @@ -23,7 +20,7 @@ <ItemGroup> <Compile Include="FxCopBaseline.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="System\Net\AuthenticationManager.cs" /> <Compile Include="System\Net\Authorization.cs" /> <Compile Include="System\Net\FileWebRequest.cs" /> @@ -102,7 +99,7 @@ <Link>Common\System\Threading\Tasks\TaskToApm.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' != 'net463' "> + <ItemGroup Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' == 'netstandard'"> <Compile Include="$(CommonPath)\Interop\Windows\wininet\Interop.wininet_errors.cs"> <Link>Common\Interop\Windows\wininet\Interop.wininet_errors.cs</Link> </Compile> @@ -125,7 +122,29 @@ <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.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> diff --git a/src/System.Net.Requests/src/project.json b/src/System.Net.Requests/src/project.json deleted file mode 100644 index cdf23a7fb4..0000000000 --- a/src/System.Net.Requests/src/project.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.Win32.Primitives": "4.4.0-beta-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Collections.Concurrent": "4.4.0-beta-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Collections.Specialized": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tracing": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.Compression": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.Net.Http": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Net.Sockets": "4.4.0-beta-24904-01", - "System.Net.ServicePoint": "4.4.0-beta-24904-01", - "System.Net.WebHeaderCollection": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Security.Principal": "4.4.0-beta-24904-01", - "System.Security.Principal.Windows": "4.4.0-beta-24904-01", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Primitives": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Net.Requests/tests/Configurations.props b/src/System.Net.Requests/tests/Configurations.props new file mode 100644 index 0000000000..512c938bad --- /dev/null +++ b/src/System.Net.Requests/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.Requests/tests/System.Net.Requests.Tests.csproj b/src/System.Net.Requests/tests/System.Net.Requests.Tests.csproj index 6c70dc4a4c..6baae18160 100644 --- a/src/System.Net.Requests/tests/System.Net.Requests.Tests.csproj +++ b/src/System.Net.Requests/tests/System.Net.Requests.Tests.csproj @@ -2,13 +2,9 @@ <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Windows_Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{851A40FE-7F07-415D-8592-5FE2096E84D3}</ProjectGuid> - <OutputType>Library</OutputType> <StringResourcesPath>../src/Resources/Strings.resx</StringResourcesPath> <DefineConstants Condition="'$(TargetGroup)'==''">$(DefineConstants);netstandard17</DefineConstants> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> @@ -31,8 +27,8 @@ </Compile> <Compile Include="$(CommonTestPath)\System\Net\Http\LoopbackServer.cs"> <Link>Common\System\Net\Http\LoopbackServer.cs</Link> - </Compile> - <Compile Include="$(CommonTestPath)\System\Diagnostics\RemoteExecutorTestBase.cs"> + </Compile> + <Compile Include="$(CommonTestPath)\System\Diagnostics\RemoteExecutorTestBase.cs"> <Link>Common\System\Diagnostics\RemoteExecutorTestBase.cs</Link> </Compile> <Compile Include="$(CommonTestPath)\System\IO\FileCleanupTestBase.cs"> @@ -59,11 +55,5 @@ <Link>Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Net.Requests.pkgproj"> - <Name>System.Net.Requests</Name> - <Project>{5EE76DCC-9FD5-47FD-AB45-BD0F0857740F}</Project> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Net.Security/dir.props b/src/System.Net.Security/dir.props index 503cf86a87..bfbc5bd9e0 100644 --- a/src/System.Net.Security/dir.props +++ b/src/System.Net.Security/dir.props @@ -1,7 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Net.Security/ref/Configurations.props b/src/System.Net.Security/ref/Configurations.props new file mode 100644 index 0000000000..de35842580 --- /dev/null +++ b/src/System.Net.Security/ref/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7; + netcoreapp1.1; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.Security/ref/System.Net.Security.csproj b/src/System.Net.Security/ref/System.Net.Security.csproj index f6d6dc6a39..7a75a4011f 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> </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 4bbd1b0943..0000000000 --- a/src/System.Net.Security/ref/project.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "dependencies": { - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24904-01", - "System.Security.Principal": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {}, - "netcoreapp1.1": {} - } -} diff --git a/src/System.Net.Security/src/Configurations.props b/src/System.Net.Security/src/Configurations.props new file mode 100644 index 0000000000..3bb6330d9e --- /dev/null +++ b/src/System.Net.Security/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard-Unix; + netstandard-Windows_NT; + net463-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.Security/src/System.Net.Security.builds b/src/System.Net.Security/src/System.Net.Security.builds deleted file mode 100644 index f7bc64f5d6..0000000000 --- a/src/System.Net.Security/src/System.Net.Security.builds +++ /dev/null @@ -1,16 +0,0 @@ -<?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> - <Project Include="System.Net.Security.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.Net.Security.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.Net.Security.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> diff --git a/src/System.Net.Security/src/System.Net.Security.csproj b/src/System.Net.Security/src/System.Net.Security.csproj index 16c5469a15..a85d8b495e 100644 --- a/src/System.Net.Security/src/System.Net.Security.csproj +++ b/src/System.Net.Security/src/System.Net.Security.csproj @@ -1,8 +1,5 @@ -<?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.Net.Security</AssemblyName> @@ -11,15 +8,6 @@ <DefineConstants>$(DefineConstants);FEATURE_CORECLR</DefineConstants> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> <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'" /> @@ -28,7 +16,7 @@ <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'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="System\PinnableBufferCache.cs" /> <Compile Include="System\Net\FixedSizeReader.cs" /> <Compile Include="System\Net\HelperAsyncResults.cs" /> @@ -135,7 +123,7 @@ <Link>Common\System\Net\SecurityStatusPal.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' != 'net463' "> + <ItemGroup Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' == 'netstandard' "> <Compile Include="System\Net\CertificateValidationPal.Windows.cs" /> <Compile Include="System\Net\Security\NegotiateStreamPal.Windows.cs" /> <Compile Include="System\Net\Security\NetEventSource.Security.Windows.cs" /> @@ -374,5 +362,30 @@ <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> + <ItemGroup Condition="'$(TargetsUnix)' == 'true'"> + <Reference Include="System.Security.Cryptography.Algorithms" /> + <Reference Include="System.Security.Cryptography.OpenSsl" /> + <Reference Include="System.Security.Cryptography.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.Security/src/unix/project.json b/src/System.Net.Security/src/unix/project.json deleted file mode 100644 index 5f6576cb91..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-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Collections.Concurrent": "4.4.0-beta-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tracing": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.Globalization.Extensions": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.Security.Cryptography.OpenSsl": "4.4.0-beta-24904-01", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24904-01", - "System.Security.Principal": "4.4.0-beta-24904-01", - "System.Security.Principal.Windows": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01" - } - } - } -} 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 fad384f335..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-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Collections.Concurrent": "4.4.0-beta-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tracing": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24904-01", - "System.Security.Principal": "4.4.0-beta-24904-01", - "System.Security.Principal.Windows": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.Net.Security/tests/FunctionalTests/Configurations.props b/src/System.Net.Security/tests/FunctionalTests/Configurations.props new file mode 100644 index 0000000000..2b3220d696 --- /dev/null +++ b/src/System.Net.Security/tests/FunctionalTests/Configurations.props @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7-Unix; + netstandard1.7-Windows_NT; + netstandard1.7-OSX; + netcoreapp1.1-Windows_NT; + netcoreapp1.1-Unix; + netcoreapp1.1-OSX; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj b/src/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj index c40eb1b8c2..0faf4cfb2e 100644 --- a/src/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj +++ b/src/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj @@ -1,27 +1,12 @@ <?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> - <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{A55A2B9A-830F-4330-A0E7-02A9FB30ABD2}</ProjectGuid> - <OutputType>Library</OutputType> - <NugetTargetMoniker Condition="'$(TargetGroup)'==''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition=" '$(TargetsUnix)' == 'true' "> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> </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)' == 'Linux_Debug|AnyCPU' " /> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Linux_Release|AnyCPU' " /> @@ -102,7 +87,7 @@ <Compile Include="SslStreamAlertsTest.cs" /> <Compile Include="SslStreamSystemDefaultsTest.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)'==''"> + <ItemGroup Condition="'$(TargetGroup)'=='netstandard1.7'"> <Compile Include="LoggingTest.cs" /> <Compile Include="$(CommonTestPath)\System\Diagnostics\Tracing\TestEventListener.cs"> <Link>Common\System\Diagnostics\Tracing\TestEventListener.cs</Link> @@ -159,10 +144,6 @@ <SupplementalTestData Include="$(PackagesDir)System.Net.TestData\1.0.0-prerelease\content\**\*.*" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\pkg\System.Net.Security.pkgproj"> - <Project>{89F37791-6254-4D60-AB96-ACD3CCA0E771}</Project> - <Name>System.Net.Security</Name> - </ProjectReference> <ProjectReference Include="$(CommonTestPath)\System\Diagnostics\RemoteExecutorConsoleApp\RemoteExecutorConsoleApp.csproj"> <Project>{69e46a6f-9966-45a5-8945-2559fe337827}</Project> <Name>RemoteExecutorConsoleApp</Name> diff --git a/src/System.Net.Security/tests/FunctionalTests/unix/project.json b/src/System.Net.Security/tests/FunctionalTests/unix/project.json deleted file mode 100644 index 214f38d186..0000000000 --- a/src/System.Net.Security/tests/FunctionalTests/unix/project.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "Microsoft.Win32.Primitives": "4.4.0-beta-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Collections.Concurrent": "4.4.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.Diagnostics.Tracing": "4.4.0-beta-24904-01", - "System.Globalization.Extensions": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.Linq.Expressions": "4.4.0-beta-24904-01", - "System.Net.NameResolution": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Net.Sockets": "4.4.0-beta-24904-01", - "System.Net.TestData": "1.0.0-prerelease", - "System.ObjectModel": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Algorithms": "4.4.0-beta-24904-01", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24904-01", - "System.Security.Principal": "4.4.0-beta-24904-01", - "System.Text.RegularExpressions": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "test-runtime": { - "target": "project", - "exclude": "compile" - }, - "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04", - "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04" - }, - "frameworks": { - "netstandard1.7": {}, - "netcoreapp1.1": {} - }, - "supports": { - "coreFx.Test.netcoreapp1.1": {}, - "coreFx.Test.net463": {} - } -} diff --git a/src/System.Net.Security/tests/FunctionalTests/win/project.json b/src/System.Net.Security/tests/FunctionalTests/win/project.json deleted file mode 100644 index 2ac4663f39..0000000000 --- a/src/System.Net.Security/tests/FunctionalTests/win/project.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "System.Collections.Concurrent": "4.4.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.Diagnostics.Tracing": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.Linq.Expressions": "4.4.0-beta-24904-01", - "System.Net.NameResolution": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Net.Sockets": "4.4.0-beta-24904-01", - "System.Net.TestData": "1.0.0-prerelease", - "System.ObjectModel": "4.4.0-beta-24904-01", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24904-01", - "System.Security.Principal": "4.4.0-beta-24904-01", - "System.Security.Principal.Windows": "4.4.0-beta-24904-01", - "System.Text.RegularExpressions": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "test-runtime": { - "target": "project", - "exclude": "compile" - }, - "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04", - "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04" - }, - "frameworks": { - "netstandard1.7": {}, - "netcoreapp1.1": {} - }, - "supports": { - "coreFx.Test.netcoreapp1.1": {}, - "coreFx.Test.net463": {} - } -} diff --git a/src/System.Net.Security/tests/UnitTests/Configurations.props b/src/System.Net.Security/tests/UnitTests/Configurations.props new file mode 100644 index 0000000000..90648972ae --- /dev/null +++ b/src/System.Net.Security/tests/UnitTests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7-Unix; + netstandard1.7-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj b/src/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj index 547c9e68c2..5744adf999 100644 --- a/src/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj +++ b/src/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj @@ -1,17 +1,10 @@ -<?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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{0D174EA9-9E61-4519-8D31-7BD2331A1982}</ProjectGuid> - <OutputType>Library</OutputType> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath> - <NugetTargetMoniker>.NETStandard,Version=v1.7</NugetTargetMoniker> <!-- UnitTests compile production source-code in order to test internal units such as individual methods and classes. Dependencies are broken via Fakes. Since we are referencing netstandard, the real types can conflict with the ones @@ -25,21 +18,16 @@ <ItemGroup> <Compile Include="SslStreamAllowedProtocolsTest.cs" /> <Compile Include="TlsAlertsMatchWindowsInterop.cs" /> - <!-- Fakes --> <Compile Include="Fakes\FakeSslState.cs" /> <Compile Include="Fakes\FakeAuthenticatedStream.cs" /> <Compile Include="Fakes\FakeLazyAsyncResult.cs" /> - <!-- Common test files --> <Compile Include="$(CommonTestPath)\System\Net\SslProtocolSupport.cs"> <Link>CommonTest\System\Net\SslProtocolSupport.cs</Link> </Compile> </ItemGroup> <ItemGroup> - <None Include="project.json" /> - </ItemGroup> - <ItemGroup> <!-- Production code references --> <Compile Include="..\..\src\System\Net\Security\SslStream.cs"> <Link>ProductionCode\System\Net\Security\SslStream.cs</Link> @@ -59,7 +47,6 @@ <Compile Include="$(CommonPath)\Interop\Windows\SChannel\Interop.Alerts.cs"> <Link>Common\Interop\Windows\SChannel\Interop.Alerts.cs</Link> </Compile> - <!-- Logging --> <Compile Include="$(CommonPath)\System\Net\Shims\TraceSource.cs"> <Link>ProductionCode\Common\System\Net\Shims\TraceSource.cs</Link> @@ -72,4 +59,4 @@ </Compile> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Security/tests/UnitTests/project.json b/src/System.Net.Security/tests/UnitTests/project.json deleted file mode 100644 index 148cf37b47..0000000000 --- a/src/System.Net.Security/tests/UnitTests/project.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "System.Diagnostics.Tracing": "4.4.0-beta-24904-01", - "System.Linq.Expressions": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Net.Sockets": "4.4.0-beta-24904-01", - "System.Net.TestData": "1.0.0-prerelease", - "System.ObjectModel": "4.4.0-beta-24904-01", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24904-01", - "System.Text.RegularExpressions": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "test-runtime": { - "target": "project", - "exclude": "compile" - }, - "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04", - "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04" - }, - "frameworks": { - "netstandard1.7": {} - }, - "supports": { - "coreFx.Test.netcoreapp1.1": {}, - "coreFx.Test.net463": {} - } -} diff --git a/src/System.Net.ServicePoint/dir.props b/src/System.Net.ServicePoint/dir.props index ea772032c8..8714c4b9a3 100644 --- a/src/System.Net.ServicePoint/dir.props +++ b/src/System.Net.ServicePoint/dir.props @@ -1,7 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.0.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> - +</Project>
\ 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..a5d114694c 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> + <DefineConstants Condition="'$(TargetGroup)' == 'netcoreapp'">$(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 a6b6dab0b2..0000000000 --- a/src/System.Net.ServicePoint/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Net.ServicePoint/src/Configurations.props b/src/System.Net.ServicePoint/src/Configurations.props new file mode 100644 index 0000000000..53b62c64fe --- /dev/null +++ b/src/System.Net.ServicePoint/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net461-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.ServicePoint/src/System.Net.ServicePoint.builds b/src/System.Net.ServicePoint/src/System.Net.ServicePoint.builds deleted file mode 100644 index 8c00b6a8c2..0000000000 --- a/src/System.Net.ServicePoint/src/System.Net.ServicePoint.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.Net.ServicePoint.csproj" /> - <Project Include="System.Net.ServicePoint.csproj"> - <TargetGroup>net461</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Net.ServicePoint/src/System.Net.ServicePoint.csproj b/src/System.Net.ServicePoint/src/System.Net.ServicePoint.csproj index 21acd77933..c8d8564161 100644 --- a/src/System.Net.ServicePoint/src/System.Net.ServicePoint.csproj +++ b/src/System.Net.ServicePoint/src/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" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{53D09AF4-0C13-4197-B8AD-9746F0374E88}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net461'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the options --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.7_Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.7_Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard_Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard_Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net461_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net461_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' != 'net461'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="System\Net\BindIPEndPoint.cs" /> <Compile Include="System\Net\ServicePoint.cs" /> <Compile Include="System\Net\ServicePointManager.cs" /> @@ -22,7 +21,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 d25209bc5c..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-24904-01", - "System.Collections.Concurrent": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Net.Security": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24904-01" - } - }, - "net461": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.1": "1.0.1" - } - } - } -} diff --git a/src/System.Net.ServicePoint/tests/Configurations.props b/src/System.Net.ServicePoint/tests/Configurations.props new file mode 100644 index 0000000000..de35842580 --- /dev/null +++ b/src/System.Net.ServicePoint/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7; + netcoreapp1.1; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.csproj b/src/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.csproj index 07211498db..2d9068190e 100644 --- a/src/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.csproj +++ b/src/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.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 Condition="'$(TargetGroup)'==''">.NETStandard,Version=v1.7</NugetTargetMoniker> <ProjectGuid>{0D1E2954-A5C7-4B8C-932A-31EB4A96A726}</ProjectGuid> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'netstandard1.7_Debug|AnyCPU' " /> @@ -15,14 +13,5 @@ <!-- TODO #13070: Add net463 to the condition after the TFM gets updated to the actual .Net 4.6.3.--> <Compile Include="TlsSystemDefault.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Net.ServicePoint.pkgproj"> - <Name>System.Net.ServicePoint</Name> - <Project>{53D09AF4-0C13-4197-B8AD-9746F0374E88}</Project> - </ProjectReference> - </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.Net.Sockets/dir.props b/src/System.Net.Sockets/dir.props index 7bb155c44e..a960cef1a3 100644 --- a/src/System.Net.Sockets/dir.props +++ b/src/System.Net.Sockets/dir.props @@ -1,7 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.2.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Net.Sockets/ref/4.1.0/project.json b/src/System.Net.Sockets/ref/4.1.0/project.json deleted file mode 100644 index 9f4fe4fcf2..0000000000 --- a/src/System.Net.Sockets/ref/4.1.0/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Net.Sockets": "4.3.0" - }, - "frameworks": { - "netstandard1.3": {} - } -}
\ 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 ddddc6b801..0000000000 --- a/src/System.Net.Sockets/ref/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "System.IO": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Net.Sockets/src/Configurations.props b/src/System.Net.Sockets/src/Configurations.props new file mode 100644 index 0000000000..a2712c363b --- /dev/null +++ b/src/System.Net.Sockets/src/Configurations.props @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netcore50-Windows_NT; + netstandard-Unix; + netstandard-Windows_NT; + net463-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.Sockets/src/System.Net.Sockets.builds b/src/System.Net.Sockets/src/System.Net.Sockets.builds deleted file mode 100644 index a48210b235..0000000000 --- a/src/System.Net.Sockets/src/System.Net.Sockets.builds +++ /dev/null @@ -1,21 +0,0 @@ -<?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> - <Project Include="System.Net.Sockets.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.Net.Sockets.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.Net.Sockets.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - <Project Include="System.Net.Sockets.csproj"> - <OSGroup>Windows_NT</OSGroup> - <TargetGroup>netcore50</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Net.Sockets/src/System.Net.Sockets.csproj b/src/System.Net.Sockets/src/System.Net.Sockets.csproj index 010b2ae7b6..935e6816ed 100644 --- a/src/System.Net.Sockets/src/System.Net.Sockets.csproj +++ b/src/System.Net.Sockets/src/System.Net.Sockets.csproj @@ -1,8 +1,6 @@ -<?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> - </PropertyGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <AssemblyName>System.Net.Sockets</AssemblyName> @@ -10,15 +8,10 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <EnableWinRT Condition="'$(TargetGroup)' == 'netcore50'">true</EnableWinRT> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> <AssemblyVersion Condition="'$(TargetGroup)' == 'netcore50'">4.1.1.0</AssemblyVersion> <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'" /> @@ -40,7 +33,7 @@ <Compile Include="System\Net\Sockets\SocketReceiveMessageFromResult.cs" /> <Compile Include="System\Net\Sockets\SocketTaskExtensions.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard' or '$(TargetGroup)' == 'netcore50'"> <!-- CoreCLR (All Operating Systems), .NET Native --> <Compile Include="System\Net\DnsAPMExtensions.cs" /> <Compile Include="System\Net\SocketPerfCounters.cs" /> @@ -154,7 +147,7 @@ <Link>Common\System\Threading\Tasks\TaskToApm.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition=" '$(TargetsWindows)' == 'true' AND '$(TargetGroup)' != 'net463' "> + <ItemGroup Condition=" '$(TargetsWindows)' == 'true' AND ('$(TargetGroup)' == 'netstandard' or '$(TargetGroup)' == 'netcore50')"> <!-- Windows: CoreCLR and .NET Native --> <Compile Include="System\Net\Sockets\AcceptOverlappedAsyncResult.Windows.cs" /> <Compile Include="System\Net\Sockets\BaseOverlappedAsyncResult.Windows.cs" /> @@ -277,7 +270,7 @@ </Compile> </ItemGroup> <!-- Windows : Win32 only --> - <ItemGroup Condition="'$(TargetsWindows)' == 'true' AND '$(EnableWinRT)' != 'true' AND '$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetsWindows)' == 'true' AND '$(EnableWinRT)' != 'true' AND ('$(TargetGroup)' == 'netstandard' or '$(TargetGroup)' == 'netcore50')"> <Compile Include="$(CommonPath)\Interop\Windows\Winsock\SafeOverlappedFree.cs"> <Link>Interop\Windows\Winsock\SafeOverlappedFree.cs</Link> </Compile> @@ -452,7 +445,25 @@ <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> + <ItemGroup Condition="'$(TargetsUnix)' == 'true'"> + <Reference Include="System.Threading.ThreadPool" /> </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 91f8c36efa..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-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tracing": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24904-01", - "System.Net.NameResolution": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Security.Principal.Windows": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01" - } - }, - "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 3fc92480b0..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-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tracing": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24904-01", - "System.Net.NameResolution": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Security.Principal.Windows": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Overlapped": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01" - } - } - } -} diff --git a/src/System.Net.Sockets/tests/FunctionalTests/Configurations.props b/src/System.Net.Sockets/tests/FunctionalTests/Configurations.props new file mode 100644 index 0000000000..98f53209d4 --- /dev/null +++ b/src/System.Net.Sockets/tests/FunctionalTests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj b/src/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj index a25572eff4..cdebd96900 100644 --- a/src/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj +++ b/src/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj @@ -2,11 +2,7 @@ <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition="'$(Platform)' == ''">AnyCPU</Platform> <ProjectGuid>{8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}</ProjectGuid> - <OutputType>Library</OutputType> - <NugetTargetMoniker Condition="'$(NugetTargetMoniker)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -108,12 +104,7 @@ </Compile> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\..\System.Security.Principal.Windows\pkg\System.Security.Principal.Windows.pkgproj" /> - <ProjectReference Include="..\..\pkg\System.Net.Sockets.pkgproj"> - <Project>{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}</Project> - <Name>System.Net.Sockets</Name> - </ProjectReference> - <ProjectReference Include="$(CommonTestPath)\System\Diagnostics\RemoteExecutorConsoleApp\RemoteExecutorConsoleApp.csproj"> + <ProjectReference Include="$(CommonTestPath)\System\Diagnostics\RemoteExecutorConsoleApp\RemoteExecutorConsoleApp.csproj"> <Project>{69e46a6f-9966-45a5-8945-2559fe337827}</Project> <Name>RemoteExecutorConsoleApp</Name> </ProjectReference> diff --git a/src/System.Net.Sockets/tests/PerformanceTests/Configurations.props b/src/System.Net.Sockets/tests/PerformanceTests/Configurations.props new file mode 100644 index 0000000000..a9c55e67cd --- /dev/null +++ b/src/System.Net.Sockets/tests/PerformanceTests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3-Windows_NT; + netstandard1.3-Unix; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.Sockets/tests/PerformanceTests/System.Net.Sockets.Async.Performance.Tests.csproj b/src/System.Net.Sockets/tests/PerformanceTests/System.Net.Sockets.Async.Performance.Tests.csproj index 54b7ff8177..54fb524de4 100644 --- a/src/System.Net.Sockets/tests/PerformanceTests/System.Net.Sockets.Async.Performance.Tests.csproj +++ b/src/System.Net.Sockets/tests/PerformanceTests/System.Net.Sockets.Async.Performance.Tests.csproj @@ -1,13 +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>{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}</ProjectGuid> - <OutputType>Library</OutputType> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Linux_Debug|AnyCPU' " /> @@ -18,9 +13,8 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Windows_Release|AnyCPU' " /> <ItemGroup> <Compile Include="SocketPerformanceAsyncTests.cs" /> - <Compile Include="SocketTestClientAPMMock.cs" /> + <Compile Include="SocketTestClientAPMMock.cs" /> <Compile Include="SocketTestServerAPMMock.cs" /> - <!-- Common Sockets files --> <Compile Include="$(CommonTestPath)\System\Net\Sockets\TestSettings.cs"> <Link>SocketCommon\TestSettings.cs</Link> @@ -43,7 +37,6 @@ <Compile Include="$(CommonTestPath)\System\Net\Sockets\Performance\SocketTestClientAsync.cs"> <Link>SocketCommon\SocketTestClientAsync.cs</Link> </Compile> - <!-- Common test files --> <Compile Include="$(CommonTestPath)\System\Net\TestLogging.cs"> <Link>Common\System\Net\TestLogging.cs</Link> @@ -58,25 +51,15 @@ <Link>Common\System\Net\Capability.Sockets.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition=" '$(TargetsWindows)' == 'true' "> <Compile Include="$(CommonTestPath)\System\Net\Sockets\Performance\SocketTestMemcmp.Windows.cs"> <Link>SocketCommon\SocketTestMemcmp.Windows.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition=" '$(TargetsUnix)' == 'true' "> <Compile Include="$(CommonTestPath)\System\Net\Sockets\Performance\SocketTestMemcmp.Unix.cs"> <Link>SocketCommon\SocketTestMemcmp.Unix.cs</Link> </Compile> </ItemGroup> - - <ItemGroup> - <ProjectReference Include="..\..\pkg\System.Net.Sockets.pkgproj"> - <Project>{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}</Project> - <Name>System.Net.Sockets</Name> - </ProjectReference> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.WebClient/dir.props b/src/System.Net.WebClient/dir.props index ea772032c8..f254b412b5 100644 --- a/src/System.Net.WebClient/dir.props +++ b/src/System.Net.WebClient/dir.props @@ -1,7 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.0.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> + <IsNETCoreAppRef>false</IsNETCoreAppRef> </PropertyGroup> -</Project> - +</Project>
\ No newline at end of file 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 0b210ad428..0000000000 --- a/src/System.Net.WebClient/ref/project.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "dependencies": { - "System.Collections.Specialized": "4.4.0-beta-24904-01", - "System.ComponentModel": "4.4.0-beta-24904-01", - "System.ComponentModel.Primitives": "4.4.0-beta-24904-01", - "System.ComponentModel.EventBasedAsync": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Net.Requests": "4.4.0-beta-24904-01", - "System.Net.WebHeaderCollection": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Net.WebClient/src/Configurations.props b/src/System.Net.WebClient/src/Configurations.props new file mode 100644 index 0000000000..53b62c64fe --- /dev/null +++ b/src/System.Net.WebClient/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net461-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.WebClient/src/System.Net.WebClient.builds b/src/System.Net.WebClient/src/System.Net.WebClient.builds deleted file mode 100644 index d01ac94cde..0000000000 --- a/src/System.Net.WebClient/src/System.Net.WebClient.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.Net.WebClient.csproj" /> - <Project Include="System.Net.WebClient.csproj"> - <TargetGroup>net461</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Net.WebClient/src/System.Net.WebClient.csproj b/src/System.Net.WebClient/src/System.Net.WebClient.csproj index 2c1bd1d809..27f0b4520c 100644 --- a/src/System.Net.WebClient/src/System.Net.WebClient.csproj +++ b/src/System.Net.WebClient/src/System.Net.WebClient.csproj @@ -1,18 +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> <ProjectGuid>{53D09AF4-0C13-4197-B8AD-9746F0374E88}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net461'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the options --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.7_Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.7_Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard_Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard_Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net461_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net461_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' != 'net461'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="System\Net\WebClient.cs" /> <Compile Include="$(CommonPath)\System\IO\DelegatingStream.cs"> <Link>Common\System\IO\DelegatingStream.cs</Link> @@ -34,7 +33,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 2fd87cb492..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-24904-01", - "System.Collections.Specialized": "4.4.0-beta-24904-01", - "System.ComponentModel": "4.4.0-beta-24904-01", - "System.ComponentModel.Primitives": "4.4.0-beta-24904-01", - "System.ComponentModel.EventBasedAsync": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Diagnostics.Tracing": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.Globalization.Extensions": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Net.Requests": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - } - }, - "net461": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.1": "1.0.1" - } - } - } -} diff --git a/src/System.Net.WebClient/tests/Configurations.props b/src/System.Net.WebClient/tests/Configurations.props new file mode 100644 index 0000000000..98f53209d4 --- /dev/null +++ b/src/System.Net.WebClient/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.WebClient/tests/System.Net.WebClient.Tests.csproj b/src/System.Net.WebClient/tests/System.Net.WebClient.Tests.csproj index 06e55940f9..0e51d49967 100644 --- a/src/System.Net.WebClient/tests/System.Net.WebClient.Tests.csproj +++ b/src/System.Net.WebClient/tests/System.Net.WebClient.Tests.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.7</NugetTargetMoniker> <ProjectGuid>{0D1E2954-A5C7-4B8C-932A-31EB4A96A726}</ProjectGuid> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'netstandard1.7_Debug|AnyCPU' " /> @@ -23,14 +21,5 @@ <Link>Common\System\Net\Http\LoopbackServer.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Net.WebClient.pkgproj"> - <Name>System.Net.WebClient</Name> - <Project>{53D09AF4-0C13-4197-B8AD-9746F0374E88}</Project> - </ProjectReference> - </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.Net.WebHeaderCollection/dir.props b/src/System.Net.WebHeaderCollection/dir.props index fcc1a7ca5a..bfbc5bd9e0 100644 --- a/src/System.Net.WebHeaderCollection/dir.props +++ b/src/System.Net.WebHeaderCollection/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 c85060fadd..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-24904-01", - "System.Collections.Specialized": "4.4.0-beta-24904-01" - } - } - } -} diff --git a/src/System.Net.WebHeaderCollection/src/Configurations.props b/src/System.Net.WebHeaderCollection/src/Configurations.props new file mode 100644 index 0000000000..9c336c0be9 --- /dev/null +++ b/src/System.Net.WebHeaderCollection/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.WebHeaderCollection/src/System.Net.WebHeaderCollection.builds b/src/System.Net.WebHeaderCollection/src/System.Net.WebHeaderCollection.builds deleted file mode 100644 index 88b95c1076..0000000000 --- a/src/System.Net.WebHeaderCollection/src/System.Net.WebHeaderCollection.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.Net.WebHeaderCollection.csproj" /> - <Project Include="System.Net.WebHeaderCollection.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Net.WebHeaderCollection/src/System.Net.WebHeaderCollection.csproj b/src/System.Net.WebHeaderCollection/src/System.Net.WebHeaderCollection.csproj index 29153952eb..9ec610b08e 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> @@ -7,14 +7,13 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net463'">None</ResourcesSourceOutputDirectory> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="System\Net\WebHeaderCollection.cs" /> <Compile Include="System\Net\HttpResponseHeader.cs" /> <Compile Include="System\Net\HttpRequestHeader.cs" /> @@ -45,7 +44,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 3d097d283c..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-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Collections.Specialized": "4.4.0-beta-24904-01", - "System.Diagnostics.Tracing": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Net.WebHeaderCollection/tests/Configurations.props b/src/System.Net.WebHeaderCollection/tests/Configurations.props new file mode 100644 index 0000000000..2a160a39e8 --- /dev/null +++ b/src/System.Net.WebHeaderCollection/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3-Windows_NT; + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.WebHeaderCollection/tests/System.Net.WebHeaderCollection.Tests.csproj b/src/System.Net.WebHeaderCollection/tests/System.Net.WebHeaderCollection.Tests.csproj index d21f778bc3..a6e41e51d2 100644 --- a/src/System.Net.WebHeaderCollection/tests/System.Net.WebHeaderCollection.Tests.csproj +++ b/src/System.Net.WebHeaderCollection/tests/System.Net.WebHeaderCollection.Tests.csproj @@ -1,20 +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> <ProjectGuid>{F8C21EE8-B271-4014-B9D9-B2C31520AF3F}</ProjectGuid> - <OutputType>Library</OutputType> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> - <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> - <ItemGroup> <Compile Include="WebHeaderCollectionTest.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == ''"> <Compile Include="LoggingTest.cs" /> <Compile Include="WebHeaderCollectionTest.netstandard17.cs" /> @@ -22,13 +17,5 @@ <Link>Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs</Link> </Compile> </ItemGroup> - - <ItemGroup> - <ProjectReference Include="..\pkg\System.Net.WebHeaderCollection.pkgproj"> - <Project>{5EE76DCC-9FD5-47FD-AB45-BD0F0857740F}</Project> - <Name>System.Net.WebHeaderCollection</Name> - </ProjectReference> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file 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 2a36928166..0000000000 --- a/src/System.Net.WebProxy/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Net.WebProxy/src/Configurations.props b/src/System.Net.WebProxy/src/Configurations.props new file mode 100644 index 0000000000..53b62c64fe --- /dev/null +++ b/src/System.Net.WebProxy/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net461-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.WebProxy/src/System.Net.WebProxy.builds b/src/System.Net.WebProxy/src/System.Net.WebProxy.builds deleted file mode 100644 index a5fa9d44e1..0000000000 --- a/src/System.Net.WebProxy/src/System.Net.WebProxy.builds +++ /dev/null @@ -1,11 +0,0 @@ -<?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> - <Project Include="System.Net.WebProxy.csproj" /> - <Project Include="System.Net.WebProxy.csproj"> - <TargetGroup>net461</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> diff --git a/src/System.Net.WebProxy/src/System.Net.WebProxy.csproj b/src/System.Net.WebProxy/src/System.Net.WebProxy.csproj index 15a44d0673..893cd1a561 100644 --- a/src/System.Net.WebProxy/src/System.Net.WebProxy.csproj +++ b/src/System.Net.WebProxy/src/System.Net.WebProxy.csproj @@ -1,18 +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> <ProjectGuid>{53D09AF4-0C13-4197-B8AD-9746F0374E88}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net461'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the options --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.7_Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.7_Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard_Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard_Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net461_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net461_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' != 'net461'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="System\Net\IWebProxyScript.cs" /> <Compile Include="System\Net\WebProxy.cs" /> </ItemGroup> @@ -20,7 +19,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 0977bdc1e1..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-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Diagnostics.Tracing": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.Globalization.Extensions": "4.4.0-beta-24904-01", - "System.Net.NameResolution": "4.4.0-beta-24904-01", - "System.Net.NetworkInformation": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Net.Requests": "4.4.0-beta-24904-01", - "System.Net.Sockets": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Text.RegularExpressions": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - } - }, - "net461": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.1": "1.0.1" - } - } - } -} diff --git a/src/System.Net.WebProxy/tests/Configurations.props b/src/System.Net.WebProxy/tests/Configurations.props new file mode 100644 index 0000000000..98f53209d4 --- /dev/null +++ b/src/System.Net.WebProxy/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.WebProxy/tests/System.Net.WebProxy.Tests.csproj b/src/System.Net.WebProxy/tests/System.Net.WebProxy.Tests.csproj index 8dd9e28e90..63f3b1c759 100644 --- a/src/System.Net.WebProxy/tests/System.Net.WebProxy.Tests.csproj +++ b/src/System.Net.WebProxy/tests/System.Net.WebProxy.Tests.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.7</NugetTargetMoniker> <ProjectGuid>{0D1E2954-A5C7-4B8C-932A-31EB4A96A726}</ProjectGuid> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'netstandard1.7_Debug|AnyCPU' " /> @@ -11,14 +9,5 @@ <ItemGroup> <Compile Include="WebProxyTest.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Net.WebProxy.pkgproj"> - <Name>System.Net.WebProxy</Name> - <Project>{53D09AF4-0C13-4197-B8AD-9746F0374E88}</Project> - </ProjectReference> - </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.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/Configurations.props b/src/System.Net.WebSockets.Client/src/Configurations.props new file mode 100644 index 0000000000..7ba33a3388 --- /dev/null +++ b/src/System.Net.WebSockets.Client/src/Configurations.props @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netcore50-Windows_NT; + netstandard1.3-Unix; + netstandard1.3-Windows_NT; + net46-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.builds b/src/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.builds deleted file mode 100644 index 17254a2762..0000000000 --- a/src/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.builds +++ /dev/null @@ -1,21 +0,0 @@ -<?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> - <Project Include="System.Net.WebSockets.Client.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.Net.WebSockets.Client.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.Net.WebSockets.Client.csproj"> - <TargetGroup>net46</TargetGroup> - </Project> - <Project Include="System.Net.WebSockets.Client.csproj"> - <OSGroup>Windows_NT</OSGroup> - <TargetGroup>netcore50</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - 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..a6dc39f968 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,8 +1,6 @@ -<?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>{B8AD98AE-84C3-4313-B3F1-EE8BD5BFF69B}</ProjectGuid> @@ -10,16 +8,11 @@ <EnableWinRT Condition="'$(TargetGroup)' == 'netcore50'">true</EnableWinRT> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net46'">None</ResourcesSourceOutputDirectory> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker> <!-- // uncomment to use the managed "unix" implementation on Windows <TargetsWindows Condition="'$(TargetGroup)' == ''">false</TargetsWindows> <TargetsUnix Condition="'$(TargetGroup)' == ''">true</TargetsUnix> --> </PropertyGroup> - <PropertyGroup Condition=" '$(TargetsUnix)' == 'true' and '$(ProjectJson)' == '' "> - <ProjectJson>unix/project.json</ProjectJson> - <ProjectLockJson>unix/project.lock.json</ProjectLockJson> - </PropertyGroup> <PropertyGroup Condition="'$(EnableWinRT)' != 'true'"> <DefineConstants>$(DefineConstants);FEATURE_CORECLR</DefineConstants> </PropertyGroup> @@ -61,9 +54,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 +119,36 @@ <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> + <ItemGroup Condition="'$(TargetsUnix)' == 'true'"> + <Reference Include="System.Net.NameResolution" /> + <Reference Include="System.Net.Security" /> + <Reference Include="System.Net.Sockets" /> + <Reference Include="System.Security.Cryptography.Algorithms" /> + <Reference Include="System.Security.Cryptography.Primitives" /> + <Reference Include="System.Text.Encoding.Extensions" /> + <Reference Include="System.Threading.Timer" /> + </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/netcore50/project.json b/src/System.Net.WebSockets.Client/src/netcore50/project.json deleted file mode 100644 index 16532748d8..0000000000 --- a/src/System.Net.WebSockets.Client/src/netcore50/project.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "frameworks": { - "netcore50": { - "dependencies": { - "Microsoft.TargetingPack.Private.WinRT": "1.0.3", - "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.ObjectModel": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices.WindowsRuntime": "4.3.0", - "System.Runtime.WindowsRuntime": "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" - } - } - } -}
\ No newline at end of file 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 eecc918f4c..0000000000 --- a/src/System.Net.WebSockets.Client/src/project.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "frameworks": { - "netstandard1.3": { - "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.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.Client/src/unix/project.json b/src/System.Net.WebSockets.Client/src/unix/project.json deleted file mode 100644 index fbd87a82b5..0000000000 --- a/src/System.Net.WebSockets.Client/src/unix/project.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "frameworks": { - "netstandard1.3": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.Win32.Primitives": "4.3.0", - "System.Buffers": "4.3.0", - "System.Console": "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.NameResolution": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Net.Sockets": "4.3.0", - "System.Net.Security": "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.Handles": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "System.Threading.Timer": "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.Client/tests/ClientWebSocketTestBase.cs b/src/System.Net.WebSockets.Client/tests/ClientWebSocketTestBase.cs index fbc96629d0..e06bfe3997 100644 --- a/src/System.Net.WebSockets.Client/tests/ClientWebSocketTestBase.cs +++ b/src/System.Net.WebSockets.Client/tests/ClientWebSocketTestBase.cs @@ -17,8 +17,8 @@ namespace System.Net.WebSockets.Client.Tests /// </summary> public class ClientWebSocketTestBase { - public static readonly object[][] EchoServers = Configuration.WebSockets.EchoServers; - public static readonly object[][] EchoHeadersServers = Configuration.WebSockets.EchoHeadersServers; + public static readonly object[][] EchoServers = System.Net.Test.Common.Configuration.WebSockets.EchoServers; + public static readonly object[][] EchoHeadersServers = System.Net.Test.Common.Configuration.WebSockets.EchoHeadersServers; public const int TimeOutMilliseconds = 10000; public const int CloseDescriptionMaxLength = 123; @@ -43,7 +43,7 @@ namespace System.Net.WebSockets.Client.Tests // Known server but not a real websocket endpoint. { - server = Configuration.Http.RemoteEchoServer; + server = System.Net.Test.Common.Configuration.Http.RemoteEchoServer; var ub = new UriBuilder("ws", server.Host, server.Port, server.PathAndQuery); yield return new object[] { ub.Uri }; diff --git a/src/System.Net.WebSockets.Client/tests/Configurations.props b/src/System.Net.WebSockets.Client/tests/Configurations.props new file mode 100644 index 0000000000..0c2d77f6b7 --- /dev/null +++ b/src/System.Net.WebSockets.Client/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3-Unix; + netstandard1.3-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.WebSockets.Client/tests/KeepAliveTest.cs b/src/System.Net.WebSockets.Client/tests/KeepAliveTest.cs index b8ab2caf91..c56d354092 100644 --- a/src/System.Net.WebSockets.Client/tests/KeepAliveTest.cs +++ b/src/System.Net.WebSockets.Client/tests/KeepAliveTest.cs @@ -20,7 +20,7 @@ namespace System.Net.WebSockets.Client.Tests [OuterLoop] // involves long delay public async Task KeepAlive_LongDelayBetweenSendReceives_Succeeds() { - using (ClientWebSocket cws = await WebSocketHelper.GetConnectedWebSocket(Configuration.WebSockets.RemoteEchoServer, TimeOutMilliseconds, _output, TimeSpan.FromSeconds(10))) + using (ClientWebSocket cws = await WebSocketHelper.GetConnectedWebSocket(System.Net.Test.Common.Configuration.WebSockets.RemoteEchoServer, TimeOutMilliseconds, _output, TimeSpan.FromSeconds(10))) { await cws.SendAsync(new ArraySegment<byte>(new byte[1] { 42 }), WebSocketMessageType.Binary, true, CancellationToken.None); diff --git a/src/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj b/src/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj index 935f1a3b89..0b59aa06bf 100644 --- a/src/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj +++ b/src/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj @@ -1,22 +1,17 @@ <?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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{7C395A91-D955-444C-98BF-D3F809A56CE1}</ProjectGuid> - <OutputType>Library</OutputType> <StringResourcesPath>../src/Resources/Strings.resx</StringResourcesPath> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> - <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> - + <!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. --> + <ItemGroup> + <TargetingPackExclusions Include="System.Configuration" /> + </ItemGroup> <ItemGroup> <Compile Include="$(CommonTestPath)\System\AssertExtensions.cs"> <Link>Common\System\AssertExtensions.cs</Link> @@ -44,13 +39,5 @@ <Compile Include="WebSocketData.cs" /> <Compile Include="WebSocketHelper.cs" /> </ItemGroup> - - <ItemGroup> - <ProjectReference Include="..\pkg\System.Net.WebSockets.Client.pkgproj"> - <Project>{B8AD98AE-84C3-4313-B3F1-EE8BD5BFF69B}</Project> - <Name>System.Net.WebSockets.Client</Name> - </ProjectReference> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ 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 8322d21fe3..0000000000 --- a/src/System.Net.WebSockets/ref/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "dependencies": { - "Microsoft.Win32.Primitives": "4.4.0-beta-24904-01", - "System.Collections.Specialized": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Security.Principal": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Net.WebSockets/src/Configurations.props b/src/System.Net.WebSockets/src/Configurations.props new file mode 100644 index 0000000000..9c336c0be9 --- /dev/null +++ b/src/System.Net.WebSockets/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.WebSockets/src/System.Net.WebSockets.builds b/src/System.Net.WebSockets/src/System.Net.WebSockets.builds deleted file mode 100644 index cf2d57e54c..0000000000 --- a/src/System.Net.WebSockets/src/System.Net.WebSockets.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.Net.WebSockets.csproj" /> - <Project Include="System.Net.WebSockets.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Net.WebSockets/src/System.Net.WebSockets.csproj b/src/System.Net.WebSockets/src/System.Net.WebSockets.csproj index 9fbc065072..a251ab383b 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> @@ -6,14 +6,13 @@ <AssemblyName>System.Net.WebSockets</AssemblyName> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net463'">None</ResourcesSourceOutputDirectory> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard_Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard_Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="System\Net\WebSockets\WebSocket.cs" /> <Compile Include="System\Net\WebSockets\WebSocketCloseStatus.cs" /> <Compile Include="System\Net\WebSockets\WebSocketContext.cs" /> @@ -28,7 +27,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 58dcac02a4..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-24904-01", - "System.Collections.Specialized": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Security.Principal": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Net.WebSockets/tests/Configurations.props b/src/System.Net.WebSockets/tests/Configurations.props new file mode 100644 index 0000000000..98f53209d4 --- /dev/null +++ b/src/System.Net.WebSockets/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.csproj b/src/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.csproj index 56e3c46f62..e4cdf276d8 100644 --- a/src/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.csproj +++ b/src/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.csproj @@ -2,29 +2,17 @@ <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{7C395A91-D955-444C-98BF-D3F809A56CE1}</ProjectGuid> - <OutputType>Library</OutputType> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> - <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' == ''"> <Compile Include="WebSocketTests.cs" /> </ItemGroup> - <ItemGroup> <Compile Include="WebSocketExceptionTests.cs" /> <Compile Include="WebSocketReceiveResultTests.cs" /> </ItemGroup> - - <ItemGroup> - <ProjectReference Include="..\pkg\System.Net.WebSockets.pkgproj" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file 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.WindowsRuntime/src/project.json b/src/System.Numerics.Vectors.WindowsRuntime/src/project.json deleted file mode 100644 index ac8502fa7b..0000000000 --- a/src/System.Numerics.Vectors.WindowsRuntime/src/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.ObjectModel": "4.3.0", - "System.Numerics.Vectors": "4.3.0", - "System.Runtime.WindowsRuntime": "4.3.0" - }, - "frameworks": { - "uap10.0": {} - } -}
\ No newline at end of file diff --git a/src/System.Numerics.Vectors/dir.props b/src/System.Numerics.Vectors/dir.props index c196e27704..2473cb87a7 100644 --- a/src/System.Numerics.Vectors/dir.props +++ b/src/System.Numerics.Vectors/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.3.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ No newline at end of file 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/Configurations.props b/src/System.Numerics.Vectors/src/Configurations.props new file mode 100644 index 0000000000..67b41e2049 --- /dev/null +++ b/src/System.Numerics.Vectors/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net46-Windows_NT; + netstandard1.0; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Numerics.Vectors/src/System.Numerics.Vectors.builds b/src/System.Numerics.Vectors/src/System.Numerics.Vectors.builds deleted file mode 100644 index 56ba9e4df4..0000000000 --- a/src/System.Numerics.Vectors/src/System.Numerics.Vectors.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.Numerics.Vectors.csproj" /> - <Project Include="System.Numerics.Vectors.csproj"> - <TargetGroup>net46</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj b/src/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj index b57b813f85..a97460f3b8 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> @@ -8,10 +8,9 @@ <DocumentationFile>$(OutputPath)System.Numerics.Vectors.xml</DocumentationFile> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net46'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.0</NuGetTargetMoniker> - <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.0;portable-net45+win8+wp8+wpa81</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard1.0'">netstandard1.0;portable-net45+win8+wp8+wpa81</PackageTargetFramework> </PropertyGroup> - <ItemGroup Condition="'$(TargetGroup)' == ''"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard1.0'"> <!-- Use the documentation file generated by this project for the reference assembly. This needs to be kept in sync with all of the PackageTargetFrameworks used by the reference assembly projects. --> @@ -49,7 +48,7 @@ <Compile Include="System\Numerics\Vector_Operations.cs" /> </ItemGroup> <!-- Portable version only --> - <ItemGroup Condition="'$(TargetGroup)'==''"> + <ItemGroup Condition="'$(TargetGroup)'=='netstandard1.0'"> <Compile Include="System\Numerics\Matrix3x2.cs" /> <Compile Include="System\Numerics\Matrix4x4.cs" /> <Compile Include="System\Numerics\Plane.cs" /> @@ -79,7 +78,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.Numerics.Vectors/tests/Configurations.props b/src/System.Numerics.Vectors/tests/Configurations.props new file mode 100644 index 0000000000..f0ebe53119 --- /dev/null +++ b/src/System.Numerics.Vectors/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Numerics.Vectors/tests/Performance/System.Numerics.Vectors.Performance.Tests.csproj b/src/System.Numerics.Vectors/tests/Performance/System.Numerics.Vectors.Performance.Tests.csproj index dee2a5961c..21b481611c 100644 --- a/src/System.Numerics.Vectors/tests/Performance/System.Numerics.Vectors.Performance.Tests.csproj +++ b/src/System.Numerics.Vectors/tests/Performance/System.Numerics.Vectors.Performance.Tests.csproj @@ -2,14 +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" /> <PropertyGroup> - <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion> <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>System.Numerics.Performance.Tests</RootNamespace> - <AssemblyName>System.Numerics.Vectors.Performance.Tests</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NuGetPackageImportStamp>11f13d9c</NuGetPackageImportStamp> <IncludePerformanceTests>true</IncludePerformanceTests> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> <ProjectGuid>{D9906F1A-A41A-43CD-81D2-BA94CF0001C9}</ProjectGuid> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -25,16 +20,6 @@ </Compile> </ItemGroup> <ItemGroup> - <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" /> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\pkg\System.Numerics.Vectors.pkgproj"> - <Project>{53134b0c-0d57-481b-b84e-d1991e8d54ff}</Project> - <Name>System.Numerics.Vectors</Name> - </ProjectReference> - </ItemGroup> - <ItemGroup> <None Include="..\..\src\System\Numerics\ConstantHelper.tt"> <Link>ConstantHelper.tt</Link> <Generator>TextTemplatingFileGenerator</Generator> diff --git a/src/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.csproj b/src/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.csproj index f74d1836f1..8ccd99c9a1 100644 --- a/src/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.csproj +++ b/src/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.csproj @@ -2,23 +2,12 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{A7074928-82C3-4739-88FE-9B528977950C}</ProjectGuid> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>System.Numerics.Tests</RootNamespace> - <AssemblyName>System.Numerics.Vectors.Tests</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NuGetPackageImportStamp>11f13d9c</NuGetPackageImportStamp> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> <ItemGroup> <Compile Include="..\src\System\Numerics\ConstantHelper.cs"> <AutoGen>True</AutoGen> @@ -44,16 +33,6 @@ </Compile> </ItemGroup> <ItemGroup> - <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" /> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Numerics.Vectors.pkgproj"> - <Project>{53134b0c-0d57-481b-b84e-d1991e8d54ff}</Project> - <Name>System.Numerics.Vectors</Name> - </ProjectReference> - </ItemGroup> - <ItemGroup> <None Include="..\src\System\Numerics\ConstantHelper.tt"> <Link>ConstantHelper.tt</Link> <Generator>TextTemplatingFileGenerator</Generator> diff --git a/src/System.ObjectModel/dir.props b/src/System.ObjectModel/dir.props index fcc1a7ca5a..bfbc5bd9e0 100644 --- a/src/System.ObjectModel/dir.props +++ b/src/System.ObjectModel/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.ObjectModel/ref/Configurations.props b/src/System.ObjectModel/ref/Configurations.props new file mode 100644 index 0000000000..ea9ea79f78 --- /dev/null +++ b/src/System.ObjectModel/ref/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netcoreapp; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.ObjectModel/ref/System.ObjectModel.builds b/src/System.ObjectModel/ref/System.ObjectModel.builds deleted file mode 100644 index bffb2d73fd..0000000000 --- a/src/System.ObjectModel/ref/System.ObjectModel.builds +++ /dev/null @@ -1,11 +0,0 @@ -<?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> - <Project Include="System.ObjectModel.csproj" /> - <Project Include="System.ObjectModel.csproj"> - <TargetGroup>netstandard1.7</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project>
\ 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 6bf524680a..f8c8efff1a 100644 --- a/src/System.ObjectModel/ref/System.ObjectModel.csproj +++ b/src/System.ObjectModel/ref/System.ObjectModel.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 Condition="'$(TargetGroup)' == ''">.NETCoreApp,Version=v1.1</NuGetTargetMoniker> - <DefineConstants Condition="'$(TargetGroup)' == ''">$(DefineConstants);netcoreapp11</DefineConstants> + <DefineConstants Condition="'$(TargetGroup)' == 'netcoreapp'">$(DefineConstants);netcoreapp11</DefineConstants> </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 692720cb91..0000000000 --- a/src/System.ObjectModel/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Collections": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netcoreapp1.1": {}, - "netstandard1.7": {} - } -} diff --git a/src/System.ObjectModel/src/Configurations.props b/src/System.ObjectModel/src/Configurations.props new file mode 100644 index 0000000000..9c336c0be9 --- /dev/null +++ b/src/System.ObjectModel/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.ObjectModel/src/System.ObjectModel.builds b/src/System.ObjectModel/src/System.ObjectModel.builds deleted file mode 100644 index 6e803df1eb..0000000000 --- a/src/System.ObjectModel/src/System.ObjectModel.builds +++ /dev/null @@ -1,11 +0,0 @@ -<?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> - <Project Include="System.ObjectModel.csproj" /> - <Project Include="System.ObjectModel.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project>
\ No newline at end of file diff --git a/src/System.ObjectModel/src/System.ObjectModel.csproj b/src/System.ObjectModel/src/System.ObjectModel.csproj index 01e57e4236..6ea79479e7 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> @@ -7,7 +7,6 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net463'">None</ResourcesSourceOutputDirectory> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <ItemGroup Condition="'$(TargetGroup)' == 'net463'"> <ContractProject Include="..\ref\System.ObjectModel.csproj"> @@ -15,13 +14,11 @@ </ContractProject> </ItemGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard_Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard_Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.7_Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.7_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="System\Collections\Generic\DebugView.cs" /> <Compile Include="System\Collections\Specialized\INotifyCollectionChanged.cs" /> <Compile Include="System\Collections\Specialized\NotifyCollectionChangedEventArgs.cs" /> @@ -44,7 +41,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 de0a726534..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-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.ObjectModel/src/redist/project.json b/src/System.ObjectModel/src/redist/project.json deleted file mode 100644 index 606d9c3663..0000000000 --- a/src/System.ObjectModel/src/redist/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Targets": "1.1.0", - "System.ObjectModel": "4.3.0" - }, - "frameworks": { - "netcore50": {} - } -}
\ No newline at end of file diff --git a/src/System.ObjectModel/tests/Configurations.props b/src/System.ObjectModel/tests/Configurations.props new file mode 100644 index 0000000000..11a862f330 --- /dev/null +++ b/src/System.ObjectModel/tests/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + netstandard1.7; + netcoreapp1.1; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.ObjectModel/tests/System.ObjectModel.Tests.csproj b/src/System.ObjectModel/tests/System.ObjectModel.Tests.csproj index 25e9457a9d..f5447d6b7f 100644 --- a/src/System.ObjectModel/tests/System.ObjectModel.Tests.csproj +++ b/src/System.ObjectModel/tests/System.ObjectModel.Tests.csproj @@ -1,14 +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"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{82B54697-0251-47A1-8546-FC507D0F3B08}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.ObjectModel.Tests</AssemblyName> - <RootNamespace>System.ObjectModel.Tests</RootNamespace> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETCoreApp,Version=v1.1</NuGetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> </PropertyGroup> @@ -59,11 +53,5 @@ <Link>Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.ObjectModel.pkgproj"> - <Project>{F24D3391-2928-4E83-AADE-A4461E5CAE50}</Project> - <Name>System.ObjectModel</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Private.DataContractSerialization/src/Configurations.props b/src/System.Private.DataContractSerialization/src/Configurations.props new file mode 100644 index 0000000000..fc9ef9822c --- /dev/null +++ b/src/System.Private.DataContractSerialization/src/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.builds b/src/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.builds deleted file mode 100644 index ff670b1578..0000000000 --- a/src/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.builds +++ /dev/null @@ -1,15 +0,0 @@ -<?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> - <Project Include="System.Private.DataContractSerialization.csproj" /> - <!--TODO: Bring this back when uap101aot support is added - <Project Include="System.Private.DataContractSerialization.csproj"> - <OSGroup>Windows_NT</OSGroup> - <TargetGroup>uap101aot</TargetGroup> - </Project> - --> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj b/src/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj index 36926e64f9..7dd84e791e 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> @@ -13,7 +13,6 @@ <DefineConstants Condition="'$(TargetGroup)'=='uap101aot'">$(DefineConstants);NET_NATIVE</DefineConstants> <!-- We do not want to block reflection for this assembly --> <BlockReflectionAttribute Condition="'$(TargetGroup)'=='uap101aot'">false</BlockReflectionAttribute> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -163,7 +162,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 fdc184fc03..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-24904-01", - "System.CodeDom": "4.4.0-beta-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Collections.Concurrent": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Linq": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Reflection.Emit": "4.4.0-beta-24904-01", - "System.Reflection.Emit.ILGeneration": "4.4.0-beta-24904-01", - "System.Reflection.Emit.Lightweight": "4.4.0-beta-24904-01", - "System.Reflection.Extensions": "4.4.0-beta-24904-01", - "System.Reflection.Primitives": "4.4.0-beta-24904-01", - "System.Reflection.TypeExtensions": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Primitives": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Formatters": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Text.Encoding.Extensions": "4.4.0-beta-24904-01", - "System.Text.RegularExpressions": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "System.Xml.ReaderWriter": "4.4.0-beta-24904-01", - "System.Xml.XDocument": "4.4.0-beta-24904-01", - "System.Xml.XmlDocument": "4.4.0-beta-24904-01", - "System.Xml.XmlSerializer": "4.4.0-beta-24904-01" - } - } - } -} diff --git a/src/System.Private.DataContractSerialization/src/uap101aot/project.json b/src/System.Private.DataContractSerialization/src/uap101aot/project.json deleted file mode 100644 index 9b455f309a..0000000000 --- a/src/System.Private.DataContractSerialization/src/uap101aot/project.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "frameworks": { - "netcore50": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24904-00", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "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.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.Runtime.Serialization.Primitives": "4.3.0", - "System.Runtime.WindowsRuntime": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0", - "System.Xml.XDocument": "4.3.0", - "System.Xml.XmlSerializer": "4.3.0" - } - } - } -} diff --git a/src/System.Private.Uri/dir.props b/src/System.Private.Uri/dir.props index 26011ce690..8db5396db7 100644 --- a/src/System.Private.Uri/dir.props +++ b/src/System.Private.Uri/dir.props @@ -3,5 +3,7 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.0.4.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> + <IsNETCoreAppRef>false</IsNETCoreAppRef> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Private.Uri/src/Configurations.props b/src/System.Private.Uri/src/Configurations.props new file mode 100644 index 0000000000..f2122dc3ce --- /dev/null +++ b/src/System.Private.Uri/src/Configurations.props @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + uap101aot-Windows_NT; + netstandard1.0-Unix; + netstandard1.0-Windows_NT; + netcoreapp1.2corert-Unix; + netcoreapp1.2corert-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Private.Uri/src/System.Private.Uri.builds b/src/System.Private.Uri/src/System.Private.Uri.builds deleted file mode 100644 index 66c0545c33..0000000000 --- a/src/System.Private.Uri/src/System.Private.Uri.builds +++ /dev/null @@ -1,25 +0,0 @@ -<?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> - <Project Include="System.Private.Uri.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.Private.Uri.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.Private.Uri.csproj"> - <OSGroup>Windows_NT</OSGroup> - <TargetGroup>uap101aot</TargetGroup> - </Project> - <Project Include="System.Private.Uri.csproj"> - <OSGroup>Unix</OSGroup> - <TargetGroup>netcoreapp1.2corert</TargetGroup> - </Project> - <Project Include="System.Private.Uri.csproj"> - <OSGroup>Windows_NT</OSGroup> - <TargetGroup>netcoreapp1.2corert</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> diff --git a/src/System.Private.Uri/src/System.Private.Uri.csproj b/src/System.Private.Uri/src/System.Private.Uri.csproj index 36189f66ca..1839f84157 100644 --- a/src/System.Private.Uri/src/System.Private.Uri.csproj +++ b/src/System.Private.Uri/src/System.Private.Uri.csproj @@ -1,8 +1,5 @@ -<?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> <ProjectGuid>{4AC5343E-6E31-4BA5-A795-0493AE7E9008}</ProjectGuid> @@ -11,9 +8,7 @@ <!-- Suppress warnings for type conflicts between SafeFileHandle in partial facade and mscorlib --> <NoWarn>0436</NoWarn> <SkipCommonResourcesIncludes Condition="'$(TargetGroup)'=='uap101aot' or '$(TargetGroup)' == 'netcoreapp1.2corert'">true</SkipCommonResourcesIncludes> - <DefineConstants Condition="'$(TargetGroup)'==''">$(DefineConstants);netstandard10</DefineConstants> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.0</NuGetTargetMoniker> - <PackageTargetFramework Condition="'$(TargetGroup)'==''">netstandard1.0;uap10.1</PackageTargetFramework> + <DefineConstants Condition="'$(TargetGroup)'=='netstandard1.0'">$(DefineConstants);netstandard10</DefineConstants> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> @@ -55,7 +50,7 @@ <Compile Include="System\UriScheme.cs" /> <Compile Include="System\UriSyntax.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetsWindows)' == 'true' and '$(TargetGroup)'==''"> + <ItemGroup Condition="'$(TargetsWindows)' == 'true' and '$(TargetGroup)'=='netstandard1.0'"> <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs"> <Link>Common\Interop\Windows\Interop.Libraries.cs</Link> </Compile> @@ -66,7 +61,7 @@ <Link>Common\System\Diagnostics\Debug.Windows.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition="'$(TargetsUnix)' == 'true' and '$(TargetGroup)' == ''"> + <ItemGroup Condition="'$(TargetsUnix)' == 'true' and '$(TargetGroup)' == 'netstandard1.0'"> <Compile Include="$(CommonPath)\System\Diagnostics\Debug.Unix.cs"> <Link>Common\System\Diagnostics\Debug.Unix.cs</Link> </Compile> @@ -121,9 +116,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 949084c60f..0000000000 --- a/src/System.Private.Uri/src/project.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "frameworks": { - "netstandard1.0": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03" - } - }, - "netcore50": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24904-00" - } - }, - "netcoreapp1.2": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreRT": "1.0.0-alpha-24821-02" - } - }, - "uap10.1": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24904-00" - } - } - } -} diff --git a/src/System.Private.Uri/tests/ExtendedFunctionalTests/System.Private.Uri.ExtendedFunctional.Tests.csproj b/src/System.Private.Uri/tests/ExtendedFunctionalTests/System.Private.Uri.ExtendedFunctional.Tests.csproj index ea532ea34c..26f7ebeb63 100644 --- a/src/System.Private.Uri/tests/ExtendedFunctionalTests/System.Private.Uri.ExtendedFunctional.Tests.csproj +++ b/src/System.Private.Uri/tests/ExtendedFunctionalTests/System.Private.Uri.ExtendedFunctional.Tests.csproj @@ -1,12 +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"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{0febe054-68ac-446f-b999-9068736d3cec}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Private.Uri.ExtendedFunctional.Tests</AssemblyName> - <NugetTargetMoniker>.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> @@ -18,13 +14,5 @@ <Link>Common\System\ThreadCultureChange.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\..\System.Runtime\pkg\System.Runtime.pkgproj"> - <Project>{1e689c1b-690c-4799-bde9-6e7990585894}</Project> - <Name>System.Runtime</Name> - </ProjectReference> - <ProjectReference Include="..\..\pkg\System.Private.Uri.pkgproj"> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Private.Uri/tests/FunctionalTests/System.Private.Uri.Functional.Tests.csproj b/src/System.Private.Uri/tests/FunctionalTests/System.Private.Uri.Functional.Tests.csproj index de13071d43..1fb6fe7c3f 100644 --- a/src/System.Private.Uri/tests/FunctionalTests/System.Private.Uri.Functional.Tests.csproj +++ b/src/System.Private.Uri/tests/FunctionalTests/System.Private.Uri.Functional.Tests.csproj @@ -2,11 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{B0FFC4A8-BAC3-4A7F-8FD5-5B680209371C}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Private.Uri.Functional.Tests</AssemblyName> - <NugetTargetMoniker Condition="'$(TargetGroup)'==''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> @@ -37,15 +33,5 @@ <ItemGroup Condition="'$(TargetGroup)'==''"> <Compile Include="UriParserTest.cs" /> </ItemGroup> - <ItemGroup> - <!-- System.Private.Uri doesn't have any netstandard compile assets in it's package--> - <ProjectReference Include="..\..\src\System.Private.Uri.csproj"> - <ReferenceOutputAssembly>false</ReferenceOutputAssembly> - <OutputItemType>Content</OutputItemType> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - <Targets>Build;DebugSymbolsProjectOutputGroup</Targets> - <UndefineProperties>%(ProjectReference.UndefineProperties);TargetGroup</UndefineProperties> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Private.Uri/tests/UnitTests/System.Private.Uri.Unit.Tests.csproj b/src/System.Private.Uri/tests/UnitTests/System.Private.Uri.Unit.Tests.csproj index 3ca58ec7b3..fb6460e52b 100644 --- a/src/System.Private.Uri/tests/UnitTests/System.Private.Uri.Unit.Tests.csproj +++ b/src/System.Private.Uri/tests/UnitTests/System.Private.Uri.Unit.Tests.csproj @@ -1,17 +1,11 @@ <?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> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{0D174EA9-9E61-4519-8D31-7BD2331A1982}</ProjectGuid> - <OutputType>Library</OutputType> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <NoWarn>436</NoWarn> <StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> diff --git a/src/System.Private.Xml.Linq/dir.props b/src/System.Private.Xml.Linq/dir.props new file mode 100644 index 0000000000..f254b412b5 --- /dev/null +++ b/src/System.Private.Xml.Linq/dir.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\dir.props" /> + <PropertyGroup> + <AssemblyVersion>4.0.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> + <IsNETCoreAppRef>false</IsNETCoreAppRef> + </PropertyGroup> +</Project>
\ No newline at end of file diff --git a/src/System.Private.Xml.Linq/src/Configurations.props b/src/System.Private.Xml.Linq/src/Configurations.props new file mode 100644 index 0000000000..9c336c0be9 --- /dev/null +++ b/src/System.Private.Xml.Linq/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Private.Xml.Linq/src/System.Private.Xml.Linq.builds b/src/System.Private.Xml.Linq/src/System.Private.Xml.Linq.builds deleted file mode 100644 index fb8d0a04cd..0000000000 --- a/src/System.Private.Xml.Linq/src/System.Private.Xml.Linq.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.Private.Xml.Linq.csproj" /> - <Project Include="System.Private.Xml.Linq.csproj" > - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - 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..b7bd1e3beb 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 @@ -4,23 +4,19 @@ <PropertyGroup> <ProjectGuid>{BAC347A3-9841-44FC-B1E3-2344D1152C23}</ProjectGuid> <AssemblyName>System.Private.Xml.Linq</AssemblyName> - <AssemblyVersion>4.0.0.0</AssemblyVersion> <RootNamespace>System.Xml</RootNamespace> <DefineConstants>$(DefineConstants);SILVERLIGHT</DefineConstants> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net46'">None</ResourcesSourceOutputDirectory> - <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.7</PackageTargetFramework> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> + <PackageTargetFramework Condition="'$(PackageTargetFramework)' == 'netstandard'">netstandard1.7</PackageTargetFramework> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" /> <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 Condition="'$(TargetGroup)' == 'netstandard'"> + <ProjectReference Include="..\..\System.Private.Xml\src\System.Private.Xml.csproj" /> <Compile Include="$(CommonPath)\System\Collections\Generic\ArrayBuilder.cs"> <Link>System\Collections\Generic\ArrayBuilder.cs</Link> </Compile> @@ -67,7 +63,7 @@ <Compile Include="System\Xml\XPath\XNodeNavigator.cs" /> <Compile Include="System\Xml\XPath\XObjectExtensions.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <EmbeddedResource Include="$(MsBuildThisFileDirectory)Resources\$(AssemblyName).rd.xml" /> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == 'net463'"> @@ -75,7 +71,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 053af30187..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-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Collections.Specialized": "4.4.0-beta-24904-01", - "System.Diagnostics.TraceSource": "4.4.0-beta-24904-01", - "Microsoft.Win32.Registry": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.Reflection.TypeExtensions": "4.4.0-beta-24904-01", - "System.ComponentModel.TypeConverter": "4.4.0-beta-24904-01", - "System.Console": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Linq": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "System.Threading.Tasks.Extensions": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Private.Xml.Linq/tests/Properties/System.Xml.Linq.Properties.Tests.csproj b/src/System.Private.Xml.Linq/tests/Properties/System.Xml.Linq.Properties.Tests.csproj index 26c7542388..772734494a 100644 --- a/src/System.Private.Xml.Linq/tests/Properties/System.Xml.Linq.Properties.Tests.csproj +++ b/src/System.Private.Xml.Linq/tests/Properties/System.Xml.Linq.Properties.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{D24E2563-7A46-4368-94D4-B3A39E9EF1B5}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Xml.Linq.Properties.Tests</AssemblyName> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> - <RootNamespace>System.Xml.Linq.Tests</RootNamespace> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -31,10 +25,6 @@ <ProjectReference Include="$(CommonTestPath)\System\Xml\ModuleCore\ModuleCore.csproj" /> <ProjectReference Include="..\XDocument.Common\XDocument.Common.csproj" /> <ProjectReference Include="..\XDocument.Test.ModuleCore\XDocument.Test.ModuleCore.csproj" /> - <ProjectReference Include="..\..\pkg\System.Private.Xml.Linq.pkgproj" /> - </ItemGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Private.Xml.Linq/tests/SDMSample/System.Xml.Linq.SDMSample.Tests.csproj b/src/System.Private.Xml.Linq/tests/SDMSample/System.Xml.Linq.SDMSample.Tests.csproj index 95006a7247..efa7daccce 100644 --- a/src/System.Private.Xml.Linq/tests/SDMSample/System.Xml.Linq.SDMSample.Tests.csproj +++ b/src/System.Private.Xml.Linq/tests/SDMSample/System.Xml.Linq.SDMSample.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{F6C73170-9333-4B52-B3FA-A536C5EA6A48}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Xml.Linq.SDMSample.Tests</AssemblyName> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> - <RootNamespace>XDocumentTests.SDMSample</RootNamespace> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -28,11 +22,5 @@ <Compile Include="SDMPI.cs" /> <Compile Include="SDMXName.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\pkg\System.Private.Xml.Linq.pkgproj" /> - </ItemGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Private.Xml.Linq/tests/Schema/System.Xml.Schema.Extensions.Tests.csproj b/src/System.Private.Xml.Linq/tests/Schema/System.Xml.Schema.Extensions.Tests.csproj index 380f1d6ef7..892606704e 100644 --- a/src/System.Private.Xml.Linq/tests/Schema/System.Xml.Schema.Extensions.Tests.csproj +++ b/src/System.Private.Xml.Linq/tests/Schema/System.Xml.Schema.Extensions.Tests.csproj @@ -2,12 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{AFB408EA-2EF7-42B3-B98F-BA60F6481313}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Xml.Schema.Extensions.Tests</AssemblyName> - <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -17,14 +12,5 @@ <ItemGroup> <Compile Include="ExtensionTests.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\pkg\System.Private.Xml.Linq.pkgproj" /> - </ItemGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </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.Private.Xml.Linq/tests/Schema/project.json b/src/System.Private.Xml.Linq/tests/Schema/project.json deleted file mode 100644 index e8a11cab26..0000000000 --- a/src/System.Private.Xml.Linq/tests/Schema/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Xml.ReaderWriter": "4.4.0-beta-24904-01", - "System.Xml.XDocument": "4.4.0-beta-24904-01", - "test-runtime": { - "target": "project", - "exclude": "compile" - }, - "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04", - "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04" - }, - "frameworks": { - "netstandard1.7": {}, - "net463": {} - }, - "supports": { - "coreFx.Test.netcoreapp1.1": {}, - "coreFx.Test.net463": {} - } -} diff --git a/src/System.Private.Xml.Linq/tests/Streaming/System.Xml.Linq.Streaming.Tests.csproj b/src/System.Private.Xml.Linq/tests/Streaming/System.Xml.Linq.Streaming.Tests.csproj index 2ba5d0e430..3e8d88ec48 100644 --- a/src/System.Private.Xml.Linq/tests/Streaming/System.Xml.Linq.Streaming.Tests.csproj +++ b/src/System.Private.Xml.Linq/tests/Streaming/System.Xml.Linq.Streaming.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{CB11B315-2567-4574-977D-89E3135243C4}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Xml.Linq.Streaming.Tests</AssemblyName> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> - <RootNamespace>XDocumentTests.Streaming</RootNamespace> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -24,10 +18,6 @@ <ProjectReference Include="$(CommonTestPath)\System\Xml\XmlCoreTest\XmlCoreTest.csproj" /> <ProjectReference Include="$(CommonTestPath)\System\Xml\ModuleCore\ModuleCore.csproj" /> <ProjectReference Include="..\XDocument.Common\XDocument.Common.csproj" /> - <ProjectReference Include="..\..\pkg\System.Private.Xml.Linq.pkgproj" /> - </ItemGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Private.Xml.Linq/tests/TreeManipulation/System.Xml.Linq.TreeManipulation.Tests.csproj b/src/System.Private.Xml.Linq/tests/TreeManipulation/System.Xml.Linq.TreeManipulation.Tests.csproj index e10c049d32..f1c2eda604 100644 --- a/src/System.Private.Xml.Linq/tests/TreeManipulation/System.Xml.Linq.TreeManipulation.Tests.csproj +++ b/src/System.Private.Xml.Linq/tests/TreeManipulation/System.Xml.Linq.TreeManipulation.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{10EFE488-FAB4-43DA-847D-FF057BFF52AC}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Xml.Linq.TreeManipulation.Tests</AssemblyName> - <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> - <RootNamespace>XLinqTests</RootNamespace> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -64,11 +58,6 @@ <ProjectReference Include="$(CommonTestPath)\System\Xml\XmlDiff\XmlDiff.csproj" /> <ProjectReference Include="..\XDocument.Common\XDocument.Common.csproj" /> <ProjectReference Include="..\XDocument.Test.ModuleCore\XDocument.Test.ModuleCore.csproj" /> - <ProjectReference Include="..\..\..\System.Xml.XDocument\pkg\System.Xml.XDocument.pkgproj" /> - <ProjectReference Include="..\..\pkg\System.Private.Xml.Linq.pkgproj" /> - </ItemGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Private.Xml.Linq/tests/XDocument.Common/Configurations.props b/src/System.Private.Xml.Linq/tests/XDocument.Common/Configurations.props new file mode 100644 index 0000000000..f0ebe53119 --- /dev/null +++ b/src/System.Private.Xml.Linq/tests/XDocument.Common/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Private.Xml.Linq/tests/XDocument.Common/XDocument.Common.csproj b/src/System.Private.Xml.Linq/tests/XDocument.Common/XDocument.Common.csproj index 0eeeb30e44..639dcc8b18 100644 --- a/src/System.Private.Xml.Linq/tests/XDocument.Common/XDocument.Common.csproj +++ b/src/System.Private.Xml.Linq/tests/XDocument.Common/XDocument.Common.csproj @@ -2,19 +2,15 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{52666206-B6C9-49FA-A1D7-D0A0C68807B0}</ProjectGuid> - <OutputType>Library</OutputType> <AssemblyName>XDocument.Common</AssemblyName> <RootNamespace>CoreXml.Test.XLinq</RootNamespace> - <NugetTargetMoniker Condition="'$(TargetGroup)'==''">.NETStandard,Version=v1.3</NugetTargetMoniker> + <IsTestProject>true</IsTestProject> + <NoWarn>0436</NoWarn> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> <ItemGroup> <Compile Include="BridgeHelpers.cs" /> <Compile Include="CXmlCache.cs" /> @@ -30,11 +26,5 @@ <ProjectReference Include="$(CommonTestPath)\System\Xml\XmlDiff\XmlDiff.csproj" /> <ProjectReference Include="..\XDocument.Test.ModuleCore\XDocument.Test.ModuleCore.csproj" /> </ItemGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </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.Private.Xml.Linq/tests/XDocument.Common/project.json b/src/System.Private.Xml.Linq/tests/XDocument.Common/project.json deleted file mode 100644 index b571ee97ec..0000000000 --- a/src/System.Private.Xml.Linq/tests/XDocument.Common/project.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Linq": "4.4.0-beta-24904-01", - "System.Linq.Expressions": "4.4.0-beta-24904-01", - "System.ObjectModel": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "System.Xml.ReaderWriter": "4.4.0-beta-24904-01", - "System.Xml.XDocument": "4.4.0-beta-24904-01", - "test-runtime": { - "target": "project", - "exclude": "compile" - }, - "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04", - "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04" - }, - "frameworks": { - "netstandard1.3": {} - }, - "supports": { - "coreFx.Test.netcore50": {}, - "coreFx.Test.netcoreapp1.0": {}, - "coreFx.Test.net46": {}, - "coreFx.Test.net461": {}, - "coreFx.Test.net462": {}, - "coreFx.Test.net463": {} - } -} diff --git a/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/XDocument.Test.ModuleCore.csproj b/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/XDocument.Test.ModuleCore.csproj index b45e771099..9e64ec7517 100644 --- a/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/XDocument.Test.ModuleCore.csproj +++ b/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/XDocument.Test.ModuleCore.csproj @@ -2,19 +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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{979510CE-9042-4F8D-9C74-EE03B89194CC}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>XDocument.Test.ModuleCore</AssemblyName> - <RootNamespace>Microsoft.Test.ModuleCore</RootNamespace> - <NugetTargetMoniker Condition="'$(TargetGroup)'==''">.NETStandard,Version=v1.3</NugetTargetMoniker> + <IsTestProject>true</IsTestProject> + <NoWarn>0436</NoWarn> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> <ItemGroup> <Compile Include="interop.cs" /> <Compile Include="testattribute.cs" /> @@ -29,17 +23,5 @@ <Compile Include="testvariation.cs" /> <Compile Include="util.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\pkg\System.Private.Xml.Linq.pkgproj" /> - <ProjectReference Include="..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" /> - <ProjectReference Include="..\..\..\System.Xml.XDocument\pkg\System.Xml.XDocument.pkgproj" /> - <ProjectReference Include="..\..\..\System.Xml.ReaderWriter\pkg\System.Xml.ReaderWriter.pkgproj" /> - </ItemGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </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.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/project.json b/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/project.json deleted file mode 100644 index 212ee47397..0000000000 --- a/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/project.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Console": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Linq": "4.4.0-beta-24904-01", - "System.Linq.Expressions": "4.4.0-beta-24904-01", - "System.ObjectModel": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "test-runtime": { - "target": "project", - "exclude": "compile" - }, - "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04", - "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04" - }, - "frameworks": { - "netstandard1.3": {} - }, - "supports": { - "coreFx.Test.netcore50": {}, - "coreFx.Test.netcoreapp1.0": {}, - "coreFx.Test.net46": {}, - "coreFx.Test.net461": {}, - "coreFx.Test.net462": {}, - "coreFx.Test.net463": {} - } -} diff --git a/src/System.Private.Xml.Linq/tests/XPath/XDocument/System.Xml.XPath.XDocument.Tests.csproj b/src/System.Private.Xml.Linq/tests/XPath/XDocument/System.Xml.XPath.XDocument.Tests.csproj index 980c10d46e..1437d06635 100644 --- a/src/System.Private.Xml.Linq/tests/XPath/XDocument/System.Xml.XPath.XDocument.Tests.csproj +++ b/src/System.Private.Xml.Linq/tests/XPath/XDocument/System.Xml.XPath.XDocument.Tests.csproj @@ -3,21 +3,12 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <Import Project="$(CommonTestPath)\Tests.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{10D52320-17B7-476E-BBD2-A1064DD38CBF}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Xml.XPath.XDocument.Tests</AssemblyName> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker> <RootNamespace>System.Xml.XPath.XDocument.Tests</RootNamespace> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'"> - </PropertyGroup> - <PropertyGroup> <CommonPathXPath>$(CommonPath)\System\Xml\XPath</CommonPathXPath> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <ItemGroup> <!-- XPath.XDocument navigator --> <Compile Include="CreateNavigatorComparer.cs" /> @@ -207,9 +198,5 @@ <Link>TestData\xpC001.xml</Link> </EmbeddedResource> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\..\pkg\System.Private.Xml.Linq.pkgproj" /> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Private.Xml.Linq/tests/axes/System.Xml.Linq.Axes.Tests.csproj b/src/System.Private.Xml.Linq/tests/axes/System.Xml.Linq.Axes.Tests.csproj index 6cccb04bb9..574b48d62c 100644 --- a/src/System.Private.Xml.Linq/tests/axes/System.Xml.Linq.Axes.Tests.csproj +++ b/src/System.Private.Xml.Linq/tests/axes/System.Xml.Linq.Axes.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{6D9B0285-5E8A-4C20-9C53-9E2084EF64C4}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Xml.Linq.Axes.Tests</AssemblyName> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> - <RootNamespace>System.Xml.Linq.Tests</RootNamespace> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -21,12 +15,5 @@ <Compile Include="TestData.cs" /> <Compile Include="InvalidParamValidation.cs" /> </ItemGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\pkg\System.Private.Xml.Linq.pkgproj" /> - <ProjectReference Include="..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Private.Xml.Linq/tests/events/Configurations.props b/src/System.Private.Xml.Linq/tests/events/Configurations.props new file mode 100644 index 0000000000..f0ebe53119 --- /dev/null +++ b/src/System.Private.Xml.Linq/tests/events/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Private.Xml.Linq/tests/events/System.Xml.Linq.Events.Tests.csproj b/src/System.Private.Xml.Linq/tests/events/System.Xml.Linq.Events.Tests.csproj index 8c09ef8beb..1320bdcd3a 100644 --- a/src/System.Private.Xml.Linq/tests/events/System.Xml.Linq.Events.Tests.csproj +++ b/src/System.Private.Xml.Linq/tests/events/System.Xml.Linq.Events.Tests.csproj @@ -2,19 +2,11 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <AssemblyName>System.Xml.Linq.Events.Tests</AssemblyName> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> <ProjectGuid>{C560E194-5B14-4112-ABC6-3208491E53E6}</ProjectGuid> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> <ItemGroup> <Compile Include="EventsAdd.cs" /> <Compile Include="EventsName.cs" /> @@ -23,15 +15,11 @@ <Compile Include="EventsValue.cs" /> </ItemGroup> <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <ItemGroup> <ProjectReference Include="..\XDocument.Common\XDocument.Common.csproj"> <Project>{52666206-b6c9-49fa-a1d7-d0a0c68807b0}</Project> <Name>XDocument.Common</Name> </ProjectReference> <ProjectReference Include="..\XDocument.Test.ModuleCore\XDocument.Test.ModuleCore.csproj" /> - <ProjectReference Include="..\..\pkg\System.Private.Xml.Linq.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Private.Xml.Linq/tests/misc/System.Xml.Linq.Misc.Tests.csproj b/src/System.Private.Xml.Linq/tests/misc/System.Xml.Linq.Misc.Tests.csproj index 36a4365c19..c7a44deef7 100644 --- a/src/System.Private.Xml.Linq/tests/misc/System.Xml.Linq.Misc.Tests.csproj +++ b/src/System.Private.Xml.Linq/tests/misc/System.Xml.Linq.Misc.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{35FA1FA9-A504-4B9E-93F0-E5D03C21BECA}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Xml.Linq.Misc.Tests</AssemblyName> - <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> - <RootNamespace>System.Xml.Linq.Tests</RootNamespace> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -31,11 +25,6 @@ <ProjectReference Include="$(CommonTestPath)\System\Xml\XmlDiff\XmlDiff.csproj" /> <ProjectReference Include="..\XDocument.Common\XDocument.Common.csproj" /> <ProjectReference Include="..\XDocument.Test.ModuleCore\XDocument.Test.ModuleCore.csproj" /> - <ProjectReference Include="..\..\..\System.Xml.XDocument\pkg\System.Xml.XDocument.pkgproj" /> - <ProjectReference Include="..\..\pkg\System.Private.Xml.Linq.pkgproj" /> - </ItemGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Private.Xml.Linq/tests/xNodeBuilder/System.Xml.Linq.xNodeBuilder.Tests.csproj b/src/System.Private.Xml.Linq/tests/xNodeBuilder/System.Xml.Linq.xNodeBuilder.Tests.csproj index 37dca7af46..e1f85c3e5b 100644 --- a/src/System.Private.Xml.Linq/tests/xNodeBuilder/System.Xml.Linq.xNodeBuilder.Tests.csproj +++ b/src/System.Private.Xml.Linq/tests/xNodeBuilder/System.Xml.Linq.xNodeBuilder.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{5D4FB9ED-C3AC-4EFA-9FEE-619ED4B4B92D}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Xml.Linq.xNodeBuilder.Tests</AssemblyName> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> - <RootNamespace>CoreXml.Test.XLinq</RootNamespace> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -33,10 +27,6 @@ <ProjectReference Include="$(CommonTestPath)\System\Xml\ModuleCore\ModuleCore.csproj" /> <ProjectReference Include="..\XDocument.Common\XDocument.Common.csproj" /> <ProjectReference Include="..\XDocument.Test.ModuleCore\XDocument.Test.ModuleCore.csproj" /> - <ProjectReference Include="..\..\pkg\System.Private.Xml.Linq.pkgproj" /> - </ItemGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Private.Xml.Linq/tests/xNodeReader/System.Xml.Linq.xNodeReader.Tests.csproj b/src/System.Private.Xml.Linq/tests/xNodeReader/System.Xml.Linq.xNodeReader.Tests.csproj index 659bde22ac..1d27cd2453 100644 --- a/src/System.Private.Xml.Linq/tests/xNodeReader/System.Xml.Linq.xNodeReader.Tests.csproj +++ b/src/System.Private.Xml.Linq/tests/xNodeReader/System.Xml.Linq.xNodeReader.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{6E1C5358-7F04-4791-8B5F-6A5A4E42ABF1}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Xml.Linq.xNodeReader.Tests</AssemblyName> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> - <RootNamespace>CoreXml.Test.XLinq</RootNamespace> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -41,10 +35,6 @@ <ProjectReference Include="$(CommonTestPath)\System\Xml\ModuleCore\ModuleCore.csproj" /> <ProjectReference Include="..\XDocument.Common\XDocument.Common.csproj" /> <ProjectReference Include="..\XDocument.Test.ModuleCore\XDocument.Test.ModuleCore.csproj" /> - <ProjectReference Include="..\..\pkg\System.Private.Xml.Linq.pkgproj" /> - </ItemGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Private.Xml/dir.props b/src/System.Private.Xml/dir.props new file mode 100644 index 0000000000..f254b412b5 --- /dev/null +++ b/src/System.Private.Xml/dir.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\dir.props" /> + <PropertyGroup> + <AssemblyVersion>4.0.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> + <IsNETCoreAppRef>false</IsNETCoreAppRef> + </PropertyGroup> +</Project>
\ No newline at end of file diff --git a/src/System.Private.Xml/src/Configurations.props b/src/System.Private.Xml/src/Configurations.props new file mode 100644 index 0000000000..58b5995845 --- /dev/null +++ b/src/System.Private.Xml/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard-Windows_NT; + netstandard-Unix; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Private.Xml/src/System.Private.Xml.builds b/src/System.Private.Xml/src/System.Private.Xml.builds deleted file mode 100644 index 66823e9417..0000000000 --- a/src/System.Private.Xml/src/System.Private.Xml.builds +++ /dev/null @@ -1,14 +0,0 @@ -<?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> - <Project Include="System.Private.Xml.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.Private.Xml.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Private.Xml/src/System.Private.Xml.csproj b/src/System.Private.Xml/src/System.Private.Xml.csproj index b0fbb385b5..1f10442779 100644 --- a/src/System.Private.Xml/src/System.Private.Xml.csproj +++ b/src/System.Private.Xml/src/System.Private.Xml.csproj @@ -1,26 +1,19 @@ -<?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>{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}</ProjectGuid> <AssemblyName>System.Private.Xml</AssemblyName> - <AssemblyVersion>4.0.0.0</AssemblyVersion> <RootNamespace>System.Xml</RootNamespace> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <NoWarn>$(NoWarn),649</NoWarn> <DefineConstants>$(DefineConstants);ASYNC;ASTORIA_LIGHT</DefineConstants> <!--<DefineConstants Condition="'$(TargetGroup)' == 'uap101aot'">$(DefineConstants);NET_NATIVE</DefineConstants> TODO: Bring this back when uap101aot support is added --> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> + <ItemGroup> <Compile Include="$(CommonPath)\System\ValueTuple.cs"> <Link>Common\System\ValueTuple.cs</Link> </Compile> @@ -505,11 +498,40 @@ <LogicalName>rss-0.91.dtd</LogicalName> </EmbeddedResource>--> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> + <ItemGroup> <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 +752,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 3e448cadb2..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-24904-01", - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24904-03", - "Microsoft.Win32.Registry": "4.4.0-beta-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Collections.Specialized": "4.4.0-beta-24904-01", - "System.Console": "4.4.0-beta-24904-01", - "System.ComponentModel.TypeConverter": "4.4.0-beta-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Diagnostics.TraceSource": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24904-01", - "System.Linq": "4.4.0-beta-24904-01", - "System.Net.Http": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Reflection.Emit": "4.4.0-beta-24904-01", - "System.Reflection.Emit.ILGeneration": "4.4.0-beta-24904-01", - "System.Reflection.Emit.Lightweight": "4.4.0-beta-24904-01", - "System.Reflection.Extensions": "4.4.0-beta-24904-01", - "System.Reflection.Primitives": "4.4.0-beta-24904-01", - "System.Reflection.TypeExtensions": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Security.Permissions": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Text.Encoding.Extensions": "4.4.0-beta-24904-01", - "System.Text.RegularExpressions": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "System.Threading.Tasks.Extensions": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - }, - "uap10.1": { - "dependencies": { - "Microsoft.CSharp": "4.4.0-beta-24904-01", - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24904-03", - "Microsoft.Win32.Registry": "4.4.0-beta-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Collections.Specialized": "4.4.0-beta-24904-01", - "System.Console": "4.4.0-beta-24904-01", - "System.ComponentModel.TypeConverter": "4.4.0-beta-24904-01", - "System.Data.Common": "4.4.0-beta-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Diagnostics.TraceSource": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24904-01", - "System.Linq": "4.4.0-beta-24904-01", - "System.Net.Http": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Reflection.Emit": "4.4.0-beta-24904-01", - "System.Reflection.Emit.ILGeneration": "4.4.0-beta-24904-01", - "System.Reflection.Emit.Lightweight": "4.4.0-beta-24904-01", - "System.Reflection.Extensions": "4.4.0-beta-24904-01", - "System.Reflection.Primitives": "4.4.0-beta-24904-01", - "System.Reflection.TypeExtensions": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Text.Encoding.Extensions": "4.4.0-beta-24904-01", - "System.Text.RegularExpressions": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "System.Threading.Tasks.Extensions": "4.4.0-beta-24904-01" - } - } - } -} diff --git a/src/System.Private.Xml/tests/Misc/System.Xml.Misc.Tests.csproj b/src/System.Private.Xml/tests/Misc/System.Xml.Misc.Tests.csproj index 97139b3684..97c0b4f7ac 100644 --- a/src/System.Private.Xml/tests/Misc/System.Xml.Misc.Tests.csproj +++ b/src/System.Private.Xml/tests/Misc/System.Xml.Misc.Tests.csproj @@ -2,12 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{A30BBA60-647C-4565-A42F-BE60B2CA2E8E}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Xml.Misc.Tests</AssemblyName> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker> <RootNamespace>XmlMiscTests</RootNamespace> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -19,11 +14,5 @@ <Compile Include="RandomizedHashing.cs" /> <Compile Include="..\..\src\System\Xml\Core\SecureStringHasher.cs" /> </ItemGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\pkg\System.Private.Xml.pkgproj" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Private.Xml/tests/Readers/CharCheckingReader/System.Xml.RW.CharCheckingReader.Tests.csproj b/src/System.Private.Xml/tests/Readers/CharCheckingReader/System.Xml.RW.CharCheckingReader.Tests.csproj index 0eedc1f389..a5c4cf3293 100644 --- a/src/System.Private.Xml/tests/Readers/CharCheckingReader/System.Xml.RW.CharCheckingReader.Tests.csproj +++ b/src/System.Private.Xml/tests/Readers/CharCheckingReader/System.Xml.RW.CharCheckingReader.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{6DC15D23-8213-4700-9815-AD8DEED1CE5F}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Xml.RW.CharCheckingReader.Tests</AssemblyName> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> - <RootNamespace>XmlReaderTest</RootNamespace> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -21,13 +15,9 @@ <Compile Include="InheritedCases.cs" /> </ItemGroup> <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <ItemGroup> <ProjectReference Include="$(CommonTestPath)\System\Xml\ModuleCore\ModuleCore.csproj" /> <ProjectReference Include="$(CommonTestPath)\System\Xml\XmlCoreTest\XmlCoreTest.csproj" /> <ProjectReference Include="..\..\XmlReaderLib\System.Xml.RW.XmlReaderLib.csproj" /> - <ProjectReference Include="..\..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Private.Xml/tests/Readers/CustomReader/System.Xml.RW.CustomReader.Tests.csproj b/src/System.Private.Xml/tests/Readers/CustomReader/System.Xml.RW.CustomReader.Tests.csproj index d959c77dc6..1a20f15eb1 100644 --- a/src/System.Private.Xml/tests/Readers/CustomReader/System.Xml.RW.CustomReader.Tests.csproj +++ b/src/System.Private.Xml/tests/Readers/CustomReader/System.Xml.RW.CustomReader.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{B51913C2-478E-46AA-A523-521BD4593651}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Xml.RW.CustomReader.Tests</AssemblyName> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> - <RootNamespace>XmlReaderTest.CustomReaderTest</RootNamespace> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -21,13 +15,9 @@ <Compile Include="InheritedCases.cs" /> </ItemGroup> <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <ItemGroup> <ProjectReference Include="$(CommonTestPath)\System\Xml\ModuleCore\ModuleCore.csproj" /> <ProjectReference Include="$(CommonTestPath)\System\Xml\XmlCoreTest\XmlCoreTest.csproj" /> <ProjectReference Include="..\..\XmlReaderLib\System.Xml.RW.XmlReaderLib.csproj" /> - <ProjectReference Include="..\..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Private.Xml/tests/Readers/FactoryReader/System.Xml.RW.FactoryReader.Tests.csproj b/src/System.Private.Xml/tests/Readers/FactoryReader/System.Xml.RW.FactoryReader.Tests.csproj index 1c7f93655f..f13a26481b 100644 --- a/src/System.Private.Xml/tests/Readers/FactoryReader/System.Xml.RW.FactoryReader.Tests.csproj +++ b/src/System.Private.Xml/tests/Readers/FactoryReader/System.Xml.RW.FactoryReader.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{04C5492C-FA54-4F93-8698-44B8BB7C72E0}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Xml.RW.FactoryReader.Tests</AssemblyName> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> - <RootNamespace>XmlReaderTest</RootNamespace> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -22,13 +16,9 @@ <Compile Include="TCNormalization.cs" /> </ItemGroup> <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <ItemGroup> <ProjectReference Include="$(CommonTestPath)\System\Xml\ModuleCore\ModuleCore.csproj" /> <ProjectReference Include="$(CommonTestPath)\System\Xml\XmlCoreTest\XmlCoreTest.csproj" /> <ProjectReference Include="..\..\XmlReaderLib\System.Xml.RW.XmlReaderLib.csproj" /> - <ProjectReference Include="..\..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Private.Xml/tests/Readers/NameTable/System.Xml.RW.NameTable.Tests.csproj b/src/System.Private.Xml/tests/Readers/NameTable/System.Xml.RW.NameTable.Tests.csproj index eb312a84d5..d15a5abb4d 100644 --- a/src/System.Private.Xml/tests/Readers/NameTable/System.Xml.RW.NameTable.Tests.csproj +++ b/src/System.Private.Xml/tests/Readers/NameTable/System.Xml.RW.NameTable.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{2CA30CA9-FADA-4AB6-81E3-EAE61EF44463}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Xml.RW.NameTable.Tests</AssemblyName> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> - <RootNamespace>NameTableTest</RootNamespace> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -25,13 +19,9 @@ <Compile Include="XmlNameTable.cs" /> </ItemGroup> <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <ItemGroup> <ProjectReference Include="$(CommonTestPath)\System\Xml\ModuleCore\ModuleCore.csproj" /> <ProjectReference Include="$(CommonTestPath)\System\Xml\XmlCoreTest\XmlCoreTest.csproj" /> <ProjectReference Include="..\..\XmlReaderLib\System.Xml.RW.XmlReaderLib.csproj" /> - <ProjectReference Include="..\..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Private.Xml/tests/Readers/ReaderSettings/System.Xml.RW.ReaderSettings.Tests.csproj b/src/System.Private.Xml/tests/Readers/ReaderSettings/System.Xml.RW.ReaderSettings.Tests.csproj index 0430f19a79..a556378423 100644 --- a/src/System.Private.Xml/tests/Readers/ReaderSettings/System.Xml.RW.ReaderSettings.Tests.csproj +++ b/src/System.Private.Xml/tests/Readers/ReaderSettings/System.Xml.RW.ReaderSettings.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{54B5F207-CC11-4AC3-B0D7-1E7A7E2F08DE}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Xml.RW.ReaderSettings.Tests</AssemblyName> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> - <RootNamespace>XmlReaderTest.ReaderSettingsTest</RootNamespace> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -36,14 +30,10 @@ <Compile Include="TCRSGeneric.cs" /> </ItemGroup> <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <ItemGroup> <ProjectReference Include="$(CommonTestPath)\System\Xml\BaseLibManaged\BaseLibManaged.csproj" /> <ProjectReference Include="$(CommonTestPath)\System\Xml\ModuleCore\ModuleCore.csproj" /> <ProjectReference Include="$(CommonTestPath)\System\Xml\XmlCoreTest\XmlCoreTest.csproj" /> <ProjectReference Include="..\..\XmlReaderLib\System.Xml.RW.XmlReaderLib.csproj" /> - <ProjectReference Include="..\..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Private.Xml/tests/Readers/SubtreeReader/System.Xml.RW.SubtreeReader.Tests.csproj b/src/System.Private.Xml/tests/Readers/SubtreeReader/System.Xml.RW.SubtreeReader.Tests.csproj index 851afc3848..539f05e296 100644 --- a/src/System.Private.Xml/tests/Readers/SubtreeReader/System.Xml.RW.SubtreeReader.Tests.csproj +++ b/src/System.Private.Xml/tests/Readers/SubtreeReader/System.Xml.RW.SubtreeReader.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{6DC919A7-CF8F-4CCD-A7E3-1AD9389FEC86}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Xml.RW.SubtreeReader.Tests</AssemblyName> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> - <RootNamespace>XmlReaderTest</RootNamespace> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -20,13 +14,9 @@ <Compile Include="SubtreeReaderTests.cs" /> </ItemGroup> <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <ItemGroup> <ProjectReference Include="$(CommonTestPath)\System\Xml\ModuleCore\ModuleCore.csproj" /> <ProjectReference Include="$(CommonTestPath)\System\Xml\XmlCoreTest\XmlCoreTest.csproj" /> <ProjectReference Include="..\..\XmlReaderLib\System.Xml.RW.XmlReaderLib.csproj" /> - <ProjectReference Include="..\..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Private.Xml/tests/Readers/WrappedReader/System.Xml.RW.WrappedReader.Tests.csproj b/src/System.Private.Xml/tests/Readers/WrappedReader/System.Xml.RW.WrappedReader.Tests.csproj index 73bc02d6d0..1436b99538 100644 --- a/src/System.Private.Xml/tests/Readers/WrappedReader/System.Xml.RW.WrappedReader.Tests.csproj +++ b/src/System.Private.Xml/tests/Readers/WrappedReader/System.Xml.RW.WrappedReader.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{1C8F67D6-1953-49D3-B716-F298883A79C6}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Xml.RW.WrappedReader.Tests</AssemblyName> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> - <RootNamespace>XmlReaderTest</RootNamespace> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -20,13 +14,9 @@ <Compile Include="WrappedReaderTests.cs" /> </ItemGroup> <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <ItemGroup> <ProjectReference Include="$(CommonTestPath)\System\Xml\ModuleCore\ModuleCore.csproj" /> <ProjectReference Include="$(CommonTestPath)\System\Xml\XmlCoreTest\XmlCoreTest.csproj" /> <ProjectReference Include="..\..\XmlReaderLib\System.Xml.RW.XmlReaderLib.csproj" /> - <ProjectReference Include="..\..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Private.Xml/tests/Writers/RwFactory/System.Xml.RW.RwFactory.Tests.csproj b/src/System.Private.Xml/tests/Writers/RwFactory/System.Xml.RW.RwFactory.Tests.csproj index 4733e485fe..b02e4eb875 100644 --- a/src/System.Private.Xml/tests/Writers/RwFactory/System.Xml.RW.RwFactory.Tests.csproj +++ b/src/System.Private.Xml/tests/Writers/RwFactory/System.Xml.RW.RwFactory.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{95C95878-A9CD-43D4-B1BB-D0DCAA54C3D7}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Xml.RW.RwFactory.Tests</AssemblyName> - <RootNamespace>RWFactory</RootNamespace> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -29,12 +23,8 @@ <Compile Include="WriterFactory.cs" /> </ItemGroup> <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <ItemGroup> <ProjectReference Include="$(CommonTestPath)\System\Xml\ModuleCore\ModuleCore.csproj" /> <ProjectReference Include="$(CommonTestPath)\System\Xml\XmlCoreTest\XmlCoreTest.csproj" /> - <ProjectReference Include="..\..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Private.Xml/tests/Writers/XmlWriterApi/System.Xml.RW.XmlWriterApi.Tests.csproj b/src/System.Private.Xml/tests/Writers/XmlWriterApi/System.Xml.RW.XmlWriterApi.Tests.csproj index a5fe4619d1..7392dc88d5 100644 --- a/src/System.Private.Xml/tests/Writers/XmlWriterApi/System.Xml.RW.XmlWriterApi.Tests.csproj +++ b/src/System.Private.Xml/tests/Writers/XmlWriterApi/System.Xml.RW.XmlWriterApi.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{E6DAD59F-7CB7-4E70-B4C5-FCCBC3376EDE}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Xml.RW.XmlWriterApi.Tests</AssemblyName> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> - <RootNamespace>XmlWriterAPI.Test</RootNamespace> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -56,13 +50,9 @@ <Compile Include="XmlWriterTestModule.cs" /> </ItemGroup> <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <ItemGroup> <ProjectReference Include="$(CommonTestPath)\System\Xml\XmlDiff\XmlDiff.csproj" /> <ProjectReference Include="$(CommonTestPath)\System\Xml\ModuleCore\ModuleCore.csproj" /> <ProjectReference Include="$(CommonTestPath)\System\Xml\XmlCoreTest\XmlCoreTest.csproj" /> - <ProjectReference Include="..\..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Private.Xml/tests/XPath/XPathDocument/System.Xml.XPath.Tests.csproj b/src/System.Private.Xml/tests/XPath/XPathDocument/System.Xml.XPath.Tests.csproj index 5e641ccba6..09949e7114 100644 --- a/src/System.Private.Xml/tests/XPath/XPathDocument/System.Xml.XPath.Tests.csproj +++ b/src/System.Private.Xml/tests/XPath/XPathDocument/System.Xml.XPath.Tests.csproj @@ -3,14 +3,9 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <Import Project="$(CommonTestPath)\Tests.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{D0DF902A-2486-4A38-B7A7-232B9B6590E1}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Xml.XPath.Tests</AssemblyName> <DefineConstants>$(DefineConstants);FEATURE_XML_XPATH_ID</DefineConstants> <RootNamespace>System.Xml.XPath.Tests</RootNamespace> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> </PropertyGroup> @@ -205,12 +200,5 @@ <Link>TestData\xpC001.xml</Link> </EmbeddedResource> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" /> - <ProjectReference Include="..\..\..\..\Microsoft.Win32.Registry\pkg\Microsoft.Win32.Registry.pkgproj" /> - </ItemGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Private.Xml/tests/XPath/XmlDocument/System.Xml.XPath.XmlDocument.Tests.csproj b/src/System.Private.Xml/tests/XPath/XmlDocument/System.Xml.XPath.XmlDocument.Tests.csproj index de81c4867a..2a92a1f3d1 100644 --- a/src/System.Private.Xml/tests/XPath/XmlDocument/System.Xml.XPath.XmlDocument.Tests.csproj +++ b/src/System.Private.Xml/tests/XPath/XmlDocument/System.Xml.XPath.XmlDocument.Tests.csproj @@ -3,12 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <Import Project="$(CommonTestPath)\Tests.props" /> <PropertyGroup> - <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> - <Platform Condition="'$(Platform)' == ''">AnyCPU</Platform> <ProjectGuid>{7B57D5F1-4E6C-4280-AD5B-C71C73B66B11}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Xml.XPath.XmlDocument.Tests</AssemblyName> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> <DefineConstants>$(DefineConstants);FEATURE_XML_XPATH_ID</DefineConstants> <RootNamespace>System.Xml.XPath.XmlDocument.Tests</RootNamespace> </PropertyGroup> @@ -20,9 +15,6 @@ <CommonPathXPath>$(CommonPath)\System\Xml\XPath</CommonPathXPath> </PropertyGroup> <ItemGroup> - <ProjectReference Include="..\..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" /> - </ItemGroup> - <ItemGroup> <!-- XPath.XmlDocument navigator --> <Compile Include="$(CommonPathXPath)\XmlDocument\CreateNavigatorFromXmlDocument.cs" /> <Compile Include="XmlDocumentXPathTest.cs" /> @@ -208,8 +200,5 @@ <Link>TestData\xpC001.xml</Link> </EmbeddedResource> </ItemGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Private.Xml/tests/XmlConvert/System.Xml.RW.XmlConvert.Tests.csproj b/src/System.Private.Xml/tests/XmlConvert/System.Xml.RW.XmlConvert.Tests.csproj index 06ae66a69b..ab7570f2c9 100644 --- a/src/System.Private.Xml/tests/XmlConvert/System.Xml.RW.XmlConvert.Tests.csproj +++ b/src/System.Private.Xml/tests/XmlConvert/System.Xml.RW.XmlConvert.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{3F18D20D-0267-4381-857B-EEDB7B3FC549}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Xml.RW.XmlConvert.Tests</AssemblyName> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> - <RootNamespace>XmlConvertTests</RootNamespace> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -52,12 +46,8 @@ <Compile Include="XmlIdeographicCharConvertTests3.cs" /> </ItemGroup> <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <ItemGroup> <ProjectReference Include="$(CommonTestPath)\System\Xml\ModuleCore\ModuleCore.csproj" /> <ProjectReference Include="$(CommonTestPath)\System\Xml\XmlCoreTest\XmlCoreTest.csproj" /> - <ProjectReference Include="..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Private.Xml/tests/XmlDocument/Performance/System.Xml.XmlDocument.Performance.Tests.csproj b/src/System.Private.Xml/tests/XmlDocument/Performance/System.Xml.XmlDocument.Performance.Tests.csproj index daf3c5853d..230bf8714a 100644 --- a/src/System.Private.Xml/tests/XmlDocument/Performance/System.Xml.XmlDocument.Performance.Tests.csproj +++ b/src/System.Private.Xml/tests/XmlDocument/Performance/System.Xml.XmlDocument.Performance.Tests.csproj @@ -1,12 +1,9 @@ -<?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" /> <Import Project="$(CommonTestPath)\Tests.props" /> <PropertyGroup> - <AssemblyName>System.Xml.XmlDocument.Performance.Tests</AssemblyName> - <RootNamespace>System.Xml.XmlDocument.UnitTests</RootNamespace> <IncludePerformanceTests>true</IncludePerformanceTests> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> @@ -20,12 +17,9 @@ </Compile> </ItemGroup> <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <ItemGroup> <None Include="..\example.xml"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Private.Xml/tests/XmlDocument/System.Xml.XmlDocument.Tests.csproj b/src/System.Private.Xml/tests/XmlDocument/System.Xml.XmlDocument.Tests.csproj index 4bc0864c78..4c9179e286 100644 --- a/src/System.Private.Xml/tests/XmlDocument/System.Xml.XmlDocument.Tests.csproj +++ b/src/System.Private.Xml/tests/XmlDocument/System.Xml.XmlDocument.Tests.csproj @@ -1,15 +1,9 @@ -<?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" /> <Import Project="$(CommonTestPath)\Tests.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{7EAFC2D8-48D2-4A56-A9C6-6BADF2053499}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Xml.XmlDocument.Tests</AssemblyName> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> - <RootNamespace>System.Xml.XmlDocument.UnitTests</RootNamespace> <IncludePerformanceTests>true</IncludePerformanceTests> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -114,17 +108,9 @@ </Compile> </ItemGroup> <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <ItemGroup> <None Include="example.xml"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\..\System.Xml.ReaderWriter\pkg\System.Xml.ReaderWriter.pkgproj" /> - <ProjectReference Include="..\..\..\System.Xml.XmlDocument\pkg\System.Xml.XmlDocument.pkgproj" /> - <ProjectReference Include="..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Private.Xml/tests/XmlReader/ReadContentAs/System.Xml.RW.XmlReader.ReadContentAs.Tests.csproj b/src/System.Private.Xml/tests/XmlReader/ReadContentAs/System.Xml.RW.XmlReader.ReadContentAs.Tests.csproj index 7a7b5044e4..439b4271a1 100644 --- a/src/System.Private.Xml/tests/XmlReader/ReadContentAs/System.Xml.RW.XmlReader.ReadContentAs.Tests.csproj +++ b/src/System.Private.Xml/tests/XmlReader/ReadContentAs/System.Xml.RW.XmlReader.ReadContentAs.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{DA6A9B7F-F311-49A4-8BBE-42EF3152C37B}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Xml.RW.XmlReader.ReadContentAs.Tests</AssemblyName> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> - <RootNamespace>XMLTests.ReaderWriter.ReadContentTests</RootNamespace> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -68,11 +62,5 @@ <Compile Include="ReadAsUriTests.cs" /> <Compile Include="Utils.cs" /> </ItemGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Private.Xml/tests/XmlReader/Tests/System.Xml.RW.XmlReader.Tests.csproj b/src/System.Private.Xml/tests/XmlReader/Tests/System.Xml.RW.XmlReader.Tests.csproj index 10144b3017..42bc4b2742 100644 --- a/src/System.Private.Xml/tests/XmlReader/Tests/System.Xml.RW.XmlReader.Tests.csproj +++ b/src/System.Private.Xml/tests/XmlReader/Tests/System.Xml.RW.XmlReader.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{507DB29F-74F5-4B34-A240-ABE7BD168DF6}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Xml.RW.XmlReader.Tests</AssemblyName> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> - <RootNamespace>XMLTests.ReaderWriter.Tests</RootNamespace> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -19,11 +13,5 @@ <Compile Include="AsyncReaderLateInitTests.cs" /> <Compile Include="DisposeTests.cs" /> </ItemGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Private.Xml/tests/XmlReader/XmlResolver/System.Xml.RW.XmlSystemPathResolver.Tests.csproj b/src/System.Private.Xml/tests/XmlReader/XmlResolver/System.Xml.RW.XmlSystemPathResolver.Tests.csproj index 8e12541e32..9356ba84a9 100644 --- a/src/System.Private.Xml/tests/XmlReader/XmlResolver/System.Xml.RW.XmlSystemPathResolver.Tests.csproj +++ b/src/System.Private.Xml/tests/XmlReader/XmlResolver/System.Xml.RW.XmlSystemPathResolver.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{E4BC1A16-AD0A-4F70-BD2E-3346A4D9BC2B}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Xml.RW.XmlSystemPathResolver.Tests</AssemblyName> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> - <RootNamespace>XMLTests.ReaderWriter.XmlResolverTests</RootNamespace> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -18,11 +12,5 @@ <ItemGroup> <Compile Include="XmlSystemPathResolverTests.cs" /> </ItemGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Private.Xml/tests/XmlReaderLib/System.Xml.RW.XmlReaderLib.csproj b/src/System.Private.Xml/tests/XmlReaderLib/System.Xml.RW.XmlReaderLib.csproj index e527882c78..3ef3f10051 100644 --- a/src/System.Private.Xml/tests/XmlReaderLib/System.Xml.RW.XmlReaderLib.csproj +++ b/src/System.Private.Xml/tests/XmlReaderLib/System.Xml.RW.XmlReaderLib.csproj @@ -2,13 +2,10 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{6D9B0285-5E8A-4C20-9C53-9E2084EF64C4}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Xml.RW.XmlReaderLib</AssemblyName> <RootNamespace>XmlReaderTest.Common</RootNamespace> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> + <IsTestProject>true</IsTestProject> + <NoWarn>0436</NoWarn> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -88,12 +85,6 @@ </Compile> </ItemGroup> <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <ItemGroup> - <None Include="project.json" /> - </ItemGroup> - <ItemGroup> <ProjectReference Include="$(CommonTestPath)\System\Xml\ModuleCore\ModuleCore.csproj" /> <ProjectReference Include="$(CommonTestPath)\System\Xml\XmlCoreTest\XmlCoreTest.csproj" /> </ItemGroup> diff --git a/src/System.Private.Xml/tests/XmlReaderLib/project.json b/src/System.Private.Xml/tests/XmlReaderLib/project.json deleted file mode 100644 index 816d6279bd..0000000000 --- a/src/System.Private.Xml/tests/XmlReaderLib/project.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Linq": "4.4.0-beta-24904-01", - "System.Linq.Expressions": "4.4.0-beta-24904-01", - "System.ObjectModel": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Xml.ReaderWriter": "4.4.0-beta-24904-01", - "test-runtime": { - "target": "project", - "exclude": "compile" - }, - "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04", - "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04" - }, - "frameworks": { - "netstandard1.3": {} - }, - "supports": { - "coreFx.Test.netcore50": {}, - "coreFx.Test.netcoreapp1.0": {}, - "coreFx.Test.net46": {}, - "coreFx.Test.net461": {}, - "coreFx.Test.net462": {}, - "coreFx.Test.net463": {} - } -} diff --git a/src/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/System.Xml.XmlSchemaSet.Tests.csproj b/src/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/System.Xml.XmlSchemaSet.Tests.csproj index 0578d6e3fe..8865d8eecc 100644 --- a/src/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/System.Xml.XmlSchemaSet.Tests.csproj +++ b/src/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/System.Xml.XmlSchemaSet.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{9EDAADA8-B658-430F-97EE-CCA494883D86}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Xml.XmlSchemaSet.Tests</AssemblyName> - <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> - <RootNamespace>System.Xml.Tests</RootNamespace> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -52,11 +46,5 @@ <DestinationDir>TestFiles\%(RecursiveDir)</DestinationDir> </SupplementalTestData> </ItemGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/System.Xml.XmlSchema.XmlSchemaValidatorApi.Tests.csproj b/src/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/System.Xml.XmlSchema.XmlSchemaValidatorApi.Tests.csproj index 7a2b4cdf72..1bcd7714fe 100644 --- a/src/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/System.Xml.XmlSchema.XmlSchemaValidatorApi.Tests.csproj +++ b/src/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/System.Xml.XmlSchema.XmlSchemaValidatorApi.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{B0F53AAA-4ABC-44B2-9331-D3802340DD20}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Xml.XmlSchema.XmlSchemaValidatorApi.Tests</AssemblyName> - <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> - <RootNamespace>System.Xml.Tests</RootNamespace> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -38,8 +32,5 @@ <DestinationDir>TestFiles\%(RecursiveDir)</DestinationDir> </SupplementalTestData> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Private.Xml/tests/XmlSerializer/System.Xml.XmlSerializer.Tests.csproj b/src/System.Private.Xml/tests/XmlSerializer/System.Xml.XmlSerializer.Tests.csproj index e97900bd7a..9be9bae051 100644 --- a/src/System.Private.Xml/tests/XmlSerializer/System.Xml.XmlSerializer.Tests.csproj +++ b/src/System.Private.Xml/tests/XmlSerializer/System.Xml.XmlSerializer.Tests.csproj @@ -1,10 +1,10 @@ -<?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> - <RootNamespace>System.Xml.XmlSerializer.Tests</RootNamespace> - <AssemblyName>System.Xml.XmlSerializer.Tests</AssemblyName> - <ProjectGuid>{4050F1D1-1DD2-4B48-A17B-E3F90DD18C4B}</ProjectGuid> + <PropertyGroup> + <AppDesignerFolder>Properties</AppDesignerFolder> + <ProjectGuid>{4050F1D1-1DD2-4B48-A17B-E3F90DD18C4B}</ProjectGuid> + <DefineConstants Condition="'$(TargetGroup)' == 'netcore50' OR '$(TargetGroup)' == 'netcore50aot'">$(DefineConstants);NET_NATIVE</DefineConstants> </PropertyGroup> <ItemGroup> <Compile Include="$(TestSourceFolder)..\..\..\System.Runtime.Serialization.Xml\tests\Utils.cs" /> @@ -17,4 +17,4 @@ <Compile Include="$(TestSourceFolder)XmlSerializerTests.Internal.cs" Condition="'$(UseContractReferences)' == ''" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), System.Xml.XmlSerializer.Tests.settings.targets))\System.Xml.XmlSerializer.Tests.settings.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Private.Xml/tests/XmlWriter/System.Xml.RW.XmlWriter.Tests.csproj b/src/System.Private.Xml/tests/XmlWriter/System.Xml.RW.XmlWriter.Tests.csproj index ed85bb18c6..eeb5cac4be 100644 --- a/src/System.Private.Xml/tests/XmlWriter/System.Xml.RW.XmlWriter.Tests.csproj +++ b/src/System.Private.Xml/tests/XmlWriter/System.Xml.RW.XmlWriter.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{8CDE71C2-4DA4-4AF6-9897-CD953AE653C2}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Xml.RW.XmlWriter.Tests</AssemblyName> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> - <RootNamespace>XMLTests.ReaderWriter.DisposeTests</RootNamespace> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -21,11 +15,5 @@ <Compile Include="WriteWithEncodingWithFallback.cs" /> <Compile Include="WriteWithInvalidSurrogate.cs" /> </ItemGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/System.Xml.Xsl.XslCompiledTransformApi.Tests.csproj b/src/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/System.Xml.Xsl.XslCompiledTransformApi.Tests.csproj index 72dc22ceeb..ad4a0b0f21 100644 --- a/src/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/System.Xml.Xsl.XslCompiledTransformApi.Tests.csproj +++ b/src/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/System.Xml.Xsl.XslCompiledTransformApi.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{B01E2AE1-1B52-4518-B32E-016070356A7F}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Xml.Xsl.XslCompiledTransformApi.Tests</AssemblyName> - <RootNamespace>System.Xml.Tests</RootNamespace> - <NuGetTargetMoniker>.NETCoreApp,Version=v1.1</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -36,7 +30,6 @@ <ProjectReference Include="$(CommonTestPath)\System\Xml\XmlCoreTest\XmlCoreTest.csproj" /> <ProjectReference Include="$(CommonTestPath)\System\Xml\XmlDiff\XmlDiff.csproj" /> <ProjectReference Include="..\XslTransformApi\System.Xml.Xsl.XslTransformApi.Tests.csproj" /> - <ProjectReference Include="..\..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Private.Xml/tests/Xslt/XslTransformApi/System.Xml.Xsl.XslTransformApi.Tests.csproj b/src/System.Private.Xml/tests/Xslt/XslTransformApi/System.Xml.Xsl.XslTransformApi.Tests.csproj index fda650dd60..14d1b979d8 100644 --- a/src/System.Private.Xml/tests/Xslt/XslTransformApi/System.Xml.Xsl.XslTransformApi.Tests.csproj +++ b/src/System.Private.Xml/tests/Xslt/XslTransformApi/System.Xml.Xsl.XslTransformApi.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{ACF79A18-2655-452C-B4AC-10125F0AD7A8}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Xml.Xsl.XslTransformApi.Tests</AssemblyName> - <RootNamespace>System.Xml.Tests</RootNamespace> - <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -39,7 +33,6 @@ <ProjectReference Include="$(CommonTestPath)\System\Xml\ModuleCore\ModuleCore.csproj" /> <ProjectReference Include="$(CommonTestPath)\System\Xml\XmlCoreTest\XmlCoreTest.csproj" /> <ProjectReference Include="$(CommonTestPath)\System\Xml\XmlDiff\XmlDiff.csproj" /> - <ProjectReference Include="..\..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Private.Xml/tests/Xslt/XsltCompiler/XsltCompiler.Tests.csproj b/src/System.Private.Xml/tests/Xslt/XsltCompiler/XsltCompiler.Tests.csproj index 5d211076fa..10ef80a4c9 100644 --- a/src/System.Private.Xml/tests/Xslt/XsltCompiler/XsltCompiler.Tests.csproj +++ b/src/System.Private.Xml/tests/Xslt/XsltCompiler/XsltCompiler.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{B01E2AE1-1B52-4518-B32E-016070356A7F}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>XsltCompiler.Tests</AssemblyName> - <RootNamespace>System.Xml.Tests</RootNamespace> - <NuGetTargetMoniker>.NETCoreApp,Version=v1.1</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -18,8 +12,6 @@ <OutputPath>$(OutputPath)\$(RootNamespace)\$(AssemblyName)</OutputPath> </PropertyGroup> <ItemGroup> - </ItemGroup> - <ItemGroup> <Compile Include="CommonScenarios\XsltcTestBasicFunctionality.cs" /> <Compile Include="CommonScenarios\XsltcTestCaseBase.cs" /> <Compile Include="CommonScenarios\XsltcTestFile.cs" /> @@ -37,7 +29,6 @@ <ProjectReference Include="$(CommonTestPath)\System\Xml\ModuleCore\ModuleCore.csproj" /> <ProjectReference Include="$(CommonTestPath)\System\Xml\XmlCoreTest\XmlCoreTest.csproj" /> <ProjectReference Include="$(CommonTestPath)\System\Xml\XmlDiff\XmlDiff.csproj" /> - <ProjectReference Include="..\..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Private.Xml/tests/Xslt/XsltScenarios/XsltScenarios.Tests.csproj.disabled b/src/System.Private.Xml/tests/Xslt/XsltScenarios/XsltScenarios.Tests.csproj.disabled new file mode 100644 index 0000000000..4acdb5f026 --- /dev/null +++ b/src/System.Private.Xml/tests/Xslt/XsltScenarios/XsltScenarios.Tests.csproj.disabled @@ -0,0 +1,41 @@ +<?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>{540FB7C7-0B15-4592-927F-333761E9B727}</ProjectGuid> + </PropertyGroup> + <!-- Default configurations to help VS understand the configurations --> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + </PropertyGroup> + <ItemGroup> + <!--<Compile Include="AspNet.cs" />--> + <Compile Include="EXslt.cs" /> + <Compile Include="Schematron.cs" /> + <Compile Include="Utils.cs" /> + <Compile Include="XunitAssemblyAttribute.cs" /> + <SupplementalTestData Include="..\TestFiles\**\*.*"> + <Link>TestFiles\%(RecursiveDir)%(Filename)%(Extension)</Link> + <DestinationDir>TestFiles\%(RecursiveDir)</DestinationDir> + </SupplementalTestData> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(CommonTestPath)\System\Xml\ModuleCore\ModuleCore.csproj"> + <Project>{3cf0cc76-4ce0-460a-ba37-657cfed39ab0}</Project> + <Name>ModuleCore</Name> + </ProjectReference> + <ProjectReference Include="$(CommonTestPath)\System\Xml\XmlCoreTest\XmlCoreTest.csproj"> + <Project>{89701565-f68b-46d9-bd78-95b0f052c50b}</Project> + <Name>XmlCoreTest</Name> + </ProjectReference> + <ProjectReference Include="$(CommonTestPath)\System\Xml\xmlDiff\XmlDiff.csproj"> + <Project>{466d87df-bdec-4e6c-bacd-317d79b8edbe}</Project> + <Name>XmlDiff</Name> + </ProjectReference> + </ItemGroup> + <ItemGroup> + <EmbeddedResource Include="XsltScenarios.xml" /> + </ItemGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project>
\ No newline at end of file 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/Configurations.props b/src/System.Reflection.Context/src/Configurations.props new file mode 100644 index 0000000000..46f8a8ce69 --- /dev/null +++ b/src/System.Reflection.Context/src/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.1; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Reflection.Context/src/System.Reflection.Context.builds b/src/System.Reflection.Context/src/System.Reflection.Context.builds deleted file mode 100644 index a66d5726c2..0000000000 --- a/src/System.Reflection.Context/src/System.Reflection.Context.builds +++ /dev/null @@ -1,9 +0,0 @@ -<?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> - <Project Include="System.Reflection.Context.csproj" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - 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.Context/tests/Configurations.props b/src/System.Reflection.Context/tests/Configurations.props new file mode 100644 index 0000000000..f0ebe53119 --- /dev/null +++ b/src/System.Reflection.Context/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Reflection.Context/tests/System.Reflection.Context.Tests.csproj b/src/System.Reflection.Context/tests/System.Reflection.Context.Tests.csproj index 2c2cea4e99..43b1e8bf2a 100644 --- a/src/System.Reflection.Context/tests/System.Reflection.Context.Tests.csproj +++ b/src/System.Reflection.Context/tests/System.Reflection.Context.Tests.csproj @@ -1,23 +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> <ProjectGuid>{D77FBA6C-1AA6-45A4-93E2-97A370672C53}</ProjectGuid> - <AssemblyName>System.Reflection.Context.Tests</AssemblyName> - <RootNamespace>System.Reflection.Context.Tests</RootNamespace> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <ItemGroup> <Compile Include="CustomReflectionContextTests.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Reflection.Context.pkgproj"> - <Project>{96AA2060-C846-4E56-9509-E8CB9C114C8F}</Project> - <Name>System.Reflection.Context</Name> - <TargetGroup>netcore50</TargetGroup> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Reflection.DispatchProxy/dir.props b/src/System.Reflection.DispatchProxy/dir.props index 16a766f83b..14527fd4b3 100644 --- a/src/System.Reflection.DispatchProxy/dir.props +++ b/src/System.Reflection.DispatchProxy/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.0.3.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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/Configurations.props b/src/System.Reflection.DispatchProxy/src/Configurations.props new file mode 100644 index 0000000000..faaee17d95 --- /dev/null +++ b/src/System.Reflection.DispatchProxy/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netcore50aot-Windows_NT; + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.builds b/src/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.builds deleted file mode 100644 index 928415a411..0000000000 --- a/src/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.Reflection.DispatchProxy.csproj" /> - <Project Include="System.Reflection.DispatchProxy.csproj"> - <TargetGroup>netcore50aot</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.csproj b/src/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.csproj index 4f37fd1e1d..8cdfabb4b8 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> @@ -7,14 +7,13 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netcore50aot'">true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'netcore50aot'">None</ResourcesSourceOutputDirectory> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcore50aot_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcore50aot_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' != 'netcore50aot'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard1.3'"> <Compile Include="System\Reflection\DispatchProxy.cs" /> <Compile Include="System\Reflection\DispatchProxyGenerator.cs" /> </ItemGroup> @@ -22,7 +21,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 57eb10261c..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-24904-00", - "System.Runtime": "4.3.0" - } - } - } -} diff --git a/src/System.Reflection.DispatchProxy/tests/Configurations.props b/src/System.Reflection.DispatchProxy/tests/Configurations.props new file mode 100644 index 0000000000..f0ebe53119 --- /dev/null +++ b/src/System.Reflection.DispatchProxy/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Reflection.DispatchProxy/tests/System.Reflection.DispatchProxy.Tests.csproj b/src/System.Reflection.DispatchProxy/tests/System.Reflection.DispatchProxy.Tests.csproj index 2a9badce12..17a5642a4b 100644 --- a/src/System.Reflection.DispatchProxy/tests/System.Reflection.DispatchProxy.Tests.csproj +++ b/src/System.Reflection.DispatchProxy/tests/System.Reflection.DispatchProxy.Tests.csproj @@ -1,14 +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"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{089444FE-8FF5-4D8F-A51B-32D026425F6B}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Reflection.DispatchProxy.Tests</AssemblyName> - <RootNamespace>System.Reflection.DispatchProxy.Tests</RootNamespace> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -19,11 +13,5 @@ <Compile Include="DispatchProxyTests.cs" /> <Compile Include="TestTypes.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Reflection.DispatchProxy.pkgproj"> - <Project>{1e689c1b-690c-4799-bde9-6e7990585894}</Project> - <Name>System.Reflection.DispatchProxy</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Reflection.Emit.ILGeneration/dir.props b/src/System.Reflection.Emit.ILGeneration/dir.props index 16a766f83b..d8e3293fc1 100644 --- a/src/System.Reflection.Emit.ILGeneration/dir.props +++ b/src/System.Reflection.Emit.ILGeneration/dir.props @@ -3,5 +3,7 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.0.3.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> + <IsNETCoreAppRef>false</IsNETCoreAppRef> </PropertyGroup> </Project>
\ No newline at end of file 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/Configurations.props b/src/System.Reflection.Emit.ILGeneration/src/Configurations.props new file mode 100644 index 0000000000..f0ebe53119 --- /dev/null +++ b/src/System.Reflection.Emit.ILGeneration/src/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Reflection.Emit.ILGeneration/src/System.Reflection.Emit.ILGeneration.builds b/src/System.Reflection.Emit.ILGeneration/src/System.Reflection.Emit.ILGeneration.builds deleted file mode 100644 index 83575c03f1..0000000000 --- a/src/System.Reflection.Emit.ILGeneration/src/System.Reflection.Emit.ILGeneration.builds +++ /dev/null @@ -1,9 +0,0 @@ -<?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> - <Project Include="System.Reflection.Emit.ILGeneration.csproj" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - 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..5e73afb1b1 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,20 +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> <AssemblyName>System.Reflection.Emit.ILGeneration</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <ItemGroup> - <TargetingPackReference Include="mscorlib" Condition="'$(TargetGroup)' == 'net46'" /> - <TargetingPackReference Include="System.Private.CoreLib" Condition="'$(TargetGroup)' != 'net46'" /> + <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.Reflection.Emit.ILGeneration/src/project.json b/src/System.Reflection.Emit.ILGeneration/src/project.json deleted file mode 100644 index a083fbde74..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-24904-03" - } - } - } -} diff --git a/src/System.Reflection.Emit.ILGeneration/tests/Configurations.props b/src/System.Reflection.Emit.ILGeneration/tests/Configurations.props new file mode 100644 index 0000000000..f0ebe53119 --- /dev/null +++ b/src/System.Reflection.Emit.ILGeneration/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Reflection.Emit.ILGeneration/tests/System.Reflection.Emit.ILGeneration.Tests.csproj b/src/System.Reflection.Emit.ILGeneration/tests/System.Reflection.Emit.ILGeneration.Tests.csproj index c2dc32d219..2500ca23de 100644 --- a/src/System.Reflection.Emit.ILGeneration/tests/System.Reflection.Emit.ILGeneration.Tests.csproj +++ b/src/System.Reflection.Emit.ILGeneration/tests/System.Reflection.Emit.ILGeneration.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <AssemblyName>System.Reflection.Emit.ILGeneration.Tests</AssemblyName> - <RootNamespace>System.Reflection.Emit.ILGeneration.Tests</RootNamespace> <ProjectGuid>{FB037640-0591-4DF4-A331-0BEFE50A200B}</ProjectGuid> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> diff --git a/src/System.Reflection.Emit.Lightweight/dir.props b/src/System.Reflection.Emit.Lightweight/dir.props index 16a766f83b..d8e3293fc1 100644 --- a/src/System.Reflection.Emit.Lightweight/dir.props +++ b/src/System.Reflection.Emit.Lightweight/dir.props @@ -3,5 +3,7 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.0.3.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> + <IsNETCoreAppRef>false</IsNETCoreAppRef> </PropertyGroup> </Project>
\ No newline at end of file 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/Configurations.props b/src/System.Reflection.Emit.Lightweight/src/Configurations.props new file mode 100644 index 0000000000..f0ebe53119 --- /dev/null +++ b/src/System.Reflection.Emit.Lightweight/src/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Reflection.Emit.Lightweight/src/System.Reflection.Emit.Lightweight.builds b/src/System.Reflection.Emit.Lightweight/src/System.Reflection.Emit.Lightweight.builds deleted file mode 100644 index 921b387d5f..0000000000 --- a/src/System.Reflection.Emit.Lightweight/src/System.Reflection.Emit.Lightweight.builds +++ /dev/null @@ -1,9 +0,0 @@ -<?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> - <Project Include="System.Reflection.Emit.Lightweight.csproj" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - 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..145facc91a 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,20 +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> <AssemblyName>System.Reflection.Emit.Lightweight</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <ItemGroup> - <TargetingPackReference Include="mscorlib" Condition="'$(TargetGroup)' == 'net46'" /> - <TargetingPackReference Include="System.Private.CoreLib" Condition="'$(TargetGroup)' != 'net46'" /> + <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.Reflection.Emit.Lightweight/src/project.json b/src/System.Reflection.Emit.Lightweight/src/project.json deleted file mode 100644 index a083fbde74..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-24904-03" - } - } - } -} diff --git a/src/System.Reflection.Emit.Lightweight/tests/Configurations.props b/src/System.Reflection.Emit.Lightweight/tests/Configurations.props new file mode 100644 index 0000000000..f0ebe53119 --- /dev/null +++ b/src/System.Reflection.Emit.Lightweight/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Reflection.Emit.Lightweight/tests/System.Reflection.Emit.Lightweight.Tests.csproj b/src/System.Reflection.Emit.Lightweight/tests/System.Reflection.Emit.Lightweight.Tests.csproj index 040e29b534..cdeca4c833 100644 --- a/src/System.Reflection.Emit.Lightweight/tests/System.Reflection.Emit.Lightweight.Tests.csproj +++ b/src/System.Reflection.Emit.Lightweight/tests/System.Reflection.Emit.Lightweight.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <AssemblyName>System.Reflection.Emit.Lightweight.Tests</AssemblyName> - <RootNamespace>System.Reflection.Emit.Lightweight.Tests</RootNamespace> <ProjectGuid>{C338DCF7-FB75-407B-A2ED-117FBF3AAA18}</ProjectGuid> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> diff --git a/src/System.Reflection.Emit/dir.props b/src/System.Reflection.Emit/dir.props index 16a766f83b..d8e3293fc1 100644 --- a/src/System.Reflection.Emit/dir.props +++ b/src/System.Reflection.Emit/dir.props @@ -3,5 +3,7 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.0.3.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> + <IsNETCoreAppRef>false</IsNETCoreAppRef> </PropertyGroup> </Project>
\ No newline at end of file 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/Configurations.props b/src/System.Reflection.Emit/src/Configurations.props new file mode 100644 index 0000000000..f0ebe53119 --- /dev/null +++ b/src/System.Reflection.Emit/src/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Reflection.Emit/src/System.Reflection.Emit.builds b/src/System.Reflection.Emit/src/System.Reflection.Emit.builds deleted file mode 100644 index 02928df50c..0000000000 --- a/src/System.Reflection.Emit/src/System.Reflection.Emit.builds +++ /dev/null @@ -1,9 +0,0 @@ -<?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> - <Project Include="System.Reflection.Emit.csproj" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Reflection.Emit/src/System.Reflection.Emit.csproj b/src/System.Reflection.Emit/src/System.Reflection.Emit.csproj index 8613502b89..68abf11456 100644 --- a/src/System.Reflection.Emit/src/System.Reflection.Emit.csproj +++ b/src/System.Reflection.Emit/src/System.Reflection.Emit.csproj @@ -1,20 +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> <AssemblyName>System.Reflection.Emit</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <ItemGroup> - <TargetingPackReference Include="mscorlib" Condition="'$(TargetGroup)' == 'net46'" /> - <TargetingPackReference Include="System.Private.CoreLib" Condition="'$(TargetGroup)' != 'net46'" /> + <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.Reflection.Emit/src/project.json b/src/System.Reflection.Emit/src/project.json deleted file mode 100644 index a083fbde74..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-24904-03" - } - } - } -} diff --git a/src/System.Reflection.Emit/tests/Configurations.props b/src/System.Reflection.Emit/tests/Configurations.props new file mode 100644 index 0000000000..f0ebe53119 --- /dev/null +++ b/src/System.Reflection.Emit/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Reflection.Emit/tests/ConstructorBuilder/ConstructorBuilderSetCustomAttribute.cs b/src/System.Reflection.Emit/tests/ConstructorBuilder/ConstructorBuilderSetCustomAttribute.cs index c22ea0e43a..c4798f8cd0 100644 --- a/src/System.Reflection.Emit/tests/ConstructorBuilder/ConstructorBuilderSetCustomAttribute.cs +++ b/src/System.Reflection.Emit/tests/ConstructorBuilder/ConstructorBuilderSetCustomAttribute.cs @@ -49,7 +49,7 @@ namespace System.Reflection.Emit.Tests Type createdType = type.CreateTypeInfo().AsType(); ConstructorInfo createdConstructor = createdType.GetConstructor(new Type[0]); - Attribute[] customAttributes = createdConstructor.GetCustomAttributes(true).ToArray(); + Attribute[] customAttributes = (Attribute[])CustomAttributeExtensions.GetCustomAttributes(createdConstructor, true).ToArray(); Assert.Equal(1, customAttributes.Length); Assert.Equal(2, ((IntAllAttribute)customAttributes[0])._i); diff --git a/src/System.Reflection.Emit/tests/EnumBuilder/EnumBuilder.Methods.Tests.cs b/src/System.Reflection.Emit/tests/EnumBuilder/EnumBuilder.Methods.Tests.cs index dc88405e56..dcb886fd72 100644 --- a/src/System.Reflection.Emit/tests/EnumBuilder/EnumBuilder.Methods.Tests.cs +++ b/src/System.Reflection.Emit/tests/EnumBuilder/EnumBuilder.Methods.Tests.cs @@ -215,7 +215,7 @@ namespace System.Reflection.Emit.Tests ConstructorInfo attributeConstructor = typeof(BoolAttribute).GetConstructor(new Type[] { typeof(bool) }); enumBuilder.SetCustomAttribute(attributeConstructor, new byte[] { 01, 00, 01 }); - Attribute[] objVals = enumBuilder.GetCustomAttributes(true).ToArray(); + Attribute[] objVals = (Attribute[])CustomAttributeExtensions.GetCustomAttributes(enumBuilder, true).ToArray(); Assert.Equal(new BoolAttribute(true), objVals[0]); } diff --git a/src/System.Reflection.Emit/tests/System.Reflection.Emit.Tests.csproj b/src/System.Reflection.Emit/tests/System.Reflection.Emit.Tests.csproj index 5d70cdbf4a..00aedebc5e 100644 --- a/src/System.Reflection.Emit/tests/System.Reflection.Emit.Tests.csproj +++ b/src/System.Reflection.Emit/tests/System.Reflection.Emit.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <AssemblyName>System.Reflection.Emit.Tests</AssemblyName> - <RootNamespace>System.Reflection.Emit.Tests</RootNamespace> <ProjectGuid>{1104A263-331A-4CA0-B541-759BD20F7B1D}</ProjectGuid> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> diff --git a/src/System.Reflection.Emit/tests/Utilities.cs b/src/System.Reflection.Emit/tests/Utilities.cs index 656dd45ac5..23e78906c3 100644 --- a/src/System.Reflection.Emit/tests/Utilities.cs +++ b/src/System.Reflection.Emit/tests/Utilities.cs @@ -32,6 +32,14 @@ namespace System.Reflection.Emit.Tests public IntAllAttribute(int i) { _i = i; } } + public static class TypeExtensions + { + public static Type AsType(this Type type) + { + return type; + } + } + public static class Helpers { public const BindingFlags AllFlags = BindingFlags.Static | BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic; @@ -80,7 +88,7 @@ namespace System.Reflection.Emit.Tests Assert.Equal(size, type.Size); Assert.Equal(packingSize, type.PackingSize); - Assert.Equal(implementedInterfaces ?? new Type[0], type.ImplementedInterfaces); + Assert.Equal(implementedInterfaces ?? new Type[0], type.GetInterfaces()); if (declaringType == null && !type.IsInterface && (implementedInterfaces == null || implementedInterfaces.Length == 0)) { diff --git a/src/System.Reflection.Extensions/dir.props b/src/System.Reflection.Extensions/dir.props index 503cf86a87..bfbc5bd9e0 100644 --- a/src/System.Reflection.Extensions/dir.props +++ b/src/System.Reflection.Extensions/dir.props @@ -1,7 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> - +</Project>
\ No newline at end of file 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 e3172a1409..0000000000 --- a/src/System.Reflection.Extensions/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Reflection": "4.3.0", - "System.Reflection.Primitives": "4.3.0" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Reflection.Extensions/src/Configurations.props b/src/System.Reflection.Extensions/src/Configurations.props new file mode 100644 index 0000000000..f013d10b8c --- /dev/null +++ b/src/System.Reflection.Extensions/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + uap101aot-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Reflection.Extensions/src/System.Reflection.Extensions.builds b/src/System.Reflection.Extensions/src/System.Reflection.Extensions.builds deleted file mode 100644 index ff8e39129f..0000000000 --- a/src/System.Reflection.Extensions/src/System.Reflection.Extensions.builds +++ /dev/null @@ -1,15 +0,0 @@ -<?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> - <Project Include="System.Reflection.Extensions.csproj" /> - <Project Include="System.Reflection.Extensions.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - <Project Include="System.Reflection.Extensions.csproj"> - <TargetGroup>uap101aot</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj b/src/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj index 73708a6a54..b54f40800c 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> @@ -8,8 +8,7 @@ <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <!-- all targets but netcore50aot are pure facades. Exclude resources for pure facades --> <ExcludeResourcesImport Condition="'$(TargetGroup)'!='netcore50aot'">true</ExcludeResourcesImport> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> - <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.7;uap10.1</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -17,7 +16,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 ed8b5e006c..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-24904-01", - "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-24904-01", - "System.Resources.ResourceManager": "4.3.0" - } - } - } -} diff --git a/src/System.Reflection.Extensions/tests/Configurations.props b/src/System.Reflection.Extensions/tests/Configurations.props new file mode 100644 index 0000000000..f0ebe53119 --- /dev/null +++ b/src/System.Reflection.Extensions/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Reflection.Extensions/tests/System.Reflection.Extensions.Tests.csproj b/src/System.Reflection.Extensions/tests/System.Reflection.Extensions.Tests.csproj index 574b9e503f..9f63709f85 100644 --- a/src/System.Reflection.Extensions/tests/System.Reflection.Extensions.Tests.csproj +++ b/src/System.Reflection.Extensions/tests/System.Reflection.Extensions.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <AssemblyName>System.Reflection.Extensions.Tests</AssemblyName> - <RootNamespace>System.Reflection.Extensions.Tests</RootNamespace> <ProjectGuid>{A5E6F8C2-8E71-4148-8806-12FFBDBE2974}</ProjectGuid> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> diff --git a/src/System.Reflection.Metadata/dir.props b/src/System.Reflection.Metadata/dir.props index c870b3436a..88be106a94 100644 --- a/src/System.Reflection.Metadata/dir.props +++ b/src/System.Reflection.Metadata/dir.props @@ -1,8 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <PackageVersion>1.5.0</PackageVersion> <AssemblyVersion>1.4.2.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Reflection.Metadata/src/Configurations.props b/src/System.Reflection.Metadata/src/Configurations.props new file mode 100644 index 0000000000..46f8a8ce69 --- /dev/null +++ b/src/System.Reflection.Metadata/src/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.1; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Reflection.Metadata/src/System.Reflection.Metadata.builds b/src/System.Reflection.Metadata/src/System.Reflection.Metadata.builds deleted file mode 100644 index 617fba8038..0000000000 --- a/src/System.Reflection.Metadata/src/System.Reflection.Metadata.builds +++ /dev/null @@ -1,9 +0,0 @@ -<?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> - <Project Include="System.Reflection.Metadata.csproj" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj b/src/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj index 801b51f524..959062b18a 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> @@ -13,8 +13,7 @@ <CLSCompliant>false</CLSCompliant> <!-- rev'ed to 1.4.1 so that we can drop pre-release down to beta --> <DefineConstants>$(DefineConstants)</DefineConstants> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.1</NuGetTargetMoniker> - <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.1;portable-net45+win8</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard1.1'">netstandard1.1;portable-net45+win8</PackageTargetFramework> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> <PlatformTarget>AnyCPU</PlatformTarget> @@ -246,7 +245,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.Metadata/tests/Configurations.props b/src/System.Reflection.Metadata/tests/Configurations.props new file mode 100644 index 0000000000..30186bb80b --- /dev/null +++ b/src/System.Reflection.Metadata/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.5; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj b/src/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj index 5c9a967d56..e3eaac233b 100644 --- a/src/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj +++ b/src/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj @@ -2,17 +2,10 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> - <Platform Condition="'$(Platform)' == ''">AnyCPU</Platform> <ProjectGuid>{7061832A-E8CF-4AB6-A8DC-44D2F5A43A13}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Reflection.Metadata.Tests</AssemblyName> - <RootNamespace>System.Reflection.Metadata.Tests</RootNamespace> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <FileAlignment>512</FileAlignment> <ExternallyShipping>false</ExternallyShipping> - <NuGetPackageImportStamp>83230753</NuGetPackageImportStamp> - <NugetTargetMoniker>.NETStandard,Version=v1.5</NugetTargetMoniker> + <RootNamespace>System.Reflection.Metadata.Tests</RootNamespace> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PlatformTarget>AnyCPU</PlatformTarget> @@ -27,12 +20,6 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <ProjectReference Include="..\pkg\System.Reflection.Metadata.pkgproj"> - <Project>{f3e433c8-352f-4944-bf7f-765ce435370d}</Project> - <Name>System.Reflection.Metadata</Name> - </ProjectReference> - </ItemGroup> - <ItemGroup> <Compile Include="..\..\Common\src\Interop\Windows\Interop.Libraries.cs"> <Link>Common\Interop\Windows\Interop.Libraries.cs</Link> </Compile> @@ -45,9 +32,6 @@ <Compile Include="..\..\Common\src\Interop\Windows\kernel32\Interop.LoadLibraryEx.cs"> <Link>Common\Interop\Windows\Interop.LoadLibraryEx.cs</Link> </Compile> - <Compile Include="..\..\Common\src\Microsoft\Win32\SafeHandles\SafeHandleZeroOrMinusOneIsInvalid.cs"> - <Link>Common\Microsoft\Win32\Handles\SafeHandleZeroOrMinusOneIsInvalid.cs</Link> - </Compile> <Compile Include="..\..\Common\src\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs"> <Link>Common\Microsoft\Win32\Handles\SafeLibraryHandle.cs</Link> </Compile> @@ -157,8 +141,5 @@ <None Include="Resources\Misc\Signed.cs" /> <EmbeddedResource Include="Resources\Misc\Signed.exe" /> </ItemGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Reflection.Metadata/tests/project.json b/src/System.Reflection.Metadata/tests/project.json deleted file mode 100644 index 6c9942fd3d..0000000000 --- a/src/System.Reflection.Metadata/tests/project.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Collections.Immutable": "1.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24904-01", - "System.IO.MemoryMappedFiles": "4.4.0-beta-24904-01", - "System.Linq": "4.4.0-beta-24904-01", - "System.Linq.Expressions": "4.4.0-beta-24904-01", - "System.ObjectModel": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Reflection.Primitives": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Text.RegularExpressions": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "System.Threading.Tasks.Parallel": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Algorithms": "4.4.0-beta-24904-01", - "test-runtime": { - "target": "project", - "exclude": "compile" - }, - "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04", - "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04" - }, - "frameworks": { - "netstandard1.5": {}, - "netcoreapp1.1": {} - }, - "supports": { - "coreFx.Test.netcoreapp1.0": {}, - "coreFx.Test.netcoreapp1.1": {}, - "coreFx.Test.net462": {}, - "coreFx.Test.net463": {} - } -} diff --git a/src/System.Reflection.Primitives/dir.props b/src/System.Reflection.Primitives/dir.props index 503cf86a87..bfbc5bd9e0 100644 --- a/src/System.Reflection.Primitives/dir.props +++ b/src/System.Reflection.Primitives/dir.props @@ -1,7 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> - +</Project>
\ 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 f53f8e32db..0000000000 --- a/src/System.Reflection.Primitives/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Reflection.Primitives/src/Configurations.props b/src/System.Reflection.Primitives/src/Configurations.props new file mode 100644 index 0000000000..f013d10b8c --- /dev/null +++ b/src/System.Reflection.Primitives/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + uap101aot-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Reflection.Primitives/src/System.Reflection.Primitives.builds b/src/System.Reflection.Primitives/src/System.Reflection.Primitives.builds deleted file mode 100644 index 286d65c106..0000000000 --- a/src/System.Reflection.Primitives/src/System.Reflection.Primitives.builds +++ /dev/null @@ -1,15 +0,0 @@ -<?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> - <Project Include="System.Reflection.Primitives.csproj" /> - <Project Include="System.Reflection.Primitives.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - <Project Include="System.Reflection.Primitives.csproj"> - <TargetGroup>uap101aot</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj b/src/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj index b5487a8aec..a86f6a2f44 100644 --- a/src/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj +++ b/src/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj @@ -1,11 +1,10 @@ -<?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> <AssemblyName>System.Reflection.Primitives</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(NuGetTargetMoniker)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> - <PackageTargetFramework Condition="'$(TargetGroup)'==''">netstandard1.7;uap10.1</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)'=='netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -26,7 +25,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 4b262606cf..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-24904-03" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - }, - "uap10.1": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24904-00" - } - } - } -} diff --git a/src/System.Reflection.TypeExtensions/dir.props b/src/System.Reflection.TypeExtensions/dir.props index d289289a2e..dde44234bf 100644 --- a/src/System.Reflection.TypeExtensions/dir.props +++ b/src/System.Reflection.TypeExtensions/dir.props @@ -3,6 +3,7 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.2.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> <ItemGroup> <!-- Temporarily suppress the message until we get a nuget version that knows about the mapping between netstandard1.7 and uap10.1 --> 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/Configurations.props b/src/System.Reflection.TypeExtensions/src/Configurations.props new file mode 100644 index 0000000000..bd5a53e86b --- /dev/null +++ b/src/System.Reflection.TypeExtensions/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net462-Windows_NT; + uap101aot-Windows_NT; + netstandard1.5; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.builds b/src/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.builds deleted file mode 100644 index 1ac8c4a3a3..0000000000 --- a/src/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.builds +++ /dev/null @@ -1,14 +0,0 @@ -<?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> - <Project Include="System.Reflection.TypeExtensions.csproj" /> - <Project Include="System.Reflection.TypeExtensions.csproj"> - <TargetGroup>net462</TargetGroup> - </Project> - <Project Include="System.Reflection.TypeExtensions.csproj"> - <TargetGroup>uap101aot</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> diff --git a/src/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj b/src/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj index 0dbddfaac1..e5a1a5f897 100644 --- a/src/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj +++ b/src/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj @@ -1,12 +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> <AssemblyName>System.Reflection.TypeExtensions</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <ProjectGuid>{1E689C1B-690C-4799-BDE9-6E7990585894}</ProjectGuid> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.5</NuGetTargetMoniker> - <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.5;uap10.1</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard1.5'">netstandard1.5;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -22,7 +21,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 96c304742f..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-24904-03" - } - }, - "net462": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - }, - "uap10.1": { - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01" - } - } - } -} diff --git a/src/System.Reflection.TypeExtensions/tests/Configurations.props b/src/System.Reflection.TypeExtensions/tests/Configurations.props new file mode 100644 index 0000000000..30186bb80b --- /dev/null +++ b/src/System.Reflection.TypeExtensions/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.5; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Reflection.TypeExtensions/tests/CoreCLR/System.Reflection.TypeExtensions.CoreCLR.Tests.csproj b/src/System.Reflection.TypeExtensions/tests/CoreCLR/System.Reflection.TypeExtensions.CoreCLR.Tests.csproj index ea43e2ad03..733f32b045 100644 --- a/src/System.Reflection.TypeExtensions/tests/CoreCLR/System.Reflection.TypeExtensions.CoreCLR.Tests.csproj +++ b/src/System.Reflection.TypeExtensions/tests/CoreCLR/System.Reflection.TypeExtensions.CoreCLR.Tests.csproj @@ -2,12 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{BED9F8D5-7420-404E-9EAD-D9148C16EAC1}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Reflection.TypeExtensions.CoreCLR.Tests</AssemblyName> - <RootNamespace>System.Reflection.TypeExtensions.CoreCLR.Tests</RootNamespace> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -21,9 +16,6 @@ </None> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\pkg\System.Reflection.TypeExtensions.pkgproj" /> - </ItemGroup> - <ItemGroup> <Compile Include="MemberInfoTests.CoreCLR.cs" /> <Compile Include="ModuleTests.CoreCLR.cs" /> </ItemGroup> diff --git a/src/System.Reflection.TypeExtensions/tests/System.Reflection.TypeExtensions.Tests.csproj b/src/System.Reflection.TypeExtensions/tests/System.Reflection.TypeExtensions.Tests.csproj index 903fc6e297..5f43e9c5c5 100644 --- a/src/System.Reflection.TypeExtensions/tests/System.Reflection.TypeExtensions.Tests.csproj +++ b/src/System.Reflection.TypeExtensions/tests/System.Reflection.TypeExtensions.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{089444FE-8FF5-4D8F-A51B-32D026425F6B}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Reflection.TypeExtensions.Tests</AssemblyName> - <RootNamespace>System.Reflection.TypeExtensions.Tests</RootNamespace> - <NugetTargetMoniker>.NETStandard,Version=v1.5</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -29,11 +23,5 @@ <Compile Include="MethodBaseTests.cs" /> <Compile Include="ModuleTests.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Reflection.TypeExtensions.pkgproj"> - <Project>{1e689c1b-690c-4799-bde9-6e7990585894}</Project> - <Name>System.Reflection.TypeExtensions</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Reflection/dir.props b/src/System.Reflection/dir.props index 7bb155c44e..a960cef1a3 100644 --- a/src/System.Reflection/dir.props +++ b/src/System.Reflection/dir.props @@ -1,7 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.2.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> - +</Project>
\ No newline at end of file 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 f53f8e32db..0000000000 --- a/src/System.Reflection/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Reflection/src/Configurations.props b/src/System.Reflection/src/Configurations.props new file mode 100644 index 0000000000..d561a2dc29 --- /dev/null +++ b/src/System.Reflection/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net461-Windows_NT; + uap101aot-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Reflection/src/System.Reflection.builds b/src/System.Reflection/src/System.Reflection.builds deleted file mode 100644 index ac0aa9309f..0000000000 --- a/src/System.Reflection/src/System.Reflection.builds +++ /dev/null @@ -1,15 +0,0 @@ -<?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> - <Project Include="System.Reflection.csproj" /> - <Project Include="System.Reflection.csproj"> - <TargetGroup>net461</TargetGroup> - </Project> - <Project Include="System.Reflection.csproj"> - <TargetGroup>uap101aot</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Reflection/src/System.Reflection.csproj b/src/System.Reflection/src/System.Reflection.csproj index 383a8209ed..789a56ba67 100644 --- a/src/System.Reflection/src/System.Reflection.csproj +++ b/src/System.Reflection/src/System.Reflection.csproj @@ -1,11 +1,10 @@ -<?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> <AssemblyName>System.Reflection</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(NuGetTargetMoniker)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> - <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.7;uap10.1</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -17,7 +16,7 @@ <TargetingPackReference Include="System.Private.CoreLib" Condition="'$(TargetGroup)' != 'net461'" /> </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 7fd0b14601..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-24904-03" - } - }, - "net461": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.1": "1.0.1" - } - }, - "uap10.1": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24904-00" - } - } - } -} diff --git a/src/System.Reflection/tests/AssemblyTests.cs b/src/System.Reflection/tests/AssemblyTests.cs index af9d0502ac..7ce4e81f0c 100644 --- a/src/System.Reflection/tests/AssemblyTests.cs +++ b/src/System.Reflection/tests/AssemblyTests.cs @@ -191,7 +191,7 @@ namespace System.Reflection.Tests [Fact] public void Load_Invalid() { - Assert.Throws<ArgumentNullException>("assemblyRef", () => Assembly.Load(null)); // AssemblyRef is null + Assert.Throws<ArgumentNullException>("assemblyRef", () => Assembly.Load((AssemblyName)null)); // AssemblyRef is null Assert.Throws<FileNotFoundException>(() => Assembly.Load(new AssemblyName("no such assembly"))); // No such assembly } diff --git a/src/System.Reflection/tests/Configurations.props b/src/System.Reflection/tests/Configurations.props new file mode 100644 index 0000000000..30186bb80b --- /dev/null +++ b/src/System.Reflection/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.5; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Reflection/tests/CoreCLR/AssemblyTests.CoreCLR.cs b/src/System.Reflection/tests/CoreCLR/AssemblyTests.CoreCLR.cs index c8841d763a..dcc602eed9 100644 --- a/src/System.Reflection/tests/CoreCLR/AssemblyTests.CoreCLR.cs +++ b/src/System.Reflection/tests/CoreCLR/AssemblyTests.CoreCLR.cs @@ -16,18 +16,10 @@ namespace System.Reflection.Tests { string location = GetExecutingAssembly().Location; Assert.NotEmpty(location); - string expectedDir = AppContext.BaseDirectory; string actualDir = Path.GetDirectoryName(location); - // Check that neither are relative - Assert.True(Path.IsPathRooted(expectedDir)); + // Check that location is not relative Assert.True(Path.IsPathRooted(actualDir)); - - // Normalize paths before comparison - expectedDir = Path.GetFullPath(expectedDir).TrimEnd(Path.DirectorySeparatorChar); - actualDir = Path.GetFullPath(actualDir).TrimEnd(Path.DirectorySeparatorChar); - - Assert.Equal(expectedDir, actualDir, StringComparer.OrdinalIgnoreCase); Assert.Equal("System.Reflection.CoreCLR.Tests.dll", Path.GetFileName(location), StringComparer.OrdinalIgnoreCase); } diff --git a/src/System.Reflection/tests/CoreCLR/System.Reflection.CoreCLR.Tests.csproj b/src/System.Reflection/tests/CoreCLR/System.Reflection.CoreCLR.Tests.csproj index dfd9862c89..635b770855 100644 --- a/src/System.Reflection/tests/CoreCLR/System.Reflection.CoreCLR.Tests.csproj +++ b/src/System.Reflection/tests/CoreCLR/System.Reflection.CoreCLR.Tests.csproj @@ -2,11 +2,6 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <AssemblyName>System.Reflection.CoreCLR.Tests</AssemblyName> - <RootNamespace>System.Reflection.Tests</RootNamespace> <ProjectGuid>{C8049356-559D-4F34-AC17-56F3AE62C897}</ProjectGuid> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -27,7 +22,6 @@ </EmbeddedResource> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\pkg\System.Reflection.pkgproj"/> <ProjectReference Include="..\TestExe\System.Reflection.Tests.TestExe.csproj"> <Project>{8c19b991-41e9-4b38-9602-e19375397f1d}</Project> <Name>System.Reflection.Tests.TestExe</Name> diff --git a/src/System.Reflection/tests/CoreCLR/project.json b/src/System.Reflection/tests/CoreCLR/project.json deleted file mode 100644 index 1ade0faa23..0000000000 --- a/src/System.Reflection/tests/CoreCLR/project.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "System.AppContext": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.Linq.Expressions": "4.4.0-beta-24904-01", - "System.ObjectModel": "4.4.0-beta-24904-01", - "System.Reflection.Emit": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Loader": "4.4.0-beta-24904-01", - "System.Text.RegularExpressions": "4.4.0-beta-24904-01", - "test-runtime": { - "target": "project", - "exclude": "compile" - }, - "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04", - "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04" - }, - "frameworks": { - "netstandard1.5": {} - }, - "supports": { - "coreFx.Test.netcoreapp1.0": {} - } -} diff --git a/src/System.Reflection/tests/System.Reflection.Tests.csproj b/src/System.Reflection/tests/System.Reflection.Tests.csproj index 5e7f16c1f6..2dd14384a8 100644 --- a/src/System.Reflection/tests/System.Reflection.Tests.csproj +++ b/src/System.Reflection/tests/System.Reflection.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <AssemblyName>System.Reflection.Tests</AssemblyName> - <RootNamespace>System.Reflection.Tests</RootNamespace> <ProjectGuid>{B027C72E-F04E-42E0-A7F7-993AEF8400D2}</ProjectGuid> - <NugetTargetMoniker>.NETStandard,Version=v1.5</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -42,10 +36,6 @@ </EmbeddedResource> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\pkg\System.Reflection.pkgproj"> - <Project>{446de6f0-47a0-4c2f-a918-768a76ccf461}</Project> - <Name>System.Reflection</Name> - </ProjectReference> <ProjectReference Include="TestExe\System.Reflection.Tests.TestExe.csproj"> <Project>{8c19b991-41e9-4b38-9602-e19375397f1d}</Project> <Name>System.Reflection.Tests.TestExe</Name> diff --git a/src/System.Reflection/tests/TestExe/System.Reflection.Tests.TestExe.csproj b/src/System.Reflection/tests/TestExe/System.Reflection.Tests.TestExe.csproj index d7f0989702..530638df71 100644 --- a/src/System.Reflection/tests/TestExe/System.Reflection.Tests.TestExe.csproj +++ b/src/System.Reflection/tests/TestExe/System.Reflection.Tests.TestExe.csproj @@ -4,10 +4,8 @@ <PropertyGroup> <ProjectGuid>{8C19B991-41E9-4B38-9602-E19375397F1D}</ProjectGuid> <OutputType>Exe</OutputType> - <RootNamespace>System.Reflection.Tests</RootNamespace> - <AssemblyName>System.Reflection.Tests.TestExe</AssemblyName> - <CopyNuGetImplementations>false</CopyNuGetImplementations> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> + <IsTestProject>true</IsTestProject> + <NoWarn>0436</NoWarn> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> diff --git a/src/System.Reflection/tests/TestExe/project.json b/src/System.Reflection/tests/TestExe/project.json deleted file mode 100644 index 049eca4fc8..0000000000 --- a/src/System.Reflection/tests/TestExe/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "test-runtime": { - "target": "project", - "exclude": "compile" - } - }, - "frameworks": { - "netstandard1.3": {} - }, - "supports": { - "coreFx.Test.netcore50": {}, - "coreFx.Test.netcoreapp1.0": {}, - "coreFx.Test.net46": {}, - "coreFx.Test.net461": {}, - "coreFx.Test.net462": {}, - "coreFx.Test.net463": {} - } -} diff --git a/src/System.Resources.Reader/dir.props b/src/System.Resources.Reader/dir.props index fcc1a7ca5a..bfbc5bd9e0 100644 --- a/src/System.Resources.Reader/dir.props +++ b/src/System.Resources.Reader/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ No newline at end of file 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 466ae18180..0000000000 --- a/src/System.Resources.Reader/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Resources.Reader/src/Configurations.props b/src/System.Resources.Reader/src/Configurations.props new file mode 100644 index 0000000000..fc9ef9822c --- /dev/null +++ b/src/System.Resources.Reader/src/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Resources.Reader/src/System.Resources.Reader.builds b/src/System.Resources.Reader/src/System.Resources.Reader.builds deleted file mode 100644 index 95f499498a..0000000000 --- a/src/System.Resources.Reader/src/System.Resources.Reader.builds +++ /dev/null @@ -1,9 +0,0 @@ -<?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> - <Project Include="System.Resources.Reader.csproj" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Resources.Reader/src/System.Resources.Reader.csproj b/src/System.Resources.Reader/src/System.Resources.Reader.csproj index 1f42172949..50c6b43d2e 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> @@ -7,7 +7,6 @@ <RootNamespace>System.Resources</RootNamespace> <ProjectGuid>{16EE5522-F387-4C9E-9EF2-B5134B043F37}</ProjectGuid> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -15,7 +14,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 2149d4c52b..0000000000 --- a/src/System.Resources.Reader/src/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Resources.Reader/tests/Configurations.props b/src/System.Resources.Reader/tests/Configurations.props new file mode 100644 index 0000000000..512c938bad --- /dev/null +++ b/src/System.Resources.Reader/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Resources.Reader/tests/System.Resources.Reader.Tests.csproj b/src/System.Resources.Reader/tests/System.Resources.Reader.Tests.csproj index f08789a82f..0d84da2db5 100644 --- a/src/System.Resources.Reader/tests/System.Resources.Reader.Tests.csproj +++ b/src/System.Resources.Reader/tests/System.Resources.Reader.Tests.csproj @@ -1,15 +1,9 @@ -<?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" /> <Import Project="$(CommonTestPath)\Tests.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <AssemblyName>System.Resources.Reader.Tests</AssemblyName> - <RootNamespace>System.Resources.Reader.Tests</RootNamespace> <ProjectGuid>{8D7202E8-084A-4C20-AB93-3BF70D2E0651}</ProjectGuid> - <NugetTargetMoniker Condition=" '$(TargetGroup)' == '' ">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -19,10 +13,5 @@ <ItemGroup> <Compile Include="ResourceReaderUnitTest.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Resources.Reader.pkgproj"> - <Name>System.Resources.Reader</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Resources.ResourceManager/dir.props b/src/System.Resources.ResourceManager/dir.props index fcc1a7ca5a..bfbc5bd9e0 100644 --- a/src/System.Resources.ResourceManager/dir.props +++ b/src/System.Resources.ResourceManager/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ No newline at end of file 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 12410c0faa..0000000000 --- a/src/System.Resources.ResourceManager/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Resources.ResourceManager/src/Configurations.props b/src/System.Resources.ResourceManager/src/Configurations.props new file mode 100644 index 0000000000..f013d10b8c --- /dev/null +++ b/src/System.Resources.ResourceManager/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + uap101aot-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Resources.ResourceManager/src/System.Resources.ResourceManager.builds b/src/System.Resources.ResourceManager/src/System.Resources.ResourceManager.builds deleted file mode 100644 index d60b2d1d37..0000000000 --- a/src/System.Resources.ResourceManager/src/System.Resources.ResourceManager.builds +++ /dev/null @@ -1,14 +0,0 @@ -<?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> - <Project Include="System.Resources.ResourceManager.csproj" /> - <Project Include="System.Resources.ResourceManager.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - <Project Include="System.Resources.ResourceManager.csproj" > - <TargetGroup>uap101aot</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> diff --git a/src/System.Resources.ResourceManager/src/System.Resources.ResourceManager.csproj b/src/System.Resources.ResourceManager/src/System.Resources.ResourceManager.csproj index 80e8d652c3..f7073fb949 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> @@ -6,9 +6,8 @@ <IsPartialFacadeAssembly Condition="'$(TargetGroup)' != 'uap101aot'">true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' != 'uap101aot'">None</ResourcesSourceOutputDirectory> <SkipCommonResourcesIncludes Condition="'$(TargetGroup)'=='uap101aot'">true</SkipCommonResourcesIncludes> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> <AllowUnsafeBlocks Condition="'$(TargetGroup)' == 'uap101aot'">true</AllowUnsafeBlocks> - <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.7;uap10.1</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -27,14 +26,15 @@ <TargetingPackReference Include="System.Private.CoreLib.WinRTInterop" /> <ProjectReference Include="$(SourceDir)/mscorlib.WinRT-Facade/mscorlib.WinRT-Facade.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == ''"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <TargetingPackReference Include="System.Private.CoreLib"/> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == 'net463'"> <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 630d2ab6db..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-24904-03" - } - }, - "uap10.1": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24904-00", - "Microsoft.TargetingPack.Private.WinRT": "1.0.3", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Diagnostics.Tracing": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.Resources.ResourceManager/tests/Configurations.props b/src/System.Resources.ResourceManager/tests/Configurations.props new file mode 100644 index 0000000000..512c938bad --- /dev/null +++ b/src/System.Resources.ResourceManager/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj b/src/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj index e95893a109..c767b18980 100644 --- a/src/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj +++ b/src/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj @@ -2,11 +2,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> - <AssemblyName>System.Resources.ResourceManager.Tests</AssemblyName> - <RootNamespace>System.Resources.Tests</RootNamespace> <ProjectGuid>{1D51A16C-B6D8-4E8F-98DE-21AD9A7062A1}</ProjectGuid> - <NugetTargetMoniker Condition=" '$(TargetGroup)' == '' ">.NETStandard,Version=v1.7</NugetTargetMoniker> + <RootNamespace>System.Resources.Tests</RootNamespace> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -26,8 +23,8 @@ <Compile Include="$(CommonTestPath)/System/Runtime/Serialization/Formatters/BinaryFormatterHelpers.cs"> <Link>System/Runtime/Serialization/Formatters/BinaryFormatterHelpers.cs</Link> </Compile> - <Compile Include="MissingManifestResourceExceptionTests.netstandard17.cs"/> - <Compile Include="MissingSatelliteAssemblyException.cs"/> + <Compile Include="MissingManifestResourceExceptionTests.netstandard17.cs" /> + <Compile Include="MissingSatelliteAssemblyException.cs" /> <Compile Include="ResourceManagerTests.netstandard17.cs" /> <Compile Include="ResourceSetTests.cs" /> <EmbeddedResource Include="Resources\TestResx.netstandard17.resx"> @@ -41,13 +38,10 @@ </Compile> </ItemGroup> <ItemGroup> - <ProjectReference Include="../pkg/System.Resources.ResourceManager.pkgproj"/> - </ItemGroup> - <ItemGroup> <EmbeddedResource Include="Resources\TestResx.resx"> <Generator>ResXFileCodeGenerator</Generator> <LastGenOutput>TestResx.Designer.cs</LastGenOutput> </EmbeddedResource> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Resources.Writer/dir.props b/src/System.Resources.Writer/dir.props index 041b9b1160..bfbc5bd9e0 100644 --- a/src/System.Resources.Writer/dir.props +++ b/src/System.Resources.Writer/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file 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 957483a51d..0000000000 --- a/src/System.Resources.Writer/ref/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Resources.Writer/src/Configurations.props b/src/System.Resources.Writer/src/Configurations.props new file mode 100644 index 0000000000..fc9ef9822c --- /dev/null +++ b/src/System.Resources.Writer/src/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Resources.Writer/src/System.Resources.Writer.builds b/src/System.Resources.Writer/src/System.Resources.Writer.builds deleted file mode 100644 index 7af454e518..0000000000 --- a/src/System.Resources.Writer/src/System.Resources.Writer.builds +++ /dev/null @@ -1,9 +0,0 @@ -<?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> - <Project Include="System.Resources.Writer.csproj" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Resources.Writer/src/System.Resources.Writer.csproj b/src/System.Resources.Writer/src/System.Resources.Writer.csproj index d71560dce7..73f9e8792f 100644 --- a/src/System.Resources.Writer/src/System.Resources.Writer.csproj +++ b/src/System.Resources.Writer/src/System.Resources.Writer.csproj @@ -1,11 +1,10 @@ -<?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> <AssemblyName>System.Resources.Writer</AssemblyName> <RootNamespace>System.Resources</RootNamespace> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -22,7 +21,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 c945b15b9a..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-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Resources.Writer/tests/Configurations.props b/src/System.Resources.Writer/tests/Configurations.props new file mode 100644 index 0000000000..512c938bad --- /dev/null +++ b/src/System.Resources.Writer/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Resources.Writer/tests/System.Resources.Writer.Tests.csproj b/src/System.Resources.Writer/tests/System.Resources.Writer.Tests.csproj index 0342e57145..cdcf09441d 100644 --- a/src/System.Resources.Writer/tests/System.Resources.Writer.Tests.csproj +++ b/src/System.Resources.Writer/tests/System.Resources.Writer.Tests.csproj @@ -1,15 +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" /> <Import Project="$(CommonTestPath)\Tests.props" /> - <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <AssemblyName>System.Resources.Writer.Tests</AssemblyName> - <RootNamespace>System.Resources.Writer.Tests</RootNamespace> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> - </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> </PropertyGroup> @@ -18,14 +10,5 @@ <ItemGroup> <Compile Include="ResourceWriterUnitTest.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\System.Resources.ResourceManager\pkg\System.Resources.ResourceManager.pkgproj"> - <Name>System.Resources.ResourceManager</Name> - </ProjectReference> - <ProjectReference Include="..\pkg\System.Resources.Writer.pkgproj"> - <Project>{16EE5522-F387-4C9E-9EF2-B5134B043F37}</Project> - <Name>System.Resources.Writer</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.builds b/src/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.builds deleted file mode 100644 index acbc515907..0000000000 --- a/src/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.builds +++ /dev/null @@ -1,9 +0,0 @@ -<?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> - <Project Include="System.Runtime.CompilerServices.Unsafe.ilproj" Condition="'$(OS)'=='Windows_NT'" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Runtime.CompilerServices.Unsafe/tests/Configurations.props b/src/System.Runtime.CompilerServices.Unsafe/tests/Configurations.props new file mode 100644 index 0000000000..f0ebe53119 --- /dev/null +++ b/src/System.Runtime.CompilerServices.Unsafe/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Runtime.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.csproj b/src/System.Runtime.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.csproj index 917f51d834..762ad6b96b 100644 --- a/src/System.Runtime.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.csproj +++ b/src/System.Runtime.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.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> - <RootNamespace>System.Runtime.CompilerServices</RootNamespace> - <AssemblyName>System.Runtime.CompilerServices.Unsafe.Tests</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> + <UnsupportedPlatforms>Linux;NetBSD;OSX</UnsupportedPlatforms> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> <ItemGroup> <Compile Include="UnsafeTests.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Runtime.CompilerServices.Unsafe.pkgproj"> - <Name>System.Runtime.CompilerServices.Unsafe</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> 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 f53f8e32db..0000000000 --- a/src/System.Runtime.CompilerServices.VisualC/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Runtime.CompilerServices.VisualC/src/Configurations.props b/src/System.Runtime.CompilerServices.VisualC/src/Configurations.props new file mode 100644 index 0000000000..9c336c0be9 --- /dev/null +++ b/src/System.Runtime.CompilerServices.VisualC/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Runtime.CompilerServices.VisualC/src/System.Runtime.CompilerServices.VisualC.builds b/src/System.Runtime.CompilerServices.VisualC/src/System.Runtime.CompilerServices.VisualC.builds deleted file mode 100644 index 9fe0f6ac7a..0000000000 --- a/src/System.Runtime.CompilerServices.VisualC/src/System.Runtime.CompilerServices.VisualC.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.Runtime.CompilerServices.VisualC.csproj" /> - <Project Include="System.Runtime.CompilerServices.VisualC.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - 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..0bb4ff8a8a 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,10 +1,9 @@ -<?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> <AssemblyName>System.Runtime.CompilerServices.VisualC</AssemblyName> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -12,14 +11,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> <!-- Shared CoreCLR and .NET Native --> - <ItemGroup Condition="'$(TargetGroup)' == ''"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="System\Runtime\CompilerServices\Attributes.cs" /> </ItemGroup> <ItemGroup> <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 d5b7b38393..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-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Runtime.Extensions/dir.props b/src/System.Runtime.Extensions/dir.props index 7bb155c44e..a960cef1a3 100644 --- a/src/System.Runtime.Extensions/dir.props +++ b/src/System.Runtime.Extensions/dir.props @@ -1,7 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.2.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.Extensions/ref/4.1.0/project.json b/src/System.Runtime.Extensions/ref/4.1.0/project.json deleted file mode 100644 index b9c5f0a15b..0000000000 --- a/src/System.Runtime.Extensions/ref/4.1.0/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime.Extensions": "4.3.0" - }, - "frameworks": { - "netstandard1.5": {} - } -}
\ No newline at end of file diff --git a/src/System.Runtime.Extensions/ref/Configurations.props b/src/System.Runtime.Extensions/ref/Configurations.props new file mode 100644 index 0000000000..ea9ea79f78 --- /dev/null +++ b/src/System.Runtime.Extensions/ref/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netcoreapp; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Runtime.Extensions/ref/System.Runtime.Extensions.csproj b/src/System.Runtime.Extensions/ref/System.Runtime.Extensions.csproj index 4b55f5f4eb..4eb594ad36 100644 --- a/src/System.Runtime.Extensions/ref/System.Runtime.Extensions.csproj +++ b/src/System.Runtime.Extensions/ref/System.Runtime.Extensions.csproj @@ -1,23 +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> - <!-- 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> + <DefineConstants Condition="'$(TargetGroup)' == 'netcoreapp'">$(DefineConstants);netcoreapp11</DefineConstants> </PropertyGroup> <ItemGroup> <Compile Include="System.Runtime.Extensions.cs" /> <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 993dd176e1..0000000000 --- a/src/System.Runtime.Extensions/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Security.Principal": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {}, - "netcoreapp1.1": {} - } -} diff --git a/src/System.Runtime.Extensions/src/Configurations.props b/src/System.Runtime.Extensions/src/Configurations.props new file mode 100644 index 0000000000..8659b03c29 --- /dev/null +++ b/src/System.Runtime.Extensions/src/Configurations.props @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard-Unix; + netstandard-Windows_NT; + net461-Windows_NT; + uap101aot-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Runtime.Extensions/src/System.Runtime.Extensions.builds b/src/System.Runtime.Extensions/src/System.Runtime.Extensions.builds deleted file mode 100644 index f20500238a..0000000000 --- a/src/System.Runtime.Extensions/src/System.Runtime.Extensions.builds +++ /dev/null @@ -1,19 +0,0 @@ -<?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> - <Project Include="System.Runtime.Extensions.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.Runtime.Extensions.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.Runtime.Extensions.csproj"> - <TargetGroup>net461</TargetGroup> - </Project> - <Project Include="System.Runtime.Extensions.csproj"> - <TargetGroup>uap101aot</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project>
\ No newline at end of file diff --git a/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj b/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj index 1570dd40b8..ef1755cd87 100644 --- a/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj +++ b/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj @@ -1,8 +1,5 @@ -<?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> <ProjectGuid>{845D2B72-D8A4-42E5-9BE9-17639EC4FC1A}</ProjectGuid> @@ -12,11 +9,8 @@ <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <!-- System.IO.Path conflicts between type in partial facade and in mscorlib --> <NoWarn>0436</NoWarn> - <NuGetTargetMoniker Condition="'$(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> - <!-- Temporarily ignore missing types for uap101aot --> - <GenFacadesArgs Condition="'$(TargetGroup)' == 'uap101aot'">$(GenFacadesArgs) -ignoreMissingTypes</GenFacadesArgs> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> <TargetsWindowsUap Condition="'$(TargetGroup)'=='uap101aot'">true</TargetsWindowsUap> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -34,7 +28,7 @@ </PropertyGroup> <ItemGroup Condition="'$(TargetGroup)' == 'net461'"> <ContractProject Include="..\ref\System.Runtime.Extensions.csproj"> - <TargetGroup>netstandard1.7</TargetGroup> + <TargetGroup>netstandard</TargetGroup> </ContractProject> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' != 'net461'"> @@ -121,7 +115,7 @@ <Link>Common\System\HResults.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == ''"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="System\IO\FileStreamHelpers.CoreClr.cs" /> <Compile Include="System\IO\TextReader.netstandard17.cs" /> <Compile Include="System\IO\TextWriter.netstandard17.cs" /> @@ -330,13 +324,9 @@ <Compile Include="System\StringNormalizationExtensions.cs" /> <Compile Include="System\Globalization\Extensions.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == ''"> - <ProjectReference Include="..\..\System.Private.Uri\src\System.Private.Uri.csproj"> - <UndefineProperties>%(ProjectReference.UndefineProperties);TargetGroup</UndefineProperties> - </ProjectReference> - <ProjectReference Include="..\..\System.Diagnostics.Debug\src\System.Diagnostics.Debug.csproj"> - <UndefineProperties>%(ProjectReference.UndefineProperties);TargetGroup</UndefineProperties> - </ProjectReference> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> + <ProjectReference Include="..\..\System.Private.Uri\src\System.Private.Uri.csproj" /> + <ProjectReference Include="..\..\System.Diagnostics.Debug\src\System.Diagnostics.Debug.csproj" /> <ProjectReference Include="..\..\System.Security.Principal\src\System.Security.Principal.csproj"> <Aliases>System_Security_Principal</Aliases> </ProjectReference> @@ -346,7 +336,7 @@ <TargetingPackReference Include="mscorlib" /> <TargetingPackReference Include="System" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' != 'net461'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard' or '$(TargetsWindowsUap)' == 'true'"> <TargetingPackReference Include="System.Private.CoreLib" /> </ItemGroup> <ItemGroup Condition="'$(TargetsWindowsUap)' == 'true'"> @@ -356,7 +346,7 @@ <ProjectReference Include="..\..\System.Private.Uri\src\System.Private.Uri.csproj" /> </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 0fc7ce1e2b..0000000000 --- a/src/System.Runtime.Extensions/src/project.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03" - } - }, - "netcoreapp1.2": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreRT": "1.0.0-alpha-24821-02" - } - }, - "net461": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.1": "1.0.1" - } - }, - "uap10.1": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24904-00", - "Microsoft.TargetingPack.Private.WinRT": "1.0.3" - } - } - } -} diff --git a/src/System.Runtime.Extensions/src/redist/project.json b/src/System.Runtime.Extensions/src/redist/project.json deleted file mode 100644 index dd7c85da5d..0000000000 --- a/src/System.Runtime.Extensions/src/redist/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime.Extensions": "4.3.0" - }, - "frameworks": { - "netcore50": {} - } -}
\ No newline at end of file diff --git a/src/System.Runtime.Extensions/tests/AssemblyResolveTests/AssemblyResolveTests.csproj b/src/System.Runtime.Extensions/tests/AssemblyResolveTests/AssemblyResolveTests.csproj index bdc514e94a..f2cd5ffd74 100644 --- a/src/System.Runtime.Extensions/tests/AssemblyResolveTests/AssemblyResolveTests.csproj +++ b/src/System.Runtime.Extensions/tests/AssemblyResolveTests/AssemblyResolveTests.csproj @@ -3,12 +3,9 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>ad83807c-8be5-4f27-85df-9793613233e1</ProjectGuid> - <OutputType>Library</OutputType> - <RootNamespace>AssemblyResolveTests</RootNamespace> - <AssemblyName>AssemblyResolveTests</AssemblyName> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> - <CopyNuGetImplementations>false</CopyNuGetImplementations> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker> + <IsTestProject>true</IsTestProject> + <NoWarn>0436</NoWarn> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -29,8 +26,5 @@ <TargetingPackReference Include="System.Core" /> <TargetingPackReference Include="System.Runtime" /> </ItemGroup> - <ItemGroup> - <None Include="project.json" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - </Project> +</Project> diff --git a/src/System.Runtime.Extensions/tests/AssemblyResolveTests/project.json b/src/System.Runtime.Extensions/tests/AssemblyResolveTests/project.json deleted file mode 100644 index ccbb472dc8..0000000000 --- a/src/System.Runtime.Extensions/tests/AssemblyResolveTests/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Resources.Reader": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.3": {} - } -} diff --git a/src/System.Runtime.Extensions/tests/Configurations.props b/src/System.Runtime.Extensions/tests/Configurations.props new file mode 100644 index 0000000000..dec1ed007e --- /dev/null +++ b/src/System.Runtime.Extensions/tests/Configurations.props @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netcoreapp1.1-Windows_NT; + netcoreapp1.1-Unix; + netstandard1.5-Unix; + netstandard1.5-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Runtime.Extensions/tests/Performance/System.Runtime.Extensions.Performance.Tests.csproj b/src/System.Runtime.Extensions/tests/Performance/System.Runtime.Extensions.Performance.Tests.csproj index 763c348871..70835b0bec 100644 --- a/src/System.Runtime.Extensions/tests/Performance/System.Runtime.Extensions.Performance.Tests.csproj +++ b/src/System.Runtime.Extensions/tests/Performance/System.Runtime.Extensions.Performance.Tests.csproj @@ -1,15 +1,9 @@ -<?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> - <RootNamespace>System.Runtime.Extensions.Performance.Tests</RootNamespace> - <AssemblyName>System.Runtime.Extensions.Performance.Tests</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IncludePerformanceTests>true</IncludePerformanceTests> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> @@ -23,12 +17,6 @@ </Compile> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\pkg\System.Runtime.Extensions.pkgproj"> - <Project>{1e689c1b-690c-4799-bde9-6e7990585894}</Project> - <Name>System.Runtime.Extensions.CoreCLR</Name> - </ProjectReference> - <ProjectReference Include="..\..\..\System.Private.Uri\pkg\System.Private.Uri.pkgproj" /> - <ProjectReference Include="..\..\..\System.Diagnostics.Debug\pkg\System.Diagnostics.Debug.pkgproj" /> <ProjectReference Include="$(CommonTestPath)\System\Diagnostics\RemoteExecutorConsoleApp\RemoteExecutorConsoleApp.csproj"> <Project>{69e46a6f-9966-45a5-8945-2559fe337827}</Project> <Name>RemoteExecutorConsoleApp</Name> diff --git a/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj b/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj index a1d0c67a46..4c8148131f 100644 --- a/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj +++ b/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj @@ -1,19 +1,10 @@ <?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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{6C314C9B-3D28-4B05-9B4C-B57A00A9B3B9}</ProjectGuid> - <OutputType>Library</OutputType> - <RootNamespace>System.Runtime.Extensions.Tests</RootNamespace> - <AssemblyName>System.Runtime.Extensions.Tests</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <DefineConstants Condition="'$(TargetGroup)'=='netstandard1.7'">$(DefineConstants);netstandard17</DefineConstants> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.5</NugetTargetMoniker> </PropertyGroup> <!-- Folder logic needs moved into common targets: https://github.com/dotnet/corefx/issues/11468 --> <ItemGroup Condition="'$(TargetGroup)'=='netstandard1.7'"> @@ -118,12 +109,6 @@ </Compile> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\System.Diagnostics.Debug\pkg\System.Diagnostics.Debug.pkgproj" /> - <ProjectReference Include="..\pkg\System.Runtime.Extensions.pkgproj"> - <Project>{1e689c1b-690c-4799-bde9-6e7990585894}</Project> - <Name>System.Runtime.Extensions.CoreCLR</Name> - </ProjectReference> - <ProjectReference Include="..\..\System.Private.Uri\pkg\System.Private.Uri.pkgproj" /> <ProjectReference Include="$(CommonTestPath)\System\Diagnostics\RemoteExecutorConsoleApp\RemoteExecutorConsoleApp.csproj"> <Project>{69e46a6f-9966-45a5-8945-2559fe337827}</Project> <Name>RemoteExecutorConsoleApp</Name> diff --git a/src/System.Runtime.Extensions/tests/TestApp/TestApp.csproj b/src/System.Runtime.Extensions/tests/TestApp/TestApp.csproj index 4ddc17ac0f..ccd1114092 100644 --- a/src/System.Runtime.Extensions/tests/TestApp/TestApp.csproj +++ b/src/System.Runtime.Extensions/tests/TestApp/TestApp.csproj @@ -4,11 +4,9 @@ <PropertyGroup> <ProjectGuid>{24BCEC6B-B9D2-47BC-9D66-725BD6B526FA}</ProjectGuid> <OutputType>Exe</OutputType> - <RootNamespace>TestApp</RootNamespace> - <AssemblyName>TestApp</AssemblyName> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> - <CopyNuGetImplementations>false</CopyNuGetImplementations> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker> + <IsTestProject>true</IsTestProject> + <NoWarn>0436</NoWarn> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> diff --git a/src/System.Runtime.Extensions/tests/TestApp/project.json b/src/System.Runtime.Extensions/tests/TestApp/project.json deleted file mode 100644 index ccbb472dc8..0000000000 --- a/src/System.Runtime.Extensions/tests/TestApp/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Resources.Reader": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.3": {} - } -} diff --git a/src/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/TestAppOutsideOfTPA.csproj b/src/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/TestAppOutsideOfTPA.csproj index 081d344bbf..bee5bda7a1 100644 --- a/src/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/TestAppOutsideOfTPA.csproj +++ b/src/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/TestAppOutsideOfTPA.csproj @@ -4,11 +4,9 @@ <PropertyGroup> <ProjectGuid>{C44B33E3-F89F-40B9-B353-D380C1524988}</ProjectGuid> <OutputType>Exe</OutputType> - <RootNamespace>TestAppOutsideOfTPA</RootNamespace> - <AssemblyName>TestAppOutsideOfTPA</AssemblyName> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> - <CopyNuGetImplementations>false</CopyNuGetImplementations> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker> + <IsTestProject>true</IsTestProject> + <NoWarn>0436</NoWarn> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -30,9 +28,6 @@ <TargetingPackReference Include="System.Runtime" /> </ItemGroup> <ItemGroup> - <None Include="project.json" /> - </ItemGroup> - <ItemGroup> <ProjectReference Include="..\AssemblyResolveTests\AssemblyResolveTests.csproj"> <Project>{ad83807c-8be5-4f27-85df-9793613233e1}</Project> <Name>AssemblyResolveTests</Name> diff --git a/src/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/project.json b/src/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/project.json deleted file mode 100644 index ccbb472dc8..0000000000 --- a/src/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Resources.Reader": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.3": {} - } -} diff --git a/src/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj b/src/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj index 2c35b79119..bdfdc1bf42 100644 --- a/src/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj +++ b/src/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj @@ -4,11 +4,9 @@ <PropertyGroup> <ProjectGuid>{9F312D76-9AF1-4E90-B3B0-815A1EC6C346}</ProjectGuid> <OutputType>Exe</OutputType> - <RootNamespace>VoidMainWithExitCodeApp</RootNamespace> - <AssemblyName>VoidMainWithExitCodeApp</AssemblyName> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> - <CopyNuGetImplementations>false</CopyNuGetImplementations> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker> + <IsTestProject>true</IsTestProject> + <NoWarn>0436</NoWarn> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -29,8 +27,5 @@ <TargetingPackReference Include="System.Core" /> <TargetingPackReference Include="System.Runtime" /> </ItemGroup> - <ItemGroup> - <None Include="project.json" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/project.json b/src/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/project.json deleted file mode 100644 index efe2fba890..0000000000 --- a/src/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.3": {} - } -} diff --git a/src/System.Runtime.Handles/dir.props b/src/System.Runtime.Handles/dir.props index 503cf86a87..bfbc5bd9e0 100644 --- a/src/System.Runtime.Handles/dir.props +++ b/src/System.Runtime.Handles/dir.props @@ -1,7 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> - +</Project>
\ No newline at end of file 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 f53f8e32db..0000000000 --- a/src/System.Runtime.Handles/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Runtime.Handles/src/Configurations.props b/src/System.Runtime.Handles/src/Configurations.props new file mode 100644 index 0000000000..f013d10b8c --- /dev/null +++ b/src/System.Runtime.Handles/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + uap101aot-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Runtime.Handles/src/System.Runtime.Handles.builds b/src/System.Runtime.Handles/src/System.Runtime.Handles.builds deleted file mode 100644 index 95100365b3..0000000000 --- a/src/System.Runtime.Handles/src/System.Runtime.Handles.builds +++ /dev/null @@ -1,19 +0,0 @@ -<?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> - <Project Include="System.Runtime.Handles.csproj" /> - <Project Include="System.Runtime.Handles.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - <!-- Net46 facade is currently inbox for 4.0 - <Project Include="System.Runtime.Handles.csproj"> - <TargetGroup>net46</TargetGroup> - </Project> --> - <Project Include="System.Runtime.Handles.csproj"> - <TargetGroup>uap101aot</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Runtime.Handles/src/System.Runtime.Handles.csproj b/src/System.Runtime.Handles/src/System.Runtime.Handles.csproj index 95400fb3b9..17fe026d72 100644 --- a/src/System.Runtime.Handles/src/System.Runtime.Handles.csproj +++ b/src/System.Runtime.Handles/src/System.Runtime.Handles.csproj @@ -1,12 +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> <ProjectGuid>{D85EE71C-F05B-4331-9300-8E2833D49E19}</ProjectGuid> <AssemblyName>System.Runtime.Handles</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> - <PackageTargetFramework Condition="'$(TargetGroup)'==''">netstandard1.7;uap10.1</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)'=='netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -15,15 +14,15 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcore50aot_Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> - <TargetingPackReference Include="System.Private.CoreLib" Condition="'$(TargetGroup)' != 'uap101aot'" /> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> + <TargetingPackReference Include="System.Private.CoreLib" /> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == 'net463'"> <TargetingPackReference Include="mscorlib" /> <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 05ed9b9917..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-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - }, - "uap10.1": { - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01" - } - } - } -} diff --git a/src/System.Runtime.Handles/tests/Configurations.props b/src/System.Runtime.Handles/tests/Configurations.props new file mode 100644 index 0000000000..98f53209d4 --- /dev/null +++ b/src/System.Runtime.Handles/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.csproj b/src/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.csproj index ce66b1be09..a681f349c8 100644 --- a/src/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.csproj +++ b/src/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.csproj @@ -1,12 +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"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> <ProjectGuid>{9C77C3CA-7067-4D45-BDFE-CC62AB5C1ED5}</ProjectGuid> - <NugetTargetMoniker Condition="'$(TargetGroup)'==''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -14,9 +10,6 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_NT_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_NT_Release|AnyCPU'" /> <ItemGroup> - <ProjectReference Include="..\pkg\System.Runtime.Handles.pkgproj" /> - </ItemGroup> - <ItemGroup> <Compile Include="CriticalHandle.cs" /> <Compile Include="SafeHandle.cs" /> <Compile Include="SafeWaitHandle.cs" /> diff --git a/src/System.Runtime.InteropServices.RuntimeInformation/dir.props b/src/System.Runtime.InteropServices.RuntimeInformation/dir.props index ba7c08a94c..cfbc7971a2 100644 --- a/src/System.Runtime.InteropServices.RuntimeInformation/dir.props +++ b/src/System.Runtime.InteropServices.RuntimeInformation/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.0.2.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ No newline at end of file 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/Configurations.props b/src/System.Runtime.InteropServices.RuntimeInformation/src/Configurations.props new file mode 100644 index 0000000000..3178cd309f --- /dev/null +++ b/src/System.Runtime.InteropServices.RuntimeInformation/src/Configurations.props @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + win8-Windows_NT; + wpa81-Windows_NT; + net45-Windows_NT; + netcore50-Windows_NT; + netcore50aot-Windows_NT; + netstandard1.1-Unix; + netstandard1.1-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.builds b/src/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.builds deleted file mode 100644 index 63b2b8adfd..0000000000 --- a/src/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.builds +++ /dev/null @@ -1,37 +0,0 @@ -<?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> - <Project Include="System.Runtime.InteropServices.RuntimeInformation.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.Runtime.InteropServices.RuntimeInformation.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.Runtime.InteropServices.RuntimeInformation.csproj"> - <OSGroup>Windows_NT</OSGroup> - <TargetGroup>win8</TargetGroup> - </Project> - <Project Include="System.Runtime.InteropServices.RuntimeInformation.csproj"> - <OSGroup>Windows_NT</OSGroup> - <TargetGroup>wpa81</TargetGroup> - </Project> - <Project Include="System.Runtime.InteropServices.RuntimeInformation.csproj"> - <OSGroup>Windows_NT</OSGroup> - <TargetGroup>net45</TargetGroup> - </Project> - <Project Include="System.Runtime.InteropServices.RuntimeInformation.csproj"> - <OSGroup>Windows_NT</OSGroup> - <TargetGroup>netcore50</TargetGroup> - </Project> - <Project Include="System.Runtime.InteropServices.RuntimeInformation.csproj"> - <OSGroup>Windows_NT</OSGroup> - <TargetGroup>netcore50aot</TargetGroup> - </Project> - <Project Include="System.Runtime.InteropServices.RuntimeInformation.csproj"> - <TargetGroup>netstandard1.1</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - 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..753e5897ba 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,12 +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"> - <PropertyGroup> - <Configuration Condition="'$(Configuration)'=='' AND '$(TargetGroup)' == ''">Windows_Debug</Configuration> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Windows_Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <OutputType>Library</OutputType> <RootNamespace>System.Runtime.InteropServices</RootNamespace> <AssemblyName>System.Runtime.InteropServices.RuntimeInformation</AssemblyName> @@ -16,7 +11,7 @@ <DefineConstants Condition="'$(TargetGroup)'=='win8'">win8</DefineConstants> <DefineConstants Condition="'$(TargetGroup)'=='netcore50'">netcore50</DefineConstants> <DefineConstants Condition="'$(TargetGroup)'=='netcore50aot'">netcore50;netcore50aot</DefineConstants> - <GeneratePlatformNotSupportedAssembly Condition="'$(TargetGroup)'=='netstandard1.1'">true</GeneratePlatformNotSupportedAssembly> + <GeneratePlatformNotSupportedAssembly Condition="'$(TargetGroup)'=='NOTAREALTARGETGROUP'">true</GeneratePlatformNotSupportedAssembly> <NuGetTargetMoniker>.NETStandard,Version=v1.1</NuGetTargetMoniker> <!-- Clear runtime for wpa81 & win8: these project types don't use project.json and need to resolve without a runtime --> <PackageTargetRuntime Condition="'$(TargetGroup)'=='wpa81' OR '$(TargetGroup)'=='win8'"> @@ -59,7 +54,7 @@ </Compile> <Compile Include="System\Runtime\InteropServices\RuntimeInformation\RuntimeInformation.Unix.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetsWindows)'=='true' And ('$(TargetGroup)'=='' OR '$(TargetGroup)'=='net45')"> + <ItemGroup Condition="'$(TargetsWindows)'=='true' And ('$(TargetGroup)' == 'netstandard1.1' OR '$(TargetGroup)'=='net45')"> <Compile Include="$(CommonPath)\Interop\Windows\NtDll\Interop.RtlGetVersion.cs"> <Link>Common\Interop\Windows\NtDll\Interop.RtlGetVersion.cs</Link> </Compile> @@ -85,7 +80,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 +94,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.RuntimeInformation/tests/Configurations.props b/src/System.Runtime.InteropServices.RuntimeInformation/tests/Configurations.props new file mode 100644 index 0000000000..0c2d77f6b7 --- /dev/null +++ b/src/System.Runtime.InteropServices.RuntimeInformation/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3-Unix; + netstandard1.3-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.csproj b/src/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.csproj index 2ddb4021aa..0abfd2549c 100644 --- a/src/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.csproj +++ b/src/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.csproj @@ -1,19 +1,9 @@ -<?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> - <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>System.Runtime.InteropServices.RuntimeInformation.Tests</RootNamespace> - <AssemblyName>System.Runtime.InteropServices.RuntimeInformation.Tests</AssemblyName> <ProjectGuid>{9B4D1DA9-AA4C-428F-9F66-D45C924025A5}</ProjectGuid> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -21,15 +11,9 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> </PropertyGroup> <ItemGroup> - <ProjectReference Include="..\pkg\System.Runtime.InteropServices.RuntimeInformation.pkgproj"> - <Project>{F9DF2357-81B4-4317-908E-512DA9395583}</Project> - <Name>System.Runtime.InteropServices.RuntimeInformation</Name> - </ProjectReference> - </ItemGroup> - <ItemGroup> <Compile Include="CheckArchitectureTests.cs" /> <Compile Include="CheckPlatformTests.cs" /> <Compile Include="DescriptionNameTests.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ 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/Configurations.props b/src/System.Runtime.InteropServices.WindowsRuntime/src/Configurations.props new file mode 100644 index 0000000000..faaee17d95 --- /dev/null +++ b/src/System.Runtime.InteropServices.WindowsRuntime/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netcore50aot-Windows_NT; + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Runtime.InteropServices.WindowsRuntime/src/System.Runtime.InteropServices.WindowsRuntime.builds b/src/System.Runtime.InteropServices.WindowsRuntime/src/System.Runtime.InteropServices.WindowsRuntime.builds deleted file mode 100644 index be109e733b..0000000000 --- a/src/System.Runtime.InteropServices.WindowsRuntime/src/System.Runtime.InteropServices.WindowsRuntime.builds +++ /dev/null @@ -1,17 +0,0 @@ -<?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> - <Project Include="System.Runtime.InteropServices.WindowsRuntime.csproj"/> - <!-- Net46 facade is currently inbox for 4.0 - <Project Include="System.Runtime.InteropServices.WindowsRuntime.csproj"> - <TargetGroup>net46</TargetGroup> - </Project> --> - <Project Include="System.Runtime.InteropServices.WindowsRuntime.csproj"> - <OSGroup>Windows_NT</OSGroup> - <TargetGroup>netcore50aot</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - 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..29a006ba14 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,10 +1,9 @@ -<?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> <AssemblyName>System.Runtime.InteropServices.WindowsRuntime</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -13,15 +12,12 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_netcore50aot_Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' == 'net46'"> - <TargetingPackReference Include="mscorlib" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' != 'net46'"> - <TargetingPackReference Include="System.Private.CoreLib" Condition="'$(TargetGroup)' != 'netcore50aot'" /> + <ItemGroup> + <TargetingPackReference Include="System.Private.CoreLib" Condition="'$(TargetGroup)' == 'netstandard1.3'" /> <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 dc6a9e74ac..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-24904-03" - } - }, - "netcore50": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24904-00", - "System.Runtime": "4.3.0" - } - }, - "net46": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Runtime.InteropServices/dir.props b/src/System.Runtime.InteropServices/dir.props index 7bb155c44e..a960cef1a3 100644 --- a/src/System.Runtime.InteropServices/dir.props +++ b/src/System.Runtime.InteropServices/dir.props @@ -1,7 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.2.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> - +</Project>
\ No newline at end of file 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 69322919f1..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,17 +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" /> </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 bdd838765c..0000000000 --- a/src/System.Runtime.InteropServices/ref/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "System.Reflection": "4.4.0-beta-24904-01", - "System.Reflection.Primitives": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {}, - "netcoreapp1.1": {} - } -} diff --git a/src/System.Runtime.InteropServices/src/Configurations.props b/src/System.Runtime.InteropServices/src/Configurations.props new file mode 100644 index 0000000000..f2a0c6d114 --- /dev/null +++ b/src/System.Runtime.InteropServices/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + uap101aot-Windows_NT; + net461-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.builds b/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.builds deleted file mode 100644 index 979440e2fd..0000000000 --- a/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.builds +++ /dev/null @@ -1,16 +0,0 @@ -<?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> - <Project Include="System.Runtime.InteropServices.csproj" /> - <Project Include="System.Runtime.InteropServices.csproj"> - <TargetGroup>net461</TargetGroup> - </Project> - <Project Include="System.Runtime.InteropServices.csproj"> - <OSGroup>Windows_NT</OSGroup> - <TargetGroup>uap101aot</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj b/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj index dec22715c3..5a00550968 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> @@ -8,9 +8,8 @@ <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <GenFacadesArgs Condition="'$(TargetGroup)' == 'uap101aot'">$(GenFacadesArgs) -ignoreMissingTypes</GenFacadesArgs> <!-- Force string resources to be excluded for full facades. --> - <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' != ''">None</ResourcesSourceOutputDirectory> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> - <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.7;uap10.1</PackageTargetFramework> + <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net463' or '$(TargetGroup)' == 'uap101aot'">None</ResourcesSourceOutputDirectory> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -21,10 +20,10 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_uap101aot_Release|AnyCPU'" /> <ItemGroup Condition="'$(TargetGroup)' == 'net461'"> <ContractProject Include="..\ref\System.Runtime.InteropServices.csproj"> - <TargetGroup>netstandard1.7</TargetGroup> + <TargetGroup>netstandard</TargetGroup> </ContractProject> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == ''"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="System\Runtime\InteropServices\ComAwareEventInfo.cs" /> <Compile Include="System\Runtime\InteropServices\HandleCollector.CoreCLR.cs" /> <Compile Include="System\Runtime\InteropServices\DefaultParameterValueAttribute.cs" /> @@ -65,7 +64,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 957b920806..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-24904-03" - } - }, - "uap10.1": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24904-00" - } - }, - "net461": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.1": "1.0.1" - } - } - } -} diff --git a/src/System.Runtime.InteropServices/tests/Configurations.props b/src/System.Runtime.InteropServices/tests/Configurations.props new file mode 100644 index 0000000000..98f53209d4 --- /dev/null +++ b/src/System.Runtime.InteropServices/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.csproj b/src/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.csproj index 97745e8a2f..4991fa8319 100644 --- a/src/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.csproj +++ b/src/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.csproj @@ -1,14 +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"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <RootNamespace>System.Runtime.InteropServices</RootNamespace> - <AssemblyName>System.Runtime.InteropServices.Tests</AssemblyName> <ProjectGuid>{A824F4CD-935B-4496-A1B2-C3664936DA7B}</ProjectGuid> - <NugetTargetMoniker Condition="'$(TargetGroup)'==''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -17,12 +11,10 @@ <Compile Include="System\Runtime\InteropServices\DefaultParameterValueAttributeTests.cs" /> <Compile Include="System\Runtime\InteropServices\HandleCollectorTests.cs" /> <Compile Include="System\Runtime\InteropServices\MarshalTests.cs" /> - <!-- Helpers --> + <!-- Helpers --> <Compile Include="$(CommonTestPath)\System\PlatformDetection.cs"> <Link>Common\System\PlatformDetection.cs</Link> - </Compile> - </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == ''"> + </Compile> <Compile Include="System\Runtime\InteropServices\RuntimeEnvironmentTest.netstandard1.7.cs" /> <Compile Include="System\Runtime\InteropServices\AllowReversePInvokeCallsAttributeTests.cs" /> <Compile Include="System\Runtime\InteropServices\CallingConventionTests.cs" /> @@ -47,8 +39,5 @@ <Link>System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Runtime.InteropServices.pkgproj" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.Loader/dir.props b/src/System.Runtime.Loader/dir.props index ba7c08a94c..8e334b71f3 100644 --- a/src/System.Runtime.Loader/dir.props +++ b/src/System.Runtime.Loader/dir.props @@ -3,5 +3,7 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.0.2.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> + <IsNETCoreAppRef>false</IsNETCoreAppRef> </PropertyGroup> </Project>
\ No newline at end of file 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/Configurations.props b/src/System.Runtime.Loader/src/Configurations.props new file mode 100644 index 0000000000..30186bb80b --- /dev/null +++ b/src/System.Runtime.Loader/src/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.5; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Runtime.Loader/src/System.Runtime.Loader.builds b/src/System.Runtime.Loader/src/System.Runtime.Loader.builds deleted file mode 100644 index ad84fc3e60..0000000000 --- a/src/System.Runtime.Loader/src/System.Runtime.Loader.builds +++ /dev/null @@ -1,9 +0,0 @@ -<?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> - <Project Include="System.Runtime.Loader.csproj" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Runtime.Loader/src/System.Runtime.Loader.csproj b/src/System.Runtime.Loader/src/System.Runtime.Loader.csproj index 281a3e32bb..1dc85439cc 100644 --- a/src/System.Runtime.Loader/src/System.Runtime.Loader.csproj +++ b/src/System.Runtime.Loader/src/System.Runtime.Loader.csproj @@ -1,10 +1,9 @@ -<?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> <AssemblyName>System.Runtime.Loader</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.5</NuGetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -13,7 +12,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 bb4328640e..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-24904-03" - } - } - } -} diff --git a/src/System.Runtime.Loader/tests/AssemblyLoadContextTest.cs b/src/System.Runtime.Loader/tests/AssemblyLoadContextTest.cs index 3ed283f846..3bb2f8b4f3 100644 --- a/src/System.Runtime.Loader/tests/AssemblyLoadContextTest.cs +++ b/src/System.Runtime.Loader/tests/AssemblyLoadContextTest.cs @@ -19,14 +19,23 @@ namespace System.Runtime.Loader.Tests [Fact] public static void GetAssemblyNameTest_ValidAssembly() { - var expectedName = typeof(ISet<>).GetTypeInfo().Assembly.GetName(); - var actualAsmName = AssemblyLoadContext.GetAssemblyName("System.Runtime.dll"); - Assert.Equal(expectedName.FullName, actualAsmName.FullName); - - // Verify that the AssemblyName returned by GetAssemblyName can be used to load an assembly. System.Runtime would - // already be loaded, but this is just verifying it does not throw some other unexpected exception. - var asm = Assembly.Load(actualAsmName); - Assert.NotNull(asm); + string originalDir = Environment.CurrentDirectory; + try + { + Environment.CurrentDirectory = AppContext.BaseDirectory; + var expectedName = typeof(ISet<>).GetTypeInfo().Assembly.GetName(); + var actualAsmName = AssemblyLoadContext.GetAssemblyName("System.Runtime.dll"); + Assert.Equal(expectedName.FullName, actualAsmName.FullName); + + // Verify that the AssemblyName returned by GetAssemblyName can be used to load an assembly. System.Runtime would + // already be loaded, but this is just verifying it does not throw some other unexpected exception. + var asm = Assembly.Load(actualAsmName); + Assert.NotNull(asm); + } + finally + { + Environment.CurrentDirectory = originalDir; + } } [Fact] @@ -83,16 +92,25 @@ namespace System.Runtime.Loader.Tests [Fact] public static void LoadFromAssemblyName_ValidTrustedPlatformAssembly() { - var asmName = AssemblyLoadContext.GetAssemblyName("System.Runtime.dll"); - var loadContext = new CustomTPALoadContext(); - - // We should be able to override (and thus, load) assemblies that were - // loaded in TPA load context. - var asm = loadContext.LoadFromAssemblyName(asmName); - Assert.NotNull(asm); - var loadedContext = AssemblyLoadContext.GetLoadContext(asm); - Assert.NotNull(loadedContext); - Assert.Same(loadContext, loadedContext); + string originalDir = Environment.CurrentDirectory; + try + { + Environment.CurrentDirectory = AppContext.BaseDirectory; + var asmName = AssemblyLoadContext.GetAssemblyName("System.Runtime.dll"); + var loadContext = new CustomTPALoadContext(); + + // We should be able to override (and thus, load) assemblies that were + // loaded in TPA load context. + var asm = loadContext.LoadFromAssemblyName(asmName); + Assert.NotNull(asm); + var loadedContext = AssemblyLoadContext.GetLoadContext(asm); + Assert.NotNull(loadedContext); + Assert.Same(loadContext, loadedContext); + } + finally + { + Environment.CurrentDirectory = originalDir; + } } [Fact] diff --git a/src/System.Runtime.Loader/tests/Configurations.props b/src/System.Runtime.Loader/tests/Configurations.props new file mode 100644 index 0000000000..3007f723e5 --- /dev/null +++ b/src/System.Runtime.Loader/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.6; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Runtime.Loader/tests/DefaultContext/DefaultLoadContextTest.cs b/src/System.Runtime.Loader/tests/DefaultContext/DefaultLoadContextTest.cs index c80b96cb6a..86e6b22747 100644 --- a/src/System.Runtime.Loader/tests/DefaultContext/DefaultLoadContextTest.cs +++ b/src/System.Runtime.Loader/tests/DefaultContext/DefaultLoadContextTest.cs @@ -37,7 +37,7 @@ namespace System.Runtime.Loader.Tests protected override Assembly Load(AssemblyName assemblyName) { // Override the assembly that was loaded in DefaultContext. - string assemblyPath = Path.Combine(Directory.GetCurrentDirectory(), assemblyName.Name + ".dll"); + string assemblyPath = Path.Combine(AppContext.BaseDirectory, assemblyName.Name + ".dll"); Assembly assembly = LoadFromAssemblyPath(assemblyPath); m_fLoadedFromContext = true; return assembly; @@ -287,7 +287,7 @@ namespace System.Runtime.Loader.Tests // Get reference to the helper method that will load assemblies (actually, resolve them) // from DefaultContext - Type type = asmTargetAsm.GetType("System.Runtime.Loader.Tests.TestClass"); + Type type = asmTargetAsm.GetType("System.Runtime.Loader.Tests.TestClass", true); var method = System.Reflection.TypeExtensions.GetMethod(type, "LoadFromDefaultContext"); // Load System.Runtime - since this is on TPA, it should get resolved from our custom load context diff --git a/src/System.Runtime.Loader/tests/DefaultContext/System.Runtime.Loader.DefaultContext.Tests.csproj b/src/System.Runtime.Loader/tests/DefaultContext/System.Runtime.Loader.DefaultContext.Tests.csproj index 8dc9992d19..0cd1187a7c 100644 --- a/src/System.Runtime.Loader/tests/DefaultContext/System.Runtime.Loader.DefaultContext.Tests.csproj +++ b/src/System.Runtime.Loader/tests/DefaultContext/System.Runtime.Loader.DefaultContext.Tests.csproj @@ -3,10 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>System.Runtime.Loader.DefaultContext.Tests</RootNamespace> - <AssemblyName>System.Runtime.Loader.DefaultContext.Tests</AssemblyName> <ProjectGuid>{701CB3BC-00DC-435D-BDE4-C5FC29A708A8}</ProjectGuid> - <NugetTargetMoniker>.NETStandard,Version=v1.6</NugetTargetMoniker> </PropertyGroup> <ItemGroup> <Compile Include="DefaultLoadContextTest.cs" /> diff --git a/src/System.Runtime.Loader/tests/DefaultContext/project.json b/src/System.Runtime.Loader/tests/DefaultContext/project.json deleted file mode 100644 index 2c399b99ef..0000000000 --- a/src/System.Runtime.Loader/tests/DefaultContext/project.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.Linq": "4.4.0-beta-24904-01", - "System.Linq.Expressions": "4.4.0-beta-24904-01", - "System.ObjectModel": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Reflection.TypeExtensions": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Loader": "4.4.0-beta-24904-01", - "System.Text.RegularExpressions": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "test-runtime": { - "target": "project", - "exclude": "compile" - }, - "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04", - "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04" - }, - "frameworks": { - "netstandard1.6": {} - }, - "supports": { - "coreFx.Test.netcoreapp1.0": {} - } -} diff --git a/src/System.Runtime.Loader/tests/RefEmitLoadContext/System.Runtime.Loader.RefEmitLoadContext.Tests.csproj b/src/System.Runtime.Loader/tests/RefEmitLoadContext/System.Runtime.Loader.RefEmitLoadContext.Tests.csproj index 08ff14599f..23f88661d9 100644 --- a/src/System.Runtime.Loader/tests/RefEmitLoadContext/System.Runtime.Loader.RefEmitLoadContext.Tests.csproj +++ b/src/System.Runtime.Loader/tests/RefEmitLoadContext/System.Runtime.Loader.RefEmitLoadContext.Tests.csproj @@ -3,8 +3,6 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>System.Runtime.Loader.RefEmitLoadContext.Tests</RootNamespace> - <AssemblyName>System.Runtime.Loader.RefEmitLoadContext.Tests</AssemblyName> <ProjectGuid>{701CB3BC-00DC-435D-BDE4-C5FC29A708A9}</ProjectGuid> </PropertyGroup> <ItemGroup> diff --git a/src/System.Runtime.Loader/tests/RefEmitLoadContext/project.json b/src/System.Runtime.Loader/tests/RefEmitLoadContext/project.json deleted file mode 100644 index 08590a586c..0000000000 --- a/src/System.Runtime.Loader/tests/RefEmitLoadContext/project.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.Linq": "4.4.0-beta-24904-01", - "System.Linq.Expressions": "4.4.0-beta-24904-01", - "System.ObjectModel": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Reflection.TypeExtensions": "4.4.0-beta-24904-01", - "System.Reflection.Emit": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Loader": "4.4.0-beta-24904-01", - "System.Text.RegularExpressions": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "test-runtime": { - "target": "project", - "exclude": "compile" - }, - "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04", - "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04" - }, - "frameworks": { - "netstandard1.6": {} - }, - "supports": { - "coreFx.Test.netcoreapp1.0": {} - } -} diff --git a/src/System.Runtime.Loader/tests/System.Runtime.Loader.Noop.Assembly/System.Runtime.Loader.Noop.Assembly.csproj b/src/System.Runtime.Loader/tests/System.Runtime.Loader.Noop.Assembly/System.Runtime.Loader.Noop.Assembly.csproj index 7d0087b36e..0353b91c2d 100644 --- a/src/System.Runtime.Loader/tests/System.Runtime.Loader.Noop.Assembly/System.Runtime.Loader.Noop.Assembly.csproj +++ b/src/System.Runtime.Loader/tests/System.Runtime.Loader.Noop.Assembly/System.Runtime.Loader.Noop.Assembly.csproj @@ -2,13 +2,11 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>System.Runtime.Loader.Noop.Assembly</RootNamespace> - <AssemblyName>System.Runtime.Loader.Noop.Assembly</AssemblyName> <ProjectGuid>{396D6EBF-60BD-4DAF-8783-FB403E070A57}</ProjectGuid> - <NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker> <!-- Test expects an un-signed assembly --> <SkipSigning>true</SkipSigning> + <IsTestProject>true</IsTestProject> + <NoWarn>0436</NoWarn> </PropertyGroup> <ItemGroup> <Compile Include="TestClass.cs" /> diff --git a/src/System.Runtime.Loader/tests/System.Runtime.Loader.Noop.Assembly/project.json b/src/System.Runtime.Loader/tests/System.Runtime.Loader.Noop.Assembly/project.json deleted file mode 100644 index 9cb96b4b01..0000000000 --- a/src/System.Runtime.Loader/tests/System.Runtime.Loader.Noop.Assembly/project.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "test-runtime": { - "target": "project", - "exclude": "compile" - }, - "System.Reflection.Emit": "4.4.0-beta-24904-01", - "System.Reflection.Primitives": "4.4.0-beta-24904-01", - "System.Reflection.TypeExtensions": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.6": {} - }, - "supports": { - "coreFx.Test.netcoreapp1.0": {} - } -} diff --git a/src/System.Runtime.Loader/tests/System.Runtime.Loader.Test.Assembly/System.Runtime.Loader.Test.Assembly.csproj b/src/System.Runtime.Loader/tests/System.Runtime.Loader.Test.Assembly/System.Runtime.Loader.Test.Assembly.csproj index cb0fb472fa..25a8c2080e 100644 --- a/src/System.Runtime.Loader/tests/System.Runtime.Loader.Test.Assembly/System.Runtime.Loader.Test.Assembly.csproj +++ b/src/System.Runtime.Loader/tests/System.Runtime.Loader.Test.Assembly/System.Runtime.Loader.Test.Assembly.csproj @@ -2,14 +2,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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>System.Runtime.Loader.Test.Assembly</RootNamespace> - <AssemblyName>System.Runtime.Loader.Test.Assembly</AssemblyName> <ProjectGuid>{396D6EBF-60BD-4DAF-8783-FB403E070A56}</ProjectGuid> - <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker> + <IsTestProject>true</IsTestProject> </PropertyGroup> <ItemGroup> <Compile Include="TestClass.cs" /> diff --git a/src/System.Runtime.Loader/tests/System.Runtime.Loader.Test.Assembly/project.json b/src/System.Runtime.Loader/tests/System.Runtime.Loader.Test.Assembly/project.json deleted file mode 100644 index c0a759918e..0000000000 --- a/src/System.Runtime.Loader/tests/System.Runtime.Loader.Test.Assembly/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.6": {} - }, - "supports": { - "coreFx.Test.netcoreapp1.0": {} - } -} diff --git a/src/System.Runtime.Loader/tests/System.Runtime.Loader.Tests.csproj b/src/System.Runtime.Loader/tests/System.Runtime.Loader.Tests.csproj index 8b4ea6a945..9327df0ca9 100644 --- a/src/System.Runtime.Loader/tests/System.Runtime.Loader.Tests.csproj +++ b/src/System.Runtime.Loader/tests/System.Runtime.Loader.Tests.csproj @@ -2,14 +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" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>System.Runtime.Loader.Tests</RootNamespace> - <AssemblyName>System.Runtime.Loader.Tests</AssemblyName> <ProjectGuid>{701CB3BC-00DC-435D-BDE4-C5FC29A708A7}</ProjectGuid> - <NugetTargetMoniker>.NETStandard,Version=v1.6</NugetTargetMoniker> + <RootNamespace>System.Runtime.Loader.Tests</RootNamespace> </PropertyGroup> <ItemGroup> <Compile Include="AssemblyLoadContextTest.cs" /> @@ -23,4 +18,4 @@ <EmbeddedResource Include="System.Runtime.Loader.Test.Assembly.dll" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - </Project>
\ No newline at end of file +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.Loader/tests/project.json b/src/System.Runtime.Loader/tests/project.json deleted file mode 100644 index 8e652753ae..0000000000 --- a/src/System.Runtime.Loader/tests/project.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.Linq": "4.4.0-beta-24904-01", - "System.Linq.Expressions": "4.4.0-beta-24904-01", - "System.ObjectModel": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Loader": "4.4.0-beta-24904-01", - "System.Text.RegularExpressions": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "test-runtime": { - "target": "project", - "exclude": "compile" - }, - "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04", - "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04" - }, - "frameworks": { - "netstandard1.6": {} - }, - "supports": { - "coreFx.Test.netcoreapp1.0": {} - } -} diff --git a/src/System.Runtime.Numerics/dir.props b/src/System.Runtime.Numerics/dir.props index fcc1a7ca5a..bfbc5bd9e0 100644 --- a/src/System.Runtime.Numerics/dir.props +++ b/src/System.Runtime.Numerics/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ No newline at end of file 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 f53f8e32db..0000000000 --- a/src/System.Runtime.Numerics/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Runtime.Numerics/src/Configurations.props b/src/System.Runtime.Numerics/src/Configurations.props new file mode 100644 index 0000000000..9c336c0be9 --- /dev/null +++ b/src/System.Runtime.Numerics/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Runtime.Numerics/src/System.Runtime.Numerics.builds b/src/System.Runtime.Numerics/src/System.Runtime.Numerics.builds deleted file mode 100644 index b7410d7fb0..0000000000 --- a/src/System.Runtime.Numerics/src/System.Runtime.Numerics.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.Runtime.Numerics.csproj" /> - <Project Include="System.Runtime.Numerics.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Runtime.Numerics/src/System.Runtime.Numerics.csproj b/src/System.Runtime.Numerics/src/System.Runtime.Numerics.csproj index bdf7e261cb..92d8b107c7 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> @@ -9,14 +9,13 @@ <ProjectGuid>{D2C99D27-0BEF-4319-ADB3-05CBEBA8F69B}</ProjectGuid> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net463'">None</ResourcesSourceOutputDirectory> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="System\Numerics\BigIntegerCalculator.AddSub.cs" /> <Compile Include="System\Numerics\BigIntegerCalculator.BitsBuffer.cs" /> <Compile Include="System\Numerics\BigIntegerCalculator.DivRem.cs" /> @@ -39,7 +38,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 a6da660a50..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-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Runtime.Numerics/tests/Configurations.props b/src/System.Runtime.Numerics/tests/Configurations.props new file mode 100644 index 0000000000..2a160a39e8 --- /dev/null +++ b/src/System.Runtime.Numerics/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3-Windows_NT; + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Runtime.Numerics/tests/System.Runtime.Numerics.Tests.csproj b/src/System.Runtime.Numerics/tests/System.Runtime.Numerics.Tests.csproj index 8de0efbdc9..806e70db52 100644 --- a/src/System.Runtime.Numerics/tests/System.Runtime.Numerics.Tests.csproj +++ b/src/System.Runtime.Numerics/tests/System.Runtime.Numerics.Tests.csproj @@ -1,16 +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"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>System.Numerics.Tests</RootNamespace> - <AssemblyName>System.Runtime.Numerics.Tests</AssemblyName> <ProjectGuid>{28AE24F8-BEF4-4358-B612-ADD9D587C8E1}</ProjectGuid> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -18,13 +10,6 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> </PropertyGroup> <ItemGroup> - <ProjectReference Include="..\pkg\System.Runtime.Numerics.pkgproj"> - <Project>{d2c99d27-0bef-4319-adb3-05cbeba8f69b}</Project> - <Name>System.Runtime.Numerics</Name> - <Private>true</Private> - </ProjectReference> - </ItemGroup> - <ItemGroup> <Compile Include="BigInteger\absolutevalue.cs" /> <Compile Include="BigInteger\BigIntegerToStringTests.cs" /> <Compile Include="BigInteger\BigInteger.AddTests.cs" /> diff --git a/src/System.Runtime.Serialization.Formatters/dir.props b/src/System.Runtime.Serialization.Formatters/dir.props index ba7c08a94c..8e334b71f3 100644 --- a/src/System.Runtime.Serialization.Formatters/dir.props +++ b/src/System.Runtime.Serialization.Formatters/dir.props @@ -3,5 +3,7 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.0.2.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> + <IsNETCoreAppRef>false</IsNETCoreAppRef> </PropertyGroup> </Project>
\ No newline at end of file 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 ccd5f4b5a1..0000000000 --- a/src/System.Runtime.Serialization.Formatters/ref/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "dependencies": { - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Primitives": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Runtime.Serialization.Formatters/src/Configurations.props b/src/System.Runtime.Serialization.Formatters/src/Configurations.props new file mode 100644 index 0000000000..a548d6bec7 --- /dev/null +++ b/src/System.Runtime.Serialization.Formatters/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netcoreapp; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.builds b/src/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.builds deleted file mode 100644 index 1af383d0c1..0000000000 --- a/src/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.builds +++ /dev/null @@ -1,15 +0,0 @@ -<?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> - <Project Include="System.Runtime.Serialization.Formatters.csproj" /> - <Project Include="System.Runtime.Serialization.Formatters.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - <Project Include="System.Runtime.Serialization.Formatters.csproj"> - <TargetGroup>netcoreapp1.1</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - 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..c956ca280f 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> @@ -6,13 +6,12 @@ <AssemblyName>System.Runtime.Serialization.Formatters</AssemblyName> <RootNamespace>System.Runtime.Serialization.Formatters</RootNamespace> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> - <DefineConstants Condition="'$(TargetGroup)' == 'netcoreapp1.1'">$(DefineConstants);netcoreapp11</DefineConstants> + <DefineConstants Condition="'$(TargetGroup)' == 'netcoreapp'">$(DefineConstants);netcoreapp11</DefineConstants> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> - <ItemGroup Condition="'$(TargetGroup)' == '' Or '$(TargetGroup)' == 'netcoreapp1.1'"> + <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> <Compile Include="System.Runtime.Serialization.Formatters.TypeForwards.cs" /> <Compile Include="System\TemporaryStubs.cs" /> <Compile Include="System\Runtime\Serialization\DeserializationEventHandler.cs" /> @@ -63,7 +62,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 2fc7a2e3fc..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-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Collections.Concurrent": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Reflection.Extensions": "4.4.0-beta-24904-01", - "System.Reflection.TypeExtensions": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Primitives": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.Text.Encoding.Extensions": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - }, - "netcoreapp1.1": { - "dependencies": { - "System.Collections": "4.4.0-beta-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Collections.Concurrent": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Reflection.Extensions": "4.4.0-beta-24904-01", - "System.Reflection.TypeExtensions": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Primitives": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.Text.Encoding.Extensions": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - } - } - } -} diff --git a/src/System.Runtime.Serialization.Formatters/tests/Configurations.props b/src/System.Runtime.Serialization.Formatters/tests/Configurations.props new file mode 100644 index 0000000000..98f53209d4 --- /dev/null +++ b/src/System.Runtime.Serialization.Formatters/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj b/src/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj index 0102f2a5de..7bfdda2941 100644 --- a/src/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj +++ b/src/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj @@ -1,14 +1,9 @@ -<?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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{7C70BB15-870B-4946-8098-625DACD645A6}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Runtime.Serialization.Formatters.Tests</AssemblyName> - <RootNamespace>System.Runtime.Serialization.Formatters.Tests</RootNamespace> - <NugetTargetMoniker>.NETStandard,Version=v1.7</NugetTargetMoniker> + <SkipIncludeNewtonsoftJson>true</SkipIncludeNewtonsoftJson> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -41,11 +36,6 @@ <Project>{69e46a6f-9966-45a5-8945-2559fe337827}</Project> <Name>RemoteExecutorConsoleApp</Name> </ProjectReference> - <ProjectReference Include="..\pkg\System.Runtime.Serialization.Formatters.pkgproj"> - <Project>{ca488507-3b6e-4494-b7be-7b4eeeb2c4d1}</Project> - <Name>System.Runtime.Serialization.Formatters</Name> - <Private>True</Private> - </ProjectReference> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ 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 359be557d8..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,16 +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 96b89e0b27..0000000000 --- a/src/System.Runtime.Serialization.Json/ref/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "System.IO": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Xml": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Xml.ReaderWriter": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Runtime.Serialization.Json/src/Configurations.props b/src/System.Runtime.Serialization.Json/src/Configurations.props new file mode 100644 index 0000000000..fc9ef9822c --- /dev/null +++ b/src/System.Runtime.Serialization.Json/src/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Runtime.Serialization.Json/src/System.Runtime.Serialization.Json.builds b/src/System.Runtime.Serialization.Json/src/System.Runtime.Serialization.Json.builds deleted file mode 100644 index fa960bb8a9..0000000000 --- a/src/System.Runtime.Serialization.Json/src/System.Runtime.Serialization.Json.builds +++ /dev/null @@ -1,13 +0,0 @@ -<?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> - <Project Include="System.Runtime.Serialization.Json.csproj" /> - <!-- Net46 facade is currently inbox for 4.0 - <Project Include="System.Runtime.Serialization.Json.csproj"> - <TargetGroup>net46</TargetGroup> - </Project> --> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - 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..2d36fbad96 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,24 +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> <AssemblyName>System.Runtime.Serialization.Json</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' == ''"> + <ItemGroup> <ProjectReference Include="$(SourceDir)System.Private.DataContractSerialization\src\System.Private.DataContractSerialization.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == 'net463'"> - <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 4d593f2491..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-24904-01", - "System.Runtime.Serialization.Primitives": "4.4.0-beta-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Collections.Specialized": "4.4.0-beta-24904-01", - "System.Diagnostics.TraceSource": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24904-01", - "System.Data.Common": "4.4.0-beta-24904-01", - "System.Console": "4.4.0-beta-24904-01", - "System.ComponentModel.TypeConverter": "4.4.0-beta-24904-01", - "Microsoft.Win32.Registry": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Reflection.TypeExtensions": "4.4.0-beta-24904-01", - "System.Xml.ReaderWriter": "4.4.0-beta-24904-01", - "System.Xml.XmlDocument": "4.4.0-beta-24904-01", - "System.Threading.Tasks.Extensions": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Runtime.Serialization.Json/tests/Configurations.props b/src/System.Runtime.Serialization.Json/tests/Configurations.props new file mode 100644 index 0000000000..98f53209d4 --- /dev/null +++ b/src/System.Runtime.Serialization.Json/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Runtime.Serialization.Json/tests/Performance/System.Runtime.Serialization.Json.Performance.Tests.csproj b/src/System.Runtime.Serialization.Json/tests/Performance/System.Runtime.Serialization.Json.Performance.Tests.csproj index 29deaa9d2c..aba111dc51 100644 --- a/src/System.Runtime.Serialization.Json/tests/Performance/System.Runtime.Serialization.Json.Performance.Tests.csproj +++ b/src/System.Runtime.Serialization.Json/tests/Performance/System.Runtime.Serialization.Json.Performance.Tests.csproj @@ -1,17 +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"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion> <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>System.Runtime.Serialization.Json.Performance.Tests</RootNamespace> - <AssemblyName>System.Runtime.Serialization.Json.Performance.Tests</AssemblyName> - <NugetTargetMoniker>.NETStandard,Version=v1.7</NugetTargetMoniker> - <KeepAllProjectReferences>true</KeepAllProjectReferences> - </PropertyGroup> - <PropertyGroup Condition="'$(UseContractReferences)' == 'true'" > - <ProjectJson>ContractReferences/project.json</ProjectJson> - <ProjectLockJson>ContractReferences/project.lock.json</ProjectLockJson> </PropertyGroup> <ItemGroup> <Compile Include="..\..\..\System.Runtime.Serialization.Xml\tests\Utils.cs" /> @@ -21,13 +12,8 @@ <Compile Include="DcjsPerformanceTest.cs" /> <Compile Include="JsonNetPerformanceTest.cs" /> </ItemGroup> - <ItemGroup Condition="'$(UseContractReferences)' == ''" > - <ProjectReference Include="..\..\..\System.Private.DataContractSerialization\src\System.Private.DataContractSerialization.csproj" /> - <ProjectReference Include="..\..\..\System.Runtime.Serialization.Xml\src\System.Runtime.Serialization.Xml.csproj" /> - <ProjectReference Include="..\..\..\System.Runtime.Serialization.Json\src\System.Runtime.Serialization.Json.csproj" /> - </ItemGroup> <ItemGroup> <None Include="project.json" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.Serialization.Json/tests/Performance/project.json b/src/System.Runtime.Serialization.Json/tests/Performance/project.json deleted file mode 100644 index 6c330a09c6..0000000000 --- a/src/System.Runtime.Serialization.Json/tests/Performance/project.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "dependencies": { - "Microsoft.CSharp": "4.4.0-beta-24904-01", - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Dynamic.Runtime": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Linq": "4.4.0-beta-24904-01", - "System.Linq.Expressions": "4.4.0-beta-24904-01", - "System.ObjectModel": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Primitives": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Json": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Xml": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "System.Xml.ReaderWriter": "4.4.0-beta-24904-01", - "System.Xml.XDocument": "4.4.0-beta-24904-01", - "System.Xml.XmlDocument": "4.4.0-beta-24904-01", - "System.Xml.XmlSerializer": "4.4.0-beta-24904-01", - "test-runtime": { - "target": "project", - "exclude": "compile" - }, - "Newtonsoft.Json": "8.0.4-beta1", - "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04", - "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04", - "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0040" - }, - "frameworks": { - "netstandard1.7": {} - }, - "supports": { - "coreFx.Test.netcoreapp1.1": {} - } -} diff --git a/src/System.Runtime.Serialization.Json/tests/ReflectionOnly/System.Runtime.Serialization.Json.ReflectionOnly.Tests.csproj b/src/System.Runtime.Serialization.Json/tests/ReflectionOnly/System.Runtime.Serialization.Json.ReflectionOnly.Tests.csproj index feb3ebac35..fe589252d1 100644 --- a/src/System.Runtime.Serialization.Json/tests/ReflectionOnly/System.Runtime.Serialization.Json.ReflectionOnly.Tests.csproj +++ b/src/System.Runtime.Serialization.Json/tests/ReflectionOnly/System.Runtime.Serialization.Json.ReflectionOnly.Tests.csproj @@ -3,18 +3,14 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <DefineConstants>$(DefineConstants);ReflectionOnly</DefineConstants> - <RootNamespace>System.Runtime.Serialization.Json.ReflectionOnly.Tests</RootNamespace> - <AssemblyName>System.Runtime.Serialization.Json.ReflectionOnly.Tests</AssemblyName> <ProjectGuid>{C99A835E-46F3-4C05-AD34-7DD84FB7466B}</ProjectGuid> - <ProjectJson>../project.json</ProjectJson> - <ProjectLockJson>../project.lock.json</ProjectLockJson> </PropertyGroup> <ItemGroup> - <Compile Include="$(TestSourceFolder)..\..\System.Runtime.Serialization.Xml\tests\Utils.cs" /> - <Compile Include="$(TestSourceFolder)..\..\System.Runtime.Serialization.Xml\tests\SerializationTypes.cs" /> - <Compile Include="$(TestSourceFolder)..\..\System.Runtime.Serialization.Xml\tests\SerializationTypes.CoreCLR.cs" /> - <Compile Include="$(TestSourceFolder)DataContractJsonSerializer.cs" /> - <Compile Include="$(TestSourceFolder)DataContractJsonSerializer.CoreCLR.cs" /> + <Compile Include="$(TestSourceFolder)..\..\..\System.Runtime.Serialization.Xml\tests\Utils.cs" /> + <Compile Include="$(TestSourceFolder)..\..\..\System.Runtime.Serialization.Xml\tests\SerializationTypes.cs" /> + <Compile Include="$(TestSourceFolder)..\..\..\System.Runtime.Serialization.Xml\tests\SerializationTypes.CoreCLR.cs" /> + <Compile Include="$(TestSourceFolder)..\DataContractJsonSerializer.cs" /> + <Compile Include="$(TestSourceFolder)..\DataContractJsonSerializer.CoreCLR.cs" /> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), System.Runtime.Serialization.Json.Tests.settings.targets))\System.Runtime.Serialization.Json.Tests.settings.targets" /> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.csproj b/src/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.csproj index 8f57ca026a..52ea140015 100644 --- a/src/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.csproj +++ b/src/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.csproj @@ -2,8 +2,6 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <RootNamespace>System.Runtime.Serialization.Json.Tests</RootNamespace> - <AssemblyName>System.Runtime.Serialization.Json.Tests</AssemblyName> <ProjectGuid>{701CB3BC-00DC-435D-BDE4-C5FC29A708A7}</ProjectGuid> </PropertyGroup> <ItemGroup> @@ -13,5 +11,5 @@ <Compile Include="$(TestSourceFolder)DataContractJsonSerializer.cs" /> <Compile Include="$(TestSourceFolder)DataContractJsonSerializer.CoreCLR.cs" /> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), System.Runtime.Serialization.Json.Tests.settings.targets))\System.Runtime.Serialization.Json.Tests.settings.targets" /> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.Serialization.Json/tests/project.json b/src/System.Runtime.Serialization.Json/tests/project.json deleted file mode 100644 index c23904a722..0000000000 --- a/src/System.Runtime.Serialization.Json/tests/project.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "dependencies": { - "Microsoft.CSharp": "4.4.0-beta-24904-01", - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Dynamic.Runtime": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.Linq": "4.4.0-beta-24904-01", - "System.Linq.Expressions": "4.4.0-beta-24904-01", - "System.ObjectModel": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Reflection.Extensions": "4.4.0-beta-24904-01", - "System.Reflection.TypeExtensions": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "System.Xml.ReaderWriter": "4.4.0-beta-24904-01", - "System.Xml.XDocument": "4.4.0-beta-24904-01", - "System.Xml.XmlDocument": "4.4.0-beta-24904-01", - "System.Xml.XmlSerializer": "4.4.0-beta-24904-01", - "test-runtime": { - "target": "project", - "exclude": "compile" - }, - "Newtonsoft.Json": "8.0.4-beta1", - "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04", - "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04", - "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0040" - }, - "frameworks": { - "netstandard1.7": {} - }, - "supports": { - "coreFx.Test.netcoreapp1.1": {}, - "coreFx.Test.net463": {} - } -} diff --git a/src/System.Runtime.Serialization.Primitives/ref/4.1.1/System.Runtime.Serialization.Primitives.depproj b/src/System.Runtime.Serialization.Primitives/ref/4.1.1/System.Runtime.Serialization.Primitives.depproj deleted file mode 100644 index 82d89b846b..0000000000 --- a/src/System.Runtime.Serialization.Primitives/ref/4.1.1/System.Runtime.Serialization.Primitives.depproj +++ /dev/null @@ -1,14 +0,0 @@ -<?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.1.1.0</AssemblyVersion> - <OutputType>Library</OutputType> - <PackageTargetFramework>netstandard1.3</PackageTargetFramework> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> - </PropertyGroup> - <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.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 f53f8e32db..0000000000 --- a/src/System.Runtime.Serialization.Primitives/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Runtime.Serialization.Primitives/src/Configurations.props b/src/System.Runtime.Serialization.Primitives/src/Configurations.props new file mode 100644 index 0000000000..4e4f5d7e7b --- /dev/null +++ b/src/System.Runtime.Serialization.Primitives/src/Configurations.props @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netcore50aot-Windows_NT; + uap101aot-Windows_NT; + netstandard1.3; + net463-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.builds b/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.builds deleted file mode 100644 index 8e8e479aeb..0000000000 --- a/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.builds +++ /dev/null @@ -1,24 +0,0 @@ -<?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> - <Project Include="System.Runtime.Serialization.Primitives.csproj" /> - <Project Include="System.Runtime.Serialization.Primitives.csproj"> - <TargetGroup>netstandard1.3</TargetGroup> - </Project> - <Project Include="System.Runtime.Serialization.Primitives.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - <!-- System.Runtime.Serialization.Primitives needs to be build for netcore50 because it needs to have the reflection block enabled - By default, all assemblies that are built for netcore50 or netcore50aot or uap101* have the reflection block enabled. --> - <Project Include="System.Runtime.Serialization.Primitives.csproj"> - <OSGroup>Windows_NT</OSGroup> - <TargetGroup>netcore50aot</TargetGroup> - </Project> - <Project Include="System.Runtime.Serialization.Primitives.csproj"> - <OSGroup>Windows_NT</OSGroup> - <TargetGroup>uap101aot</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> 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..f13bbd216c 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> @@ -12,8 +12,7 @@ <PlatformTarget>AnyCPU</PlatformTarget> <ProjectGuid>{CDF0ACB5-1361-4E48-8ECB-22E8022F5F01}</ProjectGuid> <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net463'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> - <PackageTargetFramework Condition="'$(TargetGroup)'==''">netstandard1.7;uap10.1</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard1.3'">netstandard1.3;netcore50</PackageTargetFramework> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -42,10 +41,8 @@ <Compile Include="System\Runtime\Serialization\SerializationException.cs" /> <Compile Include="System\Runtime\Serialization\StreamingContext.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)'=='' Or '$(TargetGroup)'=='uap101aot'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard' Or '$(TargetGroup)'=='uap101aot'"> <Compile Include="System\Runtime\Serialization\InvalidDataContractException.Serialization.cs" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)'=='' Or '$(TargetGroup)'=='uap101aot'"> <Compile Include="System.Runtime.Serialization.Primitives.TypeForwards.cs" /> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)'=='net463'"> @@ -54,7 +51,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 be3b3e0258..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-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - } - }, - "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-24904-01", - "System.Resources.ResourceManager": "4.3.0" - } - } - } -} 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 9d5721e0cd..0000000000 --- a/src/System.Runtime.Serialization.Xml/ref/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Collections.Specialized": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Primitives": "4.4.0-beta-24904-01", - "System.Xml.ReaderWriter": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Runtime.Serialization.Xml/src/Configurations.props b/src/System.Runtime.Serialization.Xml/src/Configurations.props new file mode 100644 index 0000000000..9c336c0be9 --- /dev/null +++ b/src/System.Runtime.Serialization.Xml/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Runtime.Serialization.Xml/src/System.Runtime.Serialization.Xml.builds b/src/System.Runtime.Serialization.Xml/src/System.Runtime.Serialization.Xml.builds deleted file mode 100644 index 16cd187581..0000000000 --- a/src/System.Runtime.Serialization.Xml/src/System.Runtime.Serialization.Xml.builds +++ /dev/null @@ -1,11 +0,0 @@ -<?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> - <Project Include="System.Runtime.Serialization.Xml.csproj" /> - <Project Include="System.Runtime.Serialization.Xml.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project>
\ No newline at end of file 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..4c4ae053d9 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,17 +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> <AssemblyName>System.Runtime.Serialization.Xml</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' == ''"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <ProjectReference Include="$(SourceDir)System.Private.DataContractSerialization\src\System.Private.DataContractSerialization.csproj" /> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == 'net463'"> @@ -23,7 +22,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 6b89945a31..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-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Primitives": "4.4.0-beta-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Collections.Specialized": "4.4.0-beta-24904-01", - "System.Diagnostics.TraceSource": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24904-01", - "System.Data.Common": "4.4.0-beta-24904-01", - "System.Console": "4.4.0-beta-24904-01", - "System.ComponentModel.TypeConverter": "4.4.0-beta-24904-01", - "Microsoft.Win32.Registry": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Reflection.TypeExtensions": "4.4.0-beta-24904-01", - "System.Xml.ReaderWriter": "4.4.0-beta-24904-01", - "System.Xml.XmlDocument": "4.4.0-beta-24904-01", - "System.Threading.Tasks.Extensions": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1", - "System.Runtime.Serialization.Primitives": "4.4.0-beta-24904-01" - } - } - } -} diff --git a/src/System.Runtime.Serialization.Xml/tests/Configurations.props b/src/System.Runtime.Serialization.Xml/tests/Configurations.props new file mode 100644 index 0000000000..98f53209d4 --- /dev/null +++ b/src/System.Runtime.Serialization.Xml/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Runtime.Serialization.Xml/tests/Performance/System.Runtime.Serialization.Xml.Performance.Tests.csproj b/src/System.Runtime.Serialization.Xml/tests/Performance/System.Runtime.Serialization.Xml.Performance.Tests.csproj index 6174204346..a296a9a0c0 100644 --- a/src/System.Runtime.Serialization.Xml/tests/Performance/System.Runtime.Serialization.Xml.Performance.Tests.csproj +++ b/src/System.Runtime.Serialization.Xml/tests/Performance/System.Runtime.Serialization.Xml.Performance.Tests.csproj @@ -1,17 +1,9 @@ -<?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> - <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion> <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>System.Runtime.Serialization.Xml.Performance.Tests</RootNamespace> - <AssemblyName>System.Runtime.Serialization.Xml.Performance.Tests</AssemblyName> <IncludePerformanceTests>true</IncludePerformanceTests> - <NugetTargetMoniker>.NETStandard,Version=v1.7</NugetTargetMoniker> - </PropertyGroup> - <PropertyGroup Condition="'$(UseContractReferences)' == 'true'" > - <ProjectJson>ContractReferences/project.json</ProjectJson> - <ProjectLockJson>ContractReferences/project.lock.json</ProjectLockJson> </PropertyGroup> <ItemGroup> <Compile Include="..\Utils.cs" /> @@ -24,9 +16,5 @@ <Link>Common\System\PerfUtils.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition="'$(UseContractReferences)' == ''"> - <ProjectReference Include="..\..\..\System.Private.DataContractSerialization\src\System.Private.DataContractSerialization.csproj" /> - <ProjectReference Include="..\..\..\System.Runtime.Serialization.Xml\src\System.Runtime.Serialization.Xml.csproj" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.Serialization.Xml/tests/ReflectionOnly/System.Runtime.Serialization.Xml.ReflectionOnly.Tests.csproj b/src/System.Runtime.Serialization.Xml/tests/ReflectionOnly/System.Runtime.Serialization.Xml.ReflectionOnly.Tests.csproj index d0ef365d52..01f6a62308 100644 --- a/src/System.Runtime.Serialization.Xml/tests/ReflectionOnly/System.Runtime.Serialization.Xml.ReflectionOnly.Tests.csproj +++ b/src/System.Runtime.Serialization.Xml/tests/ReflectionOnly/System.Runtime.Serialization.Xml.ReflectionOnly.Tests.csproj @@ -3,23 +3,19 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <DefineConstants>$(DefineConstants);ReflectionOnly</DefineConstants> - <RootNamespace>System.Runtime.Serialization.Xml.ReflectionOnly.Tests</RootNamespace> - <AssemblyName>System.Runtime.Serialization.Xml.ReflectionOnly.Tests</AssemblyName> <ProjectGuid>{38889701-0af4-48b3-999c-e99d639c61b6}</ProjectGuid> - <ProjectJson>../project.json</ProjectJson> - <ProjectLockJson>../project.lock.json</ProjectLockJson> </PropertyGroup> <ItemGroup> - <Compile Include="$(TestSourceFolder)Utils.cs" /> - <Compile Include="$(TestSourceFolder)SerializationTypes.cs" /> - <Compile Include="$(TestSourceFolder)SerializationTypes.CoreCLR.cs" /> - <Compile Include="$(TestSourceFolder)DataContractSerializer.cs" /> - <Compile Include="$(TestSourceFolder)DataContractSerializer.CoreCLR.cs" /> - <Compile Include="$(TestSourceFolder)DataContractSerializerStressTests.cs" /> - <Compile Include="$(TestSourceFolder)DataContractSerializerTestData.cs" /> - <Compile Include="$(TestSourceFolder)MyResolver.cs" /> - <Compile Include="$(TestSourceFolder)XmlDictionaryReaderTests.cs" /> - <Compile Include="$(TestSourceFolder)XmlDictionaryWriterTest.cs" /> + <Compile Include="$(TestSourceFolder)..\Utils.cs" /> + <Compile Include="$(TestSourceFolder)..\SerializationTypes.cs" /> + <Compile Include="$(TestSourceFolder)..\SerializationTypes.CoreCLR.cs" /> + <Compile Include="$(TestSourceFolder)..\DataContractSerializer.cs" /> + <Compile Include="$(TestSourceFolder)..\DataContractSerializer.CoreCLR.cs" /> + <Compile Include="$(TestSourceFolder)..\DataContractSerializerStressTests.cs" /> + <Compile Include="$(TestSourceFolder)..\DataContractSerializerTestData.cs" /> + <Compile Include="$(TestSourceFolder)..\MyResolver.cs" /> + <Compile Include="$(TestSourceFolder)..\XmlDictionaryReaderTests.cs" /> + <Compile Include="$(TestSourceFolder)..\XmlDictionaryWriterTest.cs" /> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), System.Runtime.Serialization.Xml.Tests.settings.targets))\System.Runtime.Serialization.Xml.Tests.settings.targets" /> -</Project> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj b/src/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj index 3bb8bba736..b2d8f72751 100644 --- a/src/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj +++ b/src/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj @@ -2,8 +2,6 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <RootNamespace>System.Runtime.Serialization.Xml.Tests</RootNamespace> - <AssemblyName>System.Runtime.Serialization.Xml.Tests</AssemblyName> <ProjectGuid>{30CAB353-089E-4294-B23B-F2DD1D945654}</ProjectGuid> </PropertyGroup> <ItemGroup> @@ -18,5 +16,5 @@ <Compile Include="$(TestSourceFolder)XmlDictionaryReaderTests.cs" /> <Compile Include="$(TestSourceFolder)XmlDictionaryWriterTest.cs" /> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), System.Runtime.Serialization.Xml.Tests.settings.targets))\System.Runtime.Serialization.Xml.Tests.settings.targets" /> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.Serialization.Xml/tests/project.json b/src/System.Runtime.Serialization.Xml/tests/project.json deleted file mode 100644 index b26ba89303..0000000000 --- a/src/System.Runtime.Serialization.Xml/tests/project.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Collections.Concurrent": "4.4.0-beta-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.Linq": "4.4.0-beta-24904-01", - "System.Linq.Expressions": "4.4.0-beta-24904-01", - "System.ObjectModel": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Reflection.Extensions": "4.4.0-beta-24904-01", - "System.Reflection.TypeExtensions": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "System.Xml.ReaderWriter": "4.4.0-beta-24904-01", - "System.Xml.XDocument": "4.4.0-beta-24904-01", - "System.Xml.XmlDocument": "4.4.0-beta-24904-01", - "System.Xml.XmlSerializer": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Primitives": "4.4.0-beta-24904-01", - "test-runtime": { - "target": "project", - "exclude": "compile" - }, - "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04", - "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04", - "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0040" - }, - "frameworks": { - "netstandard1.7": {} - }, - "supports": { - "coreFx.Test.netcoreapp1.1": {}, - "coreFx.Test.net463": {} - } -} 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 deleted file mode 100644 index 7f3faa560f..0000000000 --- a/src/System.Runtime.WindowsRuntime.UI.Xaml/src/System.Runtime.WindowsRuntime.UI.Xaml.csproj +++ /dev/null @@ -1,32 +0,0 @@ -<?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.Runtime.WindowsRuntime.UI.Xaml</AssemblyName> - <ProjectGuid>{263DA4F1-C3BC-4B43-98E7-9F38B419A131}</ProjectGuid> - <UseECMAKey Condition="'$(UseECMAKey)' == ''">true</UseECMAKey> - <PackageTargetRuntime>win8</PackageTargetRuntime> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker> - </PropertyGroup> - <!-- Default configurations to help VS understand the options --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> - <ItemGroup> - <Compile Include="System\Runtime\InteropServices\HResults.cs" /> - <Compile Include="System\Windows\CornerRadius.cs" /> - <Compile Include="System\Windows\Duration.cs" /> - <Compile Include="System\Windows\GridLength.cs" /> - <Compile Include="System\Windows\Thickness.cs" /> - <Compile Include="System\Windows\TokenizerHelper.cs" /> - <Compile Include="System\Windows\LayoutCycleException.cs" /> - <Compile Include="System\Windows\Automation\ElementNotAvailableException.cs" /> - <Compile Include="System\Windows\Automation\ElementNotEnabledException.cs" /> - <Compile Include="System\Windows\Controls\Primitives\GeneratorPosition.cs" /> - <Compile Include="System\Windows\Markup\XamlParseException.cs" /> - <Compile Include="System\Windows\Media\Matrix.cs" /> - <Compile Include="System\Windows\Media\Animation\KeyTime.cs" /> - <Compile Include="System\Windows\Media\Animation\RepeatBehavior.cs" /> - <Compile Include="System\Windows\Media\Media3D\Matrix3D.cs" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/System.Runtime.WindowsRuntime.UI.Xaml/src/System.Runtime.WindowsRuntime.UI.Xaml.csproj.disabled b/src/System.Runtime.WindowsRuntime.UI.Xaml/src/System.Runtime.WindowsRuntime.UI.Xaml.csproj.disabled new file mode 100644 index 0000000000..34a550ae1d --- /dev/null +++ b/src/System.Runtime.WindowsRuntime.UI.Xaml/src/System.Runtime.WindowsRuntime.UI.Xaml.csproj.disabled @@ -0,0 +1,35 @@ +<?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.Runtime.WindowsRuntime.UI.Xaml</AssemblyName> + <ProjectGuid>{263DA4F1-C3BC-4B43-98E7-9F38B419A131}</ProjectGuid> + <UseECMAKey Condition="'$(UseECMAKey)' == ''">true</UseECMAKey> + <PackageTargetRuntime>win8</PackageTargetRuntime> + <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker> + </PropertyGroup> + <!-- Default configurations to help VS understand the options --> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> + <ItemGroup> + <Compile Include="System\Runtime\InteropServices\HResults.cs" /> + <Compile Include="System\Windows\CornerRadius.cs" /> + <Compile Include="System\Windows\Duration.cs" /> + <Compile Include="System\Windows\GridLength.cs" /> + <Compile Include="System\Windows\Thickness.cs" /> + <Compile Include="System\Windows\TokenizerHelper.cs" /> + <Compile Include="System\Windows\LayoutCycleException.cs" /> + <Compile Include="System\Windows\Automation\ElementNotAvailableException.cs" /> + <Compile Include="System\Windows\Automation\ElementNotEnabledException.cs" /> + <Compile Include="System\Windows\Controls\Primitives\GeneratorPosition.cs" /> + <Compile Include="System\Windows\Markup\XamlParseException.cs" /> + <Compile Include="System\Windows\Media\Matrix.cs" /> + <Compile Include="System\Windows\Media\Animation\KeyTime.cs" /> + <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.UI.Xaml/src/project.json b/src/System.Runtime.WindowsRuntime.UI.Xaml/src/project.json deleted file mode 100644 index a8fac1b749..0000000000 --- a/src/System.Runtime.WindowsRuntime.UI.Xaml/src/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "frameworks": { - "netstandard1.3": { - "dependencies": { - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.WindowsRuntime": "4.3.0" - } - } - } -}
\ 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.WindowsRuntime/src/project.json b/src/System.Runtime.WindowsRuntime/src/project.json deleted file mode 100644 index 1ee47e13e6..0000000000 --- a/src/System.Runtime.WindowsRuntime/src/project.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03", - "Microsoft.TargetingPack.Private.WinRT": "1.0.3" - } - }, - "uap10.1": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24904-00", - "Microsoft.TargetingPack.Private.WinRT": "1.0.3" - } - } - } -} diff --git a/src/System.Runtime/dir.props b/src/System.Runtime/dir.props index 7bb155c44e..f6ce5c7273 100644 --- a/src/System.Runtime/dir.props +++ b/src/System.Runtime/dir.props @@ -2,6 +2,7 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.2.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project> diff --git a/src/System.Runtime/ref/4.1.0/project.json b/src/System.Runtime/ref/4.1.0/project.json deleted file mode 100644 index 0f44195b5b..0000000000 --- a/src/System.Runtime/ref/4.1.0/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.3.0" - }, - "frameworks": { - "netstandard1.5": {} - } -}
\ No newline at end of file diff --git a/src/System.Runtime/ref/Configurations.props b/src/System.Runtime/ref/Configurations.props new file mode 100644 index 0000000000..ea9ea79f78 --- /dev/null +++ b/src/System.Runtime/ref/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netcoreapp; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Runtime/ref/System.Runtime.builds b/src/System.Runtime/ref/System.Runtime.builds deleted file mode 100644 index 8c826fafff..0000000000 --- a/src/System.Runtime/ref/System.Runtime.builds +++ /dev/null @@ -1,11 +0,0 @@ -<?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> - <Project Include="System.Runtime.csproj" /> - <Project Include="System.Runtime.csproj"> - <TargetGroup>netstandard1.7</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project>
\ No newline at end of file diff --git a/src/System.Runtime/ref/System.Runtime.csproj b/src/System.Runtime/ref/System.Runtime.csproj index d4d607b994..37a403ccd4 100644 --- a/src/System.Runtime/ref/System.Runtime.csproj +++ b/src/System.Runtime/ref/System.Runtime.csproj @@ -3,12 +3,9 @@ <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> + <DefineConstants Condition="'$(TargetGroup)' == 'netcoreapp'">$(DefineConstants);netcoreapp11</DefineConstants> </PropertyGroup> <ItemGroup> <Compile Include="System.Runtime.cs" /> 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/Configurations.props b/src/System.Runtime/src/Configurations.props new file mode 100644 index 0000000000..323984f16b --- /dev/null +++ b/src/System.Runtime/src/Configurations.props @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.5; + net461-Windows_NT; + uap101aot-Windows_NT; + netcoreapp1.2corert-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Runtime/src/System.Runtime.builds b/src/System.Runtime/src/System.Runtime.builds deleted file mode 100644 index e3edfd0c0b..0000000000 --- a/src/System.Runtime/src/System.Runtime.builds +++ /dev/null @@ -1,21 +0,0 @@ -<?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> - <Project Include="System.Runtime.csproj" /> - <Project Include="System.Runtime.csproj"> - <!-- need to cross-compile to support netcoreapp1.0 --> - <TargetGroup>netstandard1.5</TargetGroup> - </Project> - <Project Include="System.Runtime.csproj"> - <TargetGroup>net461</TargetGroup> - </Project> - <Project Include="System.Runtime.csproj"> - <TargetGroup>uap101aot</TargetGroup> - </Project> - <Project Include="System.Runtime.csproj"> - <TargetGroup>netcoreapp1.2corert</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> diff --git a/src/System.Runtime/src/System.Runtime.csproj b/src/System.Runtime/src/System.Runtime.csproj index 96ae563f06..5f3beb4cf9 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)'=='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;netcoreapp1.2</PackageTargetFramework> <GenFacadesArgs Condition="'$(TargetGroup)' == 'uap101aot' Or '$(TargetGroup)' == 'netcoreapp1.2corert'">$(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'" /> @@ -22,7 +20,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net461_Release|AnyCPU'" /> <ItemGroup Condition="'$(TargetGroup)' == 'net461' OR '$(TargetGroup)' == 'uap101aot' OR '$(TargetGroup)' == 'netcoreapp1.2corert'"> <ContractProject Include="..\ref\System.Runtime.csproj"> - <TargetGroup>netstandard1.7</TargetGroup> + <TargetGroup>netstandard</TargetGroup> </ContractProject> </ItemGroup> <ItemGroup> @@ -45,17 +43,11 @@ <Compile Include="System\Runtime\CompilerServices\SpecialNameAttribute.cs" /> <Compile Include="System\Threading\WaitHandleExtensions.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)'=='' or '$(TargetGroup)' == 'netstandard1.5'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard1.5' or '$(TargetGroup)' == 'netstandard'"> <Compile Include="System\ComponentModel\DefaultValueAttribute.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\System.Private.Uri\src\System.Private.Uri.csproj" Condition="'$(TargetGroup)' == '' or '$(TargetGroup)' == 'netstandard1.5'"> - <OSGroup>Windows_NT</OSGroup> - <UndefineProperties>%(ProjectReference.UndefineProperties);TargetGroup</UndefineProperties> - </ProjectReference> - <ProjectReference Include="..\..\System.Private.Uri\src\System.Private.Uri.csproj" Condition="'$(TargetGroup)' == 'uap101aot' or '$(TargetGroup)' == 'netcoreapp1.2corert'"> - <OSGroup>Windows_NT</OSGroup> - </ProjectReference> + <ProjectReference Include="..\..\System.Private.Uri\src\System.Private.Uri.csproj" Condition="'$(TargetGroup)' == 'netstandard1.5' or '$(TargetGroup)' == 'netstandard' or '$(TargetGroup)' == 'uap101aot'" /> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' != 'net461'"> <TargetingPackReference Include="System.Private.CoreLib" /> @@ -66,7 +58,7 @@ <TargetingPackReference Include="System.ComponentModel.Composition" /> </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/src/project.json b/src/System.Runtime/src/project.json deleted file mode 100644 index c334534cea..0000000000 --- a/src/System.Runtime/src/project.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03" - } - }, - "netstandard1.5": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03" - } - }, - "netcoreapp1.2": { - "dependencies": { - "Microsoft.TargetingPack.Private.CoreRT": "1.0.0-alpha-24821-02" - } - }, - "net461": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.1": "1.0.1" - } - }, - "uap10.1": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24904-00" - } - } - } -} diff --git a/src/System.Runtime/src/redist/project.json b/src/System.Runtime/src/redist/project.json deleted file mode 100644 index aba860dd04..0000000000 --- a/src/System.Runtime/src/redist/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - }, - "frameworks": { - "netcore50": {} - } -}
\ No newline at end of file diff --git a/src/System.Runtime/tests/Configurations.props b/src/System.Runtime/tests/Configurations.props new file mode 100644 index 0000000000..c5ec56bec2 --- /dev/null +++ b/src/System.Runtime/tests/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.5; + netcoreapp1.1; + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Runtime/tests/Performance/System.Runtime.Performance.Tests.csproj b/src/System.Runtime/tests/Performance/System.Runtime.Performance.Tests.csproj index 066e1451bf..d092c563ce 100644 --- a/src/System.Runtime/tests/Performance/System.Runtime.Performance.Tests.csproj +++ b/src/System.Runtime/tests/Performance/System.Runtime.Performance.Tests.csproj @@ -1,13 +1,10 @@ -<?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> - <RootNamespace>System.Runtime.Performance.Tests</RootNamespace> - <AssemblyName>System.Runtime.Performance.Tests</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <NoWarn>1718</NoWarn> <IncludePerformanceTests>true</IncludePerformanceTests> - <NugetTargetMoniker>.NETStandard,Version=v1.5</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> @@ -32,13 +29,5 @@ <Link>Common\System\PerfUtils.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\pkg\System.Runtime.pkgproj"> - <Project>{1e689c1b-690c-4799-bde9-6e7990585894}</Project> - <Name>System.Runtime</Name> - </ProjectReference> - <ProjectReference Include="..\..\..\System.Private.Uri\pkg\System.Private.Uri.pkgproj"> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime/tests/System.Runtime.Tests.csproj b/src/System.Runtime/tests/System.Runtime.Tests.csproj index d964d8099e..f487a93390 100644 --- a/src/System.Runtime/tests/System.Runtime.Tests.csproj +++ b/src/System.Runtime/tests/System.Runtime.Tests.csproj @@ -2,30 +2,24 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{7F5F5134-00FE-4DE8-B20C-3DA8BA2EBA68}</ProjectGuid> - <OutputType>Library</OutputType> - <RootNamespace>System.Runtime.Tests</RootNamespace> - <AssemblyName>System.Runtime.Tests</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <NoWarn>1718</NoWarn> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> <DefineConstants Condition="'$(TargetGroup)'==''">$(DefineConstants);netstandard17</DefineConstants> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'netstandard1.5_Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'netstandard1.5_Release|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'netcoreapp1.1_Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'netcoreapp1.1_Release|AnyCPU' "> - </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'netstandard1.5_Debug|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'netstandard1.5_Release|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'netcoreapp1.1_Debug|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'netcoreapp1.1_Release|AnyCPU' " /> + + <ItemGroup> + <!-- Remove this when TypeBuilder extends TypeInfo. See https://github.com/dotnet/corefx/issues/14334 --> + <Compile Include="$(CommonTestPath)\System\TypeBuilderExtensions.cs" /> + </ItemGroup> + <ItemGroup> <Compile Include="$(CommonTestPath)\System\EnumTypes.cs"> <Link>Common\System\EnumTypes.cs</Link> @@ -142,7 +136,7 @@ <ItemGroup Condition="'$(TargetGroup)' != 'netcoreapp1.1'"> <Compile Include="System\StringSplitExtensions.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == ''"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard1.7'"> <Compile Include="..\..\Common\tests\System\Collections\IEnumerable.Generic.Serialization.Tests.cs"> <Link>Common\System\Collections\IEnumerable.Generic.Serialization.Tests.cs</Link> </Compile> @@ -248,14 +242,6 @@ <Project>{9F312D76-9AF1-4E90-B3B0-815A1EC6C346}</Project> <Name>TestLoadAssembly</Name> </ProjectReference> - <ProjectReference Include="..\pkg\System.Runtime.pkgproj"> - <Project>{ADBCF120-3454-4A3C-9D1D-AC4293E795D6}</Project> - <Name>System.Runtime</Name> - </ProjectReference> - <ProjectReference Include="..\..\System.Private.Uri\pkg\System.Private.Uri.pkgproj"> - <Project>{4AC5343E-6E31-4BA5-A795-0493AE7E9008}</Project> - <Name>System.Private.Uri</Name> - </ProjectReference> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Runtime/tests/TestAssembly/TestAssembly.csproj b/src/System.Runtime/tests/TestAssembly/TestAssembly.csproj index 470702c4c9..605a2b1218 100644 --- a/src/System.Runtime/tests/TestAssembly/TestAssembly.csproj +++ b/src/System.Runtime/tests/TestAssembly/TestAssembly.csproj @@ -3,11 +3,9 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{9F312D76-9AF1-4E90-B3B0-815A1EC6C346}</ProjectGuid> - <OutputType>Library</OutputType> - <RootNamespace>TestAssembly</RootNamespace> - <AssemblyName>TestAssembly</AssemblyName> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> - <CopyNuGetImplementations>false</CopyNuGetImplementations> + <IsTestProject>true</IsTestProject> + <NoWarn>0436</NoWarn> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> diff --git a/src/System.Runtime/tests/TestAssembly/project.json b/src/System.Runtime/tests/TestAssembly/project.json deleted file mode 100644 index ca4f539425..0000000000 --- a/src/System.Runtime/tests/TestAssembly/project.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01" - }, - "frameworks": { - ".NETCoreApp,Version=v1.0": {}, - ".NETCoreApp,Version=v1.1": {}, - "netstandard1.3": {}, - "netstandard1.5": {} - } -} diff --git a/src/System.Runtime/tests/TestLoadAssembly/TestLoadAssembly.csproj b/src/System.Runtime/tests/TestLoadAssembly/TestLoadAssembly.csproj index e22d772258..26b4701a44 100644 --- a/src/System.Runtime/tests/TestLoadAssembly/TestLoadAssembly.csproj +++ b/src/System.Runtime/tests/TestLoadAssembly/TestLoadAssembly.csproj @@ -3,12 +3,10 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{9F312D76-9AF1-4E90-B3B0-815A1EC6C346}</ProjectGuid> - <OutputType>Library</OutputType> - <RootNamespace>TestLoadAssembly</RootNamespace> - <AssemblyName>TestLoadAssembly</AssemblyName> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> - <CopyNuGetImplementations>false</CopyNuGetImplementations> <AssemblyVersion>1.0.0.0</AssemblyVersion> + <IsTestProject>true</IsTestProject> + <NoWarn>0436</NoWarn> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> diff --git a/src/System.Runtime/tests/TestLoadAssembly/project.json b/src/System.Runtime/tests/TestLoadAssembly/project.json deleted file mode 100644 index ca4f539425..0000000000 --- a/src/System.Runtime/tests/TestLoadAssembly/project.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01" - }, - "frameworks": { - ".NETCoreApp,Version=v1.0": {}, - ".NETCoreApp,Version=v1.1": {}, - "netstandard1.3": {}, - "netstandard1.5": {} - } -} diff --git a/src/System.Security.AccessControl/dir.props b/src/System.Security.AccessControl/dir.props index fcc1a7ca5a..8f2003a937 100644 --- a/src/System.Security.AccessControl/dir.props +++ b/src/System.Security.AccessControl/dir.props @@ -3,5 +3,7 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> + <IsNETCoreAppRef>false</IsNETCoreAppRef> </PropertyGroup> </Project>
\ No newline at end of file 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 290a4dd85c..0000000000 --- a/src/System.Security.AccessControl/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.Security.Principal.Windows": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Security.AccessControl/src/Configurations.props b/src/System.Security.AccessControl/src/Configurations.props new file mode 100644 index 0000000000..54621aaa25 --- /dev/null +++ b/src/System.Security.AccessControl/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard-Windows_NT; + netstandard-Unix; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Security.AccessControl/src/System.Security.AccessControl.builds b/src/System.Security.AccessControl/src/System.Security.AccessControl.builds deleted file mode 100644 index 9555229b9b..0000000000 --- a/src/System.Security.AccessControl/src/System.Security.AccessControl.builds +++ /dev/null @@ -1,18 +0,0 @@ -<?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> - <Project Include="System.Security.AccessControl.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.Security.AccessControl.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.Security.AccessControl.csproj"> - <OSGroup>Windows_NT</OSGroup> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Security.AccessControl/src/System.Security.AccessControl.csproj b/src/System.Security.AccessControl/src/System.Security.AccessControl.csproj index 6f5a9a5222..b1882d5fda 100644 --- a/src/System.Security.AccessControl/src/System.Security.AccessControl.csproj +++ b/src/System.Security.AccessControl/src/System.Security.AccessControl.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"> - <PropertyGroup> - <OSGroup Condition="'$(OSGroup)' == ''">Windows_NT</OSGroup> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> <AssemblyName>System.Security.AccessControl</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net463'">true</IsPartialFacadeAssembly> <GeneratePlatformNotSupportedAssembly Condition="'$(TargetsUnix)' == 'true'">true</GeneratePlatformNotSupportedAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Debug|AnyCPU'" /> @@ -20,7 +15,7 @@ <ItemGroup Condition="'$(TargetGroup)'=='net463'"> <TargetingPackReference Include="mscorlib" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)'=='' AND '$(TargetsWindows)'=='true'"> + <ItemGroup Condition="'$(TargetGroup)'=='netstandard' AND '$(TargetsWindows)'=='true'"> <Compile Include="System\Security\AccessControl\ACE.cs" /> <Compile Include="System\Security\AccessControl\ACL.cs" /> <Compile Include="System\Security\AccessControl\CommonObjectSecurity.cs" /> @@ -119,7 +114,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 3e113276c6..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-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Security.Claims": "4.4.0-beta-24904-01", - "System.Security.Principal": "4.4.0-beta-24904-01", - "System.Security.Principal.Windows": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Security.AccessControl/tests/System.Security.AccessControl.Tests.csproj b/src/System.Security.AccessControl/tests/System.Security.AccessControl.Tests.csproj index 7a8d7bd143..f0e5e748a2 100644 --- a/src/System.Security.AccessControl/tests/System.Security.AccessControl.Tests.csproj +++ b/src/System.Security.AccessControl/tests/System.Security.AccessControl.Tests.csproj @@ -1,17 +1,9 @@ -<?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> - <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> - <Platform Condition="'$(Platform)' == ''">AnyCPU</Platform> <ProjectGuid>{57E8F8D4-0766-4CC7-B3F9-B243B81DB6A5}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Security.AccessControl.Tests</AssemblyName> <UnsupportedPlatforms>Linux;NetBSD;OSX</UnsupportedPlatforms> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Debug|AnyCPU'"> <DebugSymbols>true</DebugSymbols> @@ -21,16 +13,6 @@ <PlatformTarget>AnyCPU</PlatformTarget> </PropertyGroup> <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Security.AccessControl.pkgproj"> - <Project>{879c23dc-d828-4dfb-8e92-abbc11b71035}</Project> - <Name>System.Security.AccessControl</Name> - <Private>True</Private> - </ProjectReference> - </ItemGroup> - <ItemGroup> <Compile Include="Ace\Ace.Common.Tests.cs" /> <Compile Include="Ace\Ace.Compound.Tests.cs" /> <Compile Include="Ace\Ace.Custom.Tests.cs" /> @@ -96,4 +78,4 @@ <Compile Include="Utils.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Claims/dir.props b/src/System.Security.Claims/dir.props index fcc1a7ca5a..8f2003a937 100644 --- a/src/System.Security.Claims/dir.props +++ b/src/System.Security.Claims/dir.props @@ -3,5 +3,7 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> + <IsNETCoreAppRef>false</IsNETCoreAppRef> </PropertyGroup> </Project>
\ No newline at end of file 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 8637efe32d..0000000000 --- a/src/System.Security.Claims/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Security.Principal": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Security.Claims/src/Configurations.props b/src/System.Security.Claims/src/Configurations.props new file mode 100644 index 0000000000..9c336c0be9 --- /dev/null +++ b/src/System.Security.Claims/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Security.Claims/src/System.Security.Claims.builds b/src/System.Security.Claims/src/System.Security.Claims.builds deleted file mode 100644 index 713132dc58..0000000000 --- a/src/System.Security.Claims/src/System.Security.Claims.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.Security.Claims.csproj" /> - <Project Include="System.Security.Claims.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Security.Claims/src/System.Security.Claims.csproj b/src/System.Security.Claims/src/System.Security.Claims.csproj index 51a331915a..92dc82248b 100644 --- a/src/System.Security.Claims/src/System.Security.Claims.csproj +++ b/src/System.Security.Claims/src/System.Security.Claims.csproj @@ -1,18 +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> <AssemblyName>System.Security.Claims</AssemblyName> <ProjectGuid>{A70BEC0D-5A1C-4DA0-8A0F-69F3BF565D52}</ProjectGuid> <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net463'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </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)' == 'net463_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)'==''"> + <ItemGroup Condition="'$(TargetGroup)'=='netstandard'"> <Compile Include="System\Security\Claims\Claim.cs" /> <Compile Include="System\Security\Claims\ClaimsIdentity.cs" /> <Compile Include="System\Security\Claims\ClaimsPrincipal.cs" /> @@ -25,7 +24,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 216f9d3fbc..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-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Security.Principal": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Security.Claims/tests/Configurations.props b/src/System.Security.Claims/tests/Configurations.props new file mode 100644 index 0000000000..98f53209d4 --- /dev/null +++ b/src/System.Security.Claims/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Security.Claims/tests/System.Security.Claims.Tests.csproj b/src/System.Security.Claims/tests/System.Security.Claims.Tests.csproj index 29c7059053..b87750426d 100644 --- a/src/System.Security.Claims/tests/System.Security.Claims.Tests.csproj +++ b/src/System.Security.Claims/tests/System.Security.Claims.Tests.csproj @@ -1,11 +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"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{82B54697-0251-47A1-8546-FC507D0F3B08}</ProjectGuid> - <AssemblyName>System.Security.Claims.Tests</AssemblyName> - <RootNamespace>System.Security.Claims.Tests</RootNamespace> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> @@ -15,10 +12,5 @@ <Link>Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Security.Claims.pkgproj"> - <Name>System.Security.Claims</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Algorithms/dir.props b/src/System.Security.Cryptography.Algorithms/dir.props index 554241c3f8..e48b5c0db9 100644 --- a/src/System.Security.Cryptography.Algorithms/dir.props +++ b/src/System.Security.Cryptography.Algorithms/dir.props @@ -1,7 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.3.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> - +</Project>
\ No newline at end of file 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 882038bbee..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,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.Algorithms.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.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.Algorithms/ref/project.json b/src/System.Security.Cryptography.Algorithms/ref/project.json deleted file mode 100644 index ff4321cdfc..0000000000 --- a/src/System.Security.Cryptography.Algorithms/ref/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Encoding": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Primitives": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Security.Cryptography.Algorithms/src/Configurations.props b/src/System.Security.Cryptography.Algorithms/src/Configurations.props new file mode 100644 index 0000000000..6b92af3b02 --- /dev/null +++ b/src/System.Security.Cryptography.Algorithms/src/Configurations.props @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard-Unix; + netstandard-OSX; + netstandard-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.builds b/src/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.builds deleted file mode 100644 index 19cecc7585..0000000000 --- a/src/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.builds +++ /dev/null @@ -1,20 +0,0 @@ -<?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> - <Project Include="System.Security.Cryptography.Algorithms.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.Security.Cryptography.Algorithms.csproj"> - <OSGroup>OSX</OSGroup> - </Project> - <Project Include="System.Security.Cryptography.Algorithms.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.Security.Cryptography.Algorithms.csproj"> - <OSGroup>Windows_NT</OSGroup> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> 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 aeb948eb4e..a272af017e 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,12 +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"> - <PropertyGroup> - <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Windows_Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}</ProjectGuid> <OutputType>Library</OutputType> <AssemblyName>System.Security.Cryptography.Algorithms</AssemblyName> @@ -14,7 +9,6 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <DefineConstants>INTERNAL_ASYMMETRIC_IMPLEMENTATIONS</DefineConstants> <NoWarn>CA5351;$(NoWarn)</NoWarn> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> <GenFacadesArgs Condition="'$(TargetGroup)'=='net463'">$(GenFacadesArgs) -ignoreMissingTypes</GenFacadesArgs> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'OSX_Debug|AnyCPU'" /> @@ -425,7 +419,20 @@ <Compile Include="System\Security\Cryptography\IncrementalHash.net46.cs" /> </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.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> + <ItemGroup Condition="'$(TargetsUnix)' == 'true'"> + <Reference Include="System.Runtime.Numerics" /> </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 224f8d30a3..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-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-beta-24904-01", - "System.Runtime.Numerics": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Primitives": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Encoding": "4.4.0-beta-24904-01", - "System.Text.Encoding.Extensions": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.Security.Cryptography.Algorithms/tests/Configurations.props b/src/System.Security.Cryptography.Algorithms/tests/Configurations.props new file mode 100644 index 0000000000..a98856d37e --- /dev/null +++ b/src/System.Security.Cryptography.Algorithms/tests/Configurations.props @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.6-Unix; + netstandard1.6-Windows_NT; + netstandard1.7-Unix; + netstandard1.7-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj b/src/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj index 6d6110207b..e06e09f10f 100644 --- a/src/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj +++ b/src/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj @@ -1,25 +1,11 @@ <?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> - <CLRTestKind>BuildAndRun</CLRTestKind> <ProjectGuid>{508A7D81-6462-459C-9F8F-B58FCCCFC8E7}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Security.Cryptography.Algorithms.Tests</AssemblyName> - <RootNamespace>System.Security.Cryptography.Algorithms.Tests</RootNamespace> <DefineConstants Condition="'$(TargetGroup)'==''">$(DefineConstants);netstandard17</DefineConstants> - <NugetTargetMoniker Condition="'$(TargetGroup)'==''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <ItemGroup> - <ProjectReference Include="..\pkg\System.Security.Cryptography.Algorithms.pkgproj"> - <Project>{81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}</Project> - <Name>System.Security.Cryptography.Algorithms</Name> - </ProjectReference> - </ItemGroup> - <ItemGroup> <Compile Include="$(CommonTestPath)\System\PlatformDetection.cs"> <Link>CommonTest\System\PlatformDetection.cs</Link> </Compile> @@ -220,4 +206,4 @@ <Folder Include="Common\Interop\Unix\" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Cng/dir.props b/src/System.Security.Cryptography.Cng/dir.props index 554241c3f8..ba428176d8 100644 --- a/src/System.Security.Cryptography.Cng/dir.props +++ b/src/System.Security.Cryptography.Cng/dir.props @@ -1,7 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.3.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> + <IsNETCoreAppRef>false</IsNETCoreAppRef> </PropertyGroup> -</Project> - +</Project>
\ No newline at end of file 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 94ed0d35aa..b78c167933 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> <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 fd5811b3c8..0000000000 --- a/src/System.Security.Cryptography.Cng/ref/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Algorithms": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Primitives": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Security.Cryptography.Cng/src/Configurations.props b/src/System.Security.Cryptography.Cng/src/Configurations.props new file mode 100644 index 0000000000..54621aaa25 --- /dev/null +++ b/src/System.Security.Cryptography.Cng/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard-Windows_NT; + netstandard-Unix; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.builds b/src/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.builds deleted file mode 100644 index 13ba80c104..0000000000 --- a/src/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.builds +++ /dev/null @@ -1,17 +0,0 @@ -<?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> - <Project Include="System.Security.Cryptography.Cng.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.Security.Cryptography.Cng.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.Security.Cryptography.Cng.csproj"> - <OSGroup>Windows_NT</OSGroup> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> 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 0aa484ef1a..10ea06af32 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,8 +1,5 @@ -<?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> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <AppDesignerFolder>Properties</AppDesignerFolder> @@ -11,7 +8,6 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory Condition="'$(IsPartialFacadeAssembly)' == 'true'">None</ResourcesSourceOutputDirectory> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> <GeneratePlatformNotSupportedAssembly Condition="'$(TargetsUnix)' == 'true'">true</GeneratePlatformNotSupportedAssembly> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_NT_Debug|AnyCPU'" /> @@ -258,5 +254,17 @@ <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 f4f1bdcbc1..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-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Algorithms": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Encoding": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Primitives": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.Security.Cryptography.Cng/tests/Configurations.props b/src/System.Security.Cryptography.Cng/tests/Configurations.props new file mode 100644 index 0000000000..8ac8400156 --- /dev/null +++ b/src/System.Security.Cryptography.Cng/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.6-Windows_NT; + netstandard1.7-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj b/src/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj index bd7d575e33..3015a21d58 100644 --- a/src/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj +++ b/src/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj @@ -1,28 +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"> - <PropertyGroup> - <Configuration Condition="'$(Configuration)'==''">Windows_NT_Debug</Configuration> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <CLRTestKind>BuildAndRun</CLRTestKind> <ProjectGuid>{FF53459F-66F7-4F00-8D36-DF440CE18419}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Security.Cryptography.Cng.Tests</AssemblyName> - <RootNamespace>System.Security.Cryptography.Cng.Tests</RootNamespace> <DefineConstants Condition="'$(TargetGroup)'==''">$(DefineConstants);netstandard17</DefineConstants> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_NT_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_NT_Release|AnyCPU'" /> <ItemGroup> - <ProjectReference Include="..\pkg\System.Security.Cryptography.Cng.pkgproj"> - <Project>{4c1bd451-6a99-45e7-9339-79c77c42ee9e}</Project> - <Name>System.Security.Cryptography.Cng</Name> - </ProjectReference> - </ItemGroup> - <ItemGroup> <Compile Include="CreateTests.cs" /> <Compile Include="HandleTests.cs" /> <Compile Include="OpenTests.cs" /> diff --git a/src/System.Security.Cryptography.Csp/dir.props b/src/System.Security.Cryptography.Csp/dir.props index 503cf86a87..8f2003a937 100644 --- a/src/System.Security.Cryptography.Csp/dir.props +++ b/src/System.Security.Cryptography.Csp/dir.props @@ -1,7 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> + <IsNETCoreAppRef>false</IsNETCoreAppRef> </PropertyGroup> -</Project> - +</Project>
\ No newline at end of file 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 33ec20ec0a..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,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 Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> - </PropertyGroup> <ItemGroup> <Compile Include="System.Security.Cryptography.Csp.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.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 71579ad1f4..0000000000 --- a/src/System.Security.Cryptography.Csp/ref/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "System.IO": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Algorithms": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Primitives": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Security.Cryptography.Csp/src/Configurations.props b/src/System.Security.Cryptography.Csp/src/Configurations.props new file mode 100644 index 0000000000..54621aaa25 --- /dev/null +++ b/src/System.Security.Cryptography.Csp/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard-Windows_NT; + netstandard-Unix; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.builds b/src/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.builds deleted file mode 100644 index aaf444fdab..0000000000 --- a/src/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.builds +++ /dev/null @@ -1,17 +0,0 @@ -<?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> - <Project Include="System.Security.Cryptography.Csp.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.Security.Cryptography.Csp.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.Security.Cryptography.Csp.csproj"> - <OSGroup>Windows_NT</OSGroup> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> 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 c295420fe5..c54f86d5ad 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,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"> - <PropertyGroup> - <OSGroup Condition="'$(OSGroup)' == ''">Windows_NT</OSGroup> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition="'$(Configuration)'==''">Windows_NT_Debug</Configuration> <ProjectGuid>{3B7F91D7-0677-40CA-B4E7-D4E09D89A74E}</ProjectGuid> <AssemblyName>System.Security.Cryptography.Csp</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> @@ -13,11 +9,10 @@ <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net463'">None</ResourcesSourceOutputDirectory> <NoWarn Condition="'$(TargetsUnix)' == 'true'">CS0809</NoWarn> <GeneratePlatformNotSupportedAssembly Condition="'$(TargetsUnix)' == 'true'">true</GeneratePlatformNotSupportedAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_NT_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_NT_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' != 'net463' AND '$(TargetsWindows)' == 'true'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard' AND '$(TargetsWindows)' == 'true'"> <Compile Include="System\Security\Cryptography\AesCryptoServiceProvider.cs" /> <Compile Include="System\Security\Cryptography\CapiHelper.cs" /> <Compile Include="System\Security\Cryptography\CapiHelper.DSA.cs" /> @@ -68,15 +63,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" /> + <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 59608cc553..0000000000 --- a/src/System.Security.Cryptography.Csp/src/project.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Algorithms": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Encoding": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Primitives": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Text.Encoding.Extensions": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.Security.Cryptography.Csp/tests/Configurations.props b/src/System.Security.Cryptography.Csp/tests/Configurations.props new file mode 100644 index 0000000000..9899767269 --- /dev/null +++ b/src/System.Security.Cryptography.Csp/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3-Windows_NT; + netstandard1.7-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj b/src/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj index 4072e4fb84..202f778dd0 100644 --- a/src/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj +++ b/src/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj @@ -1,27 +1,13 @@ <?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> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <CLRTestKind>BuildAndRun</CLRTestKind> <ProjectGuid>{A05C2EF2-A986-448C-9C63-735CC17409AA}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Security.Cryptography.Csp.Tests</AssemblyName> - <RootNamespace>System.Security.Cryptography.Csp.Tests</RootNamespace> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_NT_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_NT_Release|AnyCPU'" /> <ItemGroup> - <ProjectReference Include="..\pkg\System.Security.Cryptography.Csp.pkgproj"> - <Project>{3B7F91D7-0677-40CA-B4E7-D4E09D89A74E}</Project> - <Name>System.Security.Cryptography.Csp</Name> - </ProjectReference> - </ItemGroup> - <ItemGroup> <Compile Include="CspParametersTests.cs" /> <Compile Include="ImportExportCspBlob.cs" /> <Compile Include="RSACryptoServiceProviderBackCompat.cs" /> @@ -123,4 +109,4 @@ <None Include="project.json" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Encoding/dir.props b/src/System.Security.Cryptography.Encoding/dir.props index 503cf86a87..bfbc5bd9e0 100644 --- a/src/System.Security.Cryptography.Encoding/dir.props +++ b/src/System.Security.Cryptography.Encoding/dir.props @@ -1,7 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> - +</Project>
\ No newline at end of file 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 beb5a4febe..0000000000 --- a/src/System.Security.Cryptography.Encoding/ref/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Primitives": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Security.Cryptography.Encoding/src/Configurations.props b/src/System.Security.Cryptography.Encoding/src/Configurations.props new file mode 100644 index 0000000000..0decf0d6c0 --- /dev/null +++ b/src/System.Security.Cryptography.Encoding/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard-Unix; + netstandard-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.builds b/src/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.builds deleted file mode 100644 index 4a2e26663f..0000000000 --- a/src/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.builds +++ /dev/null @@ -1,18 +0,0 @@ -<?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> - <Project Include="System.Security.Cryptography.Encoding.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.Security.Cryptography.Encoding.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.Security.Cryptography.Encoding.csproj"> - <OSGroup>Windows_NT</OSGroup> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - 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..1cdaa7c4cb 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,8 +1,5 @@ -<?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> <ProjectGuid>{AA81E343-5E54-40B0-9381-C459419BE780}</ProjectGuid> @@ -10,7 +7,6 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net463'">None</ResourcesSourceOutputDirectory> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Release|AnyCPU'" /> @@ -18,7 +14,7 @@ <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'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="Internal\Cryptography\AsnFormatter.cs" /> <Compile Include="Internal\Cryptography\Helpers.cs" /> <Compile Include="Internal\Cryptography\OidLookup.cs" /> @@ -31,7 +27,7 @@ <Compile Include="System\Security\Cryptography\OidEnumerator.cs" /> <Compile Include="System\Security\Cryptography\OidGroup.cs" /> </ItemGroup> - <ItemGroup Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' != 'net463'"> + <ItemGroup Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' == 'netstandard'"> <Compile Include="Internal\Cryptography\AsnFormatter.Windows.cs" /> <Compile Include="Internal\Cryptography\CngAsnFormatter.cs" /> <Compile Include="Internal\Cryptography\OidLookup.Windows.cs" /> @@ -97,7 +93,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 a49cf01f29..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-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Collections.Concurrent": "4.4.0-beta-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Linq": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Primitives": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.Security.Cryptography.Encoding/tests/Configurations.props b/src/System.Security.Cryptography.Encoding/tests/Configurations.props new file mode 100644 index 0000000000..981075fcc5 --- /dev/null +++ b/src/System.Security.Cryptography.Encoding/tests/Configurations.props @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3-Unix; + netstandard1.3-Windows_NT; + netstandard1.7-Unix; + netstandard1.7-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.csproj b/src/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.csproj index 2f4f2d6dc4..9a55c299a5 100644 --- a/src/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.csproj +++ b/src/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.csproj @@ -1,27 +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"> - <PropertyGroup> - <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{0581E9FA-D639-4B88-96D8-D092760F90B0}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Security.Cryptography.Encoding.Tests</AssemblyName> - <RootNamespace>System.Security.Cryptography.Encoding.Tests</RootNamespace> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <DefineConstants Condition="'$(TargetGroup)'==''">$(DefineConstants);netstandard17</DefineConstants> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <ItemGroup> - <ProjectReference Include="..\pkg\System.Security.Cryptography.Encoding.pkgproj"> - <Project>{AA81E343-5E54-40B0-9381-C459419BE780}</Project> - <Name>System.Security.Cryptography.Encoding</Name> - </ProjectReference> - </ItemGroup> - <ItemGroup> <Compile Include="AsnEncodedData.cs" /> <Compile Include="AsnEncodedDataCollectionTests.cs" /> <Compile Include="DerEncoderTests.cs" /> diff --git a/src/System.Security.Cryptography.OpenSsl/dir.props b/src/System.Security.Cryptography.OpenSsl/dir.props index 503cf86a87..8f2003a937 100644 --- a/src/System.Security.Cryptography.OpenSsl/dir.props +++ b/src/System.Security.Cryptography.OpenSsl/dir.props @@ -1,7 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> + <IsNETCoreAppRef>false</IsNETCoreAppRef> </PropertyGroup> -</Project> - +</Project>
\ No newline at end of file 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 0d91af02f0..0000000000 --- a/src/System.Security.Cryptography.OpenSsl/ref/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Algorithms": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Primitives": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Security.Cryptography.OpenSsl/src/Configurations.props b/src/System.Security.Cryptography.OpenSsl/src/Configurations.props new file mode 100644 index 0000000000..3d4674aeac --- /dev/null +++ b/src/System.Security.Cryptography.OpenSsl/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard-Unix; + netstandard-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.builds b/src/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.builds deleted file mode 100644 index 277a1b2dac..0000000000 --- a/src/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.builds +++ /dev/null @@ -1,13 +0,0 @@ -<?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> - <Project Include="System.Security.Cryptography.OpenSsl.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.Security.Cryptography.OpenSsl.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> 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..6d51b23990 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,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"> - <PropertyGroup> - <Configuration Condition="'$(Configuration)'==''">Unix_Debug</Configuration> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{78452F3E-BA91-47E7-BB0F-02E8A5C116C4}</ProjectGuid> <OutputType>Library</OutputType> <AssemblyName>System.Security.Cryptography.OpenSsl</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NuGetTargetMoniker Condition="'$(NuGetTargetMoniker)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(TargetsWindows)' == 'true'"> <GeneratePlatformNotSupportedAssembly>true</GeneratePlatformNotSupportedAssembly> @@ -111,7 +107,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 9d2ff65064..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-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Runtime.Numerics": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Algorithms": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Encoding": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Primitives": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - } - } - } -} diff --git a/src/System.Security.Cryptography.OpenSsl/tests/Configurations.props b/src/System.Security.Cryptography.OpenSsl/tests/Configurations.props new file mode 100644 index 0000000000..ca3d74da1d --- /dev/null +++ b/src/System.Security.Cryptography.OpenSsl/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.6-Unix; + netstandard1.7-Unix; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj b/src/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj index 1db2cfdeac..6de6f8f873 100644 --- a/src/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj +++ b/src/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj @@ -1,16 +1,9 @@ -<?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> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <CLRTestKind>BuildAndRun</CLRTestKind> <ProjectGuid>{A05C2EF2-A986-448C-9C63-735CC17409AA}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Security.Cryptography.OpenSsl.Tests</AssemblyName> - <RootNamespace>System.Security.Cryptography.OpenSsl.Tests</RootNamespace> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> + <UnsupportedPlatforms>Windows_NT</UnsupportedPlatforms> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'FreeBSD_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'FreeBSD_Release|AnyCPU'" /> @@ -117,11 +110,5 @@ <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAXml.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Security.Cryptography.OpenSsl.pkgproj"> - <Project>{78452f3e-ba91-47e7-bb0f-02e8a5c116c4}</Project> - <Name>System.Security.Cryptography.OpenSsl</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file 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/Configurations.props b/src/System.Security.Cryptography.Pkcs/src/Configurations.props new file mode 100644 index 0000000000..17d5314bad --- /dev/null +++ b/src/System.Security.Cryptography.Pkcs/src/Configurations.props @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netcore50-Windows_NT; + netstandard1.3-Windows_NT; + netstandard1.3-Unix; + net46-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.builds b/src/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.builds deleted file mode 100644 index e38e81cf1e..0000000000 --- a/src/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.builds +++ /dev/null @@ -1,21 +0,0 @@ -<?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> - <Project Include="System.Security.Cryptography.Pkcs.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.Security.Cryptography.Pkcs.csproj"> - <OSGroup>Windows_NT</OSGroup> - <TargetGroup>netcore50</TargetGroup> - </Project> - <Project Include="System.Security.Cryptography.Pkcs.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.Security.Cryptography.Pkcs.csproj"> - <TargetGroup>net46</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - 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..3de33d6355 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,8 +1,5 @@ -<?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> <ProjectGuid>{03D84CBD-896D-4B2F-9A22-07034F51E73D}</ProjectGuid> @@ -12,7 +9,6 @@ <ResourcesSourceOutputDirectory Condition="'$(IsPartialFacadeAssembly)' == 'true'">None</ResourcesSourceOutputDirectory> <GeneratePlatformNotSupportedAssembly Condition="'$(TargetsUnix)' == 'true'">true</GeneratePlatformNotSupportedAssembly> <UsePackageTargetRuntimeDefaults Condition="'$(IsPartialFacadeAssembly)' != 'true'">true</UsePackageTargetRuntimeDefaults> - <NuGetTargetMoniker Condition="'$(TargetGroup)'==''">.NETStandard,Version=v1.3</NuGetTargetMoniker> </PropertyGroup> <!-- Don't delete these clauses even if they look useless. They tell the VS IDE that "Windows_Debug", etc., are valid configuration for this project and stop it from trying to "fix up" the .sln file --> @@ -184,7 +180,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/netcore50/project.json b/src/System.Security.Cryptography.Pkcs/src/netcore50/project.json deleted file mode 100644 index 9fe8cd5784..0000000000 --- a/src/System.Security.Cryptography.Pkcs/src/netcore50/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "System.Collections": "4.3.0", - "System.Diagnostics.Contracts": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.ObjectModel": "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.Runtime.WindowsRuntime": "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" - }, - "frameworks": { - "netcore50": {} - } -} 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 9c97f2128d..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-24904-01", - "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" - } - } - } -} diff --git a/src/System.Security.Cryptography.Pkcs/tests/Configurations.props b/src/System.Security.Cryptography.Pkcs/tests/Configurations.props new file mode 100644 index 0000000000..33bfeee701 --- /dev/null +++ b/src/System.Security.Cryptography.Pkcs/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netcoreapp1.1-Windows_NT; + netstandard1.3-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj b/src/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj index a5db79b79d..d576566bd2 100644 --- a/src/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj +++ b/src/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.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"> - <PropertyGroup> - <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <CLRTestKind>BuildAndRun</CLRTestKind> <ProjectGuid>{2DD8DFFA-09FF-46C6-8313-4A9CC1849A44}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Security.Cryptography.Pkcs.Tests</AssemblyName> - <RootNamespace>System.Security.Cryptography.Pkcs.Tests</RootNamespace> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NugetTargetMoniker> <DefineConstants Condition="'$(TargetGroup)'=='netcoreapp1.1'">$(DefineConstants);netcoreapp11</DefineConstants> </PropertyGroup> - <!-- Don't delete these clauses even if they look useless. They tell the VS IDE that "Windows_Debug", etc., are valid configuration for this project and stop it from trying to "fix up" the .sln file --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Debug|AnyCPU'" /> @@ -23,20 +14,11 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_netcore50_Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Release|AnyCPU'" /> - - <ItemGroup> - <ProjectReference Include="..\pkg\System.Security.Cryptography.Pkcs.pkgproj"> - <Project>{03D84CBD-896D-4B2F-9A22-07034F51E73D}</Project> - <Name>System.Security.Cryptography.Pkcs</Name> - </ProjectReference> - </ItemGroup> - <ItemGroup> <Compile Include="$(CommonTestPath)\System\Security\Cryptography\ByteUtils.cs"> <Link>CommonTest\System\Security\Cryptography\ByteUtils.cs</Link> </Compile> </ItemGroup> - <ItemGroup> <Compile Include="Certificates.cs" /> <Compile Include="CertLoader.cs" /> @@ -56,10 +38,8 @@ <Compile Include="Pkcs9AttributeTests.cs" /> <Compile Include="RecipientInfoCollectionTests.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)'=='netcoreapp1.1'"> - <Compile Include="EnvelopedCms\DecryptTests.KeyPersistence.cs" /> + <Compile Include="EnvelopedCms\DecryptTests.KeyPersistence.cs" /> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Primitives/dir.props b/src/System.Security.Cryptography.Primitives/dir.props index 041b9b1160..bfbc5bd9e0 100644 --- a/src/System.Security.Cryptography.Primitives/dir.props +++ b/src/System.Security.Cryptography.Primitives/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Primitives/ref/Configurations.props b/src/System.Security.Cryptography.Primitives/ref/Configurations.props new file mode 100644 index 0000000000..33dc67c6d9 --- /dev/null +++ b/src/System.Security.Cryptography.Primitives/ref/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netcoreapp; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.cs b/src/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.cs index db713dddc3..9010a3620f 100644 --- a/src/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.cs +++ b/src/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.cs @@ -47,7 +47,7 @@ namespace System.Security.Cryptography public partial class CryptoStream : System.IO.Stream, System.IDisposable { public CryptoStream(System.IO.Stream stream, System.Security.Cryptography.ICryptoTransform transform, System.Security.Cryptography.CryptoStreamMode mode) { } -#if netcoreapp11 +#if netcoreapp public CryptoStream(System.IO.Stream stream, System.Security.Cryptography.ICryptoTransform transform, System.Security.Cryptography.CryptoStreamMode mode, bool leaveOpen) { } #endif public override bool CanRead { get { throw null; } } 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 dc31f7ebe8..88d6888416 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,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> + <DefineConstants Condition="'$(TargetGroup)' == 'netcoreapp'">$(DefineConstants);netcoreapp</DefineConstants> </PropertyGroup> <ItemGroup> <Compile Include="System.Security.Cryptography.Primitives.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.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 e906ea472f..0000000000 --- a/src/System.Security.Cryptography.Primitives/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {}, - "netcoreapp1.1": {} - } -} diff --git a/src/System.Security.Cryptography.Primitives/src/Configurations.props b/src/System.Security.Cryptography.Primitives/src/Configurations.props new file mode 100644 index 0000000000..9c336c0be9 --- /dev/null +++ b/src/System.Security.Cryptography.Primitives/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.builds b/src/System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.builds deleted file mode 100644 index 3b971d883e..0000000000 --- a/src/System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.Security.Cryptography.Primitives.csproj" /> - <Project Include="System.Security.Cryptography.Primitives.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - 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 4c3ade43c0..311a8ca364 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> @@ -6,7 +6,6 @@ <AssemblyName>System.Security.Cryptography.Primitives</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net463'">None</ResourcesSourceOutputDirectory> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> @@ -14,10 +13,10 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Release|AnyCPU'" /> <ItemGroup Condition="'$(TargetGroup)' == 'net463'"> <ContractProject Include="..\ref\System.Security.Cryptography.Primitives.csproj"> - <TargetGroup>netstandard1.7</TargetGroup> + <TargetGroup>netstandard</TargetGroup> </ContractProject> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="System\Security\Cryptography\AsymmetricAlgorithm.cs" /> <Compile Include="System\Security\Cryptography\CipherMode.cs" /> <Compile Include="System\Security\Cryptography\CryptographicUnexpectedOperationException.cs" /> @@ -40,7 +39,12 @@ <TargetingPackReference Include="mscorlib" /> </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 f2d08ae29e..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-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.Security.Cryptography.Primitives/tests/Configurations.props b/src/System.Security.Cryptography.Primitives/tests/Configurations.props new file mode 100644 index 0000000000..c5a04c70ce --- /dev/null +++ b/src/System.Security.Cryptography.Primitives/tests/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3-Windows_NT; + netcoreapp1.1; + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.csproj b/src/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.csproj index 7d88276ffc..9376d7d4b7 100644 --- a/src/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.csproj +++ b/src/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.csproj @@ -1,25 +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" /> <Import Project="$(CommonTestPath)\Tests.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{101EB757-55A4-4F48-841C-C088640B8F57}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Security.Cryptography.Primitives.Tests</AssemblyName> - <RootNamespace>System.Security.Cryptography.Primitives.Tests</RootNamespace> - <NugetTargetMoniker Condition="'$(TargetGroup)'==''">.NETStandard,Version=v1.7</NugetTargetMoniker> <DefineConstants Condition="'$(TargetGroup)' == 'netcoreapp1.1'">$(DefineConstants);netcoreapp11;netstandard17</DefineConstants> <DefineConstants Condition="'$(TargetGroup)'==''">$(DefineConstants);netstandard17</DefineConstants> </PropertyGroup> <ItemGroup> - <ProjectReference Include="..\pkg\System.Security.Cryptography.Primitives.pkgproj"> - <Project>{D04A73AE-E418-4ACD-A132-7688435BE8B5}</Project> - <Name>System.Security.Cryptography.Primitives</Name> - </ProjectReference> - </ItemGroup> - <ItemGroup> <Compile Include="AsymmetricAlgorithm\Trivial.cs" /> <Compile Include="CryptoStream.cs" /> <Compile Include="HmacAlgorithmTest.cs" /> @@ -34,8 +22,8 @@ <Link>CommonTest\System\IO\PositionValueStream.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)'=='netcoreapp1.1'"> + <ItemGroup Condition="'$(TargetGroup)'=='netcoreapp1.1'"> <Compile Include="CryptoConfigTests.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file 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/Configurations.props b/src/System.Security.Cryptography.ProtectedData/src/Configurations.props new file mode 100644 index 0000000000..a6c74d0e58 --- /dev/null +++ b/src/System.Security.Cryptography.ProtectedData/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net46-Windows_NT; + netstandard1.3-Windows_NT; + netstandard1.3-Unix; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.builds b/src/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.builds deleted file mode 100644 index 083ced740b..0000000000 --- a/src/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.builds +++ /dev/null @@ -1,18 +0,0 @@ -<?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> - <Project Include="System.Security.Cryptography.ProtectedData.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.Security.Cryptography.ProtectedData.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.Security.Cryptography.ProtectedData.csproj"> - <OSGroup>Windows_NT</OSGroup> - <TargetGroup>net46</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - 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..c6b91b113e 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> @@ -11,7 +11,6 @@ <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net46'">None</ResourcesSourceOutputDirectory> <GeneratePlatformNotSupportedAssembly Condition="'$(TargetsUnix)' == 'true'">true</GeneratePlatformNotSupportedAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Release|AnyCPU'" /> @@ -50,7 +49,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 d82f99ad4b..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-24904-01", - "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" - } - } - } -} diff --git a/src/System.Security.Cryptography.ProtectedData/tests/Configurations.props b/src/System.Security.Cryptography.ProtectedData/tests/Configurations.props new file mode 100644 index 0000000000..5d77dc616e --- /dev/null +++ b/src/System.Security.Cryptography.ProtectedData/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Security.Cryptography.ProtectedData/tests/System.Security.Cryptography.ProtectedData.Tests.csproj b/src/System.Security.Cryptography.ProtectedData/tests/System.Security.Cryptography.ProtectedData.Tests.csproj index 6c3d82d638..c6151f5383 100644 --- a/src/System.Security.Cryptography.ProtectedData/tests/System.Security.Cryptography.ProtectedData.Tests.csproj +++ b/src/System.Security.Cryptography.ProtectedData/tests/System.Security.Cryptography.ProtectedData.Tests.csproj @@ -1,29 +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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <CLRTestKind>BuildAndRun</CLRTestKind> <ProjectGuid>{749ED7AD-E3C1-4611-99BD-C5D4B3934B3A}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Security.Cryptography.ProtectedData.Tests</AssemblyName> - <RootNamespace>System.Security.Cryptography.ProtectedData.Tests</RootNamespace> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <ItemGroup> - <ProjectReference Include="..\pkg\System.Security.Cryptography.ProtectedData.pkgproj"> - <Project>{FB39F994-1504-4B96-9588-E0385D3B73F1}</Project> - <Name>System.Security.Cryptography.ProtectedData</Name> - </ProjectReference> - </ItemGroup> - - <ItemGroup> <Compile Include="ProtectedDataTests.cs" /> <Compile Include="$(CommonTestPath)\System\Security\Cryptography\ByteUtils.cs"> <Link>CommonTest\System\Security\Cryptography\ByteUtils.cs</Link> </Compile> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.X509Certificates/dir.props b/src/System.Security.Cryptography.X509Certificates/dir.props index 1af9800f25..a960cef1a3 100644 --- a/src/System.Security.Cryptography.X509Certificates/dir.props +++ b/src/System.Security.Cryptography.X509Certificates/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.2.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.X509Certificates/ref/Configurations.props b/src/System.Security.Cryptography.X509Certificates/ref/Configurations.props new file mode 100644 index 0000000000..de35842580 --- /dev/null +++ b/src/System.Security.Cryptography.X509Certificates/ref/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7; + netcoreapp1.1; + </BuildConfigurations> + </PropertyGroup> +</Project> 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..e8841232ba 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,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)' == ''">.NETCoreApp,Version=v1.1</NuGetTargetMoniker> - <DefineConstants Condition="'$(TargetGroup)' == ''">$(DefineConstants);netcoreapp11</DefineConstants> + <DefineConstants Condition="'$(TargetGroup)'=='netcoreapp1.1'">$(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 f5c681666c..0000000000 --- a/src/System.Security.Cryptography.X509Certificates/ref/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "dependencies": { - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Algorithms": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Encoding": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Primitives": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {}, - "netcoreapp1.1": {} - } -} diff --git a/src/System.Security.Cryptography.X509Certificates/src/Configurations.props b/src/System.Security.Cryptography.X509Certificates/src/Configurations.props new file mode 100644 index 0000000000..8471cda58b --- /dev/null +++ b/src/System.Security.Cryptography.X509Certificates/src/Configurations.props @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard-Unix; + netstandard-Windows_NT; + net463-Windows_NT; + netcoreapp-Unix; + netcoreapp-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.builds b/src/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.builds deleted file mode 100644 index a3163ccda3..0000000000 --- a/src/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.builds +++ /dev/null @@ -1,26 +0,0 @@ -<?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> - <Project Include="System.Security.Cryptography.X509Certificates.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.Security.Cryptography.X509Certificates.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.Security.Cryptography.X509Certificates.csproj"> - <OSGroup>Unix</OSGroup> - <TargetGroup>netstandard1.7</TargetGroup> - </Project> - <Project Include="System.Security.Cryptography.X509Certificates.csproj"> - <OSGroup>Windows_NT</OSGroup> - <TargetGroup>netstandard1.7</TargetGroup> - </Project> - <Project Include="System.Security.Cryptography.X509Certificates.csproj"> - <OSGroup>Windows_NT</OSGroup> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - 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..10dd227a81 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,26 +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"> - <PropertyGroup> - <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Windows_Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{6F8576C2-6CD0-4DF3-8394-00B002D82E40}</ProjectGuid> <OutputType>Library</OutputType> <AssemblyName>System.Security.Cryptography.X509Certificates</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <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'" /> @@ -28,7 +14,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Release|AnyCPU'" /> <ItemGroup Condition="'$(TargetGroup)' == 'net463'"> <ContractProject Include="..\ref\System.Security.Cryptography.X509Certificates.csproj"> - <TargetGroup>netstandard1.7</TargetGroup> + <TargetGroup>netstandard</TargetGroup> </ContractProject> </ItemGroup> <ItemGroup Condition=" '$(IsPartialFacadeAssembly)' != 'true'"> @@ -308,5 +294,26 @@ <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> + <ItemGroup Condition="'$(TargetsUnix)' == 'true'"> + <Reference Include="System.Security.Cryptography.OpenSsl" /> + </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/facade/System.Security.Cryptography.X509Certificates.csproj b/src/System.Security.Cryptography.X509Certificates/src/facade/System.Security.Cryptography.X509Certificates.csproj index acb75f4c21..53441000c0 100644 --- a/src/System.Security.Cryptography.X509Certificates/src/facade/System.Security.Cryptography.X509Certificates.csproj +++ b/src/System.Security.Cryptography.X509Certificates/src/facade/System.Security.Cryptography.X509Certificates.csproj @@ -1,8 +1,5 @@ <?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)'==''">net46_Debug</Configuration> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <AssemblyName>System.Security.Cryptography.X509Certificates</AssemblyName> 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 0c1c1fb53e..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-24904-01", - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01" - } - }, - "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 3bc7a620c0..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-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.Globalization.Calendars": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Runtime.Numerics": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Algorithms": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Encoding": "4.4.0-beta-24904-01", - "System.Security.Cryptography.OpenSsl": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Primitives": "4.4.0-beta-24904-01", - "System.Security.SecureString": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - }, - "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 19f93141f6..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-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.Globalization.Calendars": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Watcher": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Runtime.Numerics": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Algorithms": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Cng": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Csp": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Encoding": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Primitives": "4.4.0-beta-24904-01", - "System.Security.SecureString": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {}, - "netcoreapp1.1": {} - } -} diff --git a/src/System.Security.Cryptography.X509Certificates/tests/Configurations.props b/src/System.Security.Cryptography.X509Certificates/tests/Configurations.props new file mode 100644 index 0000000000..5f727fa2c5 --- /dev/null +++ b/src/System.Security.Cryptography.X509Certificates/tests/Configurations.props @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.6-Unix; + netcoreapp1.1-Unix; + netstandard1.6-Windows_NT; + netcoreapp1.1-Windows_NT; + netstandard1.7-Unix; + netstandard1.7-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj b/src/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj index 0da376dd34..a96d95ea86 100644 --- a/src/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj +++ b/src/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj @@ -1,18 +1,9 @@ <?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> - <Configuration Condition=" '$(Configuration)' == '' ">Windows_Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{A28B0064-EFB2-4B77-B97C-DECF5DAB074E}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Security.Cryptography.X509Certificates.Tests</AssemblyName> - <RootNamespace>System.Security.Cryptography.X509Certificates.Tests</RootNamespace> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> <DefineConstants Condition="'$(TargetGroup)'==''">$(DefineConstants);netstandard17</DefineConstants> <DefineConstants Condition="'$(TargetGroup)'=='netcoreapp1.1'">$(DefineConstants);netstandard17;netcoreapp11</DefineConstants> </PropertyGroup> @@ -21,12 +12,6 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Release|AnyCPU'" /> <ItemGroup> - <ProjectReference Include="..\pkg\System.Security.Cryptography.X509Certificates.pkgproj"> - <Project>{6f8576c2-6cd0-4df3-8394-00b002d82e40}</Project> - <Name>System.Security.Cryptography.X509Certificates</Name> - </ProjectReference> - </ItemGroup> - <ItemGroup> <Compile Include="Cert.cs" /> <Compile Include="CertTests.cs" /> <Compile Include="ChainHolder.cs" /> @@ -87,4 +72,4 @@ <SupplementalTestData Include="$(PackagesDir)System.Security.Cryptography.X509Certificates.TestData\1.0.2-prerelease\content\**\*.*" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Xml/ref/project.json b/src/System.Security.Cryptography.Xml/ref/project.json deleted file mode 100644 index f53f8e32db..0000000000 --- a/src/System.Security.Cryptography.Xml/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Security.Cryptography.Xml/src/project.json b/src/System.Security.Cryptography.Xml/src/project.json deleted file mode 100644 index 6d22642f38..0000000000 --- a/src/System.Security.Cryptography.Xml/src/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "NetStandard.Library2": "2.0.0-beta-24814-01" - } - }, - "net462": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.Security.Permissions/dir.props b/src/System.Security.Permissions/dir.props index 86aacdb931..f254b412b5 100644 --- a/src/System.Security.Permissions/dir.props +++ b/src/System.Security.Permissions/dir.props @@ -3,5 +3,7 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.0.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> + <IsNETCoreAppRef>false</IsNETCoreAppRef> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Security.Permissions/ref/System.Security.Permissions.csproj b/src/System.Security.Permissions/ref/System.Security.Permissions.csproj index 68b0946877..b962a1e34c 100644 --- a/src/System.Security.Permissions/ref/System.Security.Permissions.csproj +++ b/src/System.Security.Permissions/ref/System.Security.Permissions.csproj @@ -1,16 +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" /> </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 41e12a869a..0000000000 --- a/src/System.Security.Permissions/ref/project.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "dependencies": { - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Security.AccessControl": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Primitives": "4.4.0-beta-24904-01", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24904-01", - "System.Security.Principal": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Security.Permissions/src/Configurations.props b/src/System.Security.Permissions/src/Configurations.props new file mode 100644 index 0000000000..53b62c64fe --- /dev/null +++ b/src/System.Security.Permissions/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net461-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Security.Permissions/src/System.Security.Permissions.builds b/src/System.Security.Permissions/src/System.Security.Permissions.builds deleted file mode 100644 index 9cf70858b8..0000000000 --- a/src/System.Security.Permissions/src/System.Security.Permissions.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.Security.Permissions.csproj" /> - <Project Include="System.Security.Permissions.csproj"> - <TargetGroup>net461</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Security.Permissions/src/System.Security.Permissions.csproj b/src/System.Security.Permissions/src/System.Security.Permissions.csproj index ec0314c447..e58498ceef 100644 --- a/src/System.Security.Permissions/src/System.Security.Permissions.csproj +++ b/src/System.Security.Permissions/src/System.Security.Permissions.csproj @@ -1,12 +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> <ProjectGuid>{07390899-C8F6-4E83-A3A9-6867B8CB46A0}</ProjectGuid> <RootNamespace>System.Security.Permissions</RootNamespace> <AssemblyName>System.Security.Permissions</AssemblyName> - <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.7</PackageTargetFramework> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard1.7</PackageTargetFramework> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <PackageAsRefAndLib Condition="'$(TargetGroup)' == 'net461'">true</PackageAsRefAndLib> </PropertyGroup> @@ -15,7 +14,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net461_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net461_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' != 'net461'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="System\Net\NetworkInformation\NetworkInformationAccess.cs" /> <Compile Include="System\Net\NetworkInformation\NetworkInformationPermission.cs" /> <Compile Include="System\Net\NetworkInformation\NetworkInformationPermissionAttribute.cs" /> @@ -114,16 +113,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)' == 'net461'"> <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 7d8fa80d30..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-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Security.AccessControl": "4.4.0-beta-24904-01", - "System.Security.Cryptography.Primitives": "4.4.0-beta-24904-01", - "System.Security.Cryptography.X509Certificates": "4.4.0-beta-24904-01", - "System.Security.Principal": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01" - } - }, - "net461": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.1": "1.0.1" - } - } - } -} diff --git a/src/System.Security.Permissions/tests/Configurations.props b/src/System.Security.Permissions/tests/Configurations.props new file mode 100644 index 0000000000..98f53209d4 --- /dev/null +++ b/src/System.Security.Permissions/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj b/src/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj index eab2950813..cc52d7f960 100644 --- a/src/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj +++ b/src/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj @@ -2,26 +2,12 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion> - <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>System.Security.Permissions.Tests</RootNamespace> - <AssemblyName>System.Security.Permissions.Tests</AssemblyName> <ProjectGuid>{492EC54D-D2C4-4B3F-AC1F-646B3F7EBB02}</ProjectGuid> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Security.Permissions.pkgproj"> - <Name>System.Security.Permissions</Name> - </ProjectReference> - <!-- Do not remove this P2P reference since part of the implementation of NonGeneric has moved to Runtime.Extensions --> - <ProjectReference Include="..\..\System.Runtime.Extensions\pkg\System.Runtime.Extensions.pkgproj" /> - <!-- Do not remove this P2P reference since part of the implementation of NonGeneric has moved to Runtime.Extensions --> - <ProjectReference Include="..\..\System.IO\pkg\System.IO.pkgproj" /> - </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == ''"> <Compile Include="PrincipalPermissionTests.cs" /> <Compile Include="SecurityElementTests.cs" /> diff --git a/src/System.Security.Principal.Windows/dir.props b/src/System.Security.Principal.Windows/dir.props index 503cf86a87..8f2003a937 100644 --- a/src/System.Security.Principal.Windows/dir.props +++ b/src/System.Security.Principal.Windows/dir.props @@ -1,7 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> + <IsNETCoreAppRef>false</IsNETCoreAppRef> </PropertyGroup> -</Project> - +</Project>
\ 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 92b251ff00..0000000000 --- a/src/System.Security.Principal.Windows/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.Security.Claims": "4.4.0-beta-24904-01", - "System.Security.Principal": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Security.Principal.Windows/src/Configurations.props b/src/System.Security.Principal.Windows/src/Configurations.props new file mode 100644 index 0000000000..2d365bdaa4 --- /dev/null +++ b/src/System.Security.Principal.Windows/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard-Windows_NT; + netstandard-Unix; + net463-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Security.Principal.Windows/src/System.Security.Principal.Windows.builds b/src/System.Security.Principal.Windows/src/System.Security.Principal.Windows.builds deleted file mode 100644 index e25a9a21e5..0000000000 --- a/src/System.Security.Principal.Windows/src/System.Security.Principal.Windows.builds +++ /dev/null @@ -1,17 +0,0 @@ -<?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> - <Project Include="System.Security.Principal.Windows.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.Security.Principal.Windows.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.Security.Principal.Windows.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - 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..6d5cc13930 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,8 +1,5 @@ -<?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>{F9E9894E-2513-4085-9046-311AD49D8AE6}</ProjectGuid> @@ -11,14 +8,13 @@ <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net463'">None</ResourcesSourceOutputDirectory> <GeneratePlatformNotSupportedAssembly Condition="'$(TargetsUnix)' == 'true'">true</GeneratePlatformNotSupportedAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the options --> <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' AND '$(TargetsWindows)' == 'true'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard' AND '$(TargetsWindows)' == 'true'"> <Compile Include="Microsoft\Win32\SafeHandles\SafeAccessTokenHandle.cs" /> <Compile Include="Microsoft\Win32\SafeHandles\SafeSecurityHandles.cs" /> <Compile Include="System\Security\Principal\IdentityNotMappedException.cs" /> @@ -185,7 +181,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 40604bb527..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-24904-01", - "Microsoft.Win32.Primitives": "4.4.0-beta-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Security.Claims": "4.4.0-beta-24904-01", - "System.Security.Principal": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.Security.Principal.Windows/tests/Configurations.props b/src/System.Security.Principal.Windows/tests/Configurations.props new file mode 100644 index 0000000000..e82727004a --- /dev/null +++ b/src/System.Security.Principal.Windows/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj b/src/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj index 18cfa4590e..99643a605a 100644 --- a/src/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj +++ b/src/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj @@ -1,17 +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> - <Configuration Condition=" '$(Configuration)' == '' ">Windows_Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <AssemblyName>System.Security.Principal.Windows.Tests</AssemblyName> - <RootNamespace>System.Security.Principal.Windows.Tests</RootNamespace> <ProjectGuid>{6C36F3AC-54A1-4021-9F5D-CDEFF7347277}</ProjectGuid> - <NugetTargetMoniker>.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <ItemGroup> <Compile Include="WindowsIdentityTests.cs" /> @@ -20,11 +11,5 @@ <Link>Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Security.Principal.Windows.pkgproj"> - <Project>{f9e9894e-2513-4085-9046-311ad49d8ae6}</Project> - <Name>System.Security.Principal.Windows</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Principal/dir.props b/src/System.Security.Principal/dir.props index fcc1a7ca5a..bfbc5bd9e0 100644 --- a/src/System.Security.Principal/dir.props +++ b/src/System.Security.Principal/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ No newline at end of file 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 f53f8e32db..0000000000 --- a/src/System.Security.Principal/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Security.Principal/src/Configurations.props b/src/System.Security.Principal/src/Configurations.props new file mode 100644 index 0000000000..f013d10b8c --- /dev/null +++ b/src/System.Security.Principal/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + uap101aot-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Security.Principal/src/System.Security.Principal.builds b/src/System.Security.Principal/src/System.Security.Principal.builds deleted file mode 100644 index f4a8646edb..0000000000 --- a/src/System.Security.Principal/src/System.Security.Principal.builds +++ /dev/null @@ -1,15 +0,0 @@ -<?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> - <Project Include="System.Security.Principal.csproj" /> - <Project Include="System.Security.Principal.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - <Project Include="System.Security.Principal.csproj"> - <TargetGroup>uap101aot</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Security.Principal/src/System.Security.Principal.csproj b/src/System.Security.Principal/src/System.Security.Principal.csproj index bf72ac681f..659655a444 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> @@ -7,16 +7,15 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net463'">None</ResourcesSourceOutputDirectory> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.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> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> </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)' == 'net463_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="System\Security\Principal\IIdentity.cs" /> <Compile Include="System\Security\Principal\IPrincipal.cs" /> <Compile Include="System\Security\Principal\PrincipalPolicy.cs" /> @@ -26,7 +25,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 d5b3b5afa4..0000000000 --- a/src/System.Security.Principal/src/project.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "frameworks": { - "netstandard1.7": { - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - }, - "uap10.1": { - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01" - } - } - } -} 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 828c2f9210..0000000000 --- a/src/System.Security.SecureString/ref/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Security.SecureString/src/Configurations.props b/src/System.Security.SecureString/src/Configurations.props new file mode 100644 index 0000000000..9c336c0be9 --- /dev/null +++ b/src/System.Security.SecureString/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Security.SecureString/src/System.Security.SecureString.builds b/src/System.Security.SecureString/src/System.Security.SecureString.builds deleted file mode 100644 index e6b964e1bb..0000000000 --- a/src/System.Security.SecureString/src/System.Security.SecureString.builds +++ /dev/null @@ -1,15 +0,0 @@ -<?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> - <Project Include="System.Security.SecureString.csproj" /> - <Project Include="System.Security.SecureString.csproj"> - <TargetGroup>net463</TargetGroup> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.Security.SecureString.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> diff --git a/src/System.Security.SecureString/src/System.Security.SecureString.csproj b/src/System.Security.SecureString/src/System.Security.SecureString.csproj index bc7f024b98..62b7fdf3f8 100644 --- a/src/System.Security.SecureString/src/System.Security.SecureString.csproj +++ b/src/System.Security.SecureString/src/System.Security.SecureString.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"> - <PropertyGroup> - <Configuration Condition="'$(Configuration)'=='' AND '$(TargetGroup)' == ''">Windows_Debug</Configuration> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{A958BBDD-3238-4E58-AB7F-390AB6D88233}</ProjectGuid> <RootNamespace>System.Security.SecureString</RootNamespace> <AssemblyName>System.Security.SecureString</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> @@ -19,12 +15,13 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <TargetingPackReference Include="System.Private.CoreLib" /> </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 882af5ba33..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-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01" - } - } - } -} diff --git a/src/System.Security.SecureString/tests/Configurations.props b/src/System.Security.SecureString/tests/Configurations.props new file mode 100644 index 0000000000..f0ebe53119 --- /dev/null +++ b/src/System.Security.SecureString/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Security.SecureString/tests/System.Security.SecureString.Tests.csproj b/src/System.Security.SecureString/tests/System.Security.SecureString.Tests.csproj index a4c8e0a525..5d5b83e2b2 100644 --- a/src/System.Security.SecureString/tests/System.Security.SecureString.Tests.csproj +++ b/src/System.Security.SecureString/tests/System.Security.SecureString.Tests.csproj @@ -1,18 +1,9 @@ -<?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)'==''">Debug</Configuration> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{69609238-62C7-479D-A8CE-709F41101D3C}</ProjectGuid> - <OutputType>Library</OutputType> - <RootNamespace>System.Security.SecureString.Tests</RootNamespace> - <AssemblyName>System.Security.SecureString.Tests</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> @@ -20,13 +11,5 @@ <ItemGroup> <Compile Include="SecureStringTests.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Security.SecureString.pkgproj"> - <Project>{A958BBDD-3238-4E58-AB7F-390AB6D88233}</Project> - <Name>System.Security.SecureString</Name> - <OSGroup>$(InputOSGroup)</OSGroup> - </ProjectReference> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file 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 803c8de8f9..0000000000 --- a/src/System.ServiceProcess.ServiceController/ref/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.ServiceProcess.ServiceController/src/Configurations.props b/src/System.ServiceProcess.ServiceController/src/Configurations.props new file mode 100644 index 0000000000..2d365bdaa4 --- /dev/null +++ b/src/System.ServiceProcess.ServiceController/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard-Windows_NT; + netstandard-Unix; + net463-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.builds b/src/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.builds deleted file mode 100644 index 11e4ca9891..0000000000 --- a/src/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.builds +++ /dev/null @@ -1,17 +0,0 @@ -<?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> - <Project Include="System.ServiceProcess.ServiceController.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.ServiceProcess.ServiceController.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.ServiceProcess.ServiceController.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj b/src/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj index 6ac21515b7..5e274a4e59 100644 --- a/src/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj +++ b/src/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj @@ -1,8 +1,5 @@ -<?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> <RootNamespace>System.ServiceProcess.ServiceController</RootNamespace> @@ -12,14 +9,13 @@ <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net463'">None</ResourcesSourceOutputDirectory> <GeneratePlatformNotSupportedAssembly Condition="'$(TargetsUnix)' == 'true'">true</GeneratePlatformNotSupportedAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <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' AND '$(TargetsWindows)' == 'true'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard' AND '$(TargetsWindows)' == 'true'"> <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs"> <Link>Common\Interop\Windows\Interop.Libraries.cs</Link> </Compile> @@ -80,7 +76,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 af781393ed..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-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.1": "1.0.1" - } - } - } -} diff --git a/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestNativeService/System.ServiceProcess.ServiceController.TestNativeService.vcxproj b/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestNativeService/System.ServiceProcess.ServiceController.TestNativeService.vcxproj index 6733d2044c..b1d4b25c07 100644 --- a/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestNativeService/System.ServiceProcess.ServiceController.TestNativeService.vcxproj +++ b/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestNativeService/System.ServiceProcess.ServiceController.TestNativeService.vcxproj @@ -1,6 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <PropertyGroup> + <IsTestProject>true</IsTestProject> + </PropertyGroup> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Release|x64"> <Configuration>Release</Configuration> @@ -59,6 +62,7 @@ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> </ItemGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> diff --git a/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests/Configurations.props b/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests/Configurations.props new file mode 100644 index 0000000000..502bd149bb --- /dev/null +++ b/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.4-Windows_NT; + netstandard1.7-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests/System.ServiceProcess.ServiceController.Tests.csproj b/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests/System.ServiceProcess.ServiceController.Tests.csproj index 60533caf5a..3f4a2bb595 100644 --- a/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests/System.ServiceProcess.ServiceController.Tests.csproj +++ b/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests/System.ServiceProcess.ServiceController.Tests.csproj @@ -1,14 +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> - <RootNamespace>System.ServiceProcess.ServiceController.Tests</RootNamespace> - <AssemblyName>System.ServiceProcess.ServiceController.Tests</AssemblyName> <ProjectGuid>{F7D9984B-02EB-4573-84EF-00FFFBFB872C}</ProjectGuid> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Debug|AnyCPU'" /> @@ -17,12 +11,6 @@ <Compile Include="SafeServiceControllerTests.cs" /> <Compile Include="ServiceControllerTests.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\pkg\System.ServiceProcess.ServiceController.pkgproj"> - <Project>{f4821cb6-91a3-4546-bc4f-e00dbfbdaa05}</Project> - <Name>System.ServiceProcess.ServiceController</Name> - </ProjectReference> - </ItemGroup> <ItemGroup Condition="'$(TargetsWindows)'=='true' AND '$(Platform)'!='arm64'"> <ProjectReference Include="..\System.ServiceProcess.ServiceController.TestNativeService\System.ServiceProcess.ServiceController.TestNativeService.vcxproj"> <Project>{ceb0775c-4273-4ac4-b50e-4492718051ae}</Project> @@ -33,4 +21,4 @@ </ProjectReference> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Text.Encoding.CodePages/dir.props b/src/System.Text.Encoding.CodePages/dir.props index fcc1a7ca5a..8f2003a937 100644 --- a/src/System.Text.Encoding.CodePages/dir.props +++ b/src/System.Text.Encoding.CodePages/dir.props @@ -3,5 +3,7 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> + <IsNETCoreAppRef>false</IsNETCoreAppRef> </PropertyGroup> </Project>
\ No newline at end of file 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 d91ed6aece..0000000000 --- a/src/System.Text.Encoding.CodePages/ref/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Text.Encoding.CodePages/src/Configurations.props b/src/System.Text.Encoding.CodePages/src/Configurations.props new file mode 100644 index 0000000000..3d4674aeac --- /dev/null +++ b/src/System.Text.Encoding.CodePages/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard-Unix; + netstandard-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.builds b/src/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.builds deleted file mode 100644 index 561d1262ef..0000000000 --- a/src/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.builds +++ /dev/null @@ -1,14 +0,0 @@ -<?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> - <Project Include="System.Text.Encoding.CodePages.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.Text.Encoding.CodePages.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - 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 b8a4e7a5fa..7cc0a4ec82 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,18 +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"> - <PropertyGroup> - <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Windows_Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{16EE6633-F557-5C9E-9EF3-B5334B044F47}</ProjectGuid> <OutputType>Library</OutputType> <RootNamespace>System.Text.Encoding.CodePages</RootNamespace> <AssemblyName>System.Text.Encoding.CodePages</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <ItemGroup Condition="'$(TargetsWindows)' == 'true'"> <PackageTargetFramework Include="netstandard1.7" /> @@ -71,7 +65,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 --> @@ -86,4 +88,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 2a049d2f8c..0000000000 --- a/src/System.Text.Encoding.CodePages/src/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "dependencies": { - "System.Collections": "4.4.0-beta-24904-01", - "System.Diagnostics.Contracts": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Text.Encoding.CodePages/tests/Configurations.props b/src/System.Text.Encoding.CodePages/tests/Configurations.props new file mode 100644 index 0000000000..2a160a39e8 --- /dev/null +++ b/src/System.Text.Encoding.CodePages/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3-Windows_NT; + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.csproj b/src/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.csproj index 11c1b7e364..68ad04ccd4 100644 --- a/src/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.csproj +++ b/src/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.csproj @@ -1,14 +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"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Text.Encoding.CodePages.Tests</AssemblyName> - <RootNamespace>System.Text.Encoding.CodePages.Tests</RootNamespace> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> @@ -22,11 +16,5 @@ <Link>Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Text.Encoding.CodePages.pkgproj"> - <Project>{16EE6633-F557-5C9E-9EF3-B5334B044F47}</Project> - <Name>System.Text.Encoding.CodePages</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Text.Encoding.Extensions/dir.props b/src/System.Text.Encoding.Extensions/dir.props index 503cf86a87..bfbc5bd9e0 100644 --- a/src/System.Text.Encoding.Extensions/dir.props +++ b/src/System.Text.Encoding.Extensions/dir.props @@ -1,7 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> - +</Project>
\ No newline at end of file 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/Configurations.props b/src/System.Text.Encoding.Extensions/src/Configurations.props new file mode 100644 index 0000000000..9c336c0be9 --- /dev/null +++ b/src/System.Text.Encoding.Extensions/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Text.Encoding.Extensions/src/System.Text.Encoding.Extensions.builds b/src/System.Text.Encoding.Extensions/src/System.Text.Encoding.Extensions.builds deleted file mode 100644 index 00364a57a5..0000000000 --- a/src/System.Text.Encoding.Extensions/src/System.Text.Encoding.Extensions.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.Text.Encoding.Extensions.csproj" /> - <Project Include="System.Text.Encoding.Extensions.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - 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..68adccc588 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,10 +1,9 @@ -<?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> <AssemblyName>System.Text.Encoding.Extensions</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -19,10 +18,10 @@ </PropertyGroup> <ItemGroup> <TargetingPackReference Include="mscorlib" Condition="'$(TargetGroup)' == 'net463'" /> - <TargetingPackReference Include="System.Private.CoreLib" Condition="'$(TargetGroup)' != 'net463'" /> + <TargetingPackReference Include="System.Private.CoreLib" Condition="'$(TargetGroup)' == 'netstandard'" /> </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/netcore50aot/project.json b/src/System.Text.Encoding.Extensions/src/netcore50aot/project.json deleted file mode 100644 index e0b980805d..0000000000 --- a/src/System.Text.Encoding.Extensions/src/netcore50aot/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "frameworks": { - "netcore50": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24904-00" - } - } - } -} 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 4ba699b0b8..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-24904-03" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Text.Encoding.Extensions/tests/Configurations.props b/src/System.Text.Encoding.Extensions/tests/Configurations.props new file mode 100644 index 0000000000..512c938bad --- /dev/null +++ b/src/System.Text.Encoding.Extensions/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Text.Encoding.Extensions/tests/System.Text.Encoding.Extensions.Tests.csproj b/src/System.Text.Encoding.Extensions/tests/System.Text.Encoding.Extensions.Tests.csproj index 10e0c55c77..33c117b9c5 100644 --- a/src/System.Text.Encoding.Extensions/tests/System.Text.Encoding.Extensions.Tests.csproj +++ b/src/System.Text.Encoding.Extensions/tests/System.Text.Encoding.Extensions.Tests.csproj @@ -1,15 +1,9 @@ -<?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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Text.Encoding.Extensions.Tests</AssemblyName> - <RootNamespace>System.Text.Encoding.Extensions.Tests</RootNamespace> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> diff --git a/src/System.Text.Encoding/dir.props b/src/System.Text.Encoding/dir.props index 503cf86a87..bfbc5bd9e0 100644 --- a/src/System.Text.Encoding/dir.props +++ b/src/System.Text.Encoding/dir.props @@ -1,7 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> - +</Project>
\ No newline at end of file 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 f53f8e32db..0000000000 --- a/src/System.Text.Encoding/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Text.Encoding/src/Configurations.props b/src/System.Text.Encoding/src/Configurations.props new file mode 100644 index 0000000000..a25a6691e3 --- /dev/null +++ b/src/System.Text.Encoding/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + uap101aot-Windows_NT; + net463-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Text.Encoding/src/System.Text.Encoding.builds b/src/System.Text.Encoding/src/System.Text.Encoding.builds deleted file mode 100644 index 542c74bae9..0000000000 --- a/src/System.Text.Encoding/src/System.Text.Encoding.builds +++ /dev/null @@ -1,16 +0,0 @@ -<?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> - <Project Include="System.Text.Encoding.csproj" /> - <Project Include="System.Text.Encoding.csproj"> - <OSGroup>Windows_NT</OSGroup> - <TargetGroup>uap101aot</TargetGroup> - </Project> - <Project Include="System.Text.Encoding.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Text.Encoding/src/System.Text.Encoding.csproj b/src/System.Text.Encoding/src/System.Text.Encoding.csproj index fc099e8170..5ba0f9380a 100644 --- a/src/System.Text.Encoding/src/System.Text.Encoding.csproj +++ b/src/System.Text.Encoding/src/System.Text.Encoding.csproj @@ -1,12 +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> <AssemblyName>System.Text.Encoding</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.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> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -20,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.Text.Encoding/src/netcore50aot/project.json b/src/System.Text.Encoding/src/netcore50aot/project.json deleted file mode 100644 index e0b980805d..0000000000 --- a/src/System.Text.Encoding/src/netcore50aot/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "frameworks": { - "netcore50": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24904-00" - } - } - } -} diff --git a/src/System.Text.Encoding/src/project.json b/src/System.Text.Encoding/src/project.json deleted file mode 100644 index 8d08b0427c..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-24904-03" - } - }, - "uap10.1": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24904-00" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Text.Encoding/tests/Configurations.props b/src/System.Text.Encoding/tests/Configurations.props new file mode 100644 index 0000000000..512c938bad --- /dev/null +++ b/src/System.Text.Encoding/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Text.Encoding/tests/Performance/System.Text.Encoding.Performance.Tests.csproj b/src/System.Text.Encoding/tests/Performance/System.Text.Encoding.Performance.Tests.csproj index 72404c6b82..03e7ee7120 100644 --- a/src/System.Text.Encoding/tests/Performance/System.Text.Encoding.Performance.Tests.csproj +++ b/src/System.Text.Encoding/tests/Performance/System.Text.Encoding.Performance.Tests.csproj @@ -1,12 +1,9 @@ -<?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> - <AssemblyName>System.Text.Encoding.Performance.Tests</AssemblyName> - <RootNamespace>System.Text.Encoding.Performance.Tests</RootNamespace> <IncludePerformanceTests>true</IncludePerformanceTests> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> diff --git a/src/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj b/src/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj index 69248fe517..3d2d071fb1 100644 --- a/src/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj +++ b/src/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj @@ -1,15 +1,9 @@ -<?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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Text.Encoding.Tests</AssemblyName> - <RootNamespace>System.Text.Encoding.Tests</RootNamespace> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NugetTargetMoniker Condition="'$(TargetGroup)'==''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -79,19 +73,16 @@ <Compile Include="UTF8Encoding\UTF8EncodingTests.cs" /> <Compile Include="$(CommonTestPath)\System\RandomDataGenerator.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == ''"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard1.7'"> <Compile Include="Encoding\Encoding.netstandard1.7.cs" /> <Compile Include="UnicodeEncoding\UnicodeEncoding.netstandard1.7.cs" /> <Compile Include="Decoder\Decoder.netstandard1.7.cs" /> <Compile Include="Encoder\Encoder.netstandard1.7.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\System.Text.Encoding.Extensions\pkg\System.Text.Encoding.Extensions.pkgproj"> - <Name>System.Text.Encoding.Extensions</Name> - </ProjectReference> - <ProjectReference Include="..\..\System.Runtime\pkg\System.Runtime.pkgproj"> - <Name>System.Runtime</Name> - </ProjectReference> + <Compile Include="$(CommonTestPath)\System\RuntimeDetection.cs"> + <Link>Common\System\RuntimeDetection.cs</Link> + </Compile> </ItemGroup> <ItemGroup> <Compile Include="$(CommonTestPath)\System\RuntimeDetection.cs"> diff --git a/src/System.Text.Encodings.Web/src/Configurations.props b/src/System.Text.Encodings.Web/src/Configurations.props new file mode 100644 index 0000000000..2ec0365c0d --- /dev/null +++ b/src/System.Text.Encodings.Web/src/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.0; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.builds b/src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.builds deleted file mode 100644 index a2507430c9..0000000000 --- a/src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.builds +++ /dev/null @@ -1,9 +0,0 @@ -<?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> - <Project Include="System.Text.Encodings.Web.csproj" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - 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..51b8e895e3 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> @@ -8,7 +8,6 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <UseOpenKey Condition="'$(UseOpenKey)'==''">true</UseOpenKey> <DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.0</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -35,7 +34,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 9138c9e187..0000000000 --- a/src/System.Text.Encodings.Web/src/project.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "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": {} - } -} diff --git a/src/System.Text.Encodings.Web/tests/Configurations.props b/src/System.Text.Encodings.Web/tests/Configurations.props new file mode 100644 index 0000000000..f0ebe53119 --- /dev/null +++ b/src/System.Text.Encodings.Web/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.csproj b/src/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.csproj index b6801a12bd..a7116b66cd 100644 --- a/src/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.csproj +++ b/src/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <AssemblyName>System.Text.Encodings.Web.Tests</AssemblyName> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid> - <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>System.Text.Encodings.Web.Tests</RootNamespace> <FileAlignment>512</FileAlignment> <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> - <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <ItemGroup> @@ -49,17 +42,8 @@ <Compile Include="UrlEncoderTests.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\pkg\System.Text.Encodings.Web.pkgproj"> - <Project>{1dd0ff15-6234-4bd6-850a-317f05479554}</Project> - <Name>System.Text.Encodings.Web</Name> - </ProjectReference> - </ItemGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <ItemGroup> <EmbeddedResource Include="$(CommonTestPath)\Data\UnicodeData.8.0.txt"> - <LogicalName>UnicodeData.8.0.txt</LogicalName> + <LogicalName>UnicodeData.8.0.txt</LogicalName> </EmbeddedResource> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> diff --git a/src/System.Text.RegularExpressions/dir.props b/src/System.Text.RegularExpressions/dir.props index 7bb155c44e..a960cef1a3 100644 --- a/src/System.Text.RegularExpressions/dir.props +++ b/src/System.Text.RegularExpressions/dir.props @@ -1,7 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.2.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> - +</Project>
\ 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 4df590bc6f..0000000000 --- a/src/System.Text.RegularExpressions/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {}, - "netcoreapp1.1": {} - } -} diff --git a/src/System.Text.RegularExpressions/src/Configurations.props b/src/System.Text.RegularExpressions/src/Configurations.props new file mode 100644 index 0000000000..53b62c64fe --- /dev/null +++ b/src/System.Text.RegularExpressions/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net461-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.builds b/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.builds deleted file mode 100644 index f51c6b6b6f..0000000000 --- a/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.builds +++ /dev/null @@ -1,11 +0,0 @@ -<?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> - <Project Include="System.Text.RegularExpressions.csproj" /> - <Project Include="System.Text.RegularExpressions.csproj"> - <TargetGroup>net461</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project>
\ No newline at end of file diff --git a/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj b/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj index 13d2bf20d9..efe1463b87 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> @@ -6,19 +6,18 @@ <AssemblyName>System.Text.RegularExpressions</AssemblyName> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net461'">true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net461'">None</ResourcesSourceOutputDirectory> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'netstandard1.7_Debug|AnyCPU' " /> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'netstandard1.7_Release|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'netstandard_Debug|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'netstandard_Release|AnyCPU' " /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net461_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net461_Release|AnyCPU'" /> <ItemGroup Condition="'$(TargetGroup)' == 'net461'"> <ContractProject Include="..\ref\System.Text.RegularExpressions.csproj"> - <TargetGroup>netstandard1.7</TargetGroup> + <TargetGroup>netstandard</TargetGroup> </ContractProject> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' != 'net461'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="System\Text\RegularExpressions\HashtableExtensions.cs" /> <Compile Include="System\Text\RegularExpressions\Regex.cs" /> <Compile Include="System\Text\RegularExpressions\RegexBoyerMoore.cs" /> @@ -55,7 +54,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 2c57c56046..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-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - } - }, - "net461": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.1": "1.0.1" - } - } - } -} diff --git a/src/System.Text.RegularExpressions/tests/Configurations.props b/src/System.Text.RegularExpressions/tests/Configurations.props new file mode 100644 index 0000000000..cf92a56f64 --- /dev/null +++ b/src/System.Text.RegularExpressions/tests/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.6; + netcoreapp1.1; + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj b/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj index 41da08ed20..fb97d1b25b 100644 --- a/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj +++ b/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj @@ -1,15 +1,9 @@ -<?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> - <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{94B106C2-D574-4392-80AB-3EE308A078DF}</ProjectGuid> - <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> - <AssemblyName>System.Text.RegularExpressions.Tests</AssemblyName> - <NugetTargetMoniker Condition=" '$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'netstandard1.7_Debug|AnyCPU' "> @@ -48,16 +42,6 @@ <Link>System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Text.RegularExpressions.pkgproj"> - <Project>{be28323e-327a-4e0f-b7f9-16ab7eab59dd}</Project> - <Name>System.Text.RegularExpressions</Name> - </ProjectReference> - </ItemGroup> <!-- Automatically added by VS --> - <ItemGroup> - <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" /> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file 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/Configurations.props b/src/System.Threading.AccessControl/src/Configurations.props new file mode 100644 index 0000000000..a6c74d0e58 --- /dev/null +++ b/src/System.Threading.AccessControl/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net46-Windows_NT; + netstandard1.3-Windows_NT; + netstandard1.3-Unix; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Threading.AccessControl/src/System.Threading.AccessControl.builds b/src/System.Threading.AccessControl/src/System.Threading.AccessControl.builds deleted file mode 100644 index 1afb5661dc..0000000000 --- a/src/System.Threading.AccessControl/src/System.Threading.AccessControl.builds +++ /dev/null @@ -1,18 +0,0 @@ -<?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> - <Project Include="System.Threading.AccessControl.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.Threading.AccessControl.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.Threading.AccessControl.csproj"> - <OSGroup>Windows_NT</OSGroup> - <TargetGroup>net46</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj b/src/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj index a8ccc5bb27..cfc15e8e4f 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> @@ -9,14 +9,13 @@ <ProjectGuid>{E3ED83FD-3015-4BD8-A1B8-6294986E6CFA}</ProjectGuid> <GeneratePlatformNotSupportedAssembly Condition="'$(TargetsUnix)' == 'true'">true</GeneratePlatformNotSupportedAssembly> <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net46'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker> </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)' == 'net46_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)'=='' AND '$(TargetsWindows)'=='true'"> + <ItemGroup Condition="'$(TargetGroup)'=='netstandard1.3' AND '$(TargetsWindows)'=='true'"> <Compile Include="$(CommonPath)\Interop\Windows\Interop.Errors.cs"> <Link>Common\Interop\Windows\Interop.Errors.cs</Link> </Compile> @@ -31,7 +30,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.AccessControl/tests/Configurations.props b/src/System.Threading.AccessControl/tests/Configurations.props new file mode 100644 index 0000000000..5d77dc616e --- /dev/null +++ b/src/System.Threading.AccessControl/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj b/src/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj index c5881026e5..b2e9b5766f 100644 --- a/src/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj +++ b/src/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj @@ -1,23 +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> <ProjectGuid>{D77FBA6C-1AA6-45A4-93E2-97A370672C53}</ProjectGuid> - <AssemblyName>System.Threading.AccessControl.Tests</AssemblyName> - <RootNamespace>System.Threading.AccessControl.Tests</RootNamespace> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <ItemGroup> <Compile Include="MutexSecurityTests.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Threading.AccessControl.pkgproj"> - <Project>{E3ED83FD-3015-4BD8-A1B8-6294986E6CFA}</Project> - <Name>System.Threading.AccessControl</Name> - <OSGroup>$(InputOSGroup)</OSGroup> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Threading.Overlapped/dir.props b/src/System.Threading.Overlapped/dir.props index fcc1a7ca5a..bfbc5bd9e0 100644 --- a/src/System.Threading.Overlapped/dir.props +++ b/src/System.Threading.Overlapped/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 f53f8e32db..0000000000 --- a/src/System.Threading.Overlapped/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Threading.Overlapped/src/Configurations.props b/src/System.Threading.Overlapped/src/Configurations.props new file mode 100644 index 0000000000..54621aaa25 --- /dev/null +++ b/src/System.Threading.Overlapped/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard-Windows_NT; + netstandard-Unix; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Threading.Overlapped/src/System.Threading.Overlapped.builds b/src/System.Threading.Overlapped/src/System.Threading.Overlapped.builds deleted file mode 100644 index f5ee1e4ccd..0000000000 --- a/src/System.Threading.Overlapped/src/System.Threading.Overlapped.builds +++ /dev/null @@ -1,18 +0,0 @@ -<?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> - <Project Include="System.Threading.Overlapped.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.Threading.Overlapped.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.Threading.Overlapped.csproj"> - <OSGroup>Windows_NT</OSGroup> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Threading.Overlapped/src/System.Threading.Overlapped.csproj b/src/System.Threading.Overlapped/src/System.Threading.Overlapped.csproj index 45000cf1ab..6e58354a7e 100644 --- a/src/System.Threading.Overlapped/src/System.Threading.Overlapped.csproj +++ b/src/System.Threading.Overlapped/src/System.Threading.Overlapped.csproj @@ -1,27 +1,19 @@ -<?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> <AssemblyName>System.Threading.Overlapped</AssemblyName> <ProjectGuid>{6A07CCB8-3E59-47e7-B3DD-DB1F6FC501D5}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='' OR '$(TargetGroup)'=='net463'">true</IsPartialFacadeAssembly> + <IsPartialFacadeAssembly Condition="'$(TargetsWindows)' == 'true'">true</IsPartialFacadeAssembly> <GeneratePlatformNotSupportedAssembly Condition="'$(TargetsUnix)' == 'true'">true</GeneratePlatformNotSupportedAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> - </PropertyGroup> - <PropertyGroup Condition="'$(TargetsUnix)' == 'true'"> - <ProjectJson>unix/project.json</ProjectJson> - <ProjectLockJson>unix/project.lock.json</ProjectLockJson> </PropertyGroup> <!-- Help VS understand available configurations --> <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)'=='' AND '$(TargetsWindows)' == 'true'"> + <ItemGroup Condition="'$(TargetGroup)'=='netstandard' AND '$(TargetsWindows)' == 'true'"> <ProjectReference Include="..\..\System.Diagnostics.Debug\src\System.Diagnostics.Debug.csproj"> <Project>{E7E8DE8A-9EC1-46A8-A6EE-727DB32DBEB8}</Project> <Name>System.Diagnostics.Debug</Name> @@ -33,7 +25,7 @@ <Link>Common\System\HResults.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition="('$(TargetGroup)'=='' AND '$(TargetsWindows)' == 'true') OR '$(TargetGroup)'=='net463'"> + <ItemGroup Condition="('$(TargetGroup)'=='netstandard' AND '$(TargetsWindows)' == 'true') OR '$(TargetGroup)'=='net463'"> <Compile Include="System\Threading\ClrThreadPoolBoundHandle.cs" /> <Compile Include="System\Threading\ClrThreadPoolBoundHandleOverlapped.cs" /> <Compile Include="System\Threading\ClrThreadPoolPreAllocatedOverlapped.cs" /> @@ -45,8 +37,14 @@ <Link>Common\NotImplemented.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)'==''"> + <ItemGroup Condition="'$(TargetGroup)'=='netstandard' AND '$(TargetsWindows)' == 'true'"> <TargetingPackReference Include="System.Private.CoreLib" /> + <Reference Include="System.Private.CoreLib" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetGroup)'=='netstandard' AND '$(TargetsWindows)' != 'true'"> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Runtime.Handles" /> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)'=='netcore50'"> <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs"> @@ -66,8 +64,5 @@ <Compile Include="System\Threading\Win32ThreadPoolNativeOverlapped.cs" /> <Compile Include="System\Threading\Win32ThreadPoolPreAllocatedOverlapped.cs" /> </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.Threading.Overlapped/src/project.json b/src/System.Threading.Overlapped/src/project.json deleted file mode 100644 index eef219cc12..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-24904-03" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.Threading.Overlapped/src/unix/project.json b/src/System.Threading.Overlapped/src/unix/project.json deleted file mode 100644 index 7a087e762b..0000000000 --- a/src/System.Threading.Overlapped/src/unix/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Threading.Overlapped/tests/Configurations.props b/src/System.Threading.Overlapped/tests/Configurations.props new file mode 100644 index 0000000000..9899767269 --- /dev/null +++ b/src/System.Threading.Overlapped/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3-Windows_NT; + netstandard1.7-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.csproj b/src/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.csproj index 04ab24b66a..5a1b4761fb 100644 --- a/src/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.csproj +++ b/src/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.csproj @@ -1,17 +1,9 @@ -<?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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <AssemblyName>System.Threading.Overlapped.Tests</AssemblyName> <ProjectGuid>{861A3318-35AD-46ac-8257-8D5D2479BAD9}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NugetTargetMoniker Condition="'$(TargetGroup)'==''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -34,9 +26,5 @@ <ItemGroup Condition="'$(TargetGroup)'==''"> <Compile Include="OverlappedTests.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Threading.Overlapped.pkgproj" /> - <ProjectReference Include="..\..\System.Threading.ThreadPool\pkg\System.Threading.ThreadPool.pkgproj" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Threading.Tasks.Dataflow/dir.props b/src/System.Threading.Tasks.Dataflow/dir.props index 564b51b9c7..27e83b25d3 100644 --- a/src/System.Threading.Tasks.Dataflow/dir.props +++ b/src/System.Threading.Tasks.Dataflow/dir.props @@ -1,8 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <PackageVersion>4.8.0</PackageVersion> <AssemblyVersion>4.6.2.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Threading.Tasks.Dataflow/src/Configurations.props b/src/System.Threading.Tasks.Dataflow/src/Configurations.props new file mode 100644 index 0000000000..2467da4a1e --- /dev/null +++ b/src/System.Threading.Tasks.Dataflow/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.0; + netstandard1.1; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.builds b/src/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.builds deleted file mode 100644 index 04cc8adbba..0000000000 --- a/src/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.Threading.Tasks.Dataflow.csproj" /> - <Project Include="System.Threading.Tasks.Dataflow.csproj"> - <TargetGroup>netstandard1.0</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - 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..1c62bc148b 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> @@ -6,9 +6,8 @@ <RootNamespace>System.Threading.Tasks.Dataflow</RootNamespace> <AssemblyName>System.Threading.Tasks.Dataflow</AssemblyName> <DocumentationFile>$(OutputPath)System.Threading.Tasks.Dataflow.XML</DocumentationFile> - <DefineConstants Condition="'$(TargetGroup)' == ''">$(DefineConstants);CONCURRENT_COLLECTIONS;FEATURE_TRACING</DefineConstants> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.1</NuGetTargetMoniker> - <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.1;portable-net45+win8+wpa81</PackageTargetFramework> + <DefineConstants Condition="'$(TargetGroup)' == 'netstandard1.1'">$(DefineConstants);CONCURRENT_COLLECTIONS;FEATURE_TRACING</DefineConstants> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard1.1'">netstandard1.1;portable-net45+win8+wpa81</PackageTargetFramework> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -59,5 +58,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 0e7299a585..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-24904-01", - "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-24904-01", - "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" - } - } - } -} diff --git a/src/System.Threading.Tasks.Dataflow/src/wp8/project.json b/src/System.Threading.Tasks.Dataflow/src/wp8/project.json deleted file mode 100644 index acf088b854..0000000000 --- a/src/System.Threading.Tasks.Dataflow/src/wp8/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "frameworks": { - "netstandard1.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "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" - } - } - } -} diff --git a/src/System.Threading.Tasks.Dataflow/tests/Configurations.props b/src/System.Threading.Tasks.Dataflow/tests/Configurations.props new file mode 100644 index 0000000000..f0ebe53119 --- /dev/null +++ b/src/System.Threading.Tasks.Dataflow/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.csproj b/src/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.csproj index 9ae53752c9..f1714949b4 100644 --- a/src/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.csproj +++ b/src/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.csproj @@ -1,11 +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"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{72E21903-0FBA-444E-9855-3B4F05DFC1F9}</ProjectGuid> - <RootNamespace>System.Threading.Tasks.Dataflow.Tests</RootNamespace> - <AssemblyName>System.Threading.Tasks.Dataflow.Tests</AssemblyName> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> @@ -25,17 +22,10 @@ </Compile> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\pkg\System.Threading.Tasks.Dataflow.pkgproj"> - <Project>{1dd0ff15-6234-4bd6-850a-317f05479554}</Project> - <Name>System.Threading.Tasks.Dataflow</Name> - </ProjectReference> <ProjectReference Include="$(CommonTestPath)\System\Diagnostics\RemoteExecutorConsoleApp\RemoteExecutorConsoleApp.csproj"> <Project>{69e46a6f-9966-45a5-8945-2559fe337827}</Project> <Name>RemoteExecutorConsoleApp</Name> </ProjectReference> </ItemGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Threading.Tasks.Extensions/dir.props b/src/System.Threading.Tasks.Extensions/dir.props index 17b82e897d..1dadf41f32 100644 --- a/src/System.Threading.Tasks.Extensions/dir.props +++ b/src/System.Threading.Tasks.Extensions/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.1.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Threading.Tasks.Extensions/src/Configurations.props b/src/System.Threading.Tasks.Extensions/src/Configurations.props new file mode 100644 index 0000000000..2ec0365c0d --- /dev/null +++ b/src/System.Threading.Tasks.Extensions/src/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.0; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Threading.Tasks.Extensions/src/System.Threading.Tasks.Extensions.builds b/src/System.Threading.Tasks.Extensions/src/System.Threading.Tasks.Extensions.builds deleted file mode 100644 index a499dc6b56..0000000000 --- a/src/System.Threading.Tasks.Extensions/src/System.Threading.Tasks.Extensions.builds +++ /dev/null @@ -1,9 +0,0 @@ -<?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> - <Project Include="System.Threading.Tasks.Extensions.csproj" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - 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..0327c75728 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> @@ -6,8 +6,7 @@ <AssemblyName>System.Threading.Tasks.Extensions</AssemblyName> <DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile> <UseOpenKey Condition="'$(UseOpenKey)'==''">true</UseOpenKey> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.0</NuGetTargetMoniker> - <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.0;portable-net45+win8+wp8+wpa81</PackageTargetFramework> + <PackageTargetFramework>netstandard1.0;portable-net45+win8+wp8+wpa81</PackageTargetFramework> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -20,7 +19,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 675ae729a6..0000000000 --- a/src/System.Threading.Tasks.Extensions/src/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01", - "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": {} - } -} diff --git a/src/System.Threading.Tasks.Extensions/tests/Configurations.props b/src/System.Threading.Tasks.Extensions/tests/Configurations.props new file mode 100644 index 0000000000..f0ebe53119 --- /dev/null +++ b/src/System.Threading.Tasks.Extensions/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.csproj b/src/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.csproj index f4c6a3f846..c245b4910e 100644 --- a/src/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.csproj +++ b/src/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{82B54697-0251-47A1-8546-FC507D0F3B08}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Threading.Tasks.Extensions.Tests</AssemblyName> - <RootNamespace>System.Threading.Tasks.Extensions.Tests</RootNamespace> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> @@ -17,11 +11,5 @@ <Compile Include="AsyncValueTaskMethodBuilderTests.cs" /> <Compile Include="ValueTaskTests.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Threading.Tasks.Extensions.pkgproj"> - <Project>{F24D3391-2928-4E83-AADE-B34423498750}</Project> - <Name>System.Threading.Tasks.Extensions</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Threading.Tasks.Parallel/dir.props b/src/System.Threading.Tasks.Parallel/dir.props index 16a766f83b..14527fd4b3 100644 --- a/src/System.Threading.Tasks.Parallel/dir.props +++ b/src/System.Threading.Tasks.Parallel/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.0.3.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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/Configurations.props b/src/System.Threading.Tasks.Parallel/src/Configurations.props new file mode 100644 index 0000000000..f0ebe53119 --- /dev/null +++ b/src/System.Threading.Tasks.Parallel/src/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.builds b/src/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.builds deleted file mode 100644 index 74840981dd..0000000000 --- a/src/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.builds +++ /dev/null @@ -1,13 +0,0 @@ -<?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> - <Project Include="System.Threading.Tasks.Parallel.csproj" /> - <!-- Net46 facade is currently inbox for 4.0 - <Project Include="System.Threading.Tasks.Parallel.csproj"> - <TargetGroup>net46</TargetGroup> - </Project> --> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - 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..3fdf0426ed 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> @@ -8,16 +8,13 @@ <FileAlignment>512</FileAlignment> <DefineConstants>$(DefineConstants);CONCURRENT_COLLECTIONS;FEATURE_TRACING</DefineConstants> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly> - <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net46'">None</ResourcesSourceOutputDirectory> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker> - <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.3;netcore50</PackageTargetFramework> + <PackageTargetFramework>netstandard1.3;netcore50</PackageTargetFramework> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' != 'net46'"> + <ItemGroup> <Compile Include="System\Threading\PlatformHelper.cs" /> <Compile Include="System\Threading\Tasks\Box.cs" /> <Compile Include="System\Threading\Tasks\Parallel.cs" /> @@ -26,11 +23,20 @@ <Compile Include="System\Threading\Tasks\ParallelRangeManager.cs" /> <Compile Include="System\Threading\Tasks\TaskReplicator.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == 'net46'"> + <ItemGroup> <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 d1180e6c5e..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-24904-01", - "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" - } - } - } -} diff --git a/src/System.Threading.Tasks.Parallel/tests/Configurations.props b/src/System.Threading.Tasks.Parallel/tests/Configurations.props new file mode 100644 index 0000000000..30186bb80b --- /dev/null +++ b/src/System.Threading.Tasks.Parallel/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.5; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.csproj b/src/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.csproj index df80ef8b98..439f932a8b 100644 --- a/src/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.csproj +++ b/src/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.csproj @@ -1,15 +1,9 @@ -<?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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{DE29C320-2ECA-43FD-9F41-6F4F6C6BACD5}</ProjectGuid> - <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>System.Threading.Tasks.Parallel.Tests</RootNamespace> - <AssemblyName>System.Threading.Tasks.Parallel.Tests</AssemblyName> - <NugetTargetMoniker>.NETStandard,Version=v1.5</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> </PropertyGroup> @@ -41,12 +35,5 @@ <Link>CommonTest\System\Threading\ThreadPoolHelpers.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Threading.Tasks.Parallel.pkgproj"> - <Project>{A6BA5DF2-772E-4DA1-BC2D-89FF4A21EE4F}</Project> - <Name>System.Threading.Tasks.Parallel</Name> - <Private>true</Private> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Threading.Tasks/dir.props b/src/System.Threading.Tasks/dir.props index 503cf86a87..bfbc5bd9e0 100644 --- a/src/System.Threading.Tasks/dir.props +++ b/src/System.Threading.Tasks/dir.props @@ -1,7 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> - +</Project>
\ 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 f53f8e32db..0000000000 --- a/src/System.Threading.Tasks/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Threading.Tasks/src/Configurations.props b/src/System.Threading.Tasks/src/Configurations.props new file mode 100644 index 0000000000..a25a6691e3 --- /dev/null +++ b/src/System.Threading.Tasks/src/Configurations.props @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + uap101aot-Windows_NT; + net463-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Threading.Tasks/src/System.Threading.Tasks.builds b/src/System.Threading.Tasks/src/System.Threading.Tasks.builds deleted file mode 100644 index f58fcf06b0..0000000000 --- a/src/System.Threading.Tasks/src/System.Threading.Tasks.builds +++ /dev/null @@ -1,15 +0,0 @@ -<?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> - <Project Include="System.Threading.Tasks.csproj" /> - <Project Include="System.Threading.Tasks.csproj"> - <TargetGroup>uap101aot</TargetGroup> - </Project> - <Project Include="System.Threading.Tasks.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Threading.Tasks/src/System.Threading.Tasks.csproj b/src/System.Threading.Tasks/src/System.Threading.Tasks.csproj index 4b149d44da..8af2f10387 100644 --- a/src/System.Threading.Tasks/src/System.Threading.Tasks.csproj +++ b/src/System.Threading.Tasks/src/System.Threading.Tasks.csproj @@ -1,24 +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> <ProjectGuid>{3BCAEAA6-3A29-49EC-B334-6E7BE8BE9ABA}</ProjectGuid> <AssemblyName>System.Threading.Tasks</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> - <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.7;uap10.1</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' == ''"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <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> + <ProjectReference Include="..\..\System.Diagnostics.Debug\src\System.Diagnostics.Debug.csproj" /> <TargetingPackReference Include="System.Private.CoreLib" /> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == 'net463'"> @@ -30,7 +26,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 8d08b0427c..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-24904-03" - } - }, - "uap10.1": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24904-00" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Threading.Tasks/tests/Configurations.props b/src/System.Threading.Tasks/tests/Configurations.props new file mode 100644 index 0000000000..b744993779 --- /dev/null +++ b/src/System.Threading.Tasks/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.5; + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj b/src/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj index 3df8871feb..c675b8431e 100644 --- a/src/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj +++ b/src/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj @@ -1,20 +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> - <AssemblyName>System.Threading.Tasks.Tests</AssemblyName> <ProjectGuid>{B6C09633-D161-499A-8FE1-46B2D53A16E7}</ProjectGuid> - <NugetTargetMoniker Condition="'$(TargetGroup)'==''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <ItemGroup> - <!-- Compile tests against the System.Runtime contract, but copy our local-built implementation for testing --> - <ProjectReference Include="..\pkg\System.Threading.Tasks.pkgproj" /> - </ItemGroup> - <ItemGroup> <Compile Include="XunitAssemblyAttributes.cs" /> <Compile Include="UnwrapTests.cs" /> <Compile Include="AggregateExceptionTests.cs" /> diff --git a/src/System.Threading.Thread/dir.props b/src/System.Threading.Thread/dir.props index fcc1a7ca5a..bfbc5bd9e0 100644 --- a/src/System.Threading.Thread/dir.props +++ b/src/System.Threading.Thread/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ No newline at end of file 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 2f16984268..0000000000 --- a/src/System.Threading.Thread/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Security.Principal": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Threading.Thread/src/Configurations.props b/src/System.Threading.Thread/src/Configurations.props new file mode 100644 index 0000000000..d9529542a7 --- /dev/null +++ b/src/System.Threading.Thread/src/Configurations.props @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + uap101aot-Windows_NT; + netstandard-Windows_NT; + netstandard-Unix; + net461-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Threading.Thread/src/System.Threading.Thread.builds b/src/System.Threading.Thread/src/System.Threading.Thread.builds deleted file mode 100644 index 0f13018caa..0000000000 --- a/src/System.Threading.Thread/src/System.Threading.Thread.builds +++ /dev/null @@ -1,21 +0,0 @@ -<?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> - <Project Include="System.Threading.Thread.csproj"> - <OSGroup>Windows_NT</OSGroup> - </Project> - <Project Include="System.Threading.Thread.csproj"> - <OSGroup>Unix</OSGroup> - </Project> - <Project Include="System.Threading.Thread.csproj"> - <TargetGroup>net461</TargetGroup> - </Project> - <Project Include="System.Threading.Thread.csproj"> - <TargetGroup>uap101aot</TargetGroup> - <OSGroup>Windows_NT</OSGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Threading.Thread/src/System.Threading.Thread.csproj b/src/System.Threading.Thread/src/System.Threading.Thread.csproj index 868decf046..c0ded57219 100644 --- a/src/System.Threading.Thread/src/System.Threading.Thread.csproj +++ b/src/System.Threading.Thread/src/System.Threading.Thread.csproj @@ -1,12 +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> <AssemblyName>System.Threading.Thread</AssemblyName> <OutputType>Library</OutputType> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> - <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.7;uap10.1</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> <!-- Don't allow project reference to package dependency conversion --> <KeepAllProjectReferences>true</KeepAllProjectReferences> <!-- Type being defined conflicts with imported type from dependency assembly --> @@ -33,17 +32,17 @@ <Compile Include="System\Threading\ThreadAbortException.cs" /> <Compile Include="System\Threading\ThreadExceptionEventArgs.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' != 'net461' and '$(TargetGroup)' != 'uap101aot'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <ProjectReference Include="..\..\System.Runtime\src\System.Runtime.csproj"> <Aliases>System_Runtime</Aliases> </ProjectReference> <ProjectReference Include="..\..\System.Runtime.Extensions\src\System.Runtime.Extensions.csproj"> - <OSGroup>$(InputOSGroup)</OSGroup> <Aliases>System_Runtime_Extensions</Aliases> </ProjectReference> <ProjectReference Include="..\..\System.Security.Principal\src\System.Security.Principal.csproj"> <Aliases>System_Security_Principal</Aliases> </ProjectReference> + <ProjectReference Include="..\..\System.Diagnostics.Debug\src\System.Diagnostics.Debug.csproj" /> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' != 'net461'"> <TargetingPackReference Include="System.Private.CoreLib" /> @@ -58,7 +57,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 59e8dbd64e..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-24904-03", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01" - } - }, - "net461": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.1": "1.0.1" - } - }, - "uap10.1": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24904-00" - } - } - } -} diff --git a/src/System.Threading.Thread/tests/Configurations.props b/src/System.Threading.Thread/tests/Configurations.props new file mode 100644 index 0000000000..98f53209d4 --- /dev/null +++ b/src/System.Threading.Thread/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Threading.Thread/tests/System.Threading.Thread.Tests.csproj b/src/System.Threading.Thread/tests/System.Threading.Thread.Tests.csproj index 247ff7a2a6..b8b13e49a5 100644 --- a/src/System.Threading.Thread/tests/System.Threading.Thread.Tests.csproj +++ b/src/System.Threading.Thread/tests/System.Threading.Thread.Tests.csproj @@ -1,13 +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"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <AssemblyName>System.Threading.Thread.Tests</AssemblyName> <ProjectGuid>{33F5A50E-B823-4FDD-8571-365C909ACEAE}</ProjectGuid> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -28,10 +23,5 @@ <ItemGroup> <None Include="project.json" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Threading.Thread.pkgproj"> - <OSGroup>$(InputOSGroup)</OSGroup> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Threading.ThreadPool/dir.props b/src/System.Threading.ThreadPool/dir.props index fcc1a7ca5a..bfbc5bd9e0 100644 --- a/src/System.Threading.ThreadPool/dir.props +++ b/src/System.Threading.ThreadPool/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ No newline at end of file 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 bcd12f084c..0000000000 --- a/src/System.Threading.ThreadPool/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Handles": "4.4.0-beta-24904-01", - "System.Threading.Overlapped": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Threading.ThreadPool/src/Configurations.props b/src/System.Threading.ThreadPool/src/Configurations.props new file mode 100644 index 0000000000..9c336c0be9 --- /dev/null +++ b/src/System.Threading.ThreadPool/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Threading.ThreadPool/src/System.Threading.ThreadPool.builds b/src/System.Threading.ThreadPool/src/System.Threading.ThreadPool.builds deleted file mode 100644 index d1e2f67d40..0000000000 --- a/src/System.Threading.ThreadPool/src/System.Threading.ThreadPool.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.Threading.ThreadPool.csproj" /> - <Project Include="System.Threading.ThreadPool.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Threading.ThreadPool/src/System.Threading.ThreadPool.csproj b/src/System.Threading.ThreadPool/src/System.Threading.ThreadPool.csproj index d45df78141..1057ed7068 100644 --- a/src/System.Threading.ThreadPool/src/System.Threading.ThreadPool.csproj +++ b/src/System.Threading.ThreadPool/src/System.Threading.ThreadPool.csproj @@ -1,10 +1,9 @@ -<?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> <AssemblyName>System.Threading.ThreadPool</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -13,10 +12,10 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> <ItemGroup> <TargetingPackReference Include="mscorlib" Condition="'$(TargetGroup)' == 'net463'" /> - <TargetingPackReference Include="System.Private.CoreLib" Condition="'$(TargetGroup)' != 'net463'" /> + <TargetingPackReference Include="System.Private.CoreLib" Condition="'$(TargetGroup)' == 'netstandard'" /> </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 eef219cc12..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-24904-03" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.Threading.ThreadPool/tests/Configurations.props b/src/System.Threading.ThreadPool/tests/Configurations.props new file mode 100644 index 0000000000..98f53209d4 --- /dev/null +++ b/src/System.Threading.ThreadPool/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Threading.ThreadPool/tests/System.Threading.ThreadPool.Tests.csproj b/src/System.Threading.ThreadPool/tests/System.Threading.ThreadPool.Tests.csproj index 39f7984b09..1d1b8b0156 100644 --- a/src/System.Threading.ThreadPool/tests/System.Threading.ThreadPool.Tests.csproj +++ b/src/System.Threading.ThreadPool/tests/System.Threading.ThreadPool.Tests.csproj @@ -1,13 +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"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <AssemblyName>System.Threading.ThreadPool.Tests</AssemblyName> <ProjectGuid>{403AD1B8-6F95-4A2E-92A2-727606ABD866}</ProjectGuid> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -22,8 +17,5 @@ <Link>CommonTest\System\Threading\ThreadTestHelpers.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Threading.ThreadPool.pkgproj"/> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Threading.Timer/dir.props b/src/System.Threading.Timer/dir.props index fcc1a7ca5a..bfbc5bd9e0 100644 --- a/src/System.Threading.Timer/dir.props +++ b/src/System.Threading.Timer/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Threading.Timer/ref/System.Threading.Timer.csproj b/src/System.Threading.Timer/ref/System.Threading.Timer.csproj index add5f2fc69..8fb34f13dc 100644 --- a/src/System.Threading.Timer/ref/System.Threading.Timer.csproj +++ b/src/System.Threading.Timer/ref/System.Threading.Timer.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.Threading.Timer.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 f53f8e32db..0000000000 --- a/src/System.Threading.Timer/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Threading.Timer/src/Configurations.props b/src/System.Threading.Timer/src/Configurations.props new file mode 100644 index 0000000000..9c336c0be9 --- /dev/null +++ b/src/System.Threading.Timer/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Threading.Timer/src/System.Threading.Timer.builds b/src/System.Threading.Timer/src/System.Threading.Timer.builds deleted file mode 100644 index f97373f867..0000000000 --- a/src/System.Threading.Timer/src/System.Threading.Timer.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.Threading.Timer.csproj" /> - <Project Include="System.Threading.Timer.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Threading.Timer/src/System.Threading.Timer.csproj b/src/System.Threading.Timer/src/System.Threading.Timer.csproj index f126a3a11c..2f4052f023 100644 --- a/src/System.Threading.Timer/src/System.Threading.Timer.csproj +++ b/src/System.Threading.Timer/src/System.Threading.Timer.csproj @@ -1,10 +1,9 @@ -<?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> <AssemblyName>System.Threading.Timer</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -13,10 +12,10 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> <ItemGroup> <TargetingPackReference Include="mscorlib" Condition="'$(TargetGroup)' == 'net463'" /> - <TargetingPackReference Include="System.Private.CoreLib" Condition="'$(TargetGroup)' != 'net463'" /> + <TargetingPackReference Include="System.Private.CoreLib" Condition="'$(TargetGroup)' == 'netstandard'" /> </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 eef219cc12..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-24904-03" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.Threading.Timer/tests/Configurations.props b/src/System.Threading.Timer/tests/Configurations.props new file mode 100644 index 0000000000..512c938bad --- /dev/null +++ b/src/System.Threading.Timer/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Threading.Timer/tests/System.Threading.Timer.Tests.csproj b/src/System.Threading.Timer/tests/System.Threading.Timer.Tests.csproj index 3512818d4c..b83e1197e7 100644 --- a/src/System.Threading.Timer/tests/System.Threading.Timer.Tests.csproj +++ b/src/System.Threading.Timer/tests/System.Threading.Timer.Tests.csproj @@ -2,12 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <AssemblyName>System.Threading.Timer.Tests</AssemblyName> <ProjectGuid>{ac20a28f-fda8-45e8-8728-058ead16e44c}</ProjectGuid> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -22,8 +17,5 @@ <Compile Include="TimerChangeTests.netstandard1.7.cs" /> <Compile Include="TimerFiringTests.netstandard1.7.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Threading.Timer.pkgproj"/> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Threading/dir.props b/src/System.Threading/dir.props index fcc1a7ca5a..bfbc5bd9e0 100644 --- a/src/System.Threading/dir.props +++ b/src/System.Threading/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ No newline at end of file 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 f53f8e32db..0000000000 --- a/src/System.Threading/ref/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Threading/src/Configurations.props b/src/System.Threading/src/Configurations.props new file mode 100644 index 0000000000..9c336c0be9 --- /dev/null +++ b/src/System.Threading/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Threading/src/System.Threading.builds b/src/System.Threading/src/System.Threading.builds deleted file mode 100644 index ff841102f7..0000000000 --- a/src/System.Threading/src/System.Threading.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.Threading.csproj" /> - <Project Include="System.Threading.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Threading/src/System.Threading.csproj b/src/System.Threading/src/System.Threading.csproj index 3371ccbd27..1face91f28 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> @@ -6,8 +6,7 @@ <AssemblyName>System.Threading</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' != ''">None</ResourcesSourceOutputDirectory> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> + <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net463'">None</ResourcesSourceOutputDirectory> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> @@ -16,27 +15,22 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcore50aot_Release|AnyCPU' " /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU' " /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU' " /> - <ItemGroup Condition="'$(TargetGroup)' == ''"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="System\Threading\Helpers.CoreCLR.cs" /> <Compile Include="System\Threading\Barrier.cs" /> <Compile Include="System\Threading\CDSsyncETWBCLProvider.cs" /> <Compile Include="System\Threading\CountdownEvent.cs" /> <Compile Include="System\Threading\ReaderWriterLockSlim.cs" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> <Compile Include="System\Threading\HostExecutionContext.cs" /> <Compile Include="System\Threading\HostExecutionContextManager.cs" /> <Compile Include="System\Threading\LockCookie.cs" /> <Compile Include="System\Threading\ReaderWriterLock.cs" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> <Compile Include="$(CommonPath)\System\HResults.cs"> <Link>Common\System\HResults.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == ''"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <ProjectReference Include="..\..\System.Diagnostics.Debug\src\System.Diagnostics.Debug.csproj"> - <OSGroup>$(InputOSGroup)</OSGroup> </ProjectReference> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == 'net463'"> @@ -44,11 +38,11 @@ <TargetingPackReference Include="System" /> <TargetingPackReference Include="System.Core" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <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 eef219cc12..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-24904-03" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} diff --git a/src/System.Threading/tests/Configurations.props b/src/System.Threading/tests/Configurations.props new file mode 100644 index 0000000000..512c938bad --- /dev/null +++ b/src/System.Threading/tests/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Threading/tests/Performance/System.Threading.Performance.Tests.csproj b/src/System.Threading/tests/Performance/System.Threading.Performance.Tests.csproj index 20b418a8a8..a7b3f9e55d 100644 --- a/src/System.Threading/tests/Performance/System.Threading.Performance.Tests.csproj +++ b/src/System.Threading/tests/Performance/System.Threading.Performance.Tests.csproj @@ -1,10 +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"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <AssemblyName>System.Threading.Performance.Tests</AssemblyName> <IncludePerformanceTests>true</IncludePerformanceTests> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -22,7 +20,6 @@ <Name>RemoteExecutorConsoleApp</Name> </ProjectReference> <!-- Compile tests against the System.Runtime contract, but copy our local-built implementation for testing --> - <ProjectReference Include="..\..\pkg\System.Threading.pkgproj"/> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Threading/tests/System.Threading.Tests.csproj b/src/System.Threading/tests/System.Threading.Tests.csproj index 551183027b..5af0f1a859 100644 --- a/src/System.Threading/tests/System.Threading.Tests.csproj +++ b/src/System.Threading/tests/System.Threading.Tests.csproj @@ -1,13 +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"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <AssemblyName>System.Threading.Tests</AssemblyName> <ProjectGuid>{33F5A50E-B823-4FDD-8571-365C909ACEAE}</ProjectGuid> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -51,7 +46,7 @@ <Link>CommonTest\System\IO\FileCleanupTestBase.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == ''"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard1.7'"> <Compile Include="ExecutionContextTests.netstandard1.7.cs" /> <Compile Include="HostExecutionContextTests.cs" /> <Compile Include="HostExecutionContextManagerTests.cs" /> @@ -67,8 +62,6 @@ <Project>{69e46a6f-9966-45a5-8945-2559fe337827}</Project> <Name>RemoteExecutorConsoleApp</Name> </ProjectReference> - <ProjectReference Include="..\pkg\System.Threading.pkgproj"/> - <ProjectReference Include="..\..\System.Diagnostics.Debug\pkg\System.Diagnostics.Debug.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Transactions/ref/System.Transactions.csproj b/src/System.Transactions/ref/System.Transactions.csproj index 4749468275..93e504d46e 100644 --- a/src/System.Transactions/ref/System.Transactions.csproj +++ b/src/System.Transactions/ref/System.Transactions.csproj @@ -1,17 +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> - <AssemblyVersion>4.0.0.0</AssemblyVersion> - <OutputType>Library</OutputType> - <PackageTargetFramework>netstandard1.7</PackageTargetFramework> - <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> + <PropertyGroup> + <AssemblyVersion>4.0.0.0</AssemblyVersion> + <OutputType>Library</OutputType> + <PackageTargetFramework>netstandard1.7</PackageTargetFramework> </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 f0b40fa6ef..0000000000 --- a/src/System.Transactions/ref/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Primitives": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Formatters": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Transactions/src/Configurations.props b/src/System.Transactions/src/Configurations.props new file mode 100644 index 0000000000..fc9ef9822c --- /dev/null +++ b/src/System.Transactions/src/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Transactions/src/System.Transactions.builds b/src/System.Transactions/src/System.Transactions.builds deleted file mode 100644 index ed6ec1f71f..0000000000 --- a/src/System.Transactions/src/System.Transactions.builds +++ /dev/null @@ -1,9 +0,0 @@ -<?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> - <Project Include="System.Transactions.csproj" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Transactions/src/System.Transactions.csproj b/src/System.Transactions/src/System.Transactions.csproj index a63012ea8b..2985fd7601 100644 --- a/src/System.Transactions/src/System.Transactions.csproj +++ b/src/System.Transactions/src/System.Transactions.csproj @@ -1,18 +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> <AssemblyVersion>4.0.0.0</AssemblyVersion> <ProjectGuid>{2ADDB484-6F57-4D71-A3FE-A57EC6329A2B}</ProjectGuid> - <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net463'">true</IsPartialFacadeAssembly> + <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <PackageTargetFramework>netstandard1.7</PackageTargetFramework> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> </PropertyGroup> <!-- Default configurations to help VS understand the options --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)'==''"> + <ItemGroup> <Compile Include="System\Transactions\CommittableTransaction.cs" /> <Compile Include="System\Transactions\DependentTransaction.cs" /> <Compile Include="System\Transactions\DistributedTransaction.cs" /> @@ -48,10 +47,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 f5c7a2429d..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-24904-01", - "Microsoft.Win32.Primitives": "4.4.0-beta-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Collections.Specialized": "4.4.0-beta-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.Diagnostics.Process": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Diagnostics.Tracing": "4.4.0-beta-24904-01", - "System.Diagnostics.TraceSource": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Runtime.Serialization.Formatters": "4.4.0-beta-24904-01", - "System.Runtime.InteropServices": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01", - "System.Threading.Thread": "4.4.0-beta-24904-01", - "System.Threading.ThreadPool": "4.4.0-beta-24904-01", - "System.Threading.Timer": "4.4.0-beta-24904-01", - "System.Xml.XPath": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Transactions/tests/Configurations.props b/src/System.Transactions/tests/Configurations.props new file mode 100644 index 0000000000..98f53209d4 --- /dev/null +++ b/src/System.Transactions/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Transactions/tests/System.Transactions.Tests.csproj b/src/System.Transactions/tests/System.Transactions.Tests.csproj index 20b4483b99..c49582d01d 100644 --- a/src/System.Transactions/tests/System.Transactions.Tests.csproj +++ b/src/System.Transactions/tests/System.Transactions.Tests.csproj @@ -1,13 +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"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{62E2AD5F-C8D0-45FB-B6A5-AED2C77F198C}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Transactions.Tests</AssemblyName> - <NugetTargetMoniker>.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <ItemGroup> <Compile Include="NonMsdtcPromoterTests.cs" /> @@ -22,10 +17,5 @@ <Compile Include="TestEnlistments.cs" /> <Compile Include="TransactionTracingEventListener.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Transactions.pkgproj"> - <Name>System.Transactions</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.ValueTuple/src/Configurations.props b/src/System.ValueTuple/src/Configurations.props new file mode 100644 index 0000000000..a531bf696c --- /dev/null +++ b/src/System.ValueTuple/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + portable_net40+sl4+win8+wp8-Windows_NT; + netstandard1.0; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.ValueTuple/src/System.ValueTuple.builds b/src/System.ValueTuple/src/System.ValueTuple.builds deleted file mode 100644 index 0fcfd3d785..0000000000 --- a/src/System.ValueTuple/src/System.ValueTuple.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.ValueTuple.csproj" /> - <Project Include="System.ValueTuple.csproj"> - <TargetGroup>portable-net40+sl4+win8+wp8</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.ValueTuple/src/System.ValueTuple.csproj b/src/System.ValueTuple/src/System.ValueTuple.csproj index 1d8fff2f67..4493fd695a 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> @@ -6,7 +6,6 @@ <ProjectGuid>{4C2655DB-BD9E-4C86-83A6-744ECDDBDF29}</ProjectGuid> <DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile> <UseOpenKey Condition="'$(UseOpenKey)'==''">true</UseOpenKey> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.0</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the options --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -30,7 +29,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.ValueTuple/tests/Configurations.props b/src/System.ValueTuple/tests/Configurations.props new file mode 100644 index 0000000000..f0ebe53119 --- /dev/null +++ b/src/System.ValueTuple/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.ValueTuple/tests/System.ValueTuple.Tests.csproj b/src/System.ValueTuple/tests/System.ValueTuple.Tests.csproj index 9c5cc183f2..66c44601c8 100644 --- a/src/System.ValueTuple/tests/System.ValueTuple.Tests.csproj +++ b/src/System.ValueTuple/tests/System.ValueTuple.Tests.csproj @@ -2,12 +2,7 @@ <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{CBD5AE8D-8595-48E2-848F-1A3492A28FDB}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.ValueTuple.Tests</AssemblyName> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)' == 'Debug'"> <LangVersion>5</LangVersion> @@ -17,11 +12,5 @@ <Compile Include="ExtensionsTests.cs" /> <Compile Include="ValueTupleTests.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.ValueTuple.pkgproj"> - <Name>System.ValueTuple</Name> - <Project>{4C2655DB-BD9E-4C86-83A6-744ECDDBDF29}</Project> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ 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/Configurations.props b/src/System.Web.HttpUtility/src/Configurations.props new file mode 100644 index 0000000000..24e575d57f --- /dev/null +++ b/src/System.Web.HttpUtility/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net46-Windows_NT; + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Web.HttpUtility/src/System.Web.HttpUtility.builds b/src/System.Web.HttpUtility/src/System.Web.HttpUtility.builds deleted file mode 100644 index d4baca3a48..0000000000 --- a/src/System.Web.HttpUtility/src/System.Web.HttpUtility.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.Web.HttpUtility.csproj" /> - <Project Include="System.Web.HttpUtility.csproj"> - <TargetGroup>net46</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Web.HttpUtility/src/System.Web.HttpUtility.csproj b/src/System.Web.HttpUtility/src/System.Web.HttpUtility.csproj index 68f1f4e33b..bff1b23451 100644 --- a/src/System.Web.HttpUtility/src/System.Web.HttpUtility.csproj +++ b/src/System.Web.HttpUtility/src/System.Web.HttpUtility.csproj @@ -1,18 +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> <ProjectGuid>{53D09AF4-0C13-4197-B8AD-9746F0374E88}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net46'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the options --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3_Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' != 'net46'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard1.3'"> <Compile Include="System\Web\HttpUtility.cs" /> <Compile Include="System\Web\Util\HttpEncoder.cs" /> <Compile Include="System\Web\Util\HttpEncoderUtility.cs" /> @@ -23,7 +22,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.Web.HttpUtility/tests/Configurations.props b/src/System.Web.HttpUtility/tests/Configurations.props new file mode 100644 index 0000000000..f0ebe53119 --- /dev/null +++ b/src/System.Web.HttpUtility/tests/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard1.3; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Web.HttpUtility/tests/System.Web.HttpUtility.Tests.csproj b/src/System.Web.HttpUtility/tests/System.Web.HttpUtility.Tests.csproj index 557e54665b..fd6cc1b654 100644 --- a/src/System.Web.HttpUtility/tests/System.Web.HttpUtility.Tests.csproj +++ b/src/System.Web.HttpUtility/tests/System.Web.HttpUtility.Tests.csproj @@ -1,10 +1,6 @@ -<?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 Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NugetTargetMoniker> - </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'netstandard1.3_Debug|AnyCPU' "> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'netstandard1.3_Release|AnyCPU' "> @@ -13,13 +9,7 @@ <Compile Include="HttpUtility\HttpUtilityTest.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\pkg\System.Web.HttpUtility.pkgproj"> - <Name>System.Web.HttpUtility</Name> - <Project>{53D09AF4-0C13-4197-B8AD-9746F0374E88}</Project> - </ProjectReference> - </ItemGroup> - <ItemGroup> <None Include="project.json" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Xml.ReaderWriter/dir.props b/src/System.Xml.ReaderWriter/dir.props index 1af9800f25..a960cef1a3 100644 --- a/src/System.Xml.ReaderWriter/dir.props +++ b/src/System.Xml.ReaderWriter/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.2.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 4d7e04deee..0000000000 --- a/src/System.Xml.ReaderWriter/ref/project.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "dependencies": { - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Net.Primitives": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Text.Encoding": "4.4.0-beta-24904-01", - "System.Threading.Tasks": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Xml.ReaderWriter/src/Configurations.props b/src/System.Xml.ReaderWriter/src/Configurations.props new file mode 100644 index 0000000000..9c336c0be9 --- /dev/null +++ b/src/System.Xml.ReaderWriter/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Xml.ReaderWriter/src/System.Xml.ReaderWriter.builds b/src/System.Xml.ReaderWriter/src/System.Xml.ReaderWriter.builds deleted file mode 100644 index 6be8ea54d0..0000000000 --- a/src/System.Xml.ReaderWriter/src/System.Xml.ReaderWriter.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.Xml.ReaderWriter.csproj" /> - <Project Include="System.Xml.ReaderWriter.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Xml.ReaderWriter/src/System.Xml.ReaderWriter.csproj b/src/System.Xml.ReaderWriter/src/System.Xml.ReaderWriter.csproj index 7c8d5c4dd5..0e5c5ab62c 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> @@ -7,24 +7,21 @@ <RootNamespace>System.Xml</RootNamespace> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory>None</ResourcesSourceOutputDirectory> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" /> <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 Condition="'$(TargetGroup)' == 'netstandard'"> + <ProjectReference Include="..\..\System.Private.Xml\src\System.Private.Xml.csproj" /> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == 'net463'"> <TargetingPackReference Include="mscorlib" /> <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 a49ba0ee77..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-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Xml.XDocument/dir.props b/src/System.Xml.XDocument/dir.props index 503cf86a87..bfbc5bd9e0 100644 --- a/src/System.Xml.XDocument/dir.props +++ b/src/System.Xml.XDocument/dir.props @@ -1,7 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Xml.XDocument/ref/Configurations.props b/src/System.Xml.XDocument/ref/Configurations.props new file mode 100644 index 0000000000..33939fe089 --- /dev/null +++ b/src/System.Xml.XDocument/ref/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard; + netcoreapp; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Xml.XDocument/ref/System.Xml.XDocument.csproj b/src/System.Xml.XDocument/ref/System.Xml.XDocument.csproj index 2a039d6439..412c6c3bb5 100644 --- a/src/System.Xml.XDocument/ref/System.Xml.XDocument.csproj +++ b/src/System.Xml.XDocument/ref/System.Xml.XDocument.csproj @@ -1,17 +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> - <DefineConstants Condition="'$(TargetGroup)'==''">$(DefineConstants);netcoreapp11</DefineConstants> + <DefineConstants Condition="'$(TargetGroup)'=='netcoreapp'">$(DefineConstants);netcoreapp11</DefineConstants> </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 222b0a067c..0000000000 --- a/src/System.Xml.XDocument/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.IO": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Xml.ReaderWriter": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Xml.XDocument/src/Configurations.props b/src/System.Xml.XDocument/src/Configurations.props new file mode 100644 index 0000000000..9c336c0be9 --- /dev/null +++ b/src/System.Xml.XDocument/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Xml.XDocument/src/System.Xml.XDocument.builds b/src/System.Xml.XDocument/src/System.Xml.XDocument.builds deleted file mode 100644 index d52ff1fa4d..0000000000 --- a/src/System.Xml.XDocument/src/System.Xml.XDocument.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.Xml.XDocument.csproj" /> - <Project Include="System.Xml.XDocument.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Xml.XDocument/src/System.Xml.XDocument.csproj b/src/System.Xml.XDocument/src/System.Xml.XDocument.csproj index eac891b0db..76c62fc31b 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> @@ -7,25 +7,22 @@ <RootNamespace>System.Xml</RootNamespace> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory>None</ResourcesSourceOutputDirectory> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <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> + <ProjectReference Include="..\..\System.Private.Xml\src\System.Private.Xml.csproj" /> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == 'net463'"> <TargetingPackReference Include="mscorlib" /> <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 d5b7b38393..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-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Xml.XPath.XDocument/dir.props b/src/System.Xml.XPath.XDocument/dir.props index fcc1a7ca5a..8f2003a937 100644 --- a/src/System.Xml.XPath.XDocument/dir.props +++ b/src/System.Xml.XPath.XDocument/dir.props @@ -3,5 +3,7 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> + <IsNETCoreAppRef>false</IsNETCoreAppRef> </PropertyGroup> </Project>
\ No newline at end of file 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 4c411725c3..0000000000 --- a/src/System.Xml.XPath.XDocument/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Xml.XDocument": "4.4.0-beta-24904-01", - "System.Xml.XPath": "4.4.0-beta-24904-01", - "System.Xml.ReaderWriter": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Xml.XPath.XDocument/src/Configurations.props b/src/System.Xml.XPath.XDocument/src/Configurations.props new file mode 100644 index 0000000000..9c336c0be9 --- /dev/null +++ b/src/System.Xml.XPath.XDocument/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Xml.XPath.XDocument/src/System.Xml.XPath.XDocument.builds b/src/System.Xml.XPath.XDocument/src/System.Xml.XPath.XDocument.builds deleted file mode 100644 index 9c1725f659..0000000000 --- a/src/System.Xml.XPath.XDocument/src/System.Xml.XPath.XDocument.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.Xml.XPath.XDocument.csproj" /> - <Project Include="System.Xml.XPath.XDocument.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - 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..19ec0d2aa7 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> @@ -6,7 +6,6 @@ <AssemblyName>System.Xml.XPath.XDocument</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -16,10 +15,8 @@ <ItemGroup> <Compile Include="System\Xml\XPath\XDocumentExtensions.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)'==''"> - <ProjectReference Include="..\..\System.Private.Xml\src\System.Private.Xml.csproj"> - <OSGroup>$(InputOSGroup)</OSGroup> - </ProjectReference> + <ItemGroup Condition="'$(TargetGroup)'=='netstandard'"> + <ProjectReference Include="..\..\System.Private.Xml\src\System.Private.Xml.csproj" /> <ProjectReference Include="..\..\System.Private.Xml.Linq\src\System.Private.Xml.Linq.csproj" /> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)'=='net463'"> @@ -29,7 +26,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 aa4ac10e77..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-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Diagnostics.TraceSource": "4.4.0-beta-24904-01", - "Microsoft.Win32.Registry": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.Reflection.TypeExtensions": "4.4.0-beta-24904-01", - "System.ComponentModel.TypeConverter": "4.4.0-beta-24904-01", - "System.IO.FileSystem.Primitives": "4.4.0-beta-24904-01", - "System.Data.Common": "4.4.0-beta-24904-01", - "System.Console": "4.4.0-beta-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Collections.Specialized": "4.4.0-beta-24904-01", - "System.Linq": "4.4.0-beta-24904-01", - "System.Threading.Tasks.Extensions": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Xml.ReaderWriter": { - "version": "4.3.0", - "exclude": "compile" - } - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" - } - } - } -} 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/Configurations.props b/src/System.Xml.XPath.XmlDocument/src/Configurations.props new file mode 100644 index 0000000000..53b62c64fe --- /dev/null +++ b/src/System.Xml.XPath.XmlDocument/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net461-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Xml.XPath.XmlDocument/src/System.Xml.XPath.XmlDocument.builds b/src/System.Xml.XPath.XmlDocument/src/System.Xml.XPath.XmlDocument.builds deleted file mode 100644 index 6b28016431..0000000000 --- a/src/System.Xml.XPath.XmlDocument/src/System.Xml.XPath.XmlDocument.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.Xml.XPath.XmlDocument.csproj" /> - <Project Include="System.Xml.XPath.XmlDocument.csproj"> - <TargetGroup>net461</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - 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 b4a43bc4e1..aebd7878d6 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,11 +1,10 @@ -<?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> <ProjectGuid>{17CB2E3C-2904-4241-94DB-3894D24F35DA}</ProjectGuid> <AssemblyName>System.Xml.XPath.XmlDocument</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -25,7 +24,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 4604ee67f9..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-24904-01", - "System.Collections": "4.4.0-beta-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Collections.Specialized": "4.4.0-beta-24904-01", - "System.Diagnostics.Debug": "4.4.0-beta-24904-01", - "System.Diagnostics.Tools": "4.4.0-beta-24904-01", - "System.Diagnostics.TraceSource": "4.4.0-beta-24904-01", - "Microsoft.Win32.Registry": "4.4.0-beta-24904-01", - "System.Threading.Tasks.Extensions": "4.4.0-beta-24904-01", - "System.ComponentModel.TypeConverter": "4.4.0-beta-24904-01", - "System.Data.Common": "4.4.0-beta-24904-01", - "System.Console": "4.4.0-beta-24904-01", - "System.Globalization": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.IO.FileSystem": "4.4.0-beta-24904-01", - "System.Reflection.TypeExtensions": "4.4.0-beta-24904-01", - "System.Resources.ResourceManager": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Threading": "4.4.0-beta-24904-01", - "System.Xml.ReaderWriter": "4.4.0-beta-24904-01", - "System.Xml.XmlDocument": "4.4.0-beta-24904-01", - "System.Xml.XPath": "4.4.0-beta-24904-01" - } - }, - "net461": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.1": "1.0.1" - } - } - } -} diff --git a/src/System.Xml.XPath/dir.props b/src/System.Xml.XPath/dir.props index 503cf86a87..8f2003a937 100644 --- a/src/System.Xml.XPath/dir.props +++ b/src/System.Xml.XPath/dir.props @@ -1,7 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> + <IsNETCoreAppRef>false</IsNETCoreAppRef> </PropertyGroup> -</Project> - +</Project>
\ No newline at end of file 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 e995f8f4ac..0000000000 --- a/src/System.Xml.XPath/ref/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Xml.ReaderWriter": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Xml.XPath/src/Configurations.props b/src/System.Xml.XPath/src/Configurations.props new file mode 100644 index 0000000000..9c336c0be9 --- /dev/null +++ b/src/System.Xml.XPath/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Xml.XPath/src/System.Xml.XPath.builds b/src/System.Xml.XPath/src/System.Xml.XPath.builds deleted file mode 100644 index a9f3312fd1..0000000000 --- a/src/System.Xml.XPath/src/System.Xml.XPath.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.Xml.XPath.csproj" /> - <Project Include="System.Xml.XPath.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Xml.XPath/src/System.Xml.XPath.csproj b/src/System.Xml.XPath/src/System.Xml.XPath.csproj index c0efa62112..77e1050d3e 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> @@ -6,24 +6,21 @@ <AssemblyName>System.Xml.XPath</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory>None</ResourcesSourceOutputDirectory> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" /> <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 Condition="'$(TargetGroup)' == 'netstandard'"> + <ProjectReference Include="..\..\System.Private.Xml\src\System.Private.Xml.csproj" /> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == 'net463'"> <TargetingPackReference Include="mscorlib" /> <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 d5b7b38393..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-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - } - } -} diff --git a/src/System.Xml.XmlDocument/dir.props b/src/System.Xml.XmlDocument/dir.props index 503cf86a87..8f2003a937 100644 --- a/src/System.Xml.XmlDocument/dir.props +++ b/src/System.Xml.XmlDocument/dir.props @@ -1,7 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> + <IsNETCoreApp>true</IsNETCoreApp> + <IsNETCoreAppRef>false</IsNETCoreAppRef> </PropertyGroup> -</Project> - +</Project>
\ No newline at end of file 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 bb1b3a3e3f..0000000000 --- a/src/System.Xml.XmlDocument/ref/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "System.Runtime": "4.4.0-beta-24904-01", - "System.Xml.ReaderWriter": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Xml.XmlDocument/src/Configurations.props b/src/System.Xml.XmlDocument/src/Configurations.props new file mode 100644 index 0000000000..9c336c0be9 --- /dev/null +++ b/src/System.Xml.XmlDocument/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Xml.XmlDocument/src/System.Xml.XmlDocument.builds b/src/System.Xml.XmlDocument/src/System.Xml.XmlDocument.builds deleted file mode 100644 index 959830147c..0000000000 --- a/src/System.Xml.XmlDocument/src/System.Xml.XmlDocument.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <Project Include="System.Xml.XmlDocument.csproj" /> - <Project Include="System.Xml.XmlDocument.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Xml.XmlDocument/src/System.Xml.XmlDocument.csproj b/src/System.Xml.XmlDocument/src/System.Xml.XmlDocument.csproj index 9aaff99769..0e492cc30d 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> @@ -8,24 +8,21 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory>None</ResourcesSourceOutputDirectory> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" /> <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 Condition="'$(TargetGroup)' == 'netstandard'"> + <ProjectReference Include="..\..\System.Private.Xml\src\System.Private.Xml.csproj" /> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == 'net463'"> <TargetingPackReference Include="mscorlib" /> <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 d5b7b38393..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-24904-01" - } - }, - "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 4f912e0561..0000000000 --- a/src/System.Xml.XmlSerializer/ref/project.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "dependencies": { - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Collections.Specialized": "4.4.0-beta-24904-01", - "System.IO": "4.4.0-beta-24904-01", - "System.Reflection": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01", - "System.Runtime.Extensions": "4.4.0-beta-24904-01", - "System.Xml.ReaderWriter": "4.4.0-beta-24904-01", - "System.Xml.XmlDocument": "4.4.0-beta-24904-01" - }, - "frameworks": { - "netstandard1.7": {} - } -} diff --git a/src/System.Xml.XmlSerializer/src/Configurations.props b/src/System.Xml.XmlSerializer/src/Configurations.props new file mode 100644 index 0000000000..9c336c0be9 --- /dev/null +++ b/src/System.Xml.XmlSerializer/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Xml.XmlSerializer/src/System.Xml.XmlSerializer.builds b/src/System.Xml.XmlSerializer/src/System.Xml.XmlSerializer.builds deleted file mode 100644 index 1443c28833..0000000000 --- a/src/System.Xml.XmlSerializer/src/System.Xml.XmlSerializer.builds +++ /dev/null @@ -1,16 +0,0 @@ -<?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> - <Project Include="System.Xml.XmlSerializer.csproj" /> - <Project Include="System.Xml.XmlSerializer.csproj"> - <TargetGroup>net463</TargetGroup> - </Project> - <!-- Disabling this for now as this will need all the dependencies to also support uap101aot - <Project Include="System.Xml.XmlSerializer.csproj"> - <TargetGroup>uap101aot</TargetGroup> - </Project>--> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - diff --git a/src/System.Xml.XmlSerializer/src/System.Xml.XmlSerializer.csproj b/src/System.Xml.XmlSerializer/src/System.Xml.XmlSerializer.csproj index d6e603bf4c..1d26869e84 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> @@ -7,7 +7,6 @@ <ProjectGuid>{D62A6082-5229-4845-8BE9-75753E08C65A}</ProjectGuid> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory>None</ResourcesSourceOutputDirectory> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> @@ -15,10 +14,8 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap101aot_Debug|AnyCPU'" /> <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 Condition="'$(TargetGroup)' == 'netstandard'"> + <ProjectReference Include="..\..\System.Private.Xml\src\System.Private.Xml.csproj" /> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == 'uap101aot'"> <EmbeddedResource Include="..\..\System.Private.Xml\src\Resources\System.Private.Xml.rd.xml" /> @@ -28,7 +25,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 e1cef303ad..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-24904-01", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01" - } - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - }, - "uap10.1": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24904-00", - "System.Collections.NonGeneric": "4.4.0-beta-24904-01", - "System.Runtime": "4.4.0-beta-24904-01" - } - } - } -} diff --git a/src/Tools/CoreFx.Tools/AssemblyResolver.cs b/src/Tools/CoreFx.Tools/AssemblyResolver.cs new file mode 100644 index 0000000000..569317d186 --- /dev/null +++ b/src/Tools/CoreFx.Tools/AssemblyResolver.cs @@ -0,0 +1,109 @@ +// 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. + +using System; +using System.Diagnostics; +using System.IO; +using System.Reflection; + +namespace Microsoft.DotNet.Build.Common.Desktop +{ + /// <summary> + /// Used to enable app-local assembly unification. + /// </summary> + internal static class AssemblyResolver + { + static AssemblyResolver() + { + AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve; + } + + /// <summary> + /// Call to enable the assembly resolver for the current AppDomain. + /// </summary> + public static void Enable() + { + // intentionally empty. This is just meant to ensure the static constructor + // has run. + } + + private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args) + { + // apply any existing policy + AssemblyName referenceName = new AssemblyName(AppDomain.CurrentDomain.ApplyPolicy(args.Name)); + + string fileName = referenceName.Name + ".dll"; + string assemblyPath = null; + string probingPath = null; + Assembly assm = null; + + // look next to requesting assembly + assemblyPath = args.RequestingAssembly?.Location; + if (!String.IsNullOrEmpty(assemblyPath)) + { + probingPath = Path.Combine(Path.GetDirectoryName(assemblyPath), fileName); + Debug.WriteLine($"Considering {probingPath} based on RequestingAssembly"); + if (Probe(probingPath, referenceName.Version, out assm)) + { + return assm; + } + } + + // look in AppDomain base directory + probingPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, fileName); + Debug.WriteLine($"Considering {probingPath} based on BaseDirectory"); + if (Probe(probingPath, referenceName.Version, out assm)) + { + return assm; + } + + // look next to the executing assembly + assemblyPath = Assembly.GetExecutingAssembly().Location; + if (!String.IsNullOrEmpty(assemblyPath)) + { + probingPath = Path.Combine(Path.GetDirectoryName(assemblyPath), fileName); + + Debug.WriteLine($"Considering {probingPath} based on ExecutingAssembly"); + if (Probe(probingPath, referenceName.Version, out assm)) + { + return assm; + } + } + + // look in current directory + Debug.WriteLine($"Considering {fileName}"); + if (Probe(fileName, referenceName.Version, out assm)) + { + return assm; + } + + return null; + } + + /// <summary> + /// Considers a path to load for satisfying an assembly ref and loads it + /// if the file exists and version is sufficient. + /// </summary> + /// <param name="filePath">Path to consider for load</param> + /// <param name="minimumVersion">Minimum version to consider</param> + /// <param name="assembly">loaded assembly</param> + /// <returns>true if assembly was loaded</returns> + private static bool Probe(string filePath, Version minimumVersion, out Assembly assembly) + { + if (File.Exists(filePath)) + { + AssemblyName name = AssemblyName.GetAssemblyName(filePath); + + if (name.Version >= minimumVersion) + { + assembly = Assembly.Load(name); + return true; + } + } + + assembly = null; + return false; + } + } +} diff --git a/src/Tools/CoreFx.Tools/BuildTask.cs b/src/Tools/CoreFx.Tools/BuildTask.cs new file mode 100644 index 0000000000..979a99edff --- /dev/null +++ b/src/Tools/CoreFx.Tools/BuildTask.cs @@ -0,0 +1,37 @@ +// 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. + +using Microsoft.Build.Framework; +using Microsoft.Build.Utilities; + +namespace Microsoft.DotNet.Build.Tasks +{ + public abstract partial class BuildTask : ITask + { + private TaskLoggingHelper _log = null; + + internal TaskLoggingHelper Log + { + get { return _log ?? (_log = new TaskLoggingHelper(this)); } + } + + public BuildTask() + { + } + + public IBuildEngine BuildEngine + { + get; + set; + } + + public ITaskHost HostObject + { + get; + set; + } + + public abstract bool Execute(); + } +} diff --git a/src/Tools/CoreFx.Tools/BuildTask.net45.cs b/src/Tools/CoreFx.Tools/BuildTask.net45.cs new file mode 100644 index 0000000000..5dac621825 --- /dev/null +++ b/src/Tools/CoreFx.Tools/BuildTask.net45.cs @@ -0,0 +1,16 @@ +// 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. + +using Microsoft.DotNet.Build.Common.Desktop; + +namespace Microsoft.DotNet.Build.Tasks +{ + public partial class BuildTask + { + static BuildTask() + { + AssemblyResolver.Enable(); + } + } +} diff --git a/src/Tools/CoreFx.Tools/Configuration/Configuration.cs b/src/Tools/CoreFx.Tools/Configuration/Configuration.cs new file mode 100644 index 0000000000..804ee6b434 --- /dev/null +++ b/src/Tools/CoreFx.Tools/Configuration/Configuration.cs @@ -0,0 +1,208 @@ +// 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. + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Microsoft.DotNet.Build.Tasks +{ + /// <summary> + /// An ordered collection of property values + /// </summary> + public class Configuration + { + public Configuration(PropertyValue[] values) + { + if (values == null) + { + throw new ArgumentNullException(nameof(values)); + } + + Values = values; + } + + public PropertyValue[] Values { get; } + + public static IEqualityComparer<Configuration> CompatibleComparer { get; } = new CompatibleConfigurationComparer(); + + /// <summary> + /// Constructs a configuration string from this configuration + /// </summary> + /// <param name="allowDefaults">true to omit default values from configuration string</param> + /// <param name="encounteredDefault">true if a default value was omitted</param> + /// <returns>configuration string</returns> + private string GetConfigurationString(bool allowDefaults, bool includeInsignificant, out bool encounteredDefault) + { + encounteredDefault = false; + var configurationBuilder = new StringBuilder(); + foreach (var value in Values) + { + if (value.Property.Independent) + { + // skip independent properties + continue; + } + + if (allowDefaults && value == value.Property.DefaultValue) + { + // skip default value + encounteredDefault = true; + continue; + } + + if (!includeInsignificant && value.Property.Insignificant) + { + // skip insignificant properties + continue; + } + + if (configurationBuilder.Length > 0) + { + configurationBuilder.Append(ConfigurationFactory.PropertySeperator); + } + configurationBuilder.Append(value.Value); + } + + return configurationBuilder.ToString(); + } + + /// <summary> + /// Get properties assoicated with this configuration + /// </summary> + /// <returns></returns> + public IDictionary<string, string> GetProperties() + { + Dictionary<string, string> properties = new Dictionary<string, string>(); + + foreach (var value in Values) + { + properties.Add(value.Property.Name, value.Value); + + foreach (var additionalProperty in value.AdditionalProperties) + { + properties.Add(additionalProperty.Key, additionalProperty.Value); + } + } + + return properties; + } + + private static bool[] s_boolValues = new[] { true, false /*, FileNotFound */ }; + private IEnumerable<string> GetConfigurationStrings(bool includeInsignificant) + { + // only allow all defaults or no defaults. + foreach (var allowDefaults in s_boolValues) + { + var encounteredDefault = false; + + yield return GetConfigurationString(allowDefaults, includeInsignificant, out encounteredDefault); + if (!encounteredDefault) + { + // if we didn't encounter a default value don't bother with + // another pass since it will produce the same string. + break; + } + } + } + + public IEnumerable<string> GetConfigurationStrings() + { + return GetConfigurationStrings(includeInsignificant: true); + } + + public IEnumerable<string> GetSignificantConfigurationStrings() + { + return GetConfigurationStrings(includeInsignificant: false); + } + + public string GetDefaultConfigurationString() + { + var unused = false; + return GetConfigurationString(allowDefaults: true, includeInsignificant: true, encounteredDefault: out unused); + } + + public override bool Equals(object obj) + { + if (ReferenceEquals(this, obj)) + { + return true; + } + + var other = obj as Configuration; + + if (other == null) + { + return false; + } + + if (Values.Length != other.Values.Length) + { + return false; + } + return Values.SequenceEqual(other.Values); + } + + private Nullable<int> hashCode; + private Nullable<int> compatibleHashCode; + public override int GetHashCode() + { + if (hashCode == null) + { + hashCode = 0; + foreach (var value in Values) + { + hashCode ^= value.GetHashCode(); + } + } + return hashCode.Value; + } + + // Only examines significant properties for equality + private class CompatibleConfigurationComparer : IEqualityComparer<Configuration> + { + public bool Equals(Configuration x, Configuration y) + { + if (ReferenceEquals(x, y)) + { + return true; + } + + if (x == null || y == null) + { + return false; + } + + var xValues = x.Values.Where(v => !v.Property.Insignificant); + var yValues = y.Values.Where(v => !v.Property.Insignificant); + + return xValues.SequenceEqual(yValues); + } + + public int GetHashCode(Configuration obj) + { + if (obj.compatibleHashCode == null) + { + obj.compatibleHashCode = 0; + foreach (var value in obj.Values) + { + if (!value.Property.Insignificant) + { + obj.compatibleHashCode ^= value.GetHashCode(); + } + } + } + return obj.compatibleHashCode.Value; + } + } + + public override string ToString() + { + var unused = false; + return GetConfigurationString(true, true, out unused); + } + + } +} diff --git a/src/Tools/CoreFx.Tools/Configuration/ConfigurationFactory.cs b/src/Tools/CoreFx.Tools/Configuration/ConfigurationFactory.cs new file mode 100644 index 0000000000..198bcd3769 --- /dev/null +++ b/src/Tools/CoreFx.Tools/Configuration/ConfigurationFactory.cs @@ -0,0 +1,244 @@ +// 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. + +using Microsoft.Build.Framework; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; + +namespace Microsoft.DotNet.Build.Tasks +{ + public class ConfigurationFactory + { + internal const char PropertySeperator = '-'; + + private Dictionary<string, PropertyInfo> Properties { get; } + + private PropertyInfo[] PropertiesByOrder { get; } + + private PropertyInfo[] PropertiesByPrecedence { get; } + + private Dictionary<PropertyInfo, PropertyValue[]> PropertyValues { get; } + + private Dictionary<string, PropertyValue> AllPropertyValues { get; } + + public Configuration IdentityConfiguration { get; } + + public ConfigurationFactory(ITaskItem[] properties, ITaskItem[] propertyValues) + { + Properties = properties.Select(p => new PropertyInfo(p)) + .ToDictionary(p => p.Name, p => p); + PropertiesByOrder = Properties.Values.OrderBy(p => p.Order).ToArray(); + PropertiesByPrecedence = Properties.Values.OrderBy(p => p.Precedence).ToArray(); + + var propertyValueGrouping = propertyValues.Select(v => new PropertyValue(v, Properties)).GroupBy(p => p.Value); + + var duplicateValueGrouping = propertyValueGrouping.Where(g => g.Count() > 1); + + if (duplicateValueGrouping.Any()) + { + var duplicatesMessage = String.Join("; ", duplicateValueGrouping.Select(g => $"Value: {g.Key} Properties: {String.Join(", ", g.Select(p => p.Property.Name))}")); + throw new ArgumentException($"Duplicate values are not permitted. {duplicatesMessage}"); + } + + AllPropertyValues = propertyValueGrouping + .ToDictionary(g => g.Key, g => g.Single()); + + PropertyValues = AllPropertyValues.Values + .GroupBy(v => v.Property) + .ToDictionary(g => g.Key, g => g.ToArray()); + + // connect the graph + foreach (var propertyValue in AllPropertyValues.Values) + { + propertyValue.ConnectValues(AllPropertyValues); + } + + // connect property to value + foreach (var property in Properties.Values) + { + property.ConnectDefault(AllPropertyValues); + } + + IdentityConfiguration = new Configuration(PropertiesByOrder.Select(p => p.IdentityValue).ToArray()); + } + + public IEnumerable<PropertyInfo> GetProperties() + { + return PropertiesByOrder; + } + + /// <summary> + /// Get known values for a property + /// </summary> + /// <param name="property">name of property to retrieve values</param> + /// <returns></returns> + public IEnumerable<PropertyValue> GetValues(string property) + { + PropertyInfo propertyInfo; + + if (!Properties.TryGetValue(property, out propertyInfo)) + { + throw new ArgumentException($"Unknown property name {property}"); + } + + return GetValues(propertyInfo); + } + + /// <summary> + /// Get known values for a property + /// </summary> + /// <param name="property">property to retrieve values</param> + /// <returns></returns> + public IEnumerable<PropertyValue> GetValues(PropertyInfo property) + { + PropertyValue[] values; + + if (!PropertyValues.TryGetValue(property, out values)) + { + throw new ArgumentException($"Unknown property {property}."); + } + + return values; + } + + /// <summary> + /// Calculates all value combinations for properties. + /// </summary> + /// <param name="properties">List of properties, ordered by precedence</param> + /// <param name="selectValues">Value selector that returns values for each property, ordered by precedence</param> + /// <returns>All combinations of values</returns> + public IEnumerable<Configuration> GetConfigurations(Func<PropertyInfo, IEnumerable<PropertyValue>> selectValues) + { + // get all property values, ordered by precedence + var values = PropertiesByPrecedence.Select(selectValues); + + // start with an empty enumerable + IEnumerable<IEnumerable<PropertyValue>> emptySet = new[] { Enumerable.Empty<PropertyValue>() }; + + // accumulate the cross-product + var allValues = values.Aggregate( + emptySet, + (valueSets, propertyValues) => + valueSets.SelectMany(valueSet => + propertyValues.Select(propertyValue => + valueSet.Concat(new[] { propertyValue }) + ))); + + // convert into configuration + return allValues.Select( + valueSet => new Configuration( + valueSet.OrderBy(v => v.Property.Order).ToArray())); + } + + /// <summary> + /// Gets all possible value combinations in order of precedence + /// </summary> + /// <returns></returns> + public IEnumerable<Configuration> GetAllConfigurations() + { + return GetConfigurations(p => GetValues(p)); + } + + /// <summary> + /// Gets all significant combinations in order of precedence + /// </summary> + /// <returns></returns> + public IEnumerable<Configuration> GetSignficantConfigurations() + { + return GetConfigurations(p => p.Insignificant ? new[] { p.IdentityValue } : GetValues(p)); + } + + /// <summary> + /// Gets value combinations compatible with the specify value combination in order of precedence + /// </summary> + /// <param name="valueSet"></param> + /// <returns></returns> + public IEnumerable<Configuration> GetCompatibleConfigurations(Configuration configuration, bool doNotAllowCompatibleValues = false) + { + var propTable = configuration.Values.ToDictionary(v => v.Property, v => v); + + return GetConfigurations(p => propTable[p].GetCompatibleValues(doNotAllowCompatibleValues)); + } + + /// <summary> + /// Parses a configuration string to return a Configuration. + /// </summary> + /// <param name="configurationString"></param> + /// <returns></returns> + internal Configuration ParseConfiguration(string configurationString, bool permitUnknownValues = false) + { + var values = configurationString.Split(PropertySeperator); + + var valueSet = new PropertyValue[PropertiesByOrder.Length]; + + for(int propertyIndex = 0, valueIndex = 0; propertyIndex < PropertiesByOrder.Length; propertyIndex++, valueIndex++) + { + var value = valueIndex < values.Length ? values[valueIndex] : null; + var property = PropertiesByOrder[propertyIndex]; + + if (String.IsNullOrEmpty(value)) + { + if (property.DefaultValue != null) + { + valueSet[propertyIndex] = property.DefaultValue; + continue; + } + else + { + throw new ArgumentException($"No value was provided for property '{property.Name}' and no default value exists"); + } + } + + PropertyValue propertyValue; + + if (!AllPropertyValues.TryGetValue(value, out propertyValue)) + { + if (permitUnknownValues) + { + valueSet[propertyIndex] = new PropertyValue(value, property); + continue; + } + else + { + throw new ArgumentException($"Unknown value '{value}' found in configuration '{configurationString}'. Expected property '{property.Name}' with one of values {String.Join(", ", PropertyValues[property].Select(v => v.Value))}."); + } + } + + if (propertyValue.Property != property) + { + // we have a known value but it is not for the expected property. + // so long as we have properties with defaultValues, set them + while(propertyValue.Property != property) + { + if (property.DefaultValue == null) + { + // we can't use this property at this index + throw new ArgumentException($"Property '{propertyValue.Property.Name}' value '{propertyValue.Value}' occured at unexpected position in configuration '{configurationString}'"); + } + + // give this property its default value and advance to the next property + valueSet[propertyIndex++] = property.DefaultValue; + + if (propertyIndex > PropertiesByOrder.Length) + { + // we ran out of possible properties. + throw new ArgumentException($"Property '{propertyValue.Property.Name}' value '{propertyValue.Value}' occured at unexpected position in configuration '{configurationString}'"); + } + + property = PropertiesByOrder[propertyIndex]; + } + } + + // we found the position for this value. + Debug.Assert(propertyValue.Property == property); + valueSet[propertyIndex] = propertyValue; + } + + return new Configuration(valueSet); + } + } +} + diff --git a/src/Tools/CoreFx.Tools/Configuration/PropertyInfo.cs b/src/Tools/CoreFx.Tools/Configuration/PropertyInfo.cs new file mode 100644 index 0000000000..7272bec632 --- /dev/null +++ b/src/Tools/CoreFx.Tools/Configuration/PropertyInfo.cs @@ -0,0 +1,117 @@ +// 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. + +using Microsoft.Build.Utilities; +using Microsoft.Build.Framework; +using System.Collections.Generic; +using System.Linq; +using System; +using System.Text; +using System.IO; +using System.Diagnostics; +using Microsoft.Build.Construction; +using System.Collections; + +namespace Microsoft.DotNet.Build.Tasks +{ + [DebuggerDisplay("{Name}")] + public class PropertyInfo + { + private string defaultValue; + public PropertyValue DefaultValue { get; private set; } + + public PropertyValue IdentityValue { get; } + + public string Name { get; } + + public int Order { get; } + + public int Precedence { get; } + + public bool Insignificant { get; } + + public bool Independent { get; } + + public PropertyInfo(ITaskItem propertyItem) + { + Name = propertyItem.ItemSpec; + defaultValue = propertyItem.GetMetadata(nameof(DefaultValue)); + Order = ParseIntMetadata(propertyItem, nameof(Order)); + + Precedence = int.MaxValue; + var precedence = propertyItem.GetMetadata(nameof(Precedence)); + if (precedence.Equals(nameof(Independent), StringComparison.OrdinalIgnoreCase)) + { + Independent = Insignificant = true; + } + else if (precedence.Equals(nameof(Insignificant), StringComparison.OrdinalIgnoreCase)) + { + Insignificant = true; + } + else + { + Precedence = ParseIntMetadata(propertyItem, nameof(Precedence)); + } + + IdentityValue = new PropertyValue($"$({Name})", this); + } + + private static int ParseIntMetadata(ITaskItem item, string name) + { + int value; + var metadata = item.GetMetadata(name); + + if (!int.TryParse(metadata, out value)) + { + throw new InvalidDataException($"Could not parse value '{metadata}' from required metadata '{name}' on item '{item.ItemSpec}'."); + } + + return value; + } + + public void ConnectDefault(IDictionary<string, PropertyValue> values) + { + if (String.IsNullOrEmpty(defaultValue)) + { + return; + } + + PropertyValue value; + if (!values.TryGetValue(defaultValue, out value)) + { + throw new ArgumentException($"Property '{Name}' specified default '{defaultValue}' which is not a known value."); + } + + if (value.Property != this) + { + throw new ArgumentException($"Property '{Name}' specified default '{defaultValue}' but that value is associated with property '{value.Property.Name}'."); + } + + DefaultValue = value; + } + + public override bool Equals(object obj) + { + if (ReferenceEquals(this, obj)) + { + return true; + } + + var other = obj as PropertyInfo; + + if (other == null) + { + return false; + } + + return Name == other.Name; + } + + public override int GetHashCode() + { + return Name.GetHashCode(); + } + } +} + diff --git a/src/Tools/CoreFx.Tools/Configuration/PropertyValue.cs b/src/Tools/CoreFx.Tools/Configuration/PropertyValue.cs new file mode 100644 index 0000000000..d0c8516296 --- /dev/null +++ b/src/Tools/CoreFx.Tools/Configuration/PropertyValue.cs @@ -0,0 +1,157 @@ +// 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. + +using Microsoft.Build.Utilities; +using Microsoft.Build.Framework; +using System.Collections.Generic; +using System.Linq; +using System; +using System.Text; +using System.IO; +using System.Diagnostics; +using Microsoft.Build.Construction; +using System.Collections; + +namespace Microsoft.DotNet.Build.Tasks +{ + [DebuggerDisplay("{Property.Name} = {Value}")] + public class PropertyValue + { + private const string PropertyName = "Property"; + private const string ImportsName = "Imports"; + private const string CompatibleWithName = "CompatibleWith"; + + private static string[] s_excludedMetadata = new[] { PropertyName, ImportsName, CompatibleWithName }; + private static char[] s_SplitChar = new[] { ';' }; + + private string imports; + private string compatibleWith; + + public KeyValuePair<string, string>[] AdditionalProperties { get; } + + public IEnumerable<PropertyValue> CompatibleValues { get; private set; } + + public IEnumerable<PropertyValue> ImportValues { get; private set; } + + public PropertyInfo Property { get; } + + public string Value { get; } + + public PropertyValue(ITaskItem propertyValue, Dictionary<string, PropertyInfo> propertyNames) + { + Value = propertyValue.ItemSpec; + + var name = propertyValue.GetMetadata(PropertyName); + PropertyInfo property; + if (!propertyNames.TryGetValue(name, out property)) + { + throw new Exception($"PropertyValue {Value} contained unknown property name \"{name}\""); + } + Property = property; + + imports = propertyValue.GetMetadata(ImportsName); + compatibleWith = propertyValue.GetMetadata(CompatibleWithName); + + var customMetadata = propertyValue.CloneCustomMetadata(); + AdditionalProperties = customMetadata.Keys.Cast<string>() + .Where(k => !s_excludedMetadata.Contains(k)) + .Select(k => new KeyValuePair<string, string>(k, (string)customMetadata[k])) + .ToArray(); + } + + public PropertyValue(string value, PropertyInfo property) + { + Value = value; + Property = property; + AdditionalProperties = new KeyValuePair<string, string>[0]; + CompatibleValues = Enumerable.Empty<PropertyValue>(); + ImportValues = Enumerable.Empty<PropertyValue>(); + } + + public void ConnectValues(Dictionary<string, PropertyValue> values) + { + ImportValues = ConnectValues(imports, values); + CompatibleValues = ConnectValues(compatibleWith, values); + } + + private IEnumerable<PropertyValue> ConnectValues(string property, Dictionary<string, PropertyValue> values) + { + List<PropertyValue> connectedValues = new List<PropertyValue>(); + + if (!String.IsNullOrEmpty(property)) + { + foreach (var value in property.Split(s_SplitChar)) + { + PropertyValue otherProperty; + if (!values.TryGetValue(value, out otherProperty)) + { + throw new Exception($"Unknown compatible value {value} for property {Property.Name} value {Value}."); + } + connectedValues.Add(otherProperty); + } + } + + return connectedValues; + } + + public IEnumerable<PropertyValue> GetCompatibleValues(bool doNotAllowCompatibleValues) + { + var queue = new Queue<PropertyValue>(); + var visited = new HashSet<PropertyValue>(); + + IEnumerable<PropertyValue> roots = new[] { this }; + + if (!doNotAllowCompatibleValues) + { + roots = roots.Concat(CompatibleValues); + } + + // do a breadth first traversal of imports from each root, without duplicates + foreach (var root in roots) + { + queue.Enqueue(root); + visited.Add(root); + + while (queue.Count > 0) + { + var current = queue.Dequeue(); + + yield return current; + + foreach (var import in current.ImportValues) + { + if (!visited.Contains(import)) + { + queue.Enqueue(import); + visited.Add(import); + } + } + } + } + } + + public override bool Equals(object obj) + { + if (ReferenceEquals(this, obj)) + { + return true; + } + + var other = obj as PropertyValue; + + if (other == null) + { + return false; + } + + return Value == other.Value && Property == other.Property; + } + + public override int GetHashCode() + { + return Value.GetHashCode() ^ Property.GetHashCode(); + } + } +} + diff --git a/src/Tools/CoreFx.Tools/ConfigurationTask.cs b/src/Tools/CoreFx.Tools/ConfigurationTask.cs new file mode 100644 index 0000000000..4deea36283 --- /dev/null +++ b/src/Tools/CoreFx.Tools/ConfigurationTask.cs @@ -0,0 +1,46 @@ +// 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. + +using Microsoft.Build.Framework; +using Microsoft.Build.Utilities; +using System.Collections.Generic; +using System.Linq; + +namespace Microsoft.DotNet.Build.Tasks +{ + public abstract partial class ConfigurationTask : BuildTask + { + /// <summary> + /// List of properties in order of precedence. + /// Metadata: + /// DefaultValue: default value for the property. Default values may be omitted from configuration strings. + /// Precedence: integer indicating selection precedence. + /// Order: integer indicating configuration string ordering. + /// </summary> + [Required] + public ITaskItem[] Properties { get; set; } + + /// <summary> + /// Relations between property values. + /// + /// Identity: PropertyValue + /// Metadata: + /// Property: Name of property to which this value applies + /// Imports: List of other property values to consider, in breadth first order, after this value. + /// CompatibleWith: List of additional property values to consider, after all imports have been considered. + /// Each value will independently undergo a breadth-first traversal of imports. + /// Other values: Properties to be set when this configuration property is set. + /// </summary> + [Required] + public ITaskItem[] PropertyValues { get; set; } + + + protected void LoadConfiguration() + { + ConfigurationFactory = new ConfigurationFactory(Properties, PropertyValues); + } + + public ConfigurationFactory ConfigurationFactory { get; private set; } + } +} diff --git a/src/Tools/CoreFx.Tools/CoreFx.Tools.builds b/src/Tools/CoreFx.Tools/CoreFx.Tools.builds new file mode 100644 index 0000000000..4f6bd85184 --- /dev/null +++ b/src/Tools/CoreFx.Tools/CoreFx.Tools.builds @@ -0,0 +1,12 @@ +<?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> + <Project Include="$(MSBuildThisFileDirectory)$(MSBuildProjectName).csproj" /> + <Project Include="$(MSBuildThisFileDirectory)$(MSBuildProjectName).csproj"> + <TargetGroup>net45</TargetGroup> + </Project> + </ItemGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> +</Project> + diff --git a/src/Tools/CoreFx.Tools/CoreFx.Tools.csproj b/src/Tools/CoreFx.Tools/CoreFx.Tools.csproj new file mode 100644 index 0000000000..58e14f4f4e --- /dev/null +++ b/src/Tools/CoreFx.Tools/CoreFx.Tools.csproj @@ -0,0 +1,38 @@ +<?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> + <NuGetTargetMoniker Condition="'$(TargetGroup)' == 'net45'">.NETFramework,Version=v4.5</NuGetTargetMoniker> + <CLSCompliant>false</CLSCompliant> + <ProjectGuid>{360F25FA-3CD9-4338-B961-A4F3122B88B2}</ProjectGuid> + <OutputPath Condition="'$(TargetGroup)' != 'net45'">$(CoreFxToolsDir)</OutputPath> + <OutputPath Condition="'$(TargetGroup)' == 'net45'">$(CoreFxDesktopToolsDir)</OutputPath> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)' == 'netstandard1.5_Debug'" /> + <PropertyGroup Condition="'$(Configuration)' == 'net45_Debug'" /> + <ItemGroup> + <Compile Include="ConfigurationTask.cs" /> + <Compile Include="BuildTask.cs" /> + <Compile Include="Configuration\Configuration.cs" /> + <Compile Include="Configuration\ConfigurationFactory.cs" /> + <Compile Include="Configuration\PropertyValue.cs" /> + <Compile Include="Configuration\PropertyInfo.cs" /> + <Compile Include="GenerateConfigurationProps.cs" /> + <Compile Include="FindBestConfiguration.cs" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetGroup)' == 'net45'"> + <Compile Include="BuildTask.net45.cs" /> + <Compile Include="AssemblyResolver.cs" /> + <TargetingPackReference Include="System" /> + <TargetingPackReference Include="System.Core" /> + <TargetingPackReference Include="Microsoft.Build" /> + <TargetingPackReference Include="Microsoft.Build.Framework" /> + <TargetingPackReference Include="Microsoft.Build.Utilities.v4.0" /> + </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/Tools/CoreFx.Tools/FindBestConfiguration.cs b/src/Tools/CoreFx.Tools/FindBestConfiguration.cs new file mode 100644 index 0000000000..a9fd6cf3db --- /dev/null +++ b/src/Tools/CoreFx.Tools/FindBestConfiguration.cs @@ -0,0 +1,55 @@ +// 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. + +using Microsoft.Build.Framework; +using Microsoft.Build.Utilities; +using System.Collections; +using System.Collections.Generic; +using System.Linq; + +namespace Microsoft.DotNet.Build.Tasks +{ + public class FindBestConfiguration : ConfigurationTask + { + [Required] + public string BuildConfiguration { get; set; } + + [Required] + public string[] BuildConfigurations { get; set; } + + public bool DoNotAllowCompatibleValues { get; set; } + + [Output] + public ITaskItem BestConfiguration { get; set; } + + public override bool Execute() + { + LoadConfiguration(); + + var supportedProjectConfigurations = new HashSet<Configuration>( + BuildConfigurations.Where(c => !string.IsNullOrWhiteSpace(c)).Select(c => ConfigurationFactory.ParseConfiguration(c)), + Configuration.CompatibleComparer); + + var buildConfiguration = ConfigurationFactory.ParseConfiguration(BuildConfiguration); + + var compatibleConfigurations = ConfigurationFactory.GetCompatibleConfigurations(buildConfiguration, DoNotAllowCompatibleValues); + + var bestConfiguration = compatibleConfigurations.FirstOrDefault(c => supportedProjectConfigurations.Contains(c)); + + if (bestConfiguration == null) + { + Log.LogError($"Could not find any applicable configuration for '{buildConfiguration}' among projectConfigurations {string.Join(", ", supportedProjectConfigurations.Select(c => c.ToString()))}"); + Log.LogMessage(MessageImportance.Low, $"Compatible configurations: {string.Join(", ", compatibleConfigurations.Select(c => c.ToString()))}"); + } + else + { + Log.LogMessage(MessageImportance.Low, $"Chose configuration {bestConfiguration}"); + BestConfiguration = new TaskItem(bestConfiguration.ToString(), (IDictionary)bestConfiguration.GetProperties()); + } + + return !Log.HasLoggedErrors; + } + } +} + diff --git a/src/Tools/CoreFx.Tools/GenerateConfigurationProps.cs b/src/Tools/CoreFx.Tools/GenerateConfigurationProps.cs new file mode 100644 index 0000000000..75399daf3b --- /dev/null +++ b/src/Tools/CoreFx.Tools/GenerateConfigurationProps.cs @@ -0,0 +1,298 @@ +// 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. + +using Microsoft.Build.Construction; +using Microsoft.Build.Framework; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; + +namespace Microsoft.DotNet.Build.Tasks +{ + public class GenerateConfigurationProps : ConfigurationTask + { + private const char ConfigurationSeperator = ';'; + private const string ConfigurationSeperatorString = ";"; + private const string BuildConfigurationProperty = "BuildConfiguration"; + private const string AvailableBuildConfigurationsProperty = "BuildConfigurations"; + private const string ConfigurationProperty = "Configuration"; + private const string RuntimeOSProperty = "RuntimeOS"; + private const string PropsFileName = "configuration"; + private const string ConfigurationPropsPrefix = "setConfiguration"; + private const string PropsFileExtension = ".props"; + private const string ErrorMessageProperty = "ConfigurationErrorMsg"; + private const string CurrentDirectoryIdentifier = "$(MSBuildThisFileDirectory)"; + + /// <summary> + /// Directory in which to generate props files. + /// </summary> + [Required] + public string PropsFolder { get; set; } + + /// <summary> + /// Generates a set of props files which can statically determine the best $(Configuration) for + /// a given $(BuildConfiguration) from a set of configurations $(BuildConfigurations). + /// Props files also set properties based on $(Configuration) like TargetGroup, OSGroup, + /// NuGetTargetMoniker, etc. + /// </summary> + /// <returns></returns> + public override bool Execute() + { + LoadConfiguration(); + + var project = ProjectRootElement.Create(); + + var projectConfigurationNotSetCondition = $"'$({ConfigurationProperty})' == ''"; + var buildConfigurationPropsFilePath = $"{ConfigurationPropsPrefix}{PropsFileExtension}"; + var buildConfigurationImport = project.AddImport($"{CurrentDirectoryIdentifier}{buildConfigurationPropsFilePath}"); + buildConfigurationImport.Condition = projectConfigurationNotSetCondition; + + CreateBuildConfigurationPropsFile(buildConfigurationPropsFilePath); + + // Parse the properties that are part of Configuration + ParseProperties(ConfigurationProperty, project, true, p => !p.Independent); + + // Parse the independent properties that aren't part of Configuration + ParseProperties(BuildConfigurationProperty, project, true, p => p.Independent); + + CreateRuntimeIdentifier(project); + + var projectPath = Path.Combine(PropsFolder, $"{PropsFileName}{PropsFileExtension}"); + project.Save(projectPath); + + return !Log.HasLoggedErrors; + } + + + /// <summary> + /// Generates choose/when statements to parse values from configuration string + /// </summary> + /// <param name="propertyName">name of property to parse</param> + /// <param name="project">project to update</param> + private void ParseProperties(string propertyName, ProjectRootElement project, bool includeAdditionalProperites, Func<PropertyInfo, bool> configurationSelector) + { + var parseConfigurationPropertyGroup = project.LastChild as ProjectPropertyGroupElement; + + if (parseConfigurationPropertyGroup == null || !string.IsNullOrEmpty(project.LastChild.Condition)) + { + parseConfigurationPropertyGroup = project.CreatePropertyGroupElement(); + project.AppendChild(parseConfigurationPropertyGroup); + } + + // delimit property for parsing, this gaurntees that every property value is surrounded in delimiters + var parsePropertyName = $"_parse_{propertyName}"; + var parseConfigurationValue = $"{ConfigurationFactory.PropertySeperator}$({propertyName}){ConfigurationFactory.PropertySeperator}"; + parseConfigurationPropertyGroup.AddProperty(parsePropertyName, parseConfigurationValue); + + // foreach property, pull it out of Configuration and set derived values. + foreach (var property in ConfigurationFactory.GetProperties().Where(configurationSelector)) + { + var choosePropertiesElement = project.CreateChooseElement(); + project.AppendChild(choosePropertiesElement); + + foreach (var value in ConfigurationFactory.GetValues(property)) + { + var propertiesCondition = CreateContainsCondition(parsePropertyName, ConfigurationFactory.PropertySeperator + value.Value + ConfigurationFactory.PropertySeperator); + var whenPropertiesElement = project.CreateWhenElement(propertiesCondition); + choosePropertiesElement.AppendChild(whenPropertiesElement); + + AddProperties(whenPropertiesElement, value, includeAdditionalProperites); + } + + var otherwisePropertiesElement = project.CreateOtherwiseElement(); + choosePropertiesElement.AppendChild(otherwisePropertiesElement); + + if (property.DefaultValue != null) + { + AddProperties(otherwisePropertiesElement, property.DefaultValue, includeAdditionalProperites); + } + else + { + var otherwiseErrorPropertyGroup = project.CreatePropertyGroupElement(); + otherwisePropertiesElement.AppendChild(otherwiseErrorPropertyGroup); + + otherwiseErrorPropertyGroup.AddProperty(ErrorMessageProperty, $"$({ErrorMessageProperty})Could not find a value for {property.Name} from {propertyName} '$({propertyName})'."); + } + } + } + + private void CreateRuntimeIdentifier(ProjectRootElement project) + { + var rid = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment.GetRuntimeIdentifier(); + + string[] ridParts = rid.Split('-'); + + if (ridParts.Length < 1) + { + throw new System.InvalidOperationException($"Unknown rid format {rid}."); + } + + string osNameAndVersion = ridParts[0]; + + var propertyGroup = project.CreatePropertyGroupElement(); + project.AppendChild(propertyGroup); + + var runtimeProperty = propertyGroup.AddProperty(RuntimeOSProperty, $"{osNameAndVersion}"); + runtimeProperty.Condition = $"'$({RuntimeOSProperty})' == ''"; + + Log.LogMessage($"Running on OS with RID {rid}, so defaulting RuntimeOS to '{osNameAndVersion}'"); + } + + /// <summary> + /// Creates a props file to find best $(Configuration) from $(BuildConfigurations) for any $(BuildConfiguration) + /// </summary> + private void CreateBuildConfigurationPropsFile(string fileName) + { + var buildConfigurationProps = ProjectRootElement.Create(); + + // pull apart BuildConfiguration, but don't set any derived properties + ParseProperties(BuildConfigurationProperty, buildConfigurationProps, false, p => !p.Independent); + + // Set error on missing import + var buildConfigurationsPropertyGroup = buildConfigurationProps.CreatePropertyGroupElement(); + buildConfigurationProps.AppendChild(buildConfigurationsPropertyGroup); + + // get path to import + var buildConfigurationImportName = $"_import_{BuildConfigurationProperty}_props"; + var significantBuildConfiguration = ConfigurationFactory.IdentityConfiguration.GetSignificantConfigurationStrings().First(); + var buildConfigurationImportPath = $"{CurrentDirectoryIdentifier}{ConfigurationPropsPrefix}.{significantBuildConfiguration}{PropsFileExtension}"; + buildConfigurationsPropertyGroup.AddProperty(buildConfigurationImportName, buildConfigurationImportPath); + + var missingImportError = buildConfigurationsPropertyGroup.AddProperty(ErrorMessageProperty, $"$({ErrorMessageProperty}){ConfigurationProperty} is not set and $({BuildConfigurationProperty}) is not a known value for {BuildConfigurationProperty}."); + missingImportError.Condition = $"!Exists('$({buildConfigurationImportName})')"; + + // import props to set ProjectConfiguration + var buildConfigurationImport = buildConfigurationProps.CreateImportElement($"$({buildConfigurationImportName})"); + buildConfigurationImport.Condition = $"Exists('$({buildConfigurationImportName})')"; + buildConfigurationProps.AppendChild(buildConfigurationImport); + + // iterate over all possible configuration strings + foreach (var buildConfiguration in ConfigurationFactory.GetSignficantConfigurations()) + { + CreateBuildConfigurationPropsFile(buildConfiguration); + } + + buildConfigurationProps.Save(Path.Combine(PropsFolder, fileName)); + } + + /// <summary> + /// Creates a props file to find best $(Configuration) from $(BuildConfigurations) for a specific $(BuildConfiguration) + /// </summary> + /// <param name="buildConfiguration"></param> + private void CreateBuildConfigurationPropsFile(Configuration buildConfiguration) + { + var configurationSpecificProps = ProjectRootElement.Create(); + var compatibleConfigurationStrings = new StringBuilder(); + + // delimit BuildConfigurations for parsing + var parseBuildConfigurationsPropertyGroup = configurationSpecificProps.AddPropertyGroup(); + var parseBuildConfigurationsName = $"_parse_{AvailableBuildConfigurationsProperty}"; + var parseBuildConfigurationsValue = $"{ConfigurationSeperator}$({AvailableBuildConfigurationsProperty}.Replace('%0A','').Replace('%0D','').Replace(' ','')){ConfigurationSeperator}"; + parseBuildConfigurationsPropertyGroup.AddProperty(parseBuildConfigurationsName, parseBuildConfigurationsValue); + + var chooseConfigurationElement = configurationSpecificProps.CreateChooseElement(); + configurationSpecificProps.AppendChild(chooseConfigurationElement); + + // determine compatible project configurations and select best one + foreach (var compatibleConfiguration in ConfigurationFactory.GetCompatibleConfigurations(buildConfiguration)) + { + var configurationStrings = compatibleConfiguration.GetSignificantConfigurationStrings(); + + if (compatibleConfigurationStrings.Length > 0) + { + compatibleConfigurationStrings.Append(ConfigurationSeperatorString); + } + compatibleConfigurationStrings.Append(string.Join(ConfigurationSeperatorString, configurationStrings)); + + var guardedProjectConfigurationStrings = configurationStrings.Select(c => ConfigurationSeperator + c + ConfigurationSeperator); + var configurationCondition = CreateContainsCondition(parseBuildConfigurationsName, guardedProjectConfigurationStrings); + var whenConfigurationElement = configurationSpecificProps.CreateWhenElement(configurationCondition); + chooseConfigurationElement.AppendChild(whenConfigurationElement); + + // add property to set Configuration + var setConfigurationPropertyGroup = configurationSpecificProps.CreatePropertyGroupElement(); + whenConfigurationElement.AppendChild(setConfigurationPropertyGroup); + + // set project configuration + setConfigurationPropertyGroup.AddProperty(ConfigurationProperty, compatibleConfiguration.GetDefaultConfigurationString()); + } + + var configurationOtherwiseElement = configurationSpecificProps.CreateOtherwiseElement(); + chooseConfigurationElement.AppendChild(configurationOtherwiseElement); + + var configurationOtherwisePropertyGroup = configurationSpecificProps.CreatePropertyGroupElement(); + configurationOtherwiseElement.AppendChild(configurationOtherwisePropertyGroup); + + configurationOtherwisePropertyGroup.AddProperty(ErrorMessageProperty, + $"$({ErrorMessageProperty})Could not find a compatible configuration for {BuildConfigurationProperty} '$({BuildConfigurationProperty})' " + + $"from {AvailableBuildConfigurationsProperty} '$({parseBuildConfigurationsName})'. " + + $"Considered {compatibleConfigurationStrings}."); + + // save a copy of for each synonymous config string + foreach (var configurationString in buildConfiguration.GetSignificantConfigurationStrings()) + { + var configurationProjectPath = Path.Combine(PropsFolder, $"{ConfigurationPropsPrefix}.{configurationString}{PropsFileExtension}"); + configurationSpecificProps.Save(configurationProjectPath); + } + } + + private void AddProperties(ProjectElementContainer parent, PropertyValue value, bool includeAddtionalProperties) + { + var propertyGroup = parent.ContainingProject.CreatePropertyGroupElement(); + parent.AppendChild(propertyGroup); + + propertyGroup.AddProperty(value.Property.Name, value.Value); + + if (includeAddtionalProperties) + { + foreach (var additionalProperty in value.AdditionalProperties) + { + propertyGroup.AddProperty(additionalProperty.Key, additionalProperty.Value); + } + } + } + + private string CreateEqualsCondition(string propertyName, IEnumerable<string> propertyValues) + { + var condition = new StringBuilder(); + + foreach (var propertyValue in propertyValues) + { + if (condition.Length != 0) + { + condition.Append(" OR "); + } + + condition.Append($"'$({propertyName})' == '{propertyValue}'"); + } + + return condition.ToString(); + } + + private string CreateContainsCondition(string propertyName, string propertyValue) + { + return $"$({propertyName}.Contains('{propertyValue}'))"; + } + + private string CreateContainsCondition(string propertyName, IEnumerable<string> propertyValues) + { + var condition = new StringBuilder(); + + foreach (var propertyValue in propertyValues) + { + if (condition.Length != 0) + { + condition.Append(" OR "); + } + + condition.Append($"$({propertyName}.Contains('{propertyValue}'))"); + } + + return condition.ToString(); + } + } +} + diff --git a/src/Tools/CoreFx.Tools/project.json b/src/Tools/CoreFx.Tools/project.json new file mode 100644 index 0000000000..947ee2d4e0 --- /dev/null +++ b/src/Tools/CoreFx.Tools/project.json @@ -0,0 +1,26 @@ +{ + "dependencies": { + "Microsoft.DotNet.PlatformAbstractions": "1.2.0-beta-001090", + "NETStandard.Library": "1.6.0" + }, + "frameworks": { + "netstandard1.5": { + "dependencies": { + "Microsoft.Build": "0.1.0-preview-00022", + "Microsoft.Build.Framework": "0.1.0-preview-00022", + "Microsoft.Build.Tasks.Core": "0.1.0-preview-00022", + "Microsoft.Build.Utilities.Core": "0.1.0-preview-00022", + "Microsoft.Tpl.Dataflow": { + "version": "4.5.24", + "exclude": "all" + } + }, + "imports": [ "dnxcore50", "portable-net45+win8+wpa81" ] + }, + "net45": { + "dependencies": { + "Microsoft.TargetingPack.NETFramework.v4.5": "1.0.1" + } + } + } +} diff --git a/src/Tools/GenerateProps/GenerateProps.proj b/src/Tools/GenerateProps/GenerateProps.proj new file mode 100644 index 0000000000..311afda9d2 --- /dev/null +++ b/src/Tools/GenerateProps/GenerateProps.proj @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + + <Import Project="properties.props"/> + + <UsingTask TaskName="GenerateConfigurationProps" AssemblyFile="$(CoreFxToolsTaskDir)CoreFx.Tools.dll"/> + <UsingTask TaskName="FindBestConfiguration" AssemblyFile="$(CoreFxToolsTaskDir)CoreFx.Tools.dll"/> + + <Target Name="Build"> + <PropertyGroup> + <ConfigurationPropsFolder>$(ToolsDir)configuration</ConfigurationPropsFolder> + </PropertyGroup> + + <GenerateConfigurationProps Properties="@(Property)" PropertyValues="@(PropertyValue)" PropsFolder="$(ConfigurationPropsFolder)" /> + </Target> + + <Target Name="FindBestConfiguration"> + <PropertyGroup> + <ProjectConfigurations>netcoreapp1.1;netstandard1.0-Windows_NT;netstandard1.6</ProjectConfigurations> + </PropertyGroup> + + <FindBestConfiguration Properties="@(Property)" + PropertyValues="@(PropertyValue)" + BuildConfigurations="$(ProjectConfigurations)" + BuildConfiguration="netcoreapp1.1-Windows_NT-Debug-x64"> + <Output TaskParameter="BestConfiguration" ItemName="ProjectConfiguration" /> + </FindBestConfiguration> + </Target> + + <Target Name="AnnotateProjectsWithConfiguration" + Returns="@(ProjectWithConfiguration)" > + <ItemGroup> + <ProjectWithConfiguration Include="@(Project)" /> + </ItemGroup> + </Target> +</Project>
\ No newline at end of file diff --git a/src/Tools/GenerateProps/archgroups.props b/src/Tools/GenerateProps/archgroups.props new file mode 100644 index 0000000000..a03d975090 --- /dev/null +++ b/src/Tools/GenerateProps/archgroups.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <ArchGroups Include="x86" /> + <ArchGroups Include="x64" /> + <ArchGroups Include="arm" /> + <ArchGroups Include="arm64" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/src/Tools/GenerateProps/configurationgroups.props b/src/Tools/GenerateProps/configurationgroups.props new file mode 100644 index 0000000000..882c358686 --- /dev/null +++ b/src/Tools/GenerateProps/configurationgroups.props @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <ConfigurationGroups Include="Debug" /> + <ConfigurationGroups Include="Release" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/src/Tools/GenerateProps/osgroups.props b/src/Tools/GenerateProps/osgroups.props new file mode 100644 index 0000000000..db908b8a15 --- /dev/null +++ b/src/Tools/GenerateProps/osgroups.props @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <OSGroups Include="Windows_NT"> + <Imports>AnyOS</Imports> + <TargetsWindows>true</TargetsWindows> + </OSGroups> + <OSGroups Include="Unix"> + <Imports>AnyOS</Imports> + <TargetsUnix>true</TargetsUnix> + <TargetsLinux>true</TargetsLinux> + </OSGroups> + <OSGroups Include="Linux"> + <Imports>Unix</Imports> + <TargetsUnix>true</TargetsUnix> + <TargetsLinux>true</TargetsLinux> + </OSGroups> + <OSGroups Include="OSX"> + <Imports>Unix</Imports> + <TargetsUnix>true</TargetsUnix> + <TargetsOSX>true</TargetsOSX> + </OSGroups> + <OSGroups Include="FreeBSD"> + <Imports>Unix</Imports> + <TargetsUnix>true</TargetsUnix> + <TargetsFreeBSD>true</TargetsFreeBSD> + </OSGroups> + <OSGroups Include="NetBSD"> + <Imports>Unix</Imports> + <TargetsUnix>true</TargetsUnix> + <TargetsNetBSD>true</TargetsNetBSD> + </OSGroups> + <OSGroups Include="AnyOS" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/src/Tools/GenerateProps/properties.props b/src/Tools/GenerateProps/properties.props new file mode 100644 index 0000000000..50cb3708e1 --- /dev/null +++ b/src/Tools/GenerateProps/properties.props @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="osgroups.props"/> + <Import Project="targetgroups.props"/> + <Import Project="configurationgroups.props"/> + <Import Project="archgroups.props"/> + + <ItemGroup> + <Property Include="OSGroup"> + <DefaultValue>AnyOS</DefaultValue> + <!-- OSGroup has higest precedence --> + <Precedence>1</Precedence> + <!-- OSGroup appears second in configuration string --> + <Order>2</Order> + </Property> + <Property Include="TargetGroup"> + <!-- No default value --> + <DefaultValue></DefaultValue> + <!-- TargetGroup has lower precedence --> + <Precedence>2</Precedence> + <!-- TargetGroup appears first in configuration string --> + <Order>1</Order> + </Property> + <Property Include="ConfigurationGroup"> + <DefaultValue>Debug</DefaultValue> + <!-- Property is insignificant to compatibility decisions, but persisted in configuration strings --> + <Precedence>Insignificant</Precedence> + <Order>3</Order> + </Property> + <Property Include="ArchGroup"> + <DefaultValue>x64</DefaultValue> + <!-- Property is insignificant to compatibility decisions, and independent from the configuration strings --> + <Precedence>Independent</Precedence> + <Order>4</Order> + </Property> + + <PropertyValue Include="@(OSGroups)"> + <Property>OSGroup</Property> + </PropertyValue> + <PropertyValue Include="@(TargetGroups)"> + <Property>TargetGroup</Property> + </PropertyValue> + <PropertyValue Include="@(ConfigurationGroups)"> + <Property>ConfigurationGroup</Property> + </PropertyValue> + <PropertyValue Include="@(ArchGroups)"> + <Property>ArchGroup</Property> + </PropertyValue> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/src/Tools/GenerateProps/targetgroups.props b/src/Tools/GenerateProps/targetgroups.props new file mode 100644 index 0000000000..6a96669b94 --- /dev/null +++ b/src/Tools/GenerateProps/targetgroups.props @@ -0,0 +1,153 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <TargetGroups Include="netcore50"> + <PackageTargetFramework>netcore50</PackageTargetFramework> + <TargetingPackNugetPackageId>Microsoft.TargetingPack.Private.NetNative</TargetingPackNugetPackageId> + <NuGetTargetMoniker>.NETCore,Version=v5.0</NuGetTargetMoniker> + <CompatibleWith>netstandard1.4</CompatibleWith> + </TargetGroups> + <TargetGroups Include="netcore50aot"> + <PackageTargetFramework>netcore50</PackageTargetFramework> + <PackageTargetRuntime>aot</PackageTargetRuntime> + <TargetingPackNugetPackageId>Microsoft.TargetingPack.Private.NetNative</TargetingPackNugetPackageId> + <NuGetTargetMoniker>.NETCore,Version=v5.0</NuGetTargetMoniker> + <Imports>netcore50</Imports> + <CompatibleWith>netstandard1.7</CompatibleWith> + </TargetGroups> + <TargetGroups Include="netstandard1.0"> + <PackageTargetFramework>netstandard1.0</PackageTargetFramework> + <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker> + </TargetGroups> + <TargetGroups Include="netstandard1.1"> + <PackageTargetFramework>netstandard1.1</PackageTargetFramework> + <NuGetTargetMoniker>.NETStandard,Version=v1.1</NuGetTargetMoniker> + <Imports>netstandard1.0</Imports> + </TargetGroups> + <TargetGroups Include="netstandard1.2"> + <PackageTargetFramework>netstandard1.2</PackageTargetFramework> + <NuGetTargetMoniker>.NETStandard,Version=v1.2</NuGetTargetMoniker> + <Imports>netstandard1.1</Imports> + </TargetGroups> + <TargetGroups Include="netstandard1.3"> + <PackageTargetFramework>netstandard1.3</PackageTargetFramework> + <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> + <Imports>netstandard1.2</Imports> + </TargetGroups> + <TargetGroups Include="netstandard1.4"> + <PackageTargetFramework>netstandard1.4</PackageTargetFramework> + <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <Imports>netstandard1.3</Imports> + </TargetGroups> + <TargetGroups Include="netstandard1.5"> + <PackageTargetFramework>netstandard1.5</PackageTargetFramework> + <NuGetTargetMoniker>.NETStandard,Version=v1.5</NuGetTargetMoniker> + <Imports>netstandard1.4</Imports> + </TargetGroups> + <TargetGroups Include="netstandard1.6"> + <PackageTargetFramework>netstandard1.6</PackageTargetFramework> + <NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker> + <Imports>netstandard1.5</Imports> + </TargetGroups> + <TargetGroups Include="netstandard1.7"> + <PackageTargetFramework>netstandard1.7</PackageTargetFramework> + <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> + <Imports>netstandard1.6</Imports> + </TargetGroups> + <TargetGroups Include="netstandard"> + <PackageTargetFramework>netstandard1.7</PackageTargetFramework> + <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> + <Imports>netstandard1.7</Imports> + </TargetGroups> + <TargetGroups Include="netcoreapp1.0"> + <PackageTargetFramework>netcoreapp1.0</PackageTargetFramework> + <NuGetTargetMoniker>.NETCoreApp,Version=v1.0</NuGetTargetMoniker> + <CompatibleWith>netstandard1.6</CompatibleWith> + </TargetGroups> + <TargetGroups Include="netcoreapp1.1"> + <PackageTargetFramework>netcoreapp1.1</PackageTargetFramework> + <NuGetTargetMoniker>.NETCoreApp,Version=v1.1</NuGetTargetMoniker> + <Imports>netcoreapp1.0</Imports> + <CompatibleWith>netstandard1.7</CompatibleWith> + </TargetGroups> + <TargetGroups Include="netcoreapp"> + <PackageTargetFramework>netcoreapp1.1</PackageTargetFramework> + <NuGetTargetMoniker>.NETCoreApp,Version=v1.1</NuGetTargetMoniker> + <Imports>netcoreapp1.1</Imports> + <CompatibleWith>netstandard</CompatibleWith> + </TargetGroups> + <TargetGroups Include="net45"> + <PackageTargetFramework>net45</PackageTargetFramework> + <TargetingPackNugetPackageId>Microsoft.TargetingPack.NETFramework.v4.5</TargetingPackNugetPackageId> + <NuGetTargetMoniker>.NETFramework,Version=v4.5</NuGetTargetMoniker> + <CompatibleWith>netstandard1.1</CompatibleWith> + </TargetGroups> + <TargetGroups Include="net451"> + <PackageTargetFramework>net451</PackageTargetFramework> + <TargetingPackNugetPackageId>Microsoft.TargetingPack.NETFramework.v4.5.1</TargetingPackNugetPackageId> + <NuGetTargetMoniker>.NETFramework,Version=v4.5.1</NuGetTargetMoniker> + <Imports>net45</Imports> + <CompatibleWith>netstandard1.2</CompatibleWith> + </TargetGroups> + <TargetGroups Include="net46"> + <PackageTargetFramework>net46</PackageTargetFramework> + <TargetingPackNugetPackageId>Microsoft.TargetingPack.NETFramework.v4.6</TargetingPackNugetPackageId> + <NuGetTargetMoniker>.NETFramework,Version=v4.6</NuGetTargetMoniker> + <Imports>net451</Imports> + <CompatibleWith>netstandard1.3</CompatibleWith> + </TargetGroups> + <TargetGroups Include="net461"> + <PackageTargetFramework>net461</PackageTargetFramework> + <TargetingPackNugetPackageId>Microsoft.TargetingPack.NETFramework.v4.6.1</TargetingPackNugetPackageId> + <NuGetTargetMoniker>.NETFramework,Version=v4.6.1</NuGetTargetMoniker> + <Imports>net46</Imports> + <CompatibleWith>netstandard1.4</CompatibleWith> + </TargetGroups> + <TargetGroups Include="net462"> + <PackageTargetFramework>net462</PackageTargetFramework> + <TargetingPackNugetPackageId>Microsoft.TargetingPack.NETFramework.v4.6.2</TargetingPackNugetPackageId> + <NuGetTargetMoniker>.NETFramework,Version=v4.6.2</NuGetTargetMoniker> + <Imports>net461</Imports> + <CompatibleWith>netstandard1.5</CompatibleWith> + </TargetGroups> + <TargetGroups Include="net463"> + <PackageTargetFramework>net463</PackageTargetFramework> + <TargetingPackNugetPackageId>Microsoft.TargetingPack.NETFramework.v4.6.3</TargetingPackNugetPackageId> + <NuGetTargetMoniker>.NETFramework,Version=v4.6.3</NuGetTargetMoniker> + <Imports>net462</Imports> + <CompatibleWith>netstandard1.7</CompatibleWith> + </TargetGroups> + <TargetGroups Include="netfx"> + <PackageTargetFramework>net463</PackageTargetFramework> + <TargetingPackNugetPackageId>Microsoft.TargetingPack.NETFramework.v4.6.3</TargetingPackNugetPackageId> + <NuGetTargetMoniker>.NETFramework,Version=v4.6.3</NuGetTargetMoniker> + <Imports>net463</Imports> + <CompatibleWith>netstandard1.7</CompatibleWith> + </TargetGroups> + <TargetGroups Include="win8"> + <PackageTargetFramework>win8</PackageTargetFramework> + <NuGetTargetMoniker>Windows,Version=v8.0</NuGetTargetMoniker> + </TargetGroups> + <TargetGroups Include="wpa81"> + <PackageTargetFramework>wpa81</PackageTargetFramework> + <NuGetTargetMoniker>WindowsPhoneApp,Version=v8.1</NuGetTargetMoniker> + </TargetGroups> + <TargetGroups Include="uap101aot"> + <PackageTargetFramework>uap10.1</PackageTargetFramework> + <PackageTargetRuntime>aot</PackageTargetRuntime> + <NuGetTargetMoniker>UAP,Version=v10.1</NuGetTargetMoniker> + </TargetGroups> + <TargetGroups Include="uap101"> + <PackageTargetFramework>uap10.1</PackageTargetFramework> + <NuGetTargetMoniker>UAP,Version=v10.1</NuGetTargetMoniker> + </TargetGroups> + <TargetGroups Include="portable_net45+win8+sl5"> + <PackageTargetFramework>portable-net45+win8+sl5</PackageTargetFramework> + <NuGetTargetMoniker>.NETPortable,Version=v0.0,Profile=Profile47</NuGetTargetMoniker> + </TargetGroups> + <TargetGroups Include="portable_net40+sl4+win8+wp8"> + <PackageTargetFramework>portable-net40+sl4+win8+wp8</PackageTargetFramework> + <NuGetTargetMoniker>.NETPortable,Version=v0.0,Profile=Profile36</NuGetTargetMoniker> + </TargetGroups> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/src/Tools/Tools.sln b/src/Tools/Tools.sln new file mode 100644 index 0000000000..15039c2935 --- /dev/null +++ b/src/Tools/Tools.sln @@ -0,0 +1,32 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreFx.Tools", "CoreFx.Tools\CoreFx.Tools.csproj", "{360F25FA-3CD9-4338-B961-A4F3122B88B2}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GenerateProps", "GenerateProps", "{976C66AC-9E5A-476C-A474-DD82322E4B64}" + ProjectSection(SolutionItems) = preProject + GenerateProps\archgroups.props = GenerateProps\archgroups.props + GenerateProps\configurationgroups.props = GenerateProps\configurationgroups.props + GenerateProps\GenerateProps.proj = GenerateProps\GenerateProps.proj + GenerateProps\osgroups.props = GenerateProps\osgroups.props + GenerateProps\properties.props = GenerateProps\properties.props + GenerateProps\targetgroups.props = GenerateProps\targetgroups.props + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + net45_Debug|Any CPU = net45_Debug|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {360F25FA-3CD9-4338-B961-A4F3122B88B2}.Debug|Any CPU.ActiveCfg = net45_Debug|Any CPU + {360F25FA-3CD9-4338-B961-A4F3122B88B2}.Debug|Any CPU.Build.0 = net45_Debug|Any CPU + {360F25FA-3CD9-4338-B961-A4F3122B88B2}.net45_Debug|Any CPU.ActiveCfg = net45_Debug|Any CPU + {360F25FA-3CD9-4338-B961-A4F3122B88B2}.net45_Debug|Any CPU.Build.0 = net45_Debug|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/src/Tools/corefxTools.props b/src/Tools/corefxTools.props new file mode 100644 index 0000000000..89a95d571b --- /dev/null +++ b/src/Tools/corefxTools.props @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + + <!-- Temporarily enable local build of tools --> + <CoreFxToolsDir Condition="'$(CoreFxToolsDir)' == ''">$(ToolsDir)</CoreFxToolsDir> + <CoreFxDesktopToolsDir Condition="'$(CoreFxDesktopToolsDir)' == ''">$(ToolsDir)net45/</CoreFxDesktopToolsDir> + <CoreFxToolsTaskDir Condition="'$(CoreFxToolsTaskDir)' == '' AND '$(BuildToolsTargets45)' != 'true'">$(CoreFxToolsDir)</CoreFxToolsTaskDir> + <CoreFxToolsTaskDir Condition="'$(CoreFxToolsTaskDir)' == '' AND '$(BuildToolsTargets45)' == 'true'">$(CoreFxDesktopToolsDir)</CoreFxToolsTaskDir> + </PropertyGroup> +</Project> diff --git a/src/Tools/dir.props b/src/Tools/dir.props new file mode 100644 index 0000000000..94e71740ec --- /dev/null +++ b/src/Tools/dir.props @@ -0,0 +1,7 @@ +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <IsRuntimeAssembly>false</IsRuntimeAssembly> + </PropertyGroup> + + <Import Project="..\dir.props" /> +</Project> diff --git a/src/Tools/tools.builds b/src/Tools/tools.builds new file mode 100644 index 0000000000..86086037f1 --- /dev/null +++ b/src/Tools/tools.builds @@ -0,0 +1,12 @@ +<?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> + <SerializeProjects>true</SerializeProjects> + </PropertyGroup> + <ItemGroup> + <Project Include="$(MSBuildThisFileDirectory)CoreFx.Tools\CoreFx.Tools.builds" /> + <Project Include="$(MSBuildThisFileDirectory)GenerateProps\GenerateProps.proj" /> + </ItemGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> +</Project>
\ No newline at end of file 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/packages.builds b/src/packages.builds index 4c2cc571dd..5062bf464a 100644 --- a/src/packages.builds +++ b/src/packages.builds @@ -8,6 +8,7 @@ </PropertyGroup> <ItemGroup> + <!-- <Project Include="Native\pkg\**\*.builds" Condition="'$(SkipNativePackageBuild)' != 'true'"> <AdditionalProperties>$(AdditionalProperties);SkipCreatePackageOnMissingFiles=true</AdditionalProperties> <BuildAllOSGroups>$(BuildAllOSGroups)</BuildAllOSGroups> @@ -18,6 +19,13 @@ <Project Include="..\pkg\*\*.builds" Condition="'$(SkipManagedPackageBuild)' != 'true'"> <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties> </Project> + --> + <Project Include="$(MSBuildThisFileDirectory)..\pkg\Microsoft.NETCore.Platforms\Microsoft.NETCore.Platforms.builds" Condition="'$(SkipManagedPackageBuild)' != 'true'"> + <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties> + </Project> + <Project Include="$(MSBuildThisFileDirectory)..\pkg\Microsoft.Private.CoreFx.NETCoreApp\Microsoft.Private.CoreFx.NETCoreApp.builds" Condition="'$(SkipManagedPackageBuild)' != 'true'"> + <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties> + </Project> </ItemGroup> <UsingTask TaskName="GenerateNetStandardSupportTable" AssemblyFile="$(PackagingTaskDir)Microsoft.DotNet.Build.Tasks.Packaging.dll" /> diff --git a/src/ref.builds b/src/ref.builds index ffd28310a0..20ffd0dbd6 100644 --- a/src/ref.builds +++ b/src/ref.builds @@ -2,8 +2,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> - <Project Include="*\ref\**\*.builds;*\ref\**\*.*proj"> - <UndefineProperties>OSGroup;TargetGroup</UndefineProperties> + <Project Include="$(MSBuildThisFileDirectory)*\ref\*.*proj"> + <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..88aefdb47e 100644 --- a/src/src.builds +++ b/src/src.builds @@ -2,7 +2,12 @@ <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="*\src\*.builds" /> + <Project Include="$(MSBuildThisFileDirectory)*/src/*.csproj" Exclude="@(ProjectExclusions)"> + <AdditionalMetadata>ConfigurationGroup=$(ConfigurationGroup)</AdditionalMetadata> + </Project> + <Project Include="$(MSBuildThisFileDirectory)*/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/src/tests.builds b/src/tests.builds index ba2bc25bf7..45de394998 100644 --- a/src/tests.builds +++ b/src/tests.builds @@ -1,27 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <!-- Capture OSGroup passed to command line for setting default FilterToOSGroup value below --> - <_OriginalOSGroup>$(OSGroup)</_OriginalOSGroup> - </PropertyGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <ItemGroup> - <Project Include="*\tests\**\*.builds"> - <BuildAllOSGroups Condition="'$(OSGroup)' != '' OR '$(FilterToOSGroup)' != ''">false</BuildAllOSGroups> - <FilterToOSGroup Condition="'$(_OriginalOSGroup)' == ''">$(OSEnvironment)</FilterToOSGroup> + <TestProjectExclusions Include="$(MSBuildThisFileDirectory)*\tests\**\System.Security.AccessControl.Tests.csproj" /> + <TestProjectExclusions Include="$(MSBuildThisFileDirectory)*\tests\**\WebServer.csproj" Condition="'$(OS)' != 'Windows_NT'" /> + <TestProjectExclusions Include="$(MSBuildThisFileDirectory)*\tests\**\System.Runtime.CompilerServices.Unsafe.Tests.csproj" Condition="'$(OS)' != 'Windows_NT'" /> + <Project Include="$(MSBuildThisFileDirectory)*\tests\**\*.csproj" Exclude="@(TestProjectExclusions)"> + <AdditionalMetadata>ConfigurationGroup=$(ConfigurationGroup)</AdditionalMetadata> </Project> </ItemGroup> - <Import Project="$(ToolsDir)versioning.targets" Condition="Exists('$(ToolsDir)versioning.targets')" /> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> - - <!-- Make Sure that CreateOrUpdateCurrentVersionFile is the first target that runs. --> - <PropertyGroup> - <TraversalBuildDependsOn> - CreateOrUpdateCurrentVersionFile; - $(TraversalBuildDependsOn) - </TraversalBuildDependsOn> - </PropertyGroup> - </Project> diff --git a/targetingpacks.props b/targetingpacks.props new file mode 100644 index 0000000000..fd79a5bbc1 --- /dev/null +++ b/targetingpacks.props @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + + <!-- Adds test references to the targeting pack and runtime assemblies. --> + <Target Name="AddTestTargetingPackReferences" BeforeTargets="ResolveAssemblyReferences" Condition="'$(IsTestProject)' == 'true'"> + <ItemGroup> + <TargetingPackExclusions Include="System.Private.CoreLib" /> + <TargetingPackExclusions Include="System.Runtime.WindowsRuntime.UI.Xaml" /> <!-- Harmless, but causes PRI targets to run --> + + <!-- Whitelisted runtime assemblies that are OK to reference. --> + <ReferenceFromRuntime Include="xunit.core" /> + <ReferenceFromRuntime Include="Xunit.NetCore.Extensions" /> + <ReferenceFromRuntime Include="xunit.assert" /> + <ReferenceFromRuntime Include="xunit.abstractions" /> + <ReferenceFromRuntime Include="xunit.performance.core" /> + <ReferenceFromRuntime Include="xunit.execution.dotnet" /> + <ReferenceFromRuntime Include="Newtonsoft.Json" Condition="'$(SkipIncludeNewtonsoftJson)'!='true'" /> + + <!-- Add Reference's to all files in the targeting pack folder, and to whitelisted items from the group above in the runtime folder. --> + <TargetingPackItems Include="%(TargetingPackDirs.Identity)/*" Condition="'$(NoTargetingPackReferences)' != 'true'" /> + <Reference Include="%(TargetingPackItems.Filename)" Exclude="@(TargetingPackExclusions)"> <!-- TODO: System.Private.CoreLib shouldn't even be in the targeting pack. --> + <Private>false</Private> + </Reference> + <ReferencePath Include="@(ReferenceFromRuntime->'$(RuntimePath)%(Identity).dll')" /> + </ItemGroup> + </Target> + +</Project> diff --git a/tests.builds b/tests.builds new file mode 100644 index 0000000000..c2a73557c8 --- /dev/null +++ b/tests.builds @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" 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> + + <PropertyGroup> + <GenerateCodeCoverageReportForAll>true</GenerateCodeCoverageReportForAll> + </PropertyGroup> + + <Import Project="$(ToolsDir)CodeCoverage.targets" Condition="Exists('$(ToolsDir)CodeCoverage.targets')" /> + <Import Project="$(ToolsDir)PerfTesting.targets" Condition="Exists('$(ToolsDir)PerfTesting.targets') and '$(Performance)' == 'true'"/> + <Import Project="$(ToolsDir)VersionTools.targets" Condition="Exists('$(ToolsDir)VersionTools.targets')" /> + + <ItemGroup> + <Project Include="src\tests.builds" /> + </ItemGroup> + + <Import Project="dir.targets" /> + + <Import Project="dir.traversal.targets" /> + + <Import Project="$(ToolsDir)clean.targets" /> + + <PropertyGroup> + <TraversalBuildDependsOn> + CreateOrUpdateCurrentVersionFile; + $(TraversalBuildDependsOn); + </TraversalBuildDependsOn> + </PropertyGroup> + + <!-- TODO: Can we move this archive test build to BuildTools --> + <UsingTask TaskName="ZipFileCreateFromDependencyLists" Condition="'$(ArchiveTests)' == 'true'" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll"/> + <Target Name="ArchiveTestBuild" Condition="'$(ArchiveTests)' == 'true'" AfterTargets="Build" > + <ItemGroup> + <ExcludeFromArchive Include="nupkg$" /> + <ExcludeFromArchive Include="Microsoft.DotNet.BuildTools" /> + <ExcludeFromArchive Include="TestData" /> + <TestDependencyListFile Include="$(BinDir)/TestDependencies/*.dependencylist.txt" /> + </ItemGroup> + + <PropertyGroup> + <TestArchiveDir>$(TestWorkingDir)$(OSPlatformConfig)/archive/tests/</TestArchiveDir> + <TestArchiveDir Condition="'$(TestTFM)' != ''">$(TestArchiveDir)$(TestTFM)/</TestArchiveDir> + </PropertyGroup> + + <ZipFileCreateFromDependencyLists + DependencyListFiles="@(TestDependencyListFile)" + DestinationArchive="$(TestArchiveDir)\Packages.zip" + RelativePathBaseDirectory="$(PackagesDir)" + OverwriteDestination="true" /> + </Target> + + <!-- Hook that can be used to insert custom build tasks to the build process such as setup and/or cleanup tasks --> + <Import Project="build.override.targets" Condition="Exists('build.override.targets')" /> + +</Project> |