diff options
1136 files changed, 2188 insertions, 2516 deletions
diff --git a/src/Microsoft.CSharp/pkg/Microsoft.CSharp.builds b/src/Microsoft.CSharp/pkg/Microsoft.CSharp.builds index ff77c16c86..f4e337b2e1 100644 --- a/src/Microsoft.CSharp/pkg/Microsoft.CSharp.builds +++ b/src/Microsoft.CSharp/pkg/Microsoft.CSharp.builds @@ -1,8 +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" /> <ItemGroup> - <Project Include="Microsoft.CSharp.pkgproj"/> + <Project Include="Microsoft.CSharp.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> </Project>
\ No newline at end of file diff --git a/src/Microsoft.CSharp/pkg/Microsoft.CSharp.pkgproj b/src/Microsoft.CSharp/pkg/Microsoft.CSharp.pkgproj index e8b3917adf..05dd1d5b9b 100644 --- a/src/Microsoft.CSharp/pkg/Microsoft.CSharp.pkgproj +++ b/src/Microsoft.CSharp/pkg/Microsoft.CSharp.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\Microsoft.CSharp.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\Microsoft.CSharp.builds" /> <InboxOnTargetFramework Include="MonoAndroid10"> diff --git a/src/Microsoft.CSharp/ref/Microsoft.CSharp.csproj b/src/Microsoft.CSharp/ref/Microsoft.CSharp.csproj index ccb67c5614..330103c002 100644 --- a/src/Microsoft.CSharp/ref/Microsoft.CSharp.csproj +++ b/src/Microsoft.CSharp/ref/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" /> <ItemGroup> @@ -10,4 +10,4 @@ <ProjectReference Include="..\..\System.Linq.Expressions\ref\System.Linq.Expressions.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Microsoft.CSharp/src/Configurations.props b/src/Microsoft.CSharp/src/Configurations.props index fc9ef9822c..c398e42e89 100644 --- a/src/Microsoft.CSharp/src/Configurations.props +++ b/src/Microsoft.CSharp/src/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Microsoft.CSharp/tests/Configurations.props b/src/Microsoft.CSharp/tests/Configurations.props index 98f53209d4..c398e42e89 100644 --- a/src/Microsoft.CSharp/tests/Configurations.props +++ b/src/Microsoft.CSharp/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.builds b/src/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.builds index a5b9ec4ddd..c8447fb375 100644 --- a/src/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.builds +++ b/src/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj b/src/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj index f060516018..8116d5f292 100644 --- a/src/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj +++ b/src/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.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,4 +10,4 @@ <Compile Include="CSharpArgumentInfoTests.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file 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 index 39b1a43ac9..dc1e837ebf 100644 --- a/src/Microsoft.TargetingPack.Private.CoreCLR/ref/Microsoft.TargetingPack.Private.CoreCLR.depproj +++ b/src/Microsoft.TargetingPack.Private.CoreCLR/ref/Microsoft.TargetingPack.Private.CoreCLR.depproj @@ -1,9 +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"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <AssemblyName>System.Private.CoreLib</AssemblyName> - <NuGetTargetMoniker>.NETCoreApp,Version=v1.1</NuGetTargetMoniker> + <NuGetTargetMoniker>.NETCoreApp,Version=v2.0</NuGetTargetMoniker> </PropertyGroup> <ItemGroup> <TargetingPackReference Include="System.Private.CoreLib" /> diff --git a/src/Microsoft.TargetingPack.Private.CoreCLR/ref/project.json b/src/Microsoft.TargetingPack.Private.CoreCLR/ref/project.json index b3b29b50a4..94fab1bd00 100644 --- a/src/Microsoft.TargetingPack.Private.CoreCLR/ref/project.json +++ b/src/Microsoft.TargetingPack.Private.CoreCLR/ref/project.json @@ -3,6 +3,6 @@ "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03" }, "frameworks": { - "netcoreapp1.1": {} + "netcoreapp2.0": {} } } 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 index 5f01d724a0..d2702e2b8e 100644 --- a/src/Microsoft.TargetingPack.Private.WinRT/ref/Microsoft.TargetingPack.Private.WinRT.depproj +++ b/src/Microsoft.TargetingPack.Private.WinRT/ref/Microsoft.TargetingPack.Private.WinRT.depproj @@ -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,4 +10,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/Microsoft.VisualBasic/pkg/Microsoft.VisualBasic.builds b/src/Microsoft.VisualBasic/pkg/Microsoft.VisualBasic.builds index 5bfdf24482..7eee71ec8d 100644 --- a/src/Microsoft.VisualBasic/pkg/Microsoft.VisualBasic.builds +++ b/src/Microsoft.VisualBasic/pkg/Microsoft.VisualBasic.builds @@ -1,9 +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" /> <ItemGroup> <!-- Temporary workaround, VisualBasic projects cannot be built on non-Windows platforms. See issue #5230. --> - <Project Include="Microsoft.VisualBasic.pkgproj" Condition="'$(OS)'=='Windows_NT'"/> + <Project Include="Microsoft.VisualBasic.pkgproj" Condition="'$(OS)'=='Windows_NT'" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</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 51df31f1ef..ee856b066f 100644 --- a/src/Microsoft.VisualBasic/ref/Microsoft.VisualBasic.csproj +++ b/src/Microsoft.VisualBasic/ref/Microsoft.VisualBasic.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> @@ -11,4 +11,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Microsoft.VisualBasic/src/Configurations.props b/src/Microsoft.VisualBasic/src/Configurations.props index f0ebe53119..c3266e1e93 100644 --- a/src/Microsoft.VisualBasic/src/Configurations.props +++ b/src/Microsoft.VisualBasic/src/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Microsoft.VisualBasic/src/Microsoft.VisualBasic.vbproj b/src/Microsoft.VisualBasic/src/Microsoft.VisualBasic.vbproj index 08d3ded383..343c81e7fb 100644 --- a/src/Microsoft.VisualBasic/src/Microsoft.VisualBasic.vbproj +++ b/src/Microsoft.VisualBasic/src/Microsoft.VisualBasic.vbproj @@ -65,4 +65,4 @@ <Reference Include="System.Reflection.Extensions" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Microsoft.VisualBasic/tests/Configurations.props b/src/Microsoft.VisualBasic/tests/Configurations.props index f0ebe53119..c3266e1e93 100644 --- a/src/Microsoft.VisualBasic/tests/Configurations.props +++ b/src/Microsoft.VisualBasic/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.builds b/src/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.builds index dd59ef67ad..e7a5e7cf1f 100644 --- a/src/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.builds +++ b/src/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.builds @@ -1,12 +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" /> <ItemGroup> <!-- Temporary workaround, VisualBasic projects cannot be built on non-Windows platforms. See issue #5230. --> <Project Include="Microsoft.VisualBasic.Tests.csproj"> <OSGroup>Windows_NT</OSGroup> - <TestTFMs>netcore50;netcoreapp1.0;netcoreapp1.1;net46;net461;net462;net463</TestTFMs> + <TestTFMs>netcore50;netcoreapp1.0;netcoreapp;net46;net461;net462;net463</TestTFMs> </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.csproj b/src/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.csproj index ba77126032..abf36dd1b8 100644 --- a/src/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.csproj +++ b/src/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.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,4 +10,4 @@ <Compile Include="StringsTests.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Microsoft.Win32.Primitives/pkg/Microsoft.Win32.Primitives.builds b/src/Microsoft.Win32.Primitives/pkg/Microsoft.Win32.Primitives.builds index 8f48296c6f..c155e9ebb1 100644 --- a/src/Microsoft.Win32.Primitives/pkg/Microsoft.Win32.Primitives.builds +++ b/src/Microsoft.Win32.Primitives/pkg/Microsoft.Win32.Primitives.builds @@ -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" /> <ItemGroup> @@ -11,5 +11,4 @@ </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/Microsoft.Win32.Primitives/pkg/Microsoft.Win32.Primitives.pkgproj b/src/Microsoft.Win32.Primitives/pkg/Microsoft.Win32.Primitives.pkgproj index 5d7dfcd16a..4ca445e50d 100644 --- a/src/Microsoft.Win32.Primitives/pkg/Microsoft.Win32.Primitives.pkgproj +++ b/src/Microsoft.Win32.Primitives/pkg/Microsoft.Win32.Primitives.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\Microsoft.Win32.Primitives.csproj"> - <SupportedFramework>net463;uap10.1;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;uap10.1;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\Microsoft.Win32.Primitives.csproj"> <AdditionalProperties>TargetGroup=net463</AdditionalProperties> diff --git a/src/Microsoft.Win32.Primitives/pkg/unix/Microsoft.Win32.Primitives.pkgproj b/src/Microsoft.Win32.Primitives/pkg/unix/Microsoft.Win32.Primitives.pkgproj index fa3d41b0c8..3886b8703e 100644 --- a/src/Microsoft.Win32.Primitives/pkg/unix/Microsoft.Win32.Primitives.pkgproj +++ b/src/Microsoft.Win32.Primitives/pkg/unix/Microsoft.Win32.Primitives.pkgproj @@ -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> <PackageTargetRuntime>unix</PackageTargetRuntime> <PreventImplementationReference>true</PreventImplementationReference> </PropertyGroup> - <ItemGroup> - <ProjectReference Include="..\..\src\Microsoft.Win32.Primitives.csproj" > + <ProjectReference Include="..\..\src\Microsoft.Win32.Primitives.csproj"> <OSGroup>Unix</OSGroup> </ProjectReference> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/Microsoft.Win32.Primitives/pkg/win/Microsoft.Win32.Primitives.pkgproj b/src/Microsoft.Win32.Primitives/pkg/win/Microsoft.Win32.Primitives.pkgproj index f8b100e7f5..c5b6a4c428 100644 --- a/src/Microsoft.Win32.Primitives/pkg/win/Microsoft.Win32.Primitives.pkgproj +++ b/src/Microsoft.Win32.Primitives/pkg/win/Microsoft.Win32.Primitives.pkgproj @@ -1,20 +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> <PackageTargetRuntime>win</PackageTargetRuntime> <PreventImplementationReference>true</PreventImplementationReference> </PropertyGroup> - <ItemGroup> - <ProjectReference Include="..\..\src\Microsoft.Win32.Primitives.csproj" > + <ProjectReference Include="..\..\src\Microsoft.Win32.Primitives.csproj"> <OSGroup>Windows_NT</OSGroup> </ProjectReference> - <!-- don't use the dotnet implementation for any version of desktop, it's implementation comes from the reference package --> <ExternalOnTargetFramework Include="net" /> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </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 f7e77bb04f..f9181deee7 100644 --- a/src/Microsoft.Win32.Primitives/ref/Microsoft.Win32.Primitives.csproj +++ b/src/Microsoft.Win32.Primitives/ref/Microsoft.Win32.Primitives.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -8,4 +8,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Microsoft.Win32.Primitives/src/Configurations.props b/src/Microsoft.Win32.Primitives/src/Configurations.props index 3bb6330d9e..4701fcd772 100644 --- a/src/Microsoft.Win32.Primitives/src/Configurations.props +++ b/src/Microsoft.Win32.Primitives/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ net463-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj b/src/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj index 1957d70f10..b50f9dc0d7 100644 --- a/src/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj +++ b/src/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj @@ -8,7 +8,7 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> <!-- copy to uap10.1 until nuget makes the change to map that to ns1.7 --> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> diff --git a/src/Microsoft.Win32.Primitives/tests/Configurations.props b/src/Microsoft.Win32.Primitives/tests/Configurations.props index 512c938bad..b2db637110 100644 --- a/src/Microsoft.Win32.Primitives/tests/Configurations.props +++ b/src/Microsoft.Win32.Primitives/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> netstandard1.3; - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.builds b/src/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.builds index 10446e0f5d..fc4de337ee 100644 --- a/src/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.builds +++ b/src/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.builds @@ -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" /> <ItemGroup> @@ -18,4 +18,4 @@ </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file 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 3001b5c3cb..60266457b8 100644 --- a/src/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.csproj +++ b/src/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.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,4 +16,4 @@ </Compile> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Microsoft.Win32.Registry.AccessControl/pkg/Microsoft.Win32.Registry.AccessControl.builds b/src/Microsoft.Win32.Registry.AccessControl/pkg/Microsoft.Win32.Registry.AccessControl.builds index 80c58393b2..8f40c23564 100644 --- a/src/Microsoft.Win32.Registry.AccessControl/pkg/Microsoft.Win32.Registry.AccessControl.builds +++ b/src/Microsoft.Win32.Registry.AccessControl/pkg/Microsoft.Win32.Registry.AccessControl.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="Microsoft.Win32.Registry.AccessControl.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/Microsoft.Win32.Registry.AccessControl/pkg/Microsoft.Win32.Registry.AccessControl.pkgproj b/src/Microsoft.Win32.Registry.AccessControl/pkg/Microsoft.Win32.Registry.AccessControl.pkgproj index 376e46baf8..f326238d92 100644 --- a/src/Microsoft.Win32.Registry.AccessControl/pkg/Microsoft.Win32.Registry.AccessControl.pkgproj +++ b/src/Microsoft.Win32.Registry.AccessControl/pkg/Microsoft.Win32.Registry.AccessControl.pkgproj @@ -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" /> - <ItemGroup> <ProjectReference Include="..\ref\Microsoft.Win32.Registry.AccessControl.csproj"> <SupportedFramework>net46;netcoreapp1.0</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\Microsoft.Win32.Registry.AccessControl.builds" /> - <NotSupportedOnTargetFramework Include="netcore50"> <PackageTargetRuntime>win</PackageTargetRuntime> </NotSupportedOnTargetFramework> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file 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 1e0738f899..0fb604e7c1 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,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" /> <ItemGroup> @@ -11,4 +11,4 @@ <ProjectReference Include="..\..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ 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 index 234a60ff3a..b6945822ad 100644 --- a/src/Microsoft.Win32.Registry.AccessControl/src/Configurations.props +++ b/src/Microsoft.Win32.Registry.AccessControl/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ net46; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ 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 index 5d77dc616e..5f482b878b 100644 --- a/src/Microsoft.Win32.Registry.AccessControl/tests/Configurations.props +++ b/src/Microsoft.Win32.Registry.AccessControl/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.builds b/src/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.builds index 453cdfdaaf..3465c40e96 100644 --- a/src/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.builds +++ b/src/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.builds @@ -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" /> <ItemGroup> <Project Include="Microsoft.Win32.Registry.AccessControl.Tests.csproj"> <OSGroup>Windows_NT</OSGroup> - <TestTFMs>netcoreapp1.0;netcoreapp1.1;net46</TestTFMs> + <TestTFMs>netcoreapp1.0;netcoreapp;net46</TestTFMs> </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> 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 04bb22e419..2a1988f7c1 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 @@ -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,4 +10,4 @@ <Compile Include="RegistryAclExtensionsTests.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Microsoft.Win32.Registry/pkg/Microsoft.Win32.Registry.builds b/src/Microsoft.Win32.Registry/pkg/Microsoft.Win32.Registry.builds index eaa6762696..e45aaf31e3 100644 --- a/src/Microsoft.Win32.Registry/pkg/Microsoft.Win32.Registry.builds +++ b/src/Microsoft.Win32.Registry/pkg/Microsoft.Win32.Registry.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="Microsoft.Win32.Registry.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/Microsoft.Win32.Registry/pkg/Microsoft.Win32.Registry.pkgproj b/src/Microsoft.Win32.Registry/pkg/Microsoft.Win32.Registry.pkgproj index 1dd081491d..bcb5c19cd5 100644 --- a/src/Microsoft.Win32.Registry/pkg/Microsoft.Win32.Registry.pkgproj +++ b/src/Microsoft.Win32.Registry/pkg/Microsoft.Win32.Registry.pkgproj @@ -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" /> - <ItemGroup> <ProjectReference Include="..\ref\Microsoft.Win32.Registry.csproj"> - <SupportedFramework>net463;netcoreapp1.1</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\Microsoft.Win32.Registry.builds" /> - <NotSupportedOnTargetFramework Include="netcore50"> <PackageTargetRuntime>win</PackageTargetRuntime> </NotSupportedOnTargetFramework> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </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 9f2e564a79..2edfc56661 100644 --- a/src/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj +++ b/src/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -9,4 +9,4 @@ <ProjectReference Include="..\..\System.Runtime.Handles\ref\System.Runtime.Handles.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Microsoft.Win32.Registry/src/Configurations.props b/src/Microsoft.Win32.Registry/src/Configurations.props index 743b2ab182..5426f5a16a 100644 --- a/src/Microsoft.Win32.Registry/src/Configurations.props +++ b/src/Microsoft.Win32.Registry/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ net463-AnyOS; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Microsoft.Win32.Registry/tests/Configurations.props b/src/Microsoft.Win32.Registry/tests/Configurations.props index 5d77dc616e..5f482b878b 100644 --- a/src/Microsoft.Win32.Registry/tests/Configurations.props +++ b/src/Microsoft.Win32.Registry/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.builds b/src/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.builds index 152e650979..78ef9b23a8 100644 --- a/src/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.builds +++ b/src/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.builds @@ -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" /> <ItemGroup> <Project Include="Microsoft.Win32.Registry.Tests.csproj"> <OSGroup>Windows_NT</OSGroup> - <TestTFMs>netcoreapp1.0;netcoreapp1.1;net46</TestTFMs> + <TestTFMs>netcoreapp1.0;netcoreapp;net46</TestTFMs> </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> 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 51389388bc..f70c01c2ba 100644 --- a/src/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj +++ b/src/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.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> @@ -54,4 +54,4 @@ <Compile Include="XunitAssemblyAttributes.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Native/pkg/runtime.native.System.Data.SqlClient.sni/runtime.native.System.Data.SqlClient.sni.builds b/src/Native/pkg/runtime.native.System.Data.SqlClient.sni/runtime.native.System.Data.SqlClient.sni.builds index bce77a1f0d..a69db869af 100644 --- a/src/Native/pkg/runtime.native.System.Data.SqlClient.sni/runtime.native.System.Data.SqlClient.sni.builds +++ b/src/Native/pkg/runtime.native.System.Data.SqlClient.sni/runtime.native.System.Data.SqlClient.sni.builds @@ -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" /> <ItemGroup> @@ -17,4 +17,4 @@ </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Native/pkg/runtime.native.System.IO.Compression/runtime.native.System.IO.Compression.builds b/src/Native/pkg/runtime.native.System.IO.Compression/runtime.native.System.IO.Compression.builds index 9c8f6a1fbe..3b108eade7 100644 --- a/src/Native/pkg/runtime.native.System.IO.Compression/runtime.native.System.IO.Compression.builds +++ b/src/Native/pkg/runtime.native.System.IO.Compression/runtime.native.System.IO.Compression.builds @@ -1,8 +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" /> <ItemGroup> - <Project Include="runtime.native.System.IO.Compression.pkgproj"/> + <Project Include="runtime.native.System.IO.Compression.pkgproj" /> <Project Include="linux\runtime.native.System.IO.Compression.pkgproj"> <OSGroup>linux</OSGroup> <Platform>amd64</Platform> @@ -97,4 +97,4 @@ </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Native/pkg/runtime.native.System.IO.Compression/runtime.native.System.IO.Compression.pkgproj b/src/Native/pkg/runtime.native.System.IO.Compression/runtime.native.System.IO.Compression.pkgproj index 5ffbcefeb5..175e864bc2 100644 --- a/src/Native/pkg/runtime.native.System.IO.Compression/runtime.native.System.IO.Compression.pkgproj +++ b/src/Native/pkg/runtime.native.System.IO.Compression/runtime.native.System.IO.Compression.pkgproj @@ -78,4 +78,4 @@ </ProjectReference> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Native/pkg/runtime.native.System.IO.Compression/win_aot/runtime.native.System.IO.Compression.pkgproj b/src/Native/pkg/runtime.native.System.IO.Compression/win_aot/runtime.native.System.IO.Compression.pkgproj index 7f83549e66..914dec8d93 100644 --- a/src/Native/pkg/runtime.native.System.IO.Compression/win_aot/runtime.native.System.IO.Compression.pkgproj +++ b/src/Native/pkg/runtime.native.System.IO.Compression/win_aot/runtime.native.System.IO.Compression.pkgproj @@ -10,4 +10,4 @@ </NativeFile> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Native/pkg/runtime.native.System.Net.Http/runtime.native.System.Net.Http.builds b/src/Native/pkg/runtime.native.System.Net.Http/runtime.native.System.Net.Http.builds index 2463e9415d..023cd63d0b 100644 --- a/src/Native/pkg/runtime.native.System.Net.Http/runtime.native.System.Net.Http.builds +++ b/src/Native/pkg/runtime.native.System.Net.Http/runtime.native.System.Net.Http.builds @@ -1,8 +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" /> <ItemGroup> - <Project Include="runtime.native.System.Net.Http.pkgproj"/> + <Project Include="runtime.native.System.Net.Http.pkgproj" /> <Project Include="linux\runtime.native.System.Net.Http.pkgproj"> <OSGroup>linux</OSGroup> <Platform>amd64</Platform> @@ -65,4 +65,4 @@ </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Native/pkg/runtime.native.System.Net.Http/runtime.native.System.Net.Http.pkgproj b/src/Native/pkg/runtime.native.System.Net.Http/runtime.native.System.Net.Http.pkgproj index 1f090c2a0d..96772184a6 100644 --- a/src/Native/pkg/runtime.native.System.Net.Http/runtime.native.System.Net.Http.pkgproj +++ b/src/Native/pkg/runtime.native.System.Net.Http/runtime.native.System.Net.Http.pkgproj @@ -54,4 +54,4 @@ </ProjectReference> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Native/pkg/runtime.native.System.Net.Security/runtime.native.System.Net.Security.builds b/src/Native/pkg/runtime.native.System.Net.Security/runtime.native.System.Net.Security.builds index f6d0d52ab5..473b683411 100644 --- a/src/Native/pkg/runtime.native.System.Net.Security/runtime.native.System.Net.Security.builds +++ b/src/Native/pkg/runtime.native.System.Net.Security/runtime.native.System.Net.Security.builds @@ -1,8 +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" /> <ItemGroup> - <Project Include="runtime.native.System.Net.Security.pkgproj"/> + <Project Include="runtime.native.System.Net.Security.pkgproj" /> <Project Include="linux\runtime.native.System.Net.Security.pkgproj"> <OSGroup>linux</OSGroup> <Platform>amd64</Platform> @@ -65,4 +65,4 @@ </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Native/pkg/runtime.native.System.Net.Security/runtime.native.System.Net.Security.pkgproj b/src/Native/pkg/runtime.native.System.Net.Security/runtime.native.System.Net.Security.pkgproj index 856b78b74a..738e981f0c 100644 --- a/src/Native/pkg/runtime.native.System.Net.Security/runtime.native.System.Net.Security.pkgproj +++ b/src/Native/pkg/runtime.native.System.Net.Security/runtime.native.System.Net.Security.pkgproj @@ -54,4 +54,4 @@ </ProjectReference> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Native/pkg/runtime.native.System.Security.Cryptography.Apple/osx/runtime.native.System.Security.Cryptography.Apple.pkgproj b/src/Native/pkg/runtime.native.System.Security.Cryptography.Apple/osx/runtime.native.System.Security.Cryptography.Apple.pkgproj index b54a9fafd2..ae1fdd3c42 100644 --- a/src/Native/pkg/runtime.native.System.Security.Cryptography.Apple/osx/runtime.native.System.Security.Cryptography.Apple.pkgproj +++ b/src/Native/pkg/runtime.native.System.Security.Cryptography.Apple/osx/runtime.native.System.Security.Cryptography.Apple.pkgproj @@ -12,4 +12,4 @@ </NativeFile> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Native/pkg/runtime.native.System.Security.Cryptography.Apple/runtime.native.System.Security.Cryptography.Apple.builds b/src/Native/pkg/runtime.native.System.Security.Cryptography.Apple/runtime.native.System.Security.Cryptography.Apple.builds index 220be811d7..964bdcc80c 100644 --- a/src/Native/pkg/runtime.native.System.Security.Cryptography.Apple/runtime.native.System.Security.Cryptography.Apple.builds +++ b/src/Native/pkg/runtime.native.System.Security.Cryptography.Apple/runtime.native.System.Security.Cryptography.Apple.builds @@ -2,11 +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" /> <ItemGroup> - <Project Include="runtime.native.System.Security.Cryptography.Apple.pkgproj"/> + <Project Include="runtime.native.System.Security.Cryptography.Apple.pkgproj" /> <Project Include="osx\runtime.native.System.Security.Cryptography.Apple.pkgproj"> <OSGroup>osx.10</OSGroup> <Platform>amd64</Platform> </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Native/pkg/runtime.native.System.Security.Cryptography.Apple/runtime.native.System.Security.Cryptography.Apple.pkgproj b/src/Native/pkg/runtime.native.System.Security.Cryptography.Apple/runtime.native.System.Security.Cryptography.Apple.pkgproj index 9696fefe02..4ea2914ac9 100644 --- a/src/Native/pkg/runtime.native.System.Security.Cryptography.Apple/runtime.native.System.Security.Cryptography.Apple.pkgproj +++ b/src/Native/pkg/runtime.native.System.Security.Cryptography.Apple/runtime.native.System.Security.Cryptography.Apple.pkgproj @@ -15,4 +15,4 @@ </ProjectReference> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/alpine/3.4.3/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj b/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/alpine/3.4.3/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj index bd26f5300b..c7d128a970 100644 --- a/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/alpine/3.4.3/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj +++ b/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/alpine/3.4.3/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj @@ -12,4 +12,4 @@ </NativeFile> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/debian/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj b/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/debian/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj index 93ac6630c7..188d114d7b 100644 --- a/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/debian/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj +++ b/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/debian/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj @@ -12,4 +12,4 @@ </NativeFile> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/fedora/23/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj b/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/fedora/23/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj index bf4dc62bb5..8afb07a108 100644 --- a/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/fedora/23/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj +++ b/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/fedora/23/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj @@ -12,4 +12,4 @@ </NativeFile> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/fedora/24/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj b/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/fedora/24/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj index ff80db6a28..5728baebc6 100644 --- a/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/fedora/24/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj +++ b/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/fedora/24/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj @@ -12,4 +12,4 @@ </NativeFile> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/linux/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj b/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/linux/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj index 95f30b84fb..dd1e66c073 100644 --- a/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/linux/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj +++ b/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/linux/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj @@ -12,4 +12,4 @@ </NativeFile> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/opensuse/13.2/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj b/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/opensuse/13.2/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj index 587070bc26..eb47efcd78 100644 --- a/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/opensuse/13.2/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj +++ b/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/opensuse/13.2/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj @@ -12,4 +12,4 @@ </NativeFile> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/opensuse/42.1/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj b/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/opensuse/42.1/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj index c46d097cc8..110163154c 100644 --- a/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/opensuse/42.1/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj +++ b/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/opensuse/42.1/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj @@ -12,4 +12,4 @@ </NativeFile> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/osx/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj b/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/osx/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj index 319a9d2ea0..292713f684 100644 --- a/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/osx/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj +++ b/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/osx/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj @@ -12,4 +12,4 @@ </NativeFile> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/rhel/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj b/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/rhel/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj index b31b04dc87..a5fa21c91b 100644 --- a/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/rhel/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj +++ b/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/rhel/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj @@ -12,4 +12,4 @@ </NativeFile> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/runtime.native.System.Security.Cryptography.OpenSsl.builds b/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/runtime.native.System.Security.Cryptography.OpenSsl.builds index a0a8e719ad..442a58fe1a 100644 --- a/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/runtime.native.System.Security.Cryptography.OpenSsl.builds +++ b/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/runtime.native.System.Security.Cryptography.OpenSsl.builds @@ -1,8 +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" /> <ItemGroup> - <Project Include="runtime.native.System.Security.Cryptography.OpenSsl.pkgproj"/> + <Project Include="runtime.native.System.Security.Cryptography.OpenSsl.pkgproj" /> <Project Include="linux\runtime.native.System.Security.Cryptography.OpenSsl.pkgproj"> <OSGroup>linux</OSGroup> <Platform>amd64</Platform> @@ -65,4 +65,4 @@ </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj b/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj index 3f57206206..feae2f6f1e 100644 --- a/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj +++ b/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj @@ -54,4 +54,4 @@ </ProjectReference> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/ubuntu/14.04/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj b/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/ubuntu/14.04/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj index 546d5524b0..546fb72082 100644 --- a/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/ubuntu/14.04/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj +++ b/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/ubuntu/14.04/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj @@ -12,4 +12,4 @@ </NativeFile> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/ubuntu/16.04/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj b/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/ubuntu/16.04/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj index 54be6d6209..ce2b32c305 100644 --- a/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/ubuntu/16.04/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj +++ b/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/ubuntu/16.04/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj @@ -12,4 +12,4 @@ </NativeFile> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/ubuntu/16.10/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj b/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/ubuntu/16.10/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj index 7dcfaaad6f..fa56c3c778 100644 --- a/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/ubuntu/16.10/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj +++ b/src/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/ubuntu/16.10/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj @@ -12,4 +12,4 @@ </NativeFile> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Native/pkg/runtime.native.System.Security.Cryptography/runtime.native.System.Security.Cryptography.builds b/src/Native/pkg/runtime.native.System.Security.Cryptography/runtime.native.System.Security.Cryptography.builds index ba8760aaea..04e48d0e93 100644 --- a/src/Native/pkg/runtime.native.System.Security.Cryptography/runtime.native.System.Security.Cryptography.builds +++ b/src/Native/pkg/runtime.native.System.Security.Cryptography/runtime.native.System.Security.Cryptography.builds @@ -1,8 +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" /> <ItemGroup> - <Project Include="runtime.native.System.Security.Cryptography.pkgproj"/> + <Project Include="runtime.native.System.Security.Cryptography.pkgproj" /> <Project Include="linux\runtime.native.System.Security.Cryptography.pkgproj"> <OSGroup>linux</OSGroup> <Platform>amd64</Platform> @@ -65,4 +65,4 @@ </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Native/pkg/runtime.native.System.Security.Cryptography/runtime.native.System.Security.Cryptography.pkgproj b/src/Native/pkg/runtime.native.System.Security.Cryptography/runtime.native.System.Security.Cryptography.pkgproj index fb003be2e2..d04f0402d6 100644 --- a/src/Native/pkg/runtime.native.System.Security.Cryptography/runtime.native.System.Security.Cryptography.pkgproj +++ b/src/Native/pkg/runtime.native.System.Security.Cryptography/runtime.native.System.Security.Cryptography.pkgproj @@ -54,4 +54,4 @@ </ProjectReference> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Native/pkg/runtime.native.System.Security.Cryptography/ubuntu/14.04/runtime.native.System.Security.Cryptography.pkgproj b/src/Native/pkg/runtime.native.System.Security.Cryptography/ubuntu/14.04/runtime.native.System.Security.Cryptography.pkgproj index 04585edc99..5adf468dde 100644 --- a/src/Native/pkg/runtime.native.System.Security.Cryptography/ubuntu/14.04/runtime.native.System.Security.Cryptography.pkgproj +++ b/src/Native/pkg/runtime.native.System.Security.Cryptography/ubuntu/14.04/runtime.native.System.Security.Cryptography.pkgproj @@ -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> @@ -12,4 +12,4 @@ </NativeFile> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Native/pkg/runtime.native.System/runtime.native.System.builds b/src/Native/pkg/runtime.native.System/runtime.native.System.builds index c1e25bc130..26d2d8393d 100644 --- a/src/Native/pkg/runtime.native.System/runtime.native.System.builds +++ b/src/Native/pkg/runtime.native.System/runtime.native.System.builds @@ -1,8 +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" /> <ItemGroup> - <Project Include="runtime.native.System.pkgproj"/> + <Project Include="runtime.native.System.pkgproj" /> <Project Include="linux\runtime.native.System.pkgproj"> <OSGroup>linux</OSGroup> <Platform>amd64</Platform> @@ -65,4 +65,4 @@ </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Native/pkg/runtime.native.System/runtime.native.System.pkgproj b/src/Native/pkg/runtime.native.System/runtime.native.System.pkgproj index c319829cac..bebdf263a4 100644 --- a/src/Native/pkg/runtime.native.System/runtime.native.System.pkgproj +++ b/src/Native/pkg/runtime.native.System/runtime.native.System.pkgproj @@ -54,4 +54,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.AppContext/pkg/System.AppContext.builds b/src/System.AppContext/pkg/System.AppContext.builds index 8d55fc313f..1e1d0c2a6d 100644 --- a/src/System.AppContext/pkg/System.AppContext.builds +++ b/src/System.AppContext/pkg/System.AppContext.builds @@ -1,8 +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" /> <ItemGroup> - <Project Include="System.AppContext.pkgproj"/> + <Project Include="System.AppContext.pkgproj" /> </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/pkg/System.AppContext.pkgproj b/src/System.AppContext/pkg/System.AppContext.pkgproj index 7fee7b449a..029da5833a 100644 --- a/src/System.AppContext/pkg/System.AppContext.pkgproj +++ b/src/System.AppContext/pkg/System.AppContext.pkgproj @@ -6,7 +6,7 @@ </PropertyGroup> <ItemGroup> <ProjectReference Include="..\ref\System.AppContext.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.AppContext.builds" /> </ItemGroup> diff --git a/src/System.AppContext/ref/4.0.0/System.AppContext.depproj b/src/System.AppContext/ref/4.0.0/System.AppContext.depproj index 6343408bc9..4a6bfcac64 100644 --- a/src/System.AppContext/ref/4.0.0/System.AppContext.depproj +++ b/src/System.AppContext/ref/4.0.0/System.AppContext.depproj @@ -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> diff --git a/src/System.AppContext/ref/System.AppContext.csproj b/src/System.AppContext/ref/System.AppContext.csproj index 8b51d5ad91..156180cf17 100644 --- a/src/System.AppContext/ref/System.AppContext.csproj +++ b/src/System.AppContext/ref/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" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -12,4 +12,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.AppContext/src/Configurations.props b/src/System.AppContext/src/Configurations.props index f20b2fb8af..21929915a6 100644 --- a/src/System.AppContext/src/Configurations.props +++ b/src/System.AppContext/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.AppContext/tests/Configurations.props b/src/System.AppContext/tests/Configurations.props index f0ebe53119..c3266e1e93 100644 --- a/src/System.AppContext/tests/Configurations.props +++ b/src/System.AppContext/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.AppContext/tests/System.AppContext.Tests.builds b/src/System.AppContext/tests/System.AppContext.Tests.builds index 2a81e1ed5d..31fa1e6fb8 100644 --- a/src/System.AppContext/tests/System.AppContext.Tests.builds +++ b/src/System.AppContext/tests/System.AppContext.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.AppContext/tests/System.AppContext.Tests.csproj b/src/System.AppContext/tests/System.AppContext.Tests.csproj index 909e3e36a6..6163f38735 100644 --- a/src/System.AppContext/tests/System.AppContext.Tests.csproj +++ b/src/System.AppContext/tests/System.AppContext.Tests.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> @@ -11,4 +11,4 @@ <Compile Include="AppContext.Switch.Validation.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Buffers/pkg/System.Buffers.builds b/src/System.Buffers/pkg/System.Buffers.builds index 30967ca538..e26f2fb99b 100644 --- a/src/System.Buffers/pkg/System.Buffers.builds +++ b/src/System.Buffers/pkg/System.Buffers.builds @@ -1,8 +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" /> <ItemGroup> - <Project Include="System.Buffers.pkgproj"/> + <Project Include="System.Buffers.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Buffers/pkg/System.Buffers.pkgproj b/src/System.Buffers/pkg/System.Buffers.pkgproj index 7a03df5226..5d2845689b 100644 --- a/src/System.Buffers/pkg/System.Buffers.pkgproj +++ b/src/System.Buffers/pkg/System.Buffers.pkgproj @@ -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" /> <ItemGroup> diff --git a/src/System.Buffers/ref/System.Buffers.builds b/src/System.Buffers/ref/System.Buffers.builds index 4f9df67634..94931a06df 100644 --- a/src/System.Buffers/ref/System.Buffers.builds +++ b/src/System.Buffers/ref/System.Buffers.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Buffers/ref/System.Buffers.csproj b/src/System.Buffers/ref/System.Buffers.csproj index 729dbb282a..20884aa980 100644 --- a/src/System.Buffers/ref/System.Buffers.csproj +++ b/src/System.Buffers/ref/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> @@ -12,4 +12,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Buffers/src/Configurations.props b/src/System.Buffers/src/Configurations.props index e133d875b2..09d8d895fc 100644 --- a/src/System.Buffers/src/Configurations.props +++ b/src/System.Buffers/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netcoreapp; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Buffers/tests/Configurations.props b/src/System.Buffers/tests/Configurations.props index f0ebe53119..c3266e1e93 100644 --- a/src/System.Buffers/tests/Configurations.props +++ b/src/System.Buffers/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Buffers/tests/System.Buffers.Tests.builds b/src/System.Buffers/tests/System.Buffers.Tests.builds index db3987bbfa..6b872b42e9 100644 --- a/src/System.Buffers/tests/System.Buffers.Tests.builds +++ b/src/System.Buffers/tests/System.Buffers.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Buffers/tests/System.Buffers.Tests.csproj b/src/System.Buffers/tests/System.Buffers.Tests.csproj index ddedd4d4cf..0cf523dd5e 100644 --- a/src/System.Buffers/tests/System.Buffers.Tests.csproj +++ b/src/System.Buffers/tests/System.Buffers.Tests.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> diff --git a/src/System.CodeDom/pkg/System.CodeDom.builds b/src/System.CodeDom/pkg/System.CodeDom.builds index 50a2c489bc..dac981e474 100644 --- a/src/System.CodeDom/pkg/System.CodeDom.builds +++ b/src/System.CodeDom/pkg/System.CodeDom.builds @@ -1,8 +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" /> <ItemGroup> - <Project Include="System.CodeDom.pkgproj"/> + <Project Include="System.CodeDom.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.CodeDom/pkg/System.CodeDom.pkgproj b/src/System.CodeDom/pkg/System.CodeDom.pkgproj index 97f66ff3b6..debf4ee361 100644 --- a/src/System.CodeDom/pkg/System.CodeDom.pkgproj +++ b/src/System.CodeDom/pkg/System.CodeDom.pkgproj @@ -1,13 +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" /> - <ItemGroup> <ProjectReference Include="..\ref\System.CodeDom.csproj"> - <SupportedFramework>net461;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.CodeDom.builds" /> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</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 23dbaab984..fabaca9f5a 100644 --- a/src/System.CodeDom/ref/System.CodeDom.csproj +++ b/src/System.CodeDom/ref/System.CodeDom.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -16,4 +16,4 @@ <ProjectReference Include="..\..\System.Text.Encoding\ref\System.Text.Encoding.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.CodeDom/src/Configurations.props b/src/System.CodeDom/src/Configurations.props index 32bba83db7..22152c1856 100644 --- a/src/System.CodeDom/src/Configurations.props +++ b/src/System.CodeDom/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.CodeDom/tests/Configurations.props b/src/System.CodeDom/tests/Configurations.props index 98f53209d4..c398e42e89 100644 --- a/src/System.CodeDom/tests/Configurations.props +++ b/src/System.CodeDom/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.CodeDom/tests/System.CodeDom.Tests.builds b/src/System.CodeDom/tests/System.CodeDom.Tests.builds index c17afe5f4c..2f6caea74d 100644 --- a/src/System.CodeDom/tests/System.CodeDom.Tests.builds +++ b/src/System.CodeDom/tests/System.CodeDom.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Collections.Concurrent/pkg/System.Collections.Concurrent.builds b/src/System.Collections.Concurrent/pkg/System.Collections.Concurrent.builds index ca46a36809..2fae066846 100644 --- a/src/System.Collections.Concurrent/pkg/System.Collections.Concurrent.builds +++ b/src/System.Collections.Concurrent/pkg/System.Collections.Concurrent.builds @@ -1,8 +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" /> <ItemGroup> - <Project Include="System.Collections.Concurrent.pkgproj"/> + <Project Include="System.Collections.Concurrent.pkgproj" /> </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/pkg/System.Collections.Concurrent.pkgproj b/src/System.Collections.Concurrent/pkg/System.Collections.Concurrent.pkgproj index 26019957ce..a979ce292c 100644 --- a/src/System.Collections.Concurrent/pkg/System.Collections.Concurrent.pkgproj +++ b/src/System.Collections.Concurrent/pkg/System.Collections.Concurrent.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.Collections.Concurrent.builds"> - <SupportedFramework>netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Collections.Concurrent.builds" /> <InboxOnTargetFramework Include="MonoAndroid10" /> diff --git a/src/System.Collections.Concurrent/ref/Configurations.props b/src/System.Collections.Concurrent/ref/Configurations.props index 84eaf1100d..77a4b65bc9 100644 --- a/src/System.Collections.Concurrent/ref/Configurations.props +++ b/src/System.Collections.Concurrent/ref/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netcoreapp; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Collections.Concurrent/ref/System.Collections.Concurrent.csproj b/src/System.Collections.Concurrent/ref/System.Collections.Concurrent.csproj index 4c2e8373f8..2c9009a063 100644 --- a/src/System.Collections.Concurrent/ref/System.Collections.Concurrent.csproj +++ b/src/System.Collections.Concurrent/ref/System.Collections.Concurrent.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -12,4 +12,4 @@ <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Collections.Concurrent/src/Configurations.props b/src/System.Collections.Concurrent/src/Configurations.props index fc9ef9822c..c398e42e89 100644 --- a/src/System.Collections.Concurrent/src/Configurations.props +++ b/src/System.Collections.Concurrent/src/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Collections.Concurrent/tests/Configurations.props b/src/System.Collections.Concurrent/tests/Configurations.props index 512c938bad..b2db637110 100644 --- a/src/System.Collections.Concurrent/tests/Configurations.props +++ b/src/System.Collections.Concurrent/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> netstandard1.3; - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.builds b/src/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.builds index 15a1cc3feb..38a1209b3e 100644 --- a/src/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.builds +++ b/src/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.builds @@ -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" /> <ItemGroup> @@ -8,7 +8,7 @@ <TestTFMs>netcoreapp1.0</TestTFMs> </Project> <Project Include="System.Collections.Concurrent.Tests.csproj"> - <TargetGroup>netcoreapp1.1</TargetGroup> + <TargetGroup>netcoreapp</TargetGroup> </Project> <Project Include="System.Collections.Concurrent.Tests.csproj"> <TargetGroup>netstandard1.3</TargetGroup> 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 81b81e76b8..913d26cb25 100644 --- a/src/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj +++ b/src/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.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> @@ -95,4 +95,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.Collections.Immutable/pkg/System.Collections.Immutable.builds b/src/System.Collections.Immutable/pkg/System.Collections.Immutable.builds index 3c4d0d809e..df62b39632 100644 --- a/src/System.Collections.Immutable/pkg/System.Collections.Immutable.builds +++ b/src/System.Collections.Immutable/pkg/System.Collections.Immutable.builds @@ -1,8 +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" /> <ItemGroup> - <Project Include="System.Collections.Immutable.pkgproj"/> + <Project Include="System.Collections.Immutable.pkgproj" /> </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.Immutable/pkg/System.Collections.Immutable.pkgproj b/src/System.Collections.Immutable/pkg/System.Collections.Immutable.pkgproj index 27fe407485..153b38b0d1 100644 --- a/src/System.Collections.Immutable/pkg/System.Collections.Immutable.pkgproj +++ b/src/System.Collections.Immutable/pkg/System.Collections.Immutable.pkgproj @@ -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> <!-- we need to be supported on pre-nuget-3 platforms (Dev12, Dev11, etc) --> <MinClientVersion>2.8.6</MinClientVersion> </PropertyGroup> - <ItemGroup> <ProjectReference Include="..\src\System.Collections.Immutable.builds"> <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)</SupportedFramework> </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/src/Configurations.props b/src/System.Collections.Immutable/src/Configurations.props index 2ec0365c0d..66fc3409d3 100644 --- a/src/System.Collections.Immutable/src/Configurations.props +++ b/src/System.Collections.Immutable/src/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.0; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Collections.Immutable/tests/Configurations.props b/src/System.Collections.Immutable/tests/Configurations.props index f0ebe53119..c3266e1e93 100644 --- a/src/System.Collections.Immutable/tests/Configurations.props +++ b/src/System.Collections.Immutable/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.builds b/src/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.builds index 47bfd855e4..a3970f10bd 100644 --- a/src/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.builds +++ b/src/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Collections.NonGeneric/pkg/System.Collections.NonGeneric.builds b/src/System.Collections.NonGeneric/pkg/System.Collections.NonGeneric.builds index 11e6be71db..69cb69b19a 100644 --- a/src/System.Collections.NonGeneric/pkg/System.Collections.NonGeneric.builds +++ b/src/System.Collections.NonGeneric/pkg/System.Collections.NonGeneric.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Collections.NonGeneric.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Collections.NonGeneric/pkg/System.Collections.NonGeneric.pkgproj b/src/System.Collections.NonGeneric/pkg/System.Collections.NonGeneric.pkgproj index 740794cb85..66e289751c 100644 --- a/src/System.Collections.NonGeneric/pkg/System.Collections.NonGeneric.pkgproj +++ b/src/System.Collections.NonGeneric/pkg/System.Collections.NonGeneric.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.Collections.NonGeneric.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Collections.NonGeneric.builds" /> </ItemGroup> diff --git a/src/System.Collections.NonGeneric/ref/System.Collections.NonGeneric.csproj b/src/System.Collections.NonGeneric/ref/System.Collections.NonGeneric.csproj index 68f469d1cd..d6cfce0ef8 100644 --- a/src/System.Collections.NonGeneric/ref/System.Collections.NonGeneric.csproj +++ b/src/System.Collections.NonGeneric/ref/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" /> <ItemGroup> @@ -10,4 +10,4 @@ <ProjectReference Include="..\..\System.Globalization\ref\System.Globalization.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Collections.NonGeneric/src/Configurations.props b/src/System.Collections.NonGeneric/src/Configurations.props index 9c336c0be9..dc837f9152 100644 --- a/src/System.Collections.NonGeneric/src/Configurations.props +++ b/src/System.Collections.NonGeneric/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Collections.NonGeneric/tests/Configurations.props b/src/System.Collections.NonGeneric/tests/Configurations.props index 512c938bad..b2db637110 100644 --- a/src/System.Collections.NonGeneric/tests/Configurations.props +++ b/src/System.Collections.NonGeneric/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> netstandard1.3; - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file 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 2f2200ba3c..6d4a15e724 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 @@ -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> diff --git a/src/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.builds b/src/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.builds index 4b25e7900e..d9d95e0b45 100644 --- a/src/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.builds +++ b/src/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.builds @@ -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" /> <ItemGroup> 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 95024fdca6..201847afbc 100644 --- a/src/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.csproj +++ b/src/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.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> @@ -60,4 +60,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.Collections.Specialized/pkg/System.Collections.Specialized.builds b/src/System.Collections.Specialized/pkg/System.Collections.Specialized.builds index ac25263c07..f3f5f99d76 100644 --- a/src/System.Collections.Specialized/pkg/System.Collections.Specialized.builds +++ b/src/System.Collections.Specialized/pkg/System.Collections.Specialized.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Collections.Specialized.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Collections.Specialized/pkg/System.Collections.Specialized.pkgproj b/src/System.Collections.Specialized/pkg/System.Collections.Specialized.pkgproj index 47067bbad3..bbd5891674 100644 --- a/src/System.Collections.Specialized/pkg/System.Collections.Specialized.pkgproj +++ b/src/System.Collections.Specialized/pkg/System.Collections.Specialized.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.Collections.Specialized.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Collections.Specialized.builds" /> </ItemGroup> diff --git a/src/System.Collections.Specialized/ref/System.Collections.Specialized.csproj b/src/System.Collections.Specialized/ref/System.Collections.Specialized.csproj index 4255e9f2d7..4888b9ed0e 100644 --- a/src/System.Collections.Specialized/ref/System.Collections.Specialized.csproj +++ b/src/System.Collections.Specialized/ref/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" /> <ItemGroup> @@ -10,4 +10,4 @@ <ProjectReference Include="..\..\System.Collections.NonGeneric\ref\System.Collections.NonGeneric.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Collections.Specialized/src/Configurations.props b/src/System.Collections.Specialized/src/Configurations.props index 9c336c0be9..dc837f9152 100644 --- a/src/System.Collections.Specialized/src/Configurations.props +++ b/src/System.Collections.Specialized/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Collections.Specialized/tests/Configurations.props b/src/System.Collections.Specialized/tests/Configurations.props index 512c938bad..b2db637110 100644 --- a/src/System.Collections.Specialized/tests/Configurations.props +++ b/src/System.Collections.Specialized/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> netstandard1.3; - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.builds b/src/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.builds index a31b778413..2458532d4e 100644 --- a/src/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.builds +++ b/src/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.builds @@ -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" /> <ItemGroup> 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 c97c7ecc17..f8686b2707 100644 --- a/src/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.csproj +++ b/src/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.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> @@ -97,4 +97,4 @@ <Compile Include="NameObjectCollectionBase\MyNameObjectCollection.netstandard1.7.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Collections/pkg/System.Collections.pkgproj b/src/System.Collections/pkg/System.Collections.pkgproj index 2d3c0815f7..7adf481540 100644 --- a/src/System.Collections/pkg/System.Collections.pkgproj +++ b/src/System.Collections/pkg/System.Collections.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.Collections.builds"> - <SupportedFramework>netcoreapp1.1;net463;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>netcoreapp2.0;net463;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Collections.csproj"> <TargetGroup>net463</TargetGroup> @@ -25,4 +25,4 @@ <InboxOnTargetFramework Include="xamarinwatchos10" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Collections/pkg/any/System.Collections.pkgproj b/src/System.Collections/pkg/any/System.Collections.pkgproj index 583325762c..93655c994c 100644 --- a/src/System.Collections/pkg/any/System.Collections.pkgproj +++ b/src/System.Collections/pkg/any/System.Collections.pkgproj @@ -6,16 +6,13 @@ <PackageTargetRuntime>any</PackageTargetRuntime> <PreventImplementationReference>true</PreventImplementationReference> </PropertyGroup> - <ItemGroup> <ProjectReference Include="..\..\src\System.Collections.csproj" /> - <!-- AOT implementation comes from AOT package --> <File Include="$(PlaceholderFile)"> <TargetPath>runtimes/aot/lib/netcore50</TargetPath> <TargetFramework>aot</TargetFramework> </File> - <InboxOnTargetFramework Include="MonoAndroid10" /> <InboxOnTargetFramework Include="MonoTouch10" /> <InboxOnTargetFramework Include="net45" /> diff --git a/src/System.Collections/pkg/aot/System.Collections.pkgproj b/src/System.Collections/pkg/aot/System.Collections.pkgproj index ba9c3cd6fa..5a96eed220 100644 --- a/src/System.Collections/pkg/aot/System.Collections.pkgproj +++ b/src/System.Collections/pkg/aot/System.Collections.pkgproj @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> <PackageTargetRuntime>aot</PackageTargetRuntime> <PreventImplementationReference>true</PreventImplementationReference> @@ -11,6 +10,5 @@ <TargetGroup>uap101aot</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.Collections/ref/Configurations.props b/src/System.Collections/ref/Configurations.props index 33dc67c6d9..2845c11c54 100644 --- a/src/System.Collections/ref/Configurations.props +++ b/src/System.Collections/ref/Configurations.props @@ -1,8 +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> <BuildConfigurations> netcoreapp; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Collections/ref/System.Collections.builds b/src/System.Collections/ref/System.Collections.builds index 169e592393..be36a84c39 100644 --- a/src/System.Collections/ref/System.Collections.builds +++ b/src/System.Collections/ref/System.Collections.builds @@ -4,7 +4,7 @@ <ItemGroup> <Project Include="System.Collections.csproj" /> <Project Include="System.Collections.csproj"> - <TargetGroup>netstandard1.7</TargetGroup> + <TargetGroup>netstandard</TargetGroup> </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> diff --git a/src/System.Collections/ref/System.Collections.csproj b/src/System.Collections/ref/System.Collections.csproj index 41c0a98842..cc59bc0632 100644 --- a/src/System.Collections/ref/System.Collections.csproj +++ b/src/System.Collections/ref/System.Collections.csproj @@ -11,4 +11,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Collections/src/Configurations.props b/src/System.Collections/src/Configurations.props index f013d10b8c..ed0bd2acc9 100644 --- a/src/System.Collections/src/Configurations.props +++ b/src/System.Collections/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Collections/src/System.Collections.csproj b/src/System.Collections/src/System.Collections.csproj index dfa7989ba0..fa5c7d80be 100644 --- a/src/System.Collections/src/System.Collections.csproj +++ b/src/System.Collections/src/System.Collections.csproj @@ -8,7 +8,7 @@ <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <!-- 436 is thrown because BitArray conflict with corelib --> <NoWarn>0436</NoWarn> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Default configurations to help VS understand the options --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> diff --git a/src/System.Collections/tests/Configurations.props b/src/System.Collections/tests/Configurations.props index 0b1283dabb..c3520855a0 100644 --- a/src/System.Collections/tests/Configurations.props +++ b/src/System.Collections/tests/Configurations.props @@ -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"> <PropertyGroup> <BuildConfigurations> - netcoreapp1.1; + netcoreapp; netstandard1.3; - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file 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 e3851e4c44..26c940e658 100644 --- a/src/System.Collections/tests/Performance/System.Collections.Performance.Tests.csproj +++ b/src/System.Collections/tests/Performance/System.Collections.Performance.Tests.csproj @@ -1,12 +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> <IncludePerformanceTests>true</IncludePerformanceTests> </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)' == 'Debug|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> <ItemGroup> <Compile Include="Perf.Dictionary.cs" /> <Compile Include="Perf.HashSet.cs" /> diff --git a/src/System.Collections/tests/System.Collections.Tests.builds b/src/System.Collections/tests/System.Collections.Tests.builds index a748a9a6f9..3e205bc99f 100644 --- a/src/System.Collections/tests/System.Collections.Tests.builds +++ b/src/System.Collections/tests/System.Collections.Tests.builds @@ -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" /> <ItemGroup> <Project Include="System.Collections.Tests.csproj" /> <Project Include="System.Collections.Tests.csproj"> - <TargetGroup>netcoreapp1.1</TargetGroup> + <TargetGroup>netcoreapp</TargetGroup> </Project> <Project Include="System.Collections.Tests.csproj"> <TargetGroup>netstandard1.3</TargetGroup> diff --git a/src/System.Collections/tests/System.Collections.Tests.csproj b/src/System.Collections/tests/System.Collections.Tests.csproj index 6313043ff3..4aec0d2d09 100644 --- a/src/System.Collections/tests/System.Collections.Tests.csproj +++ b/src/System.Collections/tests/System.Collections.Tests.csproj @@ -10,58 +10,58 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> <ItemGroup> <!-- Common Collections tests --> - <Compile Include="$(CommonTestPath)\System\Collections\CollectionAsserts.cs" > + <Compile Include="$(CommonTestPath)\System\Collections\CollectionAsserts.cs"> <Link>Common\System\Collections\CollectionAsserts.cs</Link> </Compile> - <Compile Include="$(CommonTestPath)\System\Collections\ICollection.NonGeneric.Tests.cs" > + <Compile Include="$(CommonTestPath)\System\Collections\ICollection.NonGeneric.Tests.cs"> <Link>Common\System\Collections\ICollection.NonGeneric.Tests.cs</Link> </Compile> - <Compile Include="$(CommonTestPath)\System\Collections\ICollection.Generic.Tests.cs" > + <Compile Include="$(CommonTestPath)\System\Collections\ICollection.Generic.Tests.cs"> <Link>Common\System\Collections\ICollection.Generic.Tests.cs</Link> </Compile> - <Compile Include="$(CommonTestPath)\System\Collections\IDictionary.NonGeneric.Tests.cs" > + <Compile Include="$(CommonTestPath)\System\Collections\IDictionary.NonGeneric.Tests.cs"> <Link>Common\System\Collections\IDictionary.NonGeneric.Tests.cs</Link> </Compile> - <Compile Include="$(CommonTestPath)\System\Collections\IDictionary.Generic.Tests.cs" > + <Compile Include="$(CommonTestPath)\System\Collections\IDictionary.Generic.Tests.cs"> <Link>Common\System\Collections\IDictionary.Generic.Tests.cs</Link> </Compile> - <Compile Include="$(CommonTestPath)\System\Collections\IEnumerable.NonGeneric.Tests.cs" > + <Compile Include="$(CommonTestPath)\System\Collections\IEnumerable.NonGeneric.Tests.cs"> <Link>Common\System\Collections\IEnumerable.NonGeneric.Tests.cs</Link> </Compile> - <Compile Include="$(CommonTestPath)\System\Collections\IEnumerable.Generic.Tests.cs" > + <Compile Include="$(CommonTestPath)\System\Collections\IEnumerable.Generic.Tests.cs"> <Link>Common\System\Collections\IEnumerable.Generic.Tests.cs</Link> </Compile> - <Compile Include="$(CommonTestPath)\System\Collections\IList.NonGeneric.Tests.cs" > + <Compile Include="$(CommonTestPath)\System\Collections\IList.NonGeneric.Tests.cs"> <Link>Common\System\Collections\IList.NonGeneric.Tests.cs</Link> </Compile> - <Compile Include="$(CommonTestPath)\System\Collections\IList.Generic.Tests.cs" > + <Compile Include="$(CommonTestPath)\System\Collections\IList.Generic.Tests.cs"> <Link>Common\System\Collections\IList.Generic.Tests.cs</Link> </Compile> - <Compile Include="$(CommonTestPath)\System\Collections\IGenericSharedAPI.Tests.cs" > + <Compile Include="$(CommonTestPath)\System\Collections\IGenericSharedAPI.Tests.cs"> <Link>Common\System\Collections\IGenericSharedAPI.Tests.cs</Link> </Compile> - <Compile Include="$(CommonTestPath)\System\Collections\ISet.Generic.Tests.cs" > + <Compile Include="$(CommonTestPath)\System\Collections\ISet.Generic.Tests.cs"> <Link>Common\System\Collections\ISet.Generic.Tests.cs</Link> </Compile> - <Compile Include="$(CommonTestPath)\System\Collections\TestBase.NonGeneric.cs" > + <Compile Include="$(CommonTestPath)\System\Collections\TestBase.NonGeneric.cs"> <Link>Common\System\Collections\TestBase.NonGeneric.Tests.cs</Link> </Compile> - <Compile Include="$(CommonTestPath)\System\Collections\TestBase.Generic.cs" > + <Compile Include="$(CommonTestPath)\System\Collections\TestBase.Generic.cs"> <Link>Common\System\Collections\TestBase.Generic.Tests.cs</Link> </Compile> - <Compile Include="$(CommonTestPath)\System\Collections\DebugView.Tests.cs" > + <Compile Include="$(CommonTestPath)\System\Collections\DebugView.Tests.cs"> <Link>Common\System\Collections\DebugView.Tests.cs</Link> </Compile> - <Compile Include="$(CommonTestPath)\System\Collections\TestingTypes.cs" > + <Compile Include="$(CommonTestPath)\System\Collections\TestingTypes.cs"> <Link>Common\System\Collections\TestingTypes.cs</Link> </Compile> - <Compile Include="$(CommonTestPath)\System\EnumTypes.cs" > + <Compile Include="$(CommonTestPath)\System\EnumTypes.cs"> <Link>Common\System\EnumTypes.cs</Link> </Compile> - <Compile Include="$(CommonTestPath)\System\ObjectCloner.cs" > + <Compile Include="$(CommonTestPath)\System\ObjectCloner.cs"> <Link>Common\System\ObjectCloner.cs</Link> </Compile> - <Compile Include="$(CommonTestPath)\System\RuntimeDetection.cs" > + <Compile Include="$(CommonTestPath)\System\RuntimeDetection.cs"> <Link>Common\System\RuntimeDetection.cs</Link> </Compile> <!-- Generic tests --> @@ -146,12 +146,12 @@ </Compile> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)'=='netstandard'"> - <Compile Include="$(CommonTestPath)\System\Collections\IEnumerable.NonGeneric.Serialization.Tests.cs" > + <Compile Include="$(CommonTestPath)\System\Collections\IEnumerable.NonGeneric.Serialization.Tests.cs"> <Link>Common\System\Collections\IEnumerable.NonGeneric.Serialization.Tests.cs</Link> </Compile> - <Compile Include="$(CommonTestPath)\System\Collections\IEnumerable.Generic.Serialization.Tests.cs" > + <Compile Include="$(CommonTestPath)\System\Collections\IEnumerable.Generic.Serialization.Tests.cs"> <Link>Common\System\Collections\IEnumerable.Generic.Serialization.Tests.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.ComponentModel.Annotations/pkg/System.ComponentModel.Annotations.builds b/src/System.ComponentModel.Annotations/pkg/System.ComponentModel.Annotations.builds index 508c2e49b4..27f1f57356 100644 --- a/src/System.ComponentModel.Annotations/pkg/System.ComponentModel.Annotations.builds +++ b/src/System.ComponentModel.Annotations/pkg/System.ComponentModel.Annotations.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.ComponentModel.Annotations.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.ComponentModel.Annotations/pkg/System.ComponentModel.Annotations.pkgproj b/src/System.ComponentModel.Annotations/pkg/System.ComponentModel.Annotations.pkgproj index 6a0c1796a8..9343d44caf 100644 --- a/src/System.ComponentModel.Annotations/pkg/System.ComponentModel.Annotations.pkgproj +++ b/src/System.ComponentModel.Annotations/pkg/System.ComponentModel.Annotations.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.ComponentModel.Annotations.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.ComponentModel.Annotations.builds" /> <InboxOnTargetFramework Include="MonoAndroid10" /> diff --git a/src/System.ComponentModel.Annotations/ref/System.ComponentModel.Annotations.csproj b/src/System.ComponentModel.Annotations/ref/System.ComponentModel.Annotations.csproj index daa3fcfd7b..bb4215b427 100644 --- a/src/System.ComponentModel.Annotations/ref/System.ComponentModel.Annotations.csproj +++ b/src/System.ComponentModel.Annotations/ref/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" /> <ItemGroup> @@ -9,4 +9,4 @@ <ProjectReference Include="..\..\System.ComponentModel\ref\System.ComponentModel.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.ComponentModel.Annotations/src/Configurations.props b/src/System.ComponentModel.Annotations/src/Configurations.props index 9c336c0be9..dc837f9152 100644 --- a/src/System.ComponentModel.Annotations/src/Configurations.props +++ b/src/System.ComponentModel.Annotations/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.ComponentModel.Annotations/tests/Configurations.props b/src/System.ComponentModel.Annotations/tests/Configurations.props index 98f53209d4..c398e42e89 100644 --- a/src/System.ComponentModel.Annotations/tests/Configurations.props +++ b/src/System.ComponentModel.Annotations/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.ComponentModel.Annotations/tests/System.ComponentModel.Annotations.Tests.builds b/src/System.ComponentModel.Annotations/tests/System.ComponentModel.Annotations.Tests.builds index 43464bca11..d6136ab850 100644 --- a/src/System.ComponentModel.Annotations/tests/System.ComponentModel.Annotations.Tests.builds +++ b/src/System.ComponentModel.Annotations/tests/System.ComponentModel.Annotations.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.ComponentModel.EventBasedAsync/pkg/System.ComponentModel.EventBasedAsync.builds b/src/System.ComponentModel.EventBasedAsync/pkg/System.ComponentModel.EventBasedAsync.builds index 637025120e..f3720a9abe 100644 --- a/src/System.ComponentModel.EventBasedAsync/pkg/System.ComponentModel.EventBasedAsync.builds +++ b/src/System.ComponentModel.EventBasedAsync/pkg/System.ComponentModel.EventBasedAsync.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.ComponentModel.EventBasedAsync.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.ComponentModel.EventBasedAsync/pkg/System.ComponentModel.EventBasedAsync.pkgproj b/src/System.ComponentModel.EventBasedAsync/pkg/System.ComponentModel.EventBasedAsync.pkgproj index a874b63409..087383073a 100644 --- a/src/System.ComponentModel.EventBasedAsync/pkg/System.ComponentModel.EventBasedAsync.pkgproj +++ b/src/System.ComponentModel.EventBasedAsync/pkg/System.ComponentModel.EventBasedAsync.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.ComponentModel.EventBasedAsync.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.ComponentModel.EventBasedAsync.builds" /> <InboxOnTargetFramework Include="MonoAndroid10" /> diff --git a/src/System.ComponentModel.EventBasedAsync/ref/System.ComponentModel.EventBasedAsync.csproj b/src/System.ComponentModel.EventBasedAsync/ref/System.ComponentModel.EventBasedAsync.csproj index f61a3fbfe7..0f63ea0ae4 100644 --- a/src/System.ComponentModel.EventBasedAsync/ref/System.ComponentModel.EventBasedAsync.csproj +++ b/src/System.ComponentModel.EventBasedAsync/ref/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" /> <ItemGroup> @@ -11,4 +11,4 @@ <ProjectReference Include="..\..\System.Threading\ref\System.Threading.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.ComponentModel.EventBasedAsync/src/Configurations.props b/src/System.ComponentModel.EventBasedAsync/src/Configurations.props index 9c336c0be9..dc837f9152 100644 --- a/src/System.ComponentModel.EventBasedAsync/src/Configurations.props +++ b/src/System.ComponentModel.EventBasedAsync/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.ComponentModel.EventBasedAsync/tests/Configurations.props b/src/System.ComponentModel.EventBasedAsync/tests/Configurations.props index f0ebe53119..c3266e1e93 100644 --- a/src/System.ComponentModel.EventBasedAsync/tests/Configurations.props +++ b/src/System.ComponentModel.EventBasedAsync/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.ComponentModel.EventBasedAsync/tests/System.ComponentModel.EventBasedAsync.Tests.builds b/src/System.ComponentModel.EventBasedAsync/tests/System.ComponentModel.EventBasedAsync.Tests.builds index 46f389e113..a518b86351 100644 --- a/src/System.ComponentModel.EventBasedAsync/tests/System.ComponentModel.EventBasedAsync.Tests.builds +++ b/src/System.ComponentModel.EventBasedAsync/tests/System.ComponentModel.EventBasedAsync.Tests.builds @@ -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" /> <ItemGroup> 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 76517e3955..6031c85c1d 100644 --- a/src/System.ComponentModel.EventBasedAsync/tests/System.ComponentModel.EventBasedAsync.Tests.csproj +++ b/src/System.ComponentModel.EventBasedAsync/tests/System.ComponentModel.EventBasedAsync.Tests.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> diff --git a/src/System.ComponentModel.Primitives/pkg/System.ComponentModel.Primitives.builds b/src/System.ComponentModel.Primitives/pkg/System.ComponentModel.Primitives.builds index c0c1477fad..5cbb34ced0 100644 --- a/src/System.ComponentModel.Primitives/pkg/System.ComponentModel.Primitives.builds +++ b/src/System.ComponentModel.Primitives/pkg/System.ComponentModel.Primitives.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.ComponentModel.Primitives.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.ComponentModel.Primitives/pkg/System.ComponentModel.Primitives.pkgproj b/src/System.ComponentModel.Primitives/pkg/System.ComponentModel.Primitives.pkgproj index 9413ddc9a5..7af100b8ab 100644 --- a/src/System.ComponentModel.Primitives/pkg/System.ComponentModel.Primitives.pkgproj +++ b/src/System.ComponentModel.Primitives/pkg/System.ComponentModel.Primitives.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.ComponentModel.Primitives.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.ComponentModel.Primitives.builds" /> </ItemGroup> diff --git a/src/System.ComponentModel.Primitives/ref/System.ComponentModel.Primitives.csproj b/src/System.ComponentModel.Primitives/ref/System.ComponentModel.Primitives.csproj index 4eae778a3d..f091b8f216 100644 --- a/src/System.ComponentModel.Primitives/ref/System.ComponentModel.Primitives.csproj +++ b/src/System.ComponentModel.Primitives/ref/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" /> <ItemGroup> @@ -10,4 +10,4 @@ <ProjectReference Include="..\..\System.ComponentModel\ref\System.ComponentModel.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.ComponentModel.Primitives/src/Configurations.props b/src/System.ComponentModel.Primitives/src/Configurations.props index 9c336c0be9..dc837f9152 100644 --- a/src/System.ComponentModel.Primitives/src/Configurations.props +++ b/src/System.ComponentModel.Primitives/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.ComponentModel.Primitives/tests/Configurations.props b/src/System.ComponentModel.Primitives/tests/Configurations.props index 512c938bad..b2db637110 100644 --- a/src/System.ComponentModel.Primitives/tests/Configurations.props +++ b/src/System.ComponentModel.Primitives/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> netstandard1.3; - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.builds b/src/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.builds index 34abfe1249..c619b5a9ba 100644 --- a/src/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.builds +++ b/src/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.builds @@ -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" /> <ItemGroup> 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 c69b258425..ce1990b85f 100644 --- a/src/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.csproj +++ b/src/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -29,4 +29,4 @@ <Compile Include="EventHandlerListTests.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.ComponentModel.TypeConverter/pkg/System.ComponentModel.TypeConverter.builds b/src/System.ComponentModel.TypeConverter/pkg/System.ComponentModel.TypeConverter.builds index 5e30a6915b..63838aa383 100644 --- a/src/System.ComponentModel.TypeConverter/pkg/System.ComponentModel.TypeConverter.builds +++ b/src/System.ComponentModel.TypeConverter/pkg/System.ComponentModel.TypeConverter.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.ComponentModel.TypeConverter.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.ComponentModel.TypeConverter/pkg/System.ComponentModel.TypeConverter.pkgproj b/src/System.ComponentModel.TypeConverter/pkg/System.ComponentModel.TypeConverter.pkgproj index f80cab399b..e71310870c 100644 --- a/src/System.ComponentModel.TypeConverter/pkg/System.ComponentModel.TypeConverter.pkgproj +++ b/src/System.ComponentModel.TypeConverter/pkg/System.ComponentModel.TypeConverter.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.ComponentModel.TypeConverter.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.ComponentModel.TypeConverter.builds" /> </ItemGroup> diff --git a/src/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.csproj b/src/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.csproj index 5a950152b0..100d244e13 100644 --- a/src/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.csproj +++ b/src/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.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" /> <ItemGroup> @@ -16,6 +16,5 @@ <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" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.ComponentModel.TypeConverter/src/Configurations.props b/src/System.ComponentModel.TypeConverter/src/Configurations.props index 9c336c0be9..dc837f9152 100644 --- a/src/System.ComponentModel.TypeConverter/src/Configurations.props +++ b/src/System.ComponentModel.TypeConverter/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.ComponentModel.TypeConverter/tests/Configurations.props b/src/System.ComponentModel.TypeConverter/tests/Configurations.props index b744993779..800e963c80 100644 --- a/src/System.ComponentModel.TypeConverter/tests/Configurations.props +++ b/src/System.ComponentModel.TypeConverter/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> netstandard1.5; - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.builds b/src/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.builds index 341f1019cb..8dc9f1d908 100644 --- a/src/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.builds +++ b/src/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.builds @@ -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" /> <ItemGroup> 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 5ebfc1b1fb..3bff40c065 100644 --- a/src/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj +++ b/src/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.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> @@ -77,4 +77,4 @@ <Compile Include="Security\Authentication\ExtendedProtection\ExtendedProtectionPolicyTypeConverterTests.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.ComponentModel/pkg/System.ComponentModel.builds b/src/System.ComponentModel/pkg/System.ComponentModel.builds index c7c6771674..6c98115945 100644 --- a/src/System.ComponentModel/pkg/System.ComponentModel.builds +++ b/src/System.ComponentModel/pkg/System.ComponentModel.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.ComponentModel.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.ComponentModel/pkg/System.ComponentModel.pkgproj b/src/System.ComponentModel/pkg/System.ComponentModel.pkgproj index b973dc122d..5c28546c74 100644 --- a/src/System.ComponentModel/pkg/System.ComponentModel.pkgproj +++ b/src/System.ComponentModel/pkg/System.ComponentModel.pkgproj @@ -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" /> <ItemGroup> diff --git a/src/System.ComponentModel/ref/System.ComponentModel.csproj b/src/System.ComponentModel/ref/System.ComponentModel.csproj index facd34b330..2b7c05c1fb 100644 --- a/src/System.ComponentModel/ref/System.ComponentModel.csproj +++ b/src/System.ComponentModel/ref/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" /> <ItemGroup> @@ -8,4 +8,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.ComponentModel/src/Configurations.props b/src/System.ComponentModel/src/Configurations.props index f0ebe53119..c3266e1e93 100644 --- a/src/System.ComponentModel/src/Configurations.props +++ b/src/System.ComponentModel/src/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.ComponentModel/tests/Configurations.props b/src/System.ComponentModel/tests/Configurations.props index f0ebe53119..c3266e1e93 100644 --- a/src/System.ComponentModel/tests/Configurations.props +++ b/src/System.ComponentModel/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.ComponentModel/tests/System.ComponentModel.Tests.builds b/src/System.ComponentModel/tests/System.ComponentModel.Tests.builds index b063511118..4b3f9458d0 100644 --- a/src/System.ComponentModel/tests/System.ComponentModel.Tests.builds +++ b/src/System.ComponentModel/tests/System.ComponentModel.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.ComponentModel/tests/System.ComponentModel.Tests.csproj b/src/System.ComponentModel/tests/System.ComponentModel.Tests.csproj index d217e391d2..581a1b9086 100644 --- a/src/System.ComponentModel/tests/System.ComponentModel.Tests.csproj +++ b/src/System.ComponentModel/tests/System.ComponentModel.Tests.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> diff --git a/src/System.Composition.AttributedModel/pkg/System.Composition.AttributedModel.builds b/src/System.Composition.AttributedModel/pkg/System.Composition.AttributedModel.builds index 27b1553e64..17e6009937 100644 --- a/src/System.Composition.AttributedModel/pkg/System.Composition.AttributedModel.builds +++ b/src/System.Composition.AttributedModel/pkg/System.Composition.AttributedModel.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Composition.AttributedModel.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Composition.AttributedModel/pkg/System.Composition.AttributedModel.pkgproj b/src/System.Composition.AttributedModel/pkg/System.Composition.AttributedModel.pkgproj index d0f6336bdd..89aba23068 100644 --- a/src/System.Composition.AttributedModel/pkg/System.Composition.AttributedModel.pkgproj +++ b/src/System.Composition.AttributedModel/pkg/System.Composition.AttributedModel.pkgproj @@ -1,12 +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" /> - <ItemGroup> <ProjectReference Include="..\src\System.Composition.AttributedModel.builds"> <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)</SupportedFramework> </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 index 2ec0365c0d..66fc3409d3 100644 --- a/src/System.Composition.AttributedModel/src/Configurations.props +++ b/src/System.Composition.AttributedModel/src/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.0; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Composition.Convention/pkg/System.Composition.Convention.builds b/src/System.Composition.Convention/pkg/System.Composition.Convention.builds index 5f024ad563..39e774e75d 100644 --- a/src/System.Composition.Convention/pkg/System.Composition.Convention.builds +++ b/src/System.Composition.Convention/pkg/System.Composition.Convention.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Composition.Convention.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Composition.Convention/pkg/System.Composition.Convention.pkgproj b/src/System.Composition.Convention/pkg/System.Composition.Convention.pkgproj index d7981fee21..4ecab9f885 100644 --- a/src/System.Composition.Convention/pkg/System.Composition.Convention.pkgproj +++ b/src/System.Composition.Convention/pkg/System.Composition.Convention.pkgproj @@ -1,12 +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" /> - <ItemGroup> <ProjectReference Include="..\src\System.Composition.Convention.builds"> <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Composition.Convention/src/Configurations.props b/src/System.Composition.Convention/src/Configurations.props index 2ec0365c0d..66fc3409d3 100644 --- a/src/System.Composition.Convention/src/Configurations.props +++ b/src/System.Composition.Convention/src/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.0; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Composition.Convention/tests/Configurations.props b/src/System.Composition.Convention/tests/Configurations.props index ec110beba6..fa32899de2 100644 --- a/src/System.Composition.Convention/tests/Configurations.props +++ b/src/System.Composition.Convention/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netcoreapp1.0; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Composition.Convention/tests/System.Composition.Convention.Tests.builds b/src/System.Composition.Convention/tests/System.Composition.Convention.Tests.builds index 34e3e48aa7..7a93c52ea4 100644 --- a/src/System.Composition.Convention/tests/System.Composition.Convention.Tests.builds +++ b/src/System.Composition.Convention/tests/System.Composition.Convention.Tests.builds @@ -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" /> <ItemGroup> 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 b828368782..3fa0149f72 100644 --- a/src/System.Composition.Convention/tests/System.Composition.Convention.Tests.csproj +++ b/src/System.Composition.Convention/tests/System.Composition.Convention.Tests.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> diff --git a/src/System.Composition.Hosting/pkg/System.Composition.Hosting.builds b/src/System.Composition.Hosting/pkg/System.Composition.Hosting.builds index 143affbe47..6b42af7067 100644 --- a/src/System.Composition.Hosting/pkg/System.Composition.Hosting.builds +++ b/src/System.Composition.Hosting/pkg/System.Composition.Hosting.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Composition.Hosting.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Composition.Hosting/pkg/System.Composition.Hosting.pkgproj b/src/System.Composition.Hosting/pkg/System.Composition.Hosting.pkgproj index 24e92c84b9..6a19efb3ad 100644 --- a/src/System.Composition.Hosting/pkg/System.Composition.Hosting.pkgproj +++ b/src/System.Composition.Hosting/pkg/System.Composition.Hosting.pkgproj @@ -1,12 +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" /> - <ItemGroup> <ProjectReference Include="..\src\System.Composition.Hosting.builds"> <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> </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 index 2ec0365c0d..66fc3409d3 100644 --- a/src/System.Composition.Hosting/src/Configurations.props +++ b/src/System.Composition.Hosting/src/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.0; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Composition.Runtime/pkg/System.Composition.Runtime.builds b/src/System.Composition.Runtime/pkg/System.Composition.Runtime.builds index 8c944373c1..4676f95a60 100644 --- a/src/System.Composition.Runtime/pkg/System.Composition.Runtime.builds +++ b/src/System.Composition.Runtime/pkg/System.Composition.Runtime.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Composition.Runtime.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Composition.Runtime/pkg/System.Composition.Runtime.pkgproj b/src/System.Composition.Runtime/pkg/System.Composition.Runtime.pkgproj index 3a792daef5..48a297d85a 100644 --- a/src/System.Composition.Runtime/pkg/System.Composition.Runtime.pkgproj +++ b/src/System.Composition.Runtime/pkg/System.Composition.Runtime.pkgproj @@ -1,12 +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" /> - <ItemGroup> <ProjectReference Include="..\src\System.Composition.Runtime.builds"> <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Composition.Runtime/src/Configurations.props b/src/System.Composition.Runtime/src/Configurations.props index 2ec0365c0d..66fc3409d3 100644 --- a/src/System.Composition.Runtime/src/Configurations.props +++ b/src/System.Composition.Runtime/src/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.0; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Composition.TypedParts/pkg/System.Composition.TypedParts.builds b/src/System.Composition.TypedParts/pkg/System.Composition.TypedParts.builds index ed1ef7af75..f837fecc49 100644 --- a/src/System.Composition.TypedParts/pkg/System.Composition.TypedParts.builds +++ b/src/System.Composition.TypedParts/pkg/System.Composition.TypedParts.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Composition.TypedParts.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Composition.TypedParts/pkg/System.Composition.TypedParts.pkgproj b/src/System.Composition.TypedParts/pkg/System.Composition.TypedParts.pkgproj index 7288dae5f6..b189250945 100644 --- a/src/System.Composition.TypedParts/pkg/System.Composition.TypedParts.pkgproj +++ b/src/System.Composition.TypedParts/pkg/System.Composition.TypedParts.pkgproj @@ -1,12 +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" /> - <ItemGroup> <ProjectReference Include="..\src\System.Composition.TypedParts.builds"> <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Composition.TypedParts/src/Configurations.props b/src/System.Composition.TypedParts/src/Configurations.props index 2ec0365c0d..66fc3409d3 100644 --- a/src/System.Composition.TypedParts/src/Configurations.props +++ b/src/System.Composition.TypedParts/src/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.0; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ 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 001e47b2e6..47feef6f1c 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 @@ -34,4 +34,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.Composition/perftests/Microsoft.Composition.ThroughputHarness.csproj b/src/System.Composition/perftests/Microsoft.Composition.ThroughputHarness.csproj index b47f6606f3..1c7981d83e 100644 --- a/src/System.Composition/perftests/Microsoft.Composition.ThroughputHarness.csproj +++ b/src/System.Composition/perftests/Microsoft.Composition.ThroughputHarness.csproj @@ -50,4 +50,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.Composition/pkg/System.Composition.builds b/src/System.Composition/pkg/System.Composition.builds index 3809c04b74..bf350146a9 100644 --- a/src/System.Composition/pkg/System.Composition.builds +++ b/src/System.Composition/pkg/System.Composition.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Composition.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Composition/pkg/System.Composition.pkgproj b/src/System.Composition/pkg/System.Composition.pkgproj index 71d2f08f87..70113e2dbe 100644 --- a/src/System.Composition/pkg/System.Composition.pkgproj +++ b/src/System.Composition/pkg/System.Composition.pkgproj @@ -1,7 +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"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <ItemGroup> <ProjectReference Include="..\..\System.Composition.AttributedModel\pkg\System.Composition.AttributedModel.pkgproj" /> <ProjectReference Include="..\..\System.Composition.Convention\pkg\System.Composition.Convention.pkgproj" /> @@ -9,6 +8,5 @@ <ProjectReference Include="..\..\System.Composition.Runtime\pkg\System.Composition.Runtime.pkgproj" /> <ProjectReference Include="..\..\System.Composition.TypedParts\pkg\System.Composition.TypedParts.pkgproj" /> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ 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 8376f5992c..39fbbcc3c4 100644 --- a/src/System.Composition/scenarios/TestLibrary/TestLibrary.csproj +++ b/src/System.Composition/scenarios/TestLibrary/TestLibrary.csproj @@ -21,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.Composition/tests/Configurations.props b/src/System.Composition/tests/Configurations.props index f0ebe53119..c3266e1e93 100644 --- a/src/System.Composition/tests/Configurations.props +++ b/src/System.Composition/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Composition/tests/System.Composition.Tests.builds b/src/System.Composition/tests/System.Composition.Tests.builds index f86d3e9584..1712b6e8c3 100644 --- a/src/System.Composition/tests/System.Composition.Tests.builds +++ b/src/System.Composition/tests/System.Composition.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Configuration/pkg/System.Configuration.builds b/src/System.Configuration/pkg/System.Configuration.builds index b6ea2f4e29..c27c1801ac 100644 --- a/src/System.Configuration/pkg/System.Configuration.builds +++ b/src/System.Configuration/pkg/System.Configuration.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Configuration.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Configuration/pkg/System.Configuration.pkgproj b/src/System.Configuration/pkg/System.Configuration.pkgproj index eb8e5a6396..e03cbe3fe8 100644 --- a/src/System.Configuration/pkg/System.Configuration.pkgproj +++ b/src/System.Configuration/pkg/System.Configuration.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Configuration.csproj"> - <SupportedFramework>netcoreapp1.1;net461;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>netcoreapp2.0;net461;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Configuration.builds" /> <InboxOnTargetFramework Include="net461" /> diff --git a/src/System.Configuration/ref/Configurations.props b/src/System.Configuration/ref/Configurations.props index fc9ef9822c..c398e42e89 100644 --- a/src/System.Configuration/ref/Configurations.props +++ b/src/System.Configuration/ref/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Configuration/tests/System.Configuration.Tests.builds b/src/System.Configuration/tests/System.Configuration.Tests.builds index 114e4b3a04..7a2d7d0668 100644 --- a/src/System.Configuration/tests/System.Configuration.Tests.builds +++ b/src/System.Configuration/tests/System.Configuration.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Console/pkg/System.Console.builds b/src/System.Console/pkg/System.Console.builds index 09ef33c9a4..c299839d50 100644 --- a/src/System.Console/pkg/System.Console.builds +++ b/src/System.Console/pkg/System.Console.builds @@ -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" /> <ItemGroup> @@ -11,5 +11,4 @@ </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Console/pkg/System.Console.pkgproj b/src/System.Console/pkg/System.Console.pkgproj index 4b84737378..4f2f2056a8 100644 --- a/src/System.Console/pkg/System.Console.pkgproj +++ b/src/System.Console/pkg/System.Console.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.Console.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Console.csproj"> <AdditionalProperties>TargetGroup=net463</AdditionalProperties> @@ -20,4 +20,4 @@ <InboxOnTargetFramework Include="xamarinwatchos10" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Console/pkg/unix/System.Console.pkgproj b/src/System.Console/pkg/unix/System.Console.pkgproj index 4f2b33d571..18f61ce37c 100644 --- a/src/System.Console/pkg/unix/System.Console.pkgproj +++ b/src/System.Console/pkg/unix/System.Console.pkgproj @@ -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> <PackageTargetRuntime>unix</PackageTargetRuntime> <PreventImplementationReference>true</PreventImplementationReference> </PropertyGroup> <ItemGroup> - <ProjectReference Include="..\..\src\System.Console.csproj" > + <ProjectReference Include="..\..\src\System.Console.csproj"> <OSGroup>Unix</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.Console/pkg/win/System.Console.pkgproj b/src/System.Console/pkg/win/System.Console.pkgproj index f1f82aad77..025bd19030 100644 --- a/src/System.Console/pkg/win/System.Console.pkgproj +++ b/src/System.Console/pkg/win/System.Console.pkgproj @@ -1,18 +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> <PackageTargetRuntime>win</PackageTargetRuntime> <PreventImplementationReference>true</PreventImplementationReference> </PropertyGroup> - <ItemGroup> - <ProjectReference Include="..\..\src\System.Console.csproj" > + <ProjectReference Include="..\..\src\System.Console.csproj"> <OSGroup>Windows_NT</OSGroup> </ProjectReference> <ExternalOnTargetFramework Include="net" /> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Console/ref/4.0.0/System.Console.depproj b/src/System.Console/ref/4.0.0/System.Console.depproj index 7ffc8e592f..2e7ae1ef78 100644 --- a/src/System.Console/ref/4.0.0/System.Console.depproj +++ b/src/System.Console/ref/4.0.0/System.Console.depproj @@ -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> diff --git a/src/System.Console/ref/System.Console.csproj b/src/System.Console/ref/System.Console.csproj index 169444ee03..602414d62d 100644 --- a/src/System.Console/ref/System.Console.csproj +++ b/src/System.Console/ref/System.Console.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -11,4 +11,4 @@ <ProjectReference Include="..\..\System.Text.Encoding\ref\System.Text.Encoding.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Console/src/Configurations.props b/src/System.Console/src/Configurations.props index 3bb6330d9e..4701fcd772 100644 --- a/src/System.Console/src/Configurations.props +++ b/src/System.Console/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ net463-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Console/tests/Configurations.props b/src/System.Console/tests/Configurations.props index f0ebe53119..c3266e1e93 100644 --- a/src/System.Console/tests/Configurations.props +++ b/src/System.Console/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Console/tests/ManualTests/System.Console.Manual.Tests.builds b/src/System.Console/tests/ManualTests/System.Console.Manual.Tests.builds index 4082cd28cc..22a1d7f424 100644 --- a/src/System.Console/tests/ManualTests/System.Console.Manual.Tests.builds +++ b/src/System.Console/tests/ManualTests/System.Console.Manual.Tests.builds @@ -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" /> <ItemGroup> 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 67011ce19f..587501873c 100644 --- a/src/System.Console/tests/ManualTests/System.Console.Manual.Tests.csproj +++ b/src/System.Console/tests/ManualTests/System.Console.Manual.Tests.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> @@ -12,4 +12,4 @@ <Compile Include="ManualTests.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file 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 ba2a748553..4b73ba9994 100644 --- a/src/System.Console/tests/Performance/System.Console.Performance.Tests.csproj +++ b/src/System.Console/tests/Performance/System.Console.Performance.Tests.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,4 +18,4 @@ <ProjectReference Include="$(CommonTestPath)\System\Diagnostics\RemoteExecutorConsoleApp\RemoteExecutorConsoleApp.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Console/tests/System.Console.Tests.builds b/src/System.Console/tests/System.Console.Tests.builds index d0d25e47f7..2bba1b19a8 100644 --- a/src/System.Console/tests/System.Console.Tests.builds +++ b/src/System.Console/tests/System.Console.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Console/tests/System.Console.Tests.csproj b/src/System.Console/tests/System.Console.Tests.csproj index 662e650f87..103d93a4bc 100644 --- a/src/System.Console/tests/System.Console.Tests.csproj +++ b/src/System.Console/tests/System.Console.Tests.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> @@ -51,4 +51,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.Data.Common/pkg/System.Data.Common.builds b/src/System.Data.Common/pkg/System.Data.Common.builds index cc196ce7cd..de5cd462b1 100644 --- a/src/System.Data.Common/pkg/System.Data.Common.builds +++ b/src/System.Data.Common/pkg/System.Data.Common.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Data.Common.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Data.Common/pkg/System.Data.Common.pkgproj b/src/System.Data.Common/pkg/System.Data.Common.pkgproj index b9e33b3921..cfffac4957 100644 --- a/src/System.Data.Common/pkg/System.Data.Common.pkgproj +++ b/src/System.Data.Common/pkg/System.Data.Common.pkgproj @@ -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" /> <ItemGroup> @@ -6,7 +6,7 @@ <!-- netcore45;wp8 are actually supported but not the corresponding netstandard versions, so use suppression to permit an implementation until buildtools adds a way to specify netstandard support explicitly --> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Data.Common.builds" /> </ItemGroup> diff --git a/src/System.Data.Common/ref/System.Data.Common.csproj b/src/System.Data.Common/ref/System.Data.Common.csproj index bedf62dfdd..a7bca424cc 100644 --- a/src/System.Data.Common/ref/System.Data.Common.csproj +++ b/src/System.Data.Common/ref/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" /> <ItemGroup> @@ -17,4 +17,4 @@ <ProjectReference Include="..\..\System.Xml.ReaderWriter\ref\System.Xml.ReaderWriter.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Data.Common/src/Configurations.props b/src/System.Data.Common/src/Configurations.props index 9c336c0be9..dc837f9152 100644 --- a/src/System.Data.Common/src/Configurations.props +++ b/src/System.Data.Common/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Data.Common/tests/Configurations.props b/src/System.Data.Common/tests/Configurations.props index 512c938bad..b2db637110 100644 --- a/src/System.Data.Common/tests/Configurations.props +++ b/src/System.Data.Common/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> netstandard1.3; - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Data.Common/tests/System.Data.Common.Tests.builds b/src/System.Data.Common/tests/System.Data.Common.Tests.builds index ec73cbb434..6fa081f0d4 100644 --- a/src/System.Data.Common/tests/System.Data.Common.Tests.builds +++ b/src/System.Data.Common/tests/System.Data.Common.Tests.builds @@ -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" /> <ItemGroup> @@ -13,4 +13,4 @@ </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file 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 b070fd91ec..f50fa7371e 100644 --- a/src/System.Data.Common/tests/System.Data.Common.Tests.csproj +++ b/src/System.Data.Common/tests/System.Data.Common.Tests.csproj @@ -109,4 +109,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.Data.SqlClient/pkg/System.Data.SqlClient.builds b/src/System.Data.SqlClient/pkg/System.Data.SqlClient.builds index 5e88014b66..333bdf0c21 100644 --- a/src/System.Data.SqlClient/pkg/System.Data.SqlClient.builds +++ b/src/System.Data.SqlClient/pkg/System.Data.SqlClient.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Data.SqlClient.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Data.SqlClient/pkg/System.Data.SqlClient.pkgproj b/src/System.Data.SqlClient/pkg/System.Data.SqlClient.pkgproj index 24b3953047..8718423e79 100644 --- a/src/System.Data.SqlClient/pkg/System.Data.SqlClient.pkgproj +++ b/src/System.Data.SqlClient/pkg/System.Data.SqlClient.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.Data.SqlClient.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Data.SqlClient.builds" /> </ItemGroup> diff --git a/src/System.Data.SqlClient/ref/4.0/System.Data.SqlClient.depproj b/src/System.Data.SqlClient/ref/4.0/System.Data.SqlClient.depproj index f53ba94085..e31673aae0 100644 --- a/src/System.Data.SqlClient/ref/4.0/System.Data.SqlClient.depproj +++ b/src/System.Data.SqlClient/ref/4.0/System.Data.SqlClient.depproj @@ -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> diff --git a/src/System.Data.SqlClient/ref/System.Data.SqlClient.csproj b/src/System.Data.SqlClient/ref/System.Data.SqlClient.csproj index 15af2484d5..90658222ac 100644 --- a/src/System.Data.SqlClient/ref/System.Data.SqlClient.csproj +++ b/src/System.Data.SqlClient/ref/System.Data.SqlClient.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -20,4 +20,4 @@ <ProjectReference Include="..\..\System.Data.Common\ref\System.Data.Common.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Data.SqlClient/src/Configurations.props b/src/System.Data.SqlClient/src/Configurations.props index 3bb6330d9e..4701fcd772 100644 --- a/src/System.Data.SqlClient/src/Configurations.props +++ b/src/System.Data.SqlClient/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ net463-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Data.SqlClient/tests/System.Data.SqlClient.Tests.builds b/src/System.Data.SqlClient/tests/System.Data.SqlClient.Tests.builds index a81aaf71ab..771767664c 100644 --- a/src/System.Data.SqlClient/tests/System.Data.SqlClient.Tests.builds +++ b/src/System.Data.SqlClient/tests/System.Data.SqlClient.Tests.builds @@ -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" /> <ItemGroup> 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 24c1df60b6..93b1a99463 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 @@ -52,7 +52,7 @@ <Compile Include="SSPI\SecurityWrapper.cs" /> </ItemGroup> <ItemGroup Condition=" '$(TargetsWindows)' != 'true' "> - <Compile Include="SSPI\SSPIContext.Unix.cs" /> + <Compile Include="SSPI\SSPIContext.Unix.cs" /> </ItemGroup> <ItemGroup> <ProjectReference Include="..\TDS\TDS.csproj"> diff --git a/src/System.Diagnostics.Contracts/pkg/System.Diagnostics.Contracts.builds b/src/System.Diagnostics.Contracts/pkg/System.Diagnostics.Contracts.builds index 7b68d5b94a..027c8c22fb 100644 --- a/src/System.Diagnostics.Contracts/pkg/System.Diagnostics.Contracts.builds +++ b/src/System.Diagnostics.Contracts/pkg/System.Diagnostics.Contracts.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Diagnostics.Contracts.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.Contracts/pkg/System.Diagnostics.Contracts.pkgproj b/src/System.Diagnostics.Contracts/pkg/System.Diagnostics.Contracts.pkgproj index b39cd4bd21..d370f71ddc 100644 --- a/src/System.Diagnostics.Contracts/pkg/System.Diagnostics.Contracts.pkgproj +++ b/src/System.Diagnostics.Contracts/pkg/System.Diagnostics.Contracts.pkgproj @@ -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" /> <ItemGroup> diff --git a/src/System.Diagnostics.Contracts/ref/System.Diagnostics.Contracts.csproj b/src/System.Diagnostics.Contracts/ref/System.Diagnostics.Contracts.csproj index 031315f69e..fd8fc5f720 100644 --- a/src/System.Diagnostics.Contracts/ref/System.Diagnostics.Contracts.csproj +++ b/src/System.Diagnostics.Contracts/ref/System.Diagnostics.Contracts.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -8,4 +8,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.Contracts/src/Configurations.props b/src/System.Diagnostics.Contracts/src/Configurations.props index 21c8c4fda0..49902e97c5 100644 --- a/src/System.Diagnostics.Contracts/src/Configurations.props +++ b/src/System.Diagnostics.Contracts/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard1.0; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.Contracts/tests/Configurations.props b/src/System.Diagnostics.Contracts/tests/Configurations.props index f0ebe53119..c3266e1e93 100644 --- a/src/System.Diagnostics.Contracts/tests/Configurations.props +++ b/src/System.Diagnostics.Contracts/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.builds b/src/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.builds index 5fb627db0b..82df0eb310 100644 --- a/src/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.builds +++ b/src/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Diagnostics.Debug/pkg/System.Diagnostics.Debug.builds b/src/System.Diagnostics.Debug/pkg/System.Diagnostics.Debug.builds index 6ddd3d076e..7a6f788aa2 100644 --- a/src/System.Diagnostics.Debug/pkg/System.Diagnostics.Debug.builds +++ b/src/System.Diagnostics.Debug/pkg/System.Diagnostics.Debug.builds @@ -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" /> <ItemGroup> @@ -11,5 +11,4 @@ </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.Debug/pkg/System.Diagnostics.Debug.pkgproj b/src/System.Diagnostics.Debug/pkg/System.Diagnostics.Debug.pkgproj index 37ab51591e..1a92455083 100644 --- a/src/System.Diagnostics.Debug/pkg/System.Diagnostics.Debug.pkgproj +++ b/src/System.Diagnostics.Debug/pkg/System.Diagnostics.Debug.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.Diagnostics.Debug.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Diagnostics.Debug.csproj"> <TargetGroup>net463</TargetGroup> diff --git a/src/System.Diagnostics.Debug/pkg/unix/System.Diagnostics.Debug.pkgproj b/src/System.Diagnostics.Debug/pkg/unix/System.Diagnostics.Debug.pkgproj index 2b50003320..67dd3d89e4 100644 --- a/src/System.Diagnostics.Debug/pkg/unix/System.Diagnostics.Debug.pkgproj +++ b/src/System.Diagnostics.Debug/pkg/unix/System.Diagnostics.Debug.pkgproj @@ -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> <PackageTargetRuntime>unix</PackageTargetRuntime> <PreventImplementationReference>true</PreventImplementationReference> </PropertyGroup> - <ItemGroup> - <ProjectReference Include="..\..\src\System.Diagnostics.Debug.csproj" > + <ProjectReference Include="..\..\src\System.Diagnostics.Debug.csproj"> <OSGroup>Unix</OSGroup> </ProjectReference> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.Debug/pkg/win/System.Diagnostics.Debug.pkgproj b/src/System.Diagnostics.Debug/pkg/win/System.Diagnostics.Debug.pkgproj index 365c6a4df9..dfc7104ef4 100644 --- a/src/System.Diagnostics.Debug/pkg/win/System.Diagnostics.Debug.pkgproj +++ b/src/System.Diagnostics.Debug/pkg/win/System.Diagnostics.Debug.pkgproj @@ -1,12 +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> <PackageTargetRuntime>win</PackageTargetRuntime> <PreventImplementationReference>true</PreventImplementationReference> </PropertyGroup> - <ItemGroup> <ProjectReference Include="..\..\src\System.Diagnostics.Debug.csproj"> <OSGroup>Windows_NT</OSGroup> @@ -14,8 +12,7 @@ <InboxOnTargetFramework Include="net45" /> <InboxOnTargetFramework Include="win8" /> <InboxOnTargetFramework Include="wp80" /> - <InboxOnTargetFramework Include="wpa81" /> + <InboxOnTargetFramework Include="wpa81" /> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </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 212acb98bf..164ed27825 100644 --- a/src/System.Diagnostics.Debug/ref/System.Diagnostics.Debug.csproj +++ b/src/System.Diagnostics.Debug/ref/System.Diagnostics.Debug.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -8,4 +8,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.Debug/src/Configurations.props b/src/System.Diagnostics.Debug/src/Configurations.props index 3bb6330d9e..4701fcd772 100644 --- a/src/System.Diagnostics.Debug/src/Configurations.props +++ b/src/System.Diagnostics.Debug/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ net463-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.Debug/tests/Configurations.props b/src/System.Diagnostics.Debug/tests/Configurations.props index 90648972ae..cfc57211a4 100644 --- a/src/System.Diagnostics.Debug/tests/Configurations.props +++ b/src/System.Diagnostics.Debug/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> - netstandard1.7-Unix; - netstandard1.7-Windows_NT; + netstandard-Unix; + netstandard-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.builds b/src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.builds index d3ca8ccec5..a7a718c4a8 100644 --- a/src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.builds +++ b/src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.builds @@ -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" /> <ItemGroup> @@ -11,4 +11,4 @@ </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file 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 00a3e8f4a4..74d9f37c64 100644 --- a/src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj +++ b/src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj @@ -25,9 +25,9 @@ </ItemGroup> <ItemGroup> <Compile Include="AttributeTests.cs" /> - <Compile Include="DebuggerTests.cs" Condition="'$(TargetGroup)'=='netstandard'"/> + <Compile Include="DebuggerTests.cs" Condition="'$(TargetGroup)'=='netstandard'" /> <Compile Include="DebugTests.cs" /> <Compile Include="XunitAssemblyAttributes.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.builds b/src/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.builds index e5e34ab596..80dcec9b6f 100644 --- a/src/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.builds +++ b/src/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.builds @@ -1,8 +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" /> <ItemGroup> - <Project Include="System.Diagnostics.DiagnosticSource.pkgproj"/> + <Project Include="System.Diagnostics.DiagnosticSource.pkgproj" /> </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.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.pkgproj b/src/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.pkgproj index 40067c55f5..08f05504e2 100644 --- a/src/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.pkgproj +++ b/src/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.pkgproj @@ -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> <!-- we need to be supported on pre-nuget-3 platforms (Dev12, Dev11, etc) --> <MinClientVersion>2.8.6</MinClientVersion> </PropertyGroup> - <ItemGroup> <ProjectReference Include="..\src\System.Diagnostics.DiagnosticSource.builds"> <SupportedFramework>net46;net45;netcore45;netcoreapp1.0;wpa81;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</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 d487bc5070..bfaf6957d5 100644 --- a/src/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj +++ b/src/System.Diagnostics.DiagnosticSource/ref/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> @@ -11,4 +11,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.DiagnosticSource/src/Configurations.props b/src/System.Diagnostics.DiagnosticSource/src/Configurations.props index ad6ccc8341..69e325d440 100644 --- a/src/System.Diagnostics.DiagnosticSource/src/Configurations.props +++ b/src/System.Diagnostics.DiagnosticSource/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.DiagnosticSource/tests/Configurations.props b/src/System.Diagnostics.DiagnosticSource/tests/Configurations.props index f0ebe53119..c3266e1e93 100644 --- a/src/System.Diagnostics.DiagnosticSource/tests/Configurations.props +++ b/src/System.Diagnostics.DiagnosticSource/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.builds b/src/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.builds index e9689c5526..216a65acfa 100644 --- a/src/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.builds +++ b/src/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.builds @@ -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" /> <ItemGroup> 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 98ba7f4a91..2cd66ecb05 100644 --- a/src/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj +++ b/src/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.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> diff --git a/src/System.Diagnostics.FileVersionInfo/pkg/System.Diagnostics.FileVersionInfo.builds b/src/System.Diagnostics.FileVersionInfo/pkg/System.Diagnostics.FileVersionInfo.builds index 91c7b3ae69..4fda794e71 100644 --- a/src/System.Diagnostics.FileVersionInfo/pkg/System.Diagnostics.FileVersionInfo.builds +++ b/src/System.Diagnostics.FileVersionInfo/pkg/System.Diagnostics.FileVersionInfo.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Diagnostics.FileVersionInfo.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.FileVersionInfo/pkg/System.Diagnostics.FileVersionInfo.pkgproj b/src/System.Diagnostics.FileVersionInfo/pkg/System.Diagnostics.FileVersionInfo.pkgproj index 26fcc72a67..7b2ac93673 100644 --- a/src/System.Diagnostics.FileVersionInfo/pkg/System.Diagnostics.FileVersionInfo.pkgproj +++ b/src/System.Diagnostics.FileVersionInfo/pkg/System.Diagnostics.FileVersionInfo.pkgproj @@ -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" /> <ItemGroup> diff --git a/src/System.Diagnostics.FileVersionInfo/ref/System.Diagnostics.FileVersionInfo.csproj b/src/System.Diagnostics.FileVersionInfo/ref/System.Diagnostics.FileVersionInfo.csproj index 635be84c42..536050fe4f 100644 --- a/src/System.Diagnostics.FileVersionInfo/ref/System.Diagnostics.FileVersionInfo.csproj +++ b/src/System.Diagnostics.FileVersionInfo/ref/System.Diagnostics.FileVersionInfo.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -8,4 +8,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.FileVersionInfo/src/Configurations.props b/src/System.Diagnostics.FileVersionInfo/src/Configurations.props index 1eebe65a78..c1932bc105 100644 --- a/src/System.Diagnostics.FileVersionInfo/src/Configurations.props +++ b/src/System.Diagnostics.FileVersionInfo/src/Configurations.props @@ -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> <BuildConfigurations> @@ -8,4 +8,4 @@ netstandard1.3-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ 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 177480b2c1..7364b8bb31 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 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> @@ -26,4 +26,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.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests.builds b/src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests.builds index 9e7660d395..f40a138be8 100644 --- a/src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests.builds +++ b/src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests.builds @@ -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" /> <ItemGroup> 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 f4c8c165b4..0d3f1a4208 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 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> @@ -30,10 +30,10 @@ </ItemGroup> <ItemGroup> <Compile Include="FileVersionInfoTest.cs" /> - <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.VerLanguageName.cs" > + <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.VerLanguageName.cs"> <Link>ProductionCode\Common\Interop\Windows\kernel32\Interop.VerLanguageName.cs</Link> </Compile> </ItemGroup> @@ -45,4 +45,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.Diagnostics.PerformanceCounter/ref/System.Diagnostics.PerformanceCounter.csproj b/src/System.Diagnostics.PerformanceCounter/ref/System.Diagnostics.PerformanceCounter.csproj index ab87307efe..d5a51aa14c 100644 --- a/src/System.Diagnostics.PerformanceCounter/ref/System.Diagnostics.PerformanceCounter.csproj +++ b/src/System.Diagnostics.PerformanceCounter/ref/System.Diagnostics.PerformanceCounter.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" /> <ItemGroup> @@ -8,4 +8,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.Process/pkg/System.Diagnostics.Process.builds b/src/System.Diagnostics.Process/pkg/System.Diagnostics.Process.builds index 8203707792..38794fb808 100644 --- a/src/System.Diagnostics.Process/pkg/System.Diagnostics.Process.builds +++ b/src/System.Diagnostics.Process/pkg/System.Diagnostics.Process.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Diagnostics.Process.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.Process/pkg/System.Diagnostics.Process.pkgproj b/src/System.Diagnostics.Process/pkg/System.Diagnostics.Process.pkgproj index 219f2e3f9b..c7c1befdb3 100644 --- a/src/System.Diagnostics.Process/pkg/System.Diagnostics.Process.pkgproj +++ b/src/System.Diagnostics.Process/pkg/System.Diagnostics.Process.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.Diagnostics.Process.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Diagnostics.Process.builds" /> </ItemGroup> diff --git a/src/System.Diagnostics.Process/ref/System.Diagnostics.Process.csproj b/src/System.Diagnostics.Process/ref/System.Diagnostics.Process.csproj index 730e3da36c..599ad02926 100644 --- a/src/System.Diagnostics.Process/ref/System.Diagnostics.Process.csproj +++ b/src/System.Diagnostics.Process/ref/System.Diagnostics.Process.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -19,4 +19,4 @@ <ProjectReference Include="..\..\System.Diagnostics.FileVersionInfo\ref\System.Diagnostics.FileVersionInfo.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.Process/src/Configurations.props b/src/System.Diagnostics.Process/src/Configurations.props index d192a53e46..8682673c53 100644 --- a/src/System.Diagnostics.Process/src/Configurations.props +++ b/src/System.Diagnostics.Process/src/Configurations.props @@ -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> <BuildConfigurations> @@ -8,4 +8,4 @@ net463-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.Process/tests/Configurations.props b/src/System.Diagnostics.Process/tests/Configurations.props index 27a5735619..2ba6d494c0 100644 --- a/src/System.Diagnostics.Process/tests/Configurations.props +++ b/src/System.Diagnostics.Process/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> netstandard1.4; - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file 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 313c1f342c..c5148eb829 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 @@ -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> @@ -28,4 +28,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.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.builds b/src/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.builds index 953c60723d..70057f7d5c 100644 --- a/src/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.builds +++ b/src/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Diagnostics.Process.Tests.csproj"> - <TestTFMs>net463;netcoreapp1.1</TestTFMs> + <TestTFMs>net463;netcoreapp</TestTFMs> </Project> <Project Include="System.Diagnostics.Process.Tests.csproj"> <TargetGroup>netstandard1.4</TargetGroup> 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 58ea591c20..056e2cafd1 100644 --- a/src/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj +++ b/src/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.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> @@ -44,4 +44,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.Diagnostics.StackTrace/pkg/System.Diagnostics.StackTrace.builds b/src/System.Diagnostics.StackTrace/pkg/System.Diagnostics.StackTrace.builds index 97da172cfc..95baa4812f 100644 --- a/src/System.Diagnostics.StackTrace/pkg/System.Diagnostics.StackTrace.builds +++ b/src/System.Diagnostics.StackTrace/pkg/System.Diagnostics.StackTrace.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Diagnostics.StackTrace.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.StackTrace/pkg/System.Diagnostics.StackTrace.pkgproj b/src/System.Diagnostics.StackTrace/pkg/System.Diagnostics.StackTrace.pkgproj index 9f3239a70e..e881de5bf7 100644 --- a/src/System.Diagnostics.StackTrace/pkg/System.Diagnostics.StackTrace.pkgproj +++ b/src/System.Diagnostics.StackTrace/pkg/System.Diagnostics.StackTrace.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Diagnostics.StackTrace.csproj"> - <SupportedFramework>net463;uap10.1;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;uap10.1;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Diagnostics.StackTrace.builds" /> </ItemGroup> @@ -16,4 +16,4 @@ <InboxOnTargetFramework Include="xamarinwatchos10" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</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 0c2f59d72e..c976b8d9be 100644 --- a/src/System.Diagnostics.StackTrace/ref/System.Diagnostics.StackTrace.csproj +++ b/src/System.Diagnostics.StackTrace/ref/System.Diagnostics.StackTrace.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -10,4 +10,4 @@ <ProjectReference Include="..\..\System.Reflection\ref\System.Reflection.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.StackTrace/src/Configurations.props b/src/System.Diagnostics.StackTrace/src/Configurations.props index f013d10b8c..ed0bd2acc9 100644 --- a/src/System.Diagnostics.StackTrace/src/Configurations.props +++ b/src/System.Diagnostics.StackTrace/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj b/src/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj index 3e9a07ba86..4002d832f3 100644 --- a/src/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj +++ b/src/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj @@ -6,7 +6,7 @@ <ProjectGuid>{02304469-722E-4723-92A1-820B9A37D275}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='netstandard' or '$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> - <PackageTargetFramework Condition="'$(TargetGroup)'=='netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)'=='netstandard'">netstandard;uap10.1</PackageTargetFramework> <!-- Disable 1685 (aka multiple type definitions) warning so it doesn't turn into an error --> <NoWarn>$(NoWarn);1685</NoWarn> </PropertyGroup> diff --git a/src/System.Diagnostics.TextWriterTraceListener/pkg/System.Diagnostics.TextWriterTraceListener.builds b/src/System.Diagnostics.TextWriterTraceListener/pkg/System.Diagnostics.TextWriterTraceListener.builds index 9d3f29debe..f4e3b788fb 100644 --- a/src/System.Diagnostics.TextWriterTraceListener/pkg/System.Diagnostics.TextWriterTraceListener.builds +++ b/src/System.Diagnostics.TextWriterTraceListener/pkg/System.Diagnostics.TextWriterTraceListener.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Diagnostics.TextWriterTraceListener.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.TextWriterTraceListener/pkg/System.Diagnostics.TextWriterTraceListener.pkgproj b/src/System.Diagnostics.TextWriterTraceListener/pkg/System.Diagnostics.TextWriterTraceListener.pkgproj index 96e3a8997e..1cf369635f 100644 --- a/src/System.Diagnostics.TextWriterTraceListener/pkg/System.Diagnostics.TextWriterTraceListener.pkgproj +++ b/src/System.Diagnostics.TextWriterTraceListener/pkg/System.Diagnostics.TextWriterTraceListener.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Diagnostics.TextWriterTraceListener.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Diagnostics.TextWriterTraceListener.builds" /> </ItemGroup> diff --git a/src/System.Diagnostics.TextWriterTraceListener/ref/System.Diagnostics.TextWriterTraceListener.csproj b/src/System.Diagnostics.TextWriterTraceListener/ref/System.Diagnostics.TextWriterTraceListener.csproj index 4bd4825a8b..65b95a5e09 100644 --- a/src/System.Diagnostics.TextWriterTraceListener/ref/System.Diagnostics.TextWriterTraceListener.csproj +++ b/src/System.Diagnostics.TextWriterTraceListener/ref/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" /> <ItemGroup> @@ -11,4 +11,4 @@ <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.TextWriterTraceListener/src/Configurations.props b/src/System.Diagnostics.TextWriterTraceListener/src/Configurations.props index 9c336c0be9..dc837f9152 100644 --- a/src/System.Diagnostics.TextWriterTraceListener/src/Configurations.props +++ b/src/System.Diagnostics.TextWriterTraceListener/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.TextWriterTraceListener/tests/Configurations.props b/src/System.Diagnostics.TextWriterTraceListener/tests/Configurations.props index 512c938bad..b2db637110 100644 --- a/src/System.Diagnostics.TextWriterTraceListener/tests/Configurations.props +++ b/src/System.Diagnostics.TextWriterTraceListener/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> netstandard1.3; - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.TextWriterTraceListener/tests/System.Diagnostics.TextWriterTraceListener.Tests.builds b/src/System.Diagnostics.TextWriterTraceListener/tests/System.Diagnostics.TextWriterTraceListener.Tests.builds index 9bc989f272..8028296999 100644 --- a/src/System.Diagnostics.TextWriterTraceListener/tests/System.Diagnostics.TextWriterTraceListener.Tests.builds +++ b/src/System.Diagnostics.TextWriterTraceListener/tests/System.Diagnostics.TextWriterTraceListener.Tests.builds @@ -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" /> <ItemGroup> 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 3d154609d5..737e80d3eb 100644 --- a/src/System.Diagnostics.TextWriterTraceListener/tests/System.Diagnostics.TextWriterTraceListener.Tests.csproj +++ b/src/System.Diagnostics.TextWriterTraceListener/tests/System.Diagnostics.TextWriterTraceListener.Tests.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,4 +16,4 @@ <Compile Include="DelimiterWriteMethodTests.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.Tools/pkg/System.Diagnostics.Tools.pkgproj b/src/System.Diagnostics.Tools/pkg/System.Diagnostics.Tools.pkgproj index 1d9ad34d4f..4c6ab0556d 100644 --- a/src/System.Diagnostics.Tools/pkg/System.Diagnostics.Tools.pkgproj +++ b/src/System.Diagnostics.Tools/pkg/System.Diagnostics.Tools.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Diagnostics.Tools.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="any\System.Diagnostics.Tools.pkgproj" /> <ProjectReference Include="aot\System.Diagnostics.Tools.pkgproj" /> diff --git a/src/System.Diagnostics.Tools/pkg/any/System.Diagnostics.Tools.pkgproj b/src/System.Diagnostics.Tools/pkg/any/System.Diagnostics.Tools.pkgproj index 0885d67b0f..7bfa9d8a57 100644 --- a/src/System.Diagnostics.Tools/pkg/any/System.Diagnostics.Tools.pkgproj +++ b/src/System.Diagnostics.Tools/pkg/any/System.Diagnostics.Tools.pkgproj @@ -6,16 +6,13 @@ <PackageTargetRuntime>any</PackageTargetRuntime> <PreventImplementationReference>true</PreventImplementationReference> </PropertyGroup> - <ItemGroup> <ProjectReference Include="..\..\src\System.Diagnostics.Tools.csproj" /> - <!-- AOT implementation comes from AOT package --> <File Include="$(PlaceholderFile)"> <TargetPath>runtimes/aot/lib/netcore50</TargetPath> <TargetFramework>aot</TargetFramework> </File> - <InboxOnTargetFramework Include="MonoAndroid10" /> <InboxOnTargetFramework Include="MonoTouch10" /> <InboxOnTargetFramework Include="net45" /> diff --git a/src/System.Diagnostics.Tools/pkg/aot/System.Diagnostics.Tools.pkgproj b/src/System.Diagnostics.Tools/pkg/aot/System.Diagnostics.Tools.pkgproj index 5e4737373f..e250c97205 100644 --- a/src/System.Diagnostics.Tools/pkg/aot/System.Diagnostics.Tools.pkgproj +++ b/src/System.Diagnostics.Tools/pkg/aot/System.Diagnostics.Tools.pkgproj @@ -1,11 +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="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> <PackageTargetRuntime>aot</PackageTargetRuntime> <PreventImplementationReference>true</PreventImplementationReference> </PropertyGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </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 389cc55ce7..b68b6c0a9a 100644 --- a/src/System.Diagnostics.Tools/ref/System.Diagnostics.Tools.csproj +++ b/src/System.Diagnostics.Tools/ref/System.Diagnostics.Tools.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -8,4 +8,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.Tools/src/Configurations.props b/src/System.Diagnostics.Tools/src/Configurations.props index 9c336c0be9..dc837f9152 100644 --- a/src/System.Diagnostics.Tools/src/Configurations.props +++ b/src/System.Diagnostics.Tools/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.Tools/tests/Configurations.props b/src/System.Diagnostics.Tools/tests/Configurations.props index 512c938bad..b2db637110 100644 --- a/src/System.Diagnostics.Tools/tests/Configurations.props +++ b/src/System.Diagnostics.Tools/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> netstandard1.3; - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.Tools/tests/System.Diagnostics.Tools.Tests.builds b/src/System.Diagnostics.Tools/tests/System.Diagnostics.Tools.Tests.builds index cb91f3bb36..132d62ef11 100644 --- a/src/System.Diagnostics.Tools/tests/System.Diagnostics.Tools.Tests.builds +++ b/src/System.Diagnostics.Tools/tests/System.Diagnostics.Tools.Tests.builds @@ -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" /> <ItemGroup> 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 68bc26d6ac..a83c24adbf 100644 --- a/src/System.Diagnostics.Tools/tests/System.Diagnostics.Tools.Tests.csproj +++ b/src/System.Diagnostics.Tools/tests/System.Diagnostics.Tools.Tests.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -17,4 +17,4 @@ <Compile Include="System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttributeTests.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.TraceSource/pkg/System.Diagnostics.TraceSource.builds b/src/System.Diagnostics.TraceSource/pkg/System.Diagnostics.TraceSource.builds index 4e44694c35..4b24e5b17b 100644 --- a/src/System.Diagnostics.TraceSource/pkg/System.Diagnostics.TraceSource.builds +++ b/src/System.Diagnostics.TraceSource/pkg/System.Diagnostics.TraceSource.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Diagnostics.TraceSource.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.TraceSource/pkg/System.Diagnostics.TraceSource.pkgproj b/src/System.Diagnostics.TraceSource/pkg/System.Diagnostics.TraceSource.pkgproj index ac036825c4..fc18853ca7 100644 --- a/src/System.Diagnostics.TraceSource/pkg/System.Diagnostics.TraceSource.pkgproj +++ b/src/System.Diagnostics.TraceSource/pkg/System.Diagnostics.TraceSource.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Diagnostics.TraceSource.csproj"> - <SupportedFramework>net463;uap10.1;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;uap10.1;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Diagnostics.TraceSource.builds" /> </ItemGroup> diff --git a/src/System.Diagnostics.TraceSource/ref/System.Diagnostics.TraceSource.csproj b/src/System.Diagnostics.TraceSource/ref/System.Diagnostics.TraceSource.csproj index abc4e0556f..ddaaf3b53f 100644 --- a/src/System.Diagnostics.TraceSource/ref/System.Diagnostics.TraceSource.csproj +++ b/src/System.Diagnostics.TraceSource/ref/System.Diagnostics.TraceSource.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -10,4 +10,4 @@ <ProjectReference Include="..\..\System.Collections.Specialized\ref\System.Collections.Specialized.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.TraceSource/src/Configurations.props b/src/System.Diagnostics.TraceSource/src/Configurations.props index 3bb6330d9e..4701fcd772 100644 --- a/src/System.Diagnostics.TraceSource/src/Configurations.props +++ b/src/System.Diagnostics.TraceSource/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ net463-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj b/src/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj index d63e7e69dc..0bd65d66b0 100644 --- a/src/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj +++ b/src/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj @@ -7,7 +7,7 @@ <DefineConstants>$(DefineConstants);TRACE</DefineConstants> <ProjectGuid>{5380420C-EB1D-4C53-9CFC-916578C18334}</ProjectGuid> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> - <PackageTargetFramework Condition="'$(TargetGroup)'=='netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)'=='netstandard'">netstandard;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> diff --git a/src/System.Diagnostics.TraceSource/tests/Configurations.props b/src/System.Diagnostics.TraceSource/tests/Configurations.props index 90648972ae..cfc57211a4 100644 --- a/src/System.Diagnostics.TraceSource/tests/Configurations.props +++ b/src/System.Diagnostics.TraceSource/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> - netstandard1.7-Unix; - netstandard1.7-Windows_NT; + netstandard-Unix; + netstandard-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.TraceSource/tests/System.Diagnostics.TraceSource.Tests.builds b/src/System.Diagnostics.TraceSource/tests/System.Diagnostics.TraceSource.Tests.builds index e605e06794..c091a615ba 100644 --- a/src/System.Diagnostics.TraceSource/tests/System.Diagnostics.TraceSource.Tests.builds +++ b/src/System.Diagnostics.TraceSource/tests/System.Diagnostics.TraceSource.Tests.builds @@ -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" /> <ItemGroup> @@ -7,7 +7,7 @@ </Project> <Project Include="System.Diagnostics.TraceSource.Tests.csproj"> <OSGroup>Windows_NT</OSGroup> - <TestTFMs>netcoreapp1.1;net463</TestTFMs> + <TestTFMs>netcoreapp;net463</TestTFMs> </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> 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 6a3103c80f..7d75b7157f 100644 --- a/src/System.Diagnostics.TraceSource/tests/System.Diagnostics.TraceSource.Tests.csproj +++ b/src/System.Diagnostics.TraceSource/tests/System.Diagnostics.TraceSource.Tests.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> @@ -31,4 +31,4 @@ <Compile Include="CorrelationManagerTests.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.Tracing/pkg/System.Diagnostics.Tracing.pkgproj b/src/System.Diagnostics.Tracing/pkg/System.Diagnostics.Tracing.pkgproj index ad6b0250ea..afcb8402e3 100644 --- a/src/System.Diagnostics.Tracing/pkg/System.Diagnostics.Tracing.pkgproj +++ b/src/System.Diagnostics.Tracing/pkg/System.Diagnostics.Tracing.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.Diagnostics.Tracing.csproj"> - <SupportedFramework>net461;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Diagnostics.Tracing.csproj"> <TargetGroup>net461</TargetGroup> diff --git a/src/System.Diagnostics.Tracing/ref/System.Diagnostics.Tracing.csproj b/src/System.Diagnostics.Tracing/ref/System.Diagnostics.Tracing.csproj index 30f1c6ecb1..bb02cbdf56 100644 --- a/src/System.Diagnostics.Tracing/ref/System.Diagnostics.Tracing.csproj +++ b/src/System.Diagnostics.Tracing/ref/System.Diagnostics.Tracing.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -11,4 +11,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.Tracing/src/Configurations.props b/src/System.Diagnostics.Tracing/src/Configurations.props index 53b62c64fe..bcfec4bbde 100644 --- a/src/System.Diagnostics.Tracing/src/Configurations.props +++ b/src/System.Diagnostics.Tracing/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.Tracing/tests/Configurations.props b/src/System.Diagnostics.Tracing/tests/Configurations.props index b744993779..800e963c80 100644 --- a/src/System.Diagnostics.Tracing/tests/Configurations.props +++ b/src/System.Diagnostics.Tracing/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> netstandard1.5; - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.builds b/src/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.builds index 6fb5bbdd2e..61fc521573 100644 --- a/src/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.builds +++ b/src/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.builds @@ -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" /> <ItemGroup> 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 d1190694ee..ab21b44ee5 100644 --- a/src/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj +++ b/src/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.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> diff --git a/src/System.DirectoryServices.AccountManagement/pkg/System.DirectoryServices.AccountManagement.builds b/src/System.DirectoryServices.AccountManagement/pkg/System.DirectoryServices.AccountManagement.builds index 71fc0db69f..fd19154270 100644 --- a/src/System.DirectoryServices.AccountManagement/pkg/System.DirectoryServices.AccountManagement.builds +++ b/src/System.DirectoryServices.AccountManagement/pkg/System.DirectoryServices.AccountManagement.builds @@ -1,8 +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" /> <ItemGroup> - <!-- + <!-- <Project Include="System.DirectoryServices.AccountManagement.pkgproj"/> --> </ItemGroup> diff --git a/src/System.DirectoryServices.AccountManagement/pkg/System.DirectoryServices.AccountManagement.pkgproj b/src/System.DirectoryServices.AccountManagement/pkg/System.DirectoryServices.AccountManagement.pkgproj index ae3858fa9e..6f7249ef15 100644 --- a/src/System.DirectoryServices.AccountManagement/pkg/System.DirectoryServices.AccountManagement.pkgproj +++ b/src/System.DirectoryServices.AccountManagement/pkg/System.DirectoryServices.AccountManagement.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.DirectoryServices.AccountManagement.csproj"> - <SupportedFramework>netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.DirectoryServices.AccountManagement.builds" /> <InboxOnTargetFramework Include="MonoAndroid10" /> diff --git a/src/System.DirectoryServices.AccountManagement/ref/System.DirectoryServices.AccountManagement.csproj b/src/System.DirectoryServices.AccountManagement/ref/System.DirectoryServices.AccountManagement.csproj index 9d7fb92203..1f0431363c 100644 --- a/src/System.DirectoryServices.AccountManagement/ref/System.DirectoryServices.AccountManagement.csproj +++ b/src/System.DirectoryServices.AccountManagement/ref/System.DirectoryServices.AccountManagement.csproj @@ -8,4 +8,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.builds b/src/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.builds index 005e591d07..237a85d2d4 100644 --- a/src/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.builds +++ b/src/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.builds @@ -1,13 +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" /> <ItemGroup> - <!-- Disabling the builds for DirectoryServices until we get it up and running. This excludes it from being built by build.cmd + <!-- Disabling the builds for DirectoryServices until we get it up and running. This excludes it from being built by build.cmd <Project Include="System.DirectoryServices.AccountManagement.csproj"> <OSGroup>Windows_NT</OSGroup> </Project> --> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj b/src/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj index ec7283e3d0..b594f2518a 100644 --- a/src/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj +++ b/src/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj @@ -10,7 +10,7 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <DefineConstants>$(DefineConstants);FLAVOR_WHIDBEY;PAPI_AD;PAPI_REGSAM;USE_CTX_CACHE</DefineConstants> <NoWarn>$(NoWarn);8073</NoWarn> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> + <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v2.0</NuGetTargetMoniker> <GeneratePlatformNotSupportedAssembly Condition="'$(TargetsUnix)' == 'true'">true</GeneratePlatformNotSupportedAssembly> </PropertyGroup> <!-- Help VS understand available configurations --> @@ -97,4 +97,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.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj b/src/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj index 01bdda83c3..3c3d01b81f 100644 --- a/src/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj +++ b/src/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <PropertyGroup> <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> @@ -10,7 +10,7 @@ <ProjectGuid>{57E8F8D4-0766-4CC7-B3F9-B243B81DB6A5}</ProjectGuid> <OutputType>Library</OutputType> <AssemblyName>System.DirectoryServices.AccountManagement.Tests</AssemblyName> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> + <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v2.0</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> <DebugSymbols>true</DebugSymbols> @@ -40,4 +40,4 @@ <Content Include="AuthoringTests.txt" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.builds b/src/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.builds index cfd0983ca2..8d34aedeb7 100644 --- a/src/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.builds +++ b/src/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.builds @@ -1,8 +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" /> <ItemGroup> - <!-- Disabling the builds for DirectoryServices until we get it up and running. This excludes it from being built by build.cmd + <!-- Disabling the builds for DirectoryServices until we get it up and running. This excludes it from being built by build.cmd <Project Include="System.DirectoryServices.AccountManagement.Tests.csproj"> <OSGroup>Windows_NT</OSGroup> </Project> diff --git a/src/System.DirectoryServices.Protocols/pkg/System.DirectoryServices.Protocols.builds b/src/System.DirectoryServices.Protocols/pkg/System.DirectoryServices.Protocols.builds index f0b07ae454..0674caf3dc 100644 --- a/src/System.DirectoryServices.Protocols/pkg/System.DirectoryServices.Protocols.builds +++ b/src/System.DirectoryServices.Protocols/pkg/System.DirectoryServices.Protocols.builds @@ -1,8 +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" /> <ItemGroup> - <!-- + <!-- <Project Include="System.DirectoryServices.Protocols.pkgproj"/> --> </ItemGroup> diff --git a/src/System.DirectoryServices.Protocols/pkg/System.DirectoryServices.Protocols.pkgproj b/src/System.DirectoryServices.Protocols/pkg/System.DirectoryServices.Protocols.pkgproj index 39f0ecf225..3e92d29bc3 100644 --- a/src/System.DirectoryServices.Protocols/pkg/System.DirectoryServices.Protocols.pkgproj +++ b/src/System.DirectoryServices.Protocols/pkg/System.DirectoryServices.Protocols.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.DirectoryServices.Protocols.csproj"> - <SupportedFramework>netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.DirectoryServices.Protocols.builds" /> <InboxOnTargetFramework Include="MonoAndroid10" /> diff --git a/src/System.DirectoryServices.Protocols/ref/System.DirectoryServices.Protocols.csproj b/src/System.DirectoryServices.Protocols/ref/System.DirectoryServices.Protocols.csproj index 918f7b0439..0247f16235 100644 --- a/src/System.DirectoryServices.Protocols/ref/System.DirectoryServices.Protocols.csproj +++ b/src/System.DirectoryServices.Protocols/ref/System.DirectoryServices.Protocols.csproj @@ -8,4 +8,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.builds b/src/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.builds index 2f37b5f289..bd0286a2d2 100644 --- a/src/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.builds +++ b/src/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.builds @@ -1,13 +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" /> <ItemGroup> - <!-- Disabling the builds for DirectoryServices until we get it up and running. This excludes it from being built by build.cmd + <!-- Disabling the builds for DirectoryServices until we get it up and running. This excludes it from being built by build.cmd <Project Include="System.DirectoryServices.Protocols.csproj"> <OSGroup>Windows_NT</OSGroup> </Project> --> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj b/src/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj index 2e75030d9f..38800a46f7 100644 --- a/src/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj +++ b/src/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj @@ -9,7 +9,7 @@ <AssemblyName>System.DirectoryServices.Protocols</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <NoWarn>$(NoWarn);0649</NoWarn> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> + <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v2.0</NuGetTargetMoniker> <GeneratePlatformNotSupportedAssembly Condition="'$(TargetsUnix)' == 'true'">true</GeneratePlatformNotSupportedAssembly> </PropertyGroup> <!-- Help VS understand available configurations --> @@ -59,4 +59,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.DirectoryServices/pkg/System.DirectoryServices.builds b/src/System.DirectoryServices/pkg/System.DirectoryServices.builds index 54e41ffa65..7c29663b1e 100644 --- a/src/System.DirectoryServices/pkg/System.DirectoryServices.builds +++ b/src/System.DirectoryServices/pkg/System.DirectoryServices.builds @@ -1,8 +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" /> <ItemGroup> - <!-- + <!-- <Project Include="System.DirectoryServices.pkgproj"/> --> </ItemGroup> diff --git a/src/System.DirectoryServices/pkg/System.DirectoryServices.pkgproj b/src/System.DirectoryServices/pkg/System.DirectoryServices.pkgproj index 3f8ccefb0e..962988a260 100644 --- a/src/System.DirectoryServices/pkg/System.DirectoryServices.pkgproj +++ b/src/System.DirectoryServices/pkg/System.DirectoryServices.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.DirectoryServices.csproj"> - <SupportedFramework>netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.DirectoryServices.builds" /> <InboxOnTargetFramework Include="MonoAndroid10" /> diff --git a/src/System.DirectoryServices/ref/System.DirectoryServices.csproj b/src/System.DirectoryServices/ref/System.DirectoryServices.csproj index 779620faeb..f5d16e1e71 100644 --- a/src/System.DirectoryServices/ref/System.DirectoryServices.csproj +++ b/src/System.DirectoryServices/ref/System.DirectoryServices.csproj @@ -8,4 +8,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.DirectoryServices/src/System.DirectoryServices.builds b/src/System.DirectoryServices/src/System.DirectoryServices.builds index d4af2f99a7..e5fa47b771 100644 --- a/src/System.DirectoryServices/src/System.DirectoryServices.builds +++ b/src/System.DirectoryServices/src/System.DirectoryServices.builds @@ -1,13 +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" /> <ItemGroup> - <!-- Disabling the builds for DirectoryServices until we get it up and running. This excludes it from being built by build.cmd + <!-- Disabling the builds for DirectoryServices until we get it up and running. This excludes it from being built by build.cmd <Project Include="System.DirectoryServices.csproj"> <OSGroup>Windows_NT</OSGroup> </Project> --> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.DirectoryServices/src/System.DirectoryServices.csproj b/src/System.DirectoryServices/src/System.DirectoryServices.csproj index ac93f453fb..9bb3108c1d 100644 --- a/src/System.DirectoryServices/src/System.DirectoryServices.csproj +++ b/src/System.DirectoryServices/src/System.DirectoryServices.csproj @@ -8,7 +8,7 @@ <ProjectGuid>{879C23DC-D828-4DFB-8E92-ABBC11B71035}</ProjectGuid> <AssemblyName>System.DirectoryServices</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> + <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v2.0</NuGetTargetMoniker> <NoWarn>$(NoWarn);0649</NoWarn> <GeneratePlatformNotSupportedAssembly Condition="'$(TargetsUnix)' == 'true'">true</GeneratePlatformNotSupportedAssembly> </PropertyGroup> @@ -28,7 +28,7 @@ <Compile Include="System\DirectoryServices\DirectoryEntry.cs" /> <Compile Include="System\DirectoryServices\DirectoryEntryConfiguration.cs" /> <Compile Include="System\DirectoryServices\DirectorySearcher.cs" /> -<!-- <Compile Include="System\DirectoryServices\DirectoryServicesPermission.cs" /> + <!-- <Compile Include="System\DirectoryServices\DirectoryServicesPermission.cs" /> <Compile Include="System\DirectoryServices\DirectoryServicesPermissionAccess.cs" /> <Compile Include="System\DirectoryServices\DirectoryServicesPermissionAttribute.cs" /> <Compile Include="System\DirectoryServices\DirectoryServicesPermissionEntry.cs" /> @@ -149,4 +149,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.Drawing.Primitives/pkg/System.Drawing.Primitives.pkgproj b/src/System.Drawing.Primitives/pkg/System.Drawing.Primitives.pkgproj index 1a38bbee4a..60d200a7d2 100644 --- a/src/System.Drawing.Primitives/pkg/System.Drawing.Primitives.pkgproj +++ b/src/System.Drawing.Primitives/pkg/System.Drawing.Primitives.pkgproj @@ -3,11 +3,11 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.Drawing.Primitives.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Drawing.Primitives.builds"> </ProjectReference> - <InboxOnTargetFramework Include="$(AllXamarinFrameworks)" /> + <InboxOnTargetFramework Include="$(AllXamarinFrameworks)" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</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 ee7e21ad11..80a7bb014b 100644 --- a/src/System.Drawing.Primitives/ref/System.Drawing.Primitives.csproj +++ b/src/System.Drawing.Primitives/ref/System.Drawing.Primitives.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -8,4 +8,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Drawing.Primitives/src/Configurations.props b/src/System.Drawing.Primitives/src/Configurations.props index 9c336c0be9..dc837f9152 100644 --- a/src/System.Drawing.Primitives/src/Configurations.props +++ b/src/System.Drawing.Primitives/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Drawing.Primitives/tests/Configurations.props b/src/System.Drawing.Primitives/tests/Configurations.props index 512c938bad..b2db637110 100644 --- a/src/System.Drawing.Primitives/tests/Configurations.props +++ b/src/System.Drawing.Primitives/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> netstandard1.3; - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.builds b/src/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.builds index 5dc5ebecd4..fa00934b2b 100644 --- a/src/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.builds +++ b/src/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.builds @@ -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" /> <ItemGroup> 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 d2d46b7fd4..64e6847ba3 100644 --- a/src/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj +++ b/src/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -32,4 +32,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.Dynamic.Runtime/pkg/System.Dynamic.Runtime.builds b/src/System.Dynamic.Runtime/pkg/System.Dynamic.Runtime.builds index 411ec0c539..c584c73b3d 100644 --- a/src/System.Dynamic.Runtime/pkg/System.Dynamic.Runtime.builds +++ b/src/System.Dynamic.Runtime/pkg/System.Dynamic.Runtime.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Dynamic.Runtime.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Dynamic.Runtime/pkg/System.Dynamic.Runtime.pkgproj b/src/System.Dynamic.Runtime/pkg/System.Dynamic.Runtime.pkgproj index 56a1ffe4bf..13f60cfd5f 100644 --- a/src/System.Dynamic.Runtime/pkg/System.Dynamic.Runtime.pkgproj +++ b/src/System.Dynamic.Runtime/pkg/System.Dynamic.Runtime.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.Dynamic.Runtime.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Dynamic.Runtime.builds" /> <InboxOnTargetFramework Include="MonoAndroid10" /> diff --git a/src/System.Dynamic.Runtime/ref/System.Dynamic.Runtime.csproj b/src/System.Dynamic.Runtime/ref/System.Dynamic.Runtime.csproj index f6a271ea71..5ec1c4968b 100644 --- a/src/System.Dynamic.Runtime/ref/System.Dynamic.Runtime.csproj +++ b/src/System.Dynamic.Runtime/ref/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" /> <ItemGroup> @@ -10,4 +10,4 @@ <ProjectReference Include="..\..\System.Linq.Expressions\ref\System.Linq.Expressions.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Dynamic.Runtime/src/Configurations.props b/src/System.Dynamic.Runtime/src/Configurations.props index 9c336c0be9..dc837f9152 100644 --- a/src/System.Dynamic.Runtime/src/Configurations.props +++ b/src/System.Dynamic.Runtime/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Dynamic.Runtime/tests/Configurations.props b/src/System.Dynamic.Runtime/tests/Configurations.props index 98f53209d4..c398e42e89 100644 --- a/src/System.Dynamic.Runtime/tests/Configurations.props +++ b/src/System.Dynamic.Runtime/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Dynamic.Runtime/tests/System.Dynamic.Runtime.Tests.builds b/src/System.Dynamic.Runtime/tests/System.Dynamic.Runtime.Tests.builds index cfcf16cff7..63d49629fc 100644 --- a/src/System.Dynamic.Runtime/tests/System.Dynamic.Runtime.Tests.builds +++ b/src/System.Dynamic.Runtime/tests/System.Dynamic.Runtime.Tests.builds @@ -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" /> <ItemGroup> 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 09d21e0fa0..ff6423ce48 100644 --- a/src/System.Dynamic.Runtime/tests/System.Dynamic.Runtime.Tests.csproj +++ b/src/System.Dynamic.Runtime/tests/System.Dynamic.Runtime.Tests.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> diff --git a/src/System.Globalization.Calendars/pkg/System.Globalization.Calendars.builds b/src/System.Globalization.Calendars/pkg/System.Globalization.Calendars.builds index b42afe0d3c..d4200587ce 100644 --- a/src/System.Globalization.Calendars/pkg/System.Globalization.Calendars.builds +++ b/src/System.Globalization.Calendars/pkg/System.Globalization.Calendars.builds @@ -7,4 +7,4 @@ <Project Include="aot\System.Globalization.Calendars.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Globalization.Calendars/pkg/System.Globalization.Calendars.pkgproj b/src/System.Globalization.Calendars/pkg/System.Globalization.Calendars.pkgproj index c6fc6e63b3..74a6dfea3c 100644 --- a/src/System.Globalization.Calendars/pkg/System.Globalization.Calendars.pkgproj +++ b/src/System.Globalization.Calendars/pkg/System.Globalization.Calendars.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Globalization.Calendars.csproj"> - <SupportedFramework>netcoreapp1.1;net463;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>netcoreapp2.0;net463;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Globalization.Calendars.csproj"> <TargetGroup>net463</TargetGroup> diff --git a/src/System.Globalization.Calendars/pkg/any/System.Globalization.Calendars.pkgproj b/src/System.Globalization.Calendars/pkg/any/System.Globalization.Calendars.pkgproj index cc4de0af50..d4ae16b246 100644 --- a/src/System.Globalization.Calendars/pkg/any/System.Globalization.Calendars.pkgproj +++ b/src/System.Globalization.Calendars/pkg/any/System.Globalization.Calendars.pkgproj @@ -5,19 +5,15 @@ <PackageTargetRuntime>any</PackageTargetRuntime> <PreventImplementationReference>true</PreventImplementationReference> </PropertyGroup> - <ItemGroup> <ProjectReference Include="..\..\src\System.Globalization.Calendars.csproj" /> - <!-- desktop facade is in the ref package --> - <ExternalOnTargetFramework Include="net"/> - + <ExternalOnTargetFramework Include="net" /> <!-- AOT implementation comes from AOT package --> <File Include="$(PlaceholderFile)"> <TargetPath>runtimes/aot/lib/netcore50</TargetPath> <TargetFramework>aot</TargetFramework> </File> - <InboxOnTargetFramework Include="MonoAndroid10" /> <InboxOnTargetFramework Include="MonoTouch10" /> <InboxOnTargetFramework Include="xamarinios10" /> diff --git a/src/System.Globalization.Calendars/pkg/aot/System.Globalization.Calendars.pkgproj b/src/System.Globalization.Calendars/pkg/aot/System.Globalization.Calendars.pkgproj index 95cd6f7342..e250c97205 100644 --- a/src/System.Globalization.Calendars/pkg/aot/System.Globalization.Calendars.pkgproj +++ b/src/System.Globalization.Calendars/pkg/aot/System.Globalization.Calendars.pkgproj @@ -1,12 +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="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> <PackageTargetRuntime>aot</PackageTargetRuntime> <PreventImplementationReference>true</PreventImplementationReference> </PropertyGroup> - - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </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 68736474c3..87580bbf76 100644 --- a/src/System.Globalization.Calendars/ref/System.Globalization.Calendars.csproj +++ b/src/System.Globalization.Calendars/ref/System.Globalization.Calendars.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -9,4 +9,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Globalization.Calendars/src/Configurations.props b/src/System.Globalization.Calendars/src/Configurations.props index 9c336c0be9..dc837f9152 100644 --- a/src/System.Globalization.Calendars/src/Configurations.props +++ b/src/System.Globalization.Calendars/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Globalization.Calendars/tests/Configurations.props b/src/System.Globalization.Calendars/tests/Configurations.props index 512c938bad..b2db637110 100644 --- a/src/System.Globalization.Calendars/tests/Configurations.props +++ b/src/System.Globalization.Calendars/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> netstandard1.3; - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.builds b/src/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.builds index 72748a75ad..ea425bd239 100644 --- a/src/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.builds +++ b/src/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.builds @@ -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" /> <ItemGroup> 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 ff91abc0f7..863e51a1c8 100644 --- a/src/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.csproj +++ b/src/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.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> @@ -128,4 +128,4 @@ <TargetingPackReference Include="System.Runtime" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Globalization.Extensions/pkg/System.Globalization.Extensions.builds b/src/System.Globalization.Extensions/pkg/System.Globalization.Extensions.builds index 1fbf42e3d7..29d974418d 100644 --- a/src/System.Globalization.Extensions/pkg/System.Globalization.Extensions.builds +++ b/src/System.Globalization.Extensions/pkg/System.Globalization.Extensions.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Globalization.Extensions.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Globalization.Extensions/pkg/System.Globalization.Extensions.pkgproj b/src/System.Globalization.Extensions/pkg/System.Globalization.Extensions.pkgproj index 42ff146dd1..d730298980 100644 --- a/src/System.Globalization.Extensions/pkg/System.Globalization.Extensions.pkgproj +++ b/src/System.Globalization.Extensions/pkg/System.Globalization.Extensions.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Globalization.Extensions.csproj"> - <SupportedFramework>netcoreapp1.1;uap10.1;net463;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>netcoreapp2.0;uap10.1;net463;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Globalization.Extensions.builds" /> </ItemGroup> diff --git a/src/System.Globalization.Extensions/ref/System.Globalization.Extensions.csproj b/src/System.Globalization.Extensions/ref/System.Globalization.Extensions.csproj index c49bef8f71..8fe04787d7 100644 --- a/src/System.Globalization.Extensions/ref/System.Globalization.Extensions.csproj +++ b/src/System.Globalization.Extensions/ref/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" /> <ItemGroup> @@ -14,4 +14,4 @@ <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Globalization.Extensions/src/Configurations.props b/src/System.Globalization.Extensions/src/Configurations.props index 0decf0d6c0..7a242f16dd 100644 --- a/src/System.Globalization.Extensions/src/Configurations.props +++ b/src/System.Globalization.Extensions/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ netstandard-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj b/src/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj index 8b30a58487..f99d812887 100644 --- a/src/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj +++ b/src/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj @@ -9,7 +9,7 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <ProjectGuid>{2B96AA10-84C0-4927-8611-8D2474B990E8}</ProjectGuid> <!-- copy to uap10.1 until nuget makes the change to map that to ns1.7 --> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard;uap10.1</PackageTargetFramework> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> </PropertyGroup> <!-- Help VS understand available configurations --> diff --git a/src/System.Globalization.Extensions/tests/Configurations.props b/src/System.Globalization.Extensions/tests/Configurations.props index 512c938bad..b2db637110 100644 --- a/src/System.Globalization.Extensions/tests/Configurations.props +++ b/src/System.Globalization.Extensions/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> netstandard1.3; - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Globalization.Extensions/tests/System.Globalization.Extensions.Tests.builds b/src/System.Globalization.Extensions/tests/System.Globalization.Extensions.Tests.builds index 5acfbea3e4..50f3dab8e8 100644 --- a/src/System.Globalization.Extensions/tests/System.Globalization.Extensions.Tests.builds +++ b/src/System.Globalization.Extensions/tests/System.Globalization.Extensions.Tests.builds @@ -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" /> <ItemGroup> 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 4bac4b1d75..569a758202 100644 --- a/src/System.Globalization.Extensions/tests/System.Globalization.Extensions.Tests.csproj +++ b/src/System.Globalization.Extensions/tests/System.Globalization.Extensions.Tests.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> diff --git a/src/System.Globalization/pkg/System.Globalization.pkgproj b/src/System.Globalization/pkg/System.Globalization.pkgproj index 15413e81cd..6aba278bea 100644 --- a/src/System.Globalization/pkg/System.Globalization.pkgproj +++ b/src/System.Globalization/pkg/System.Globalization.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.Globalization.csproj"> - <SupportedFramework>net463;netcoreapp1.1;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Globalization.csproj"> <TargetGroup>net463</TargetGroup> diff --git a/src/System.Globalization/pkg/any/System.Globalization.pkgproj b/src/System.Globalization/pkg/any/System.Globalization.pkgproj index 52f51fcc77..0d27fbed03 100644 --- a/src/System.Globalization/pkg/any/System.Globalization.pkgproj +++ b/src/System.Globalization/pkg/any/System.Globalization.pkgproj @@ -5,16 +5,13 @@ <PackageTargetRuntime>any</PackageTargetRuntime> <PreventImplementationReference>true</PreventImplementationReference> </PropertyGroup> - <ItemGroup> <ProjectReference Include="..\..\src\System.Globalization.csproj" /> - <!-- AOT implementation comes from AOT package --> <File Include="$(PlaceholderFile)"> <TargetPath>runtimes/aot/lib/uap101</TargetPath> <TargetFramework>aot</TargetFramework> </File> - <InboxOnTargetFramework Include="MonoAndroid10" /> <InboxOnTargetFramework Include="MonoTouch10" /> <InboxOnTargetFramework Include="net45" /> diff --git a/src/System.Globalization/pkg/aot/System.Globalization.pkgproj b/src/System.Globalization/pkg/aot/System.Globalization.pkgproj index 724172d456..313c5a032e 100644 --- a/src/System.Globalization/pkg/aot/System.Globalization.pkgproj +++ b/src/System.Globalization/pkg/aot/System.Globalization.pkgproj @@ -1,17 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> <PackageTargetRuntime>aot</PackageTargetRuntime> <PreventImplementationReference>true</PreventImplementationReference> </PropertyGroup> - <ItemGroup> <ProjectReference Include="..\..\src\System.Globalization.csproj"> <TargetGroup>uap101aot</TargetGroup> </ProjectReference> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </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 ef1223d59f..169ba45a6e 100644 --- a/src/System.Globalization/ref/System.Globalization.csproj +++ b/src/System.Globalization/ref/System.Globalization.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -8,4 +8,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Globalization/src/Configurations.props b/src/System.Globalization/src/Configurations.props index f013d10b8c..ed0bd2acc9 100644 --- a/src/System.Globalization/src/Configurations.props +++ b/src/System.Globalization/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Globalization/src/System.Globalization.csproj b/src/System.Globalization/src/System.Globalization.csproj index a22f58b7d9..7448f99b37 100644 --- a/src/System.Globalization/src/System.Globalization.csproj +++ b/src/System.Globalization/src/System.Globalization.csproj @@ -4,7 +4,7 @@ <PropertyGroup> <AssemblyName>System.Globalization</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> diff --git a/src/System.Globalization/tests/Configurations.props b/src/System.Globalization/tests/Configurations.props index 512c938bad..b2db637110 100644 --- a/src/System.Globalization/tests/Configurations.props +++ b/src/System.Globalization/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> netstandard1.3; - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file 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 bf2f1cafab..56dc6cdc3f 100644 --- a/src/System.Globalization/tests/Performance/System.Globalization.Performance.Tests.csproj +++ b/src/System.Globalization/tests/Performance/System.Globalization.Performance.Tests.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> diff --git a/src/System.Globalization/tests/System.Globalization.Tests.builds b/src/System.Globalization/tests/System.Globalization.Tests.builds index f0f2f042e5..c1c1306be0 100644 --- a/src/System.Globalization/tests/System.Globalization.Tests.builds +++ b/src/System.Globalization/tests/System.Globalization.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Globalization/tests/System.Globalization.Tests.csproj b/src/System.Globalization/tests/System.Globalization.Tests.csproj index af58da570a..50c5c4810e 100644 --- a/src/System.Globalization/tests/System.Globalization.Tests.csproj +++ b/src/System.Globalization/tests/System.Globalization.Tests.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> @@ -166,4 +166,4 @@ </EmbeddedResource> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO.Compression.ZipFile/pkg/System.IO.Compression.ZipFile.builds b/src/System.IO.Compression.ZipFile/pkg/System.IO.Compression.ZipFile.builds index e10514f95e..d6ebb98729 100644 --- a/src/System.IO.Compression.ZipFile/pkg/System.IO.Compression.ZipFile.builds +++ b/src/System.IO.Compression.ZipFile/pkg/System.IO.Compression.ZipFile.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.IO.Compression.ZipFile.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.IO.Compression.ZipFile/pkg/System.IO.Compression.ZipFile.pkgproj b/src/System.IO.Compression.ZipFile/pkg/System.IO.Compression.ZipFile.pkgproj index 4d92ce9934..b6400d1b33 100644 --- a/src/System.IO.Compression.ZipFile/pkg/System.IO.Compression.ZipFile.pkgproj +++ b/src/System.IO.Compression.ZipFile/pkg/System.IO.Compression.ZipFile.pkgproj @@ -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" /> <ItemGroup> 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 360c821172..fe432ab17e 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,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -14,4 +14,4 @@ <ProjectReference Include="..\..\System.Text.Encoding\ref\System.Text.Encoding.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ 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 index 24e575d57f..f9df021aef 100644 --- a/src/System.IO.Compression.ZipFile/src/Configurations.props +++ b/src/System.IO.Compression.ZipFile/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ 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 index f0ebe53119..c3266e1e93 100644 --- a/src/System.IO.Compression.ZipFile/tests/Configurations.props +++ b/src/System.IO.Compression.ZipFile/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.builds b/src/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.builds index f49d7037cd..dcef83a6b1 100644 --- a/src/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.builds +++ b/src/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.IO.Compression/pkg/System.IO.Compression.builds b/src/System.IO.Compression/pkg/System.IO.Compression.builds index be772ea063..58fc4e4030 100644 --- a/src/System.IO.Compression/pkg/System.IO.Compression.builds +++ b/src/System.IO.Compression/pkg/System.IO.Compression.builds @@ -1,9 +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" /> <ItemGroup> - <Project Include="System.IO.Compression.pkgproj"/> + <Project Include="System.IO.Compression.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.IO.Compression/pkg/System.IO.Compression.pkgproj b/src/System.IO.Compression/pkg/System.IO.Compression.pkgproj index ed0bb20233..383cec15b5 100644 --- a/src/System.IO.Compression/pkg/System.IO.Compression.pkgproj +++ b/src/System.IO.Compression/pkg/System.IO.Compression.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.IO.Compression.csproj"> - <SupportedFramework>netcoreapp1.1;net463;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>netcoreapp2.0;net463;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.IO.Compression.builds" /> <InboxOnTargetFramework Include="net45"> @@ -30,7 +30,6 @@ <InboxOnTargetFramework Include="xamarinwatchos10"> <AsFrameworkReference>true</AsFrameworkReference> </InboxOnTargetFramework> - </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/System.IO.Compression.csproj b/src/System.IO.Compression/ref/System.IO.Compression.csproj index fd48b4b531..03e397192c 100644 --- a/src/System.IO.Compression/ref/System.IO.Compression.csproj +++ b/src/System.IO.Compression/ref/System.IO.Compression.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -14,4 +14,4 @@ <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO.Compression/src/Configurations.props b/src/System.IO.Compression/src/Configurations.props index 3bb6330d9e..4701fcd772 100644 --- a/src/System.IO.Compression/src/Configurations.props +++ b/src/System.IO.Compression/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ net463-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO.Compression/tests/Configurations.props b/src/System.IO.Compression/tests/Configurations.props index 981075fcc5..fa9e1005a0 100644 --- a/src/System.IO.Compression/tests/Configurations.props +++ b/src/System.IO.Compression/tests/Configurations.props @@ -1,11 +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> <BuildConfigurations> netstandard1.3-Unix; netstandard1.3-Windows_NT; - netstandard1.7-Unix; - netstandard1.7-Windows_NT; + netstandard-Unix; + netstandard-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO.Compression/tests/Performance/Configurations.props b/src/System.IO.Compression/tests/Performance/Configurations.props index 46f6878dcd..2845c11c54 100644 --- a/src/System.IO.Compression/tests/Performance/Configurations.props +++ b/src/System.IO.Compression/tests/Performance/Configurations.props @@ -1,8 +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> <BuildConfigurations> - netcoreapp1.1; + netcoreapp; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file 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 84691bece9..7baced43d6 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,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> diff --git a/src/System.IO.Compression/tests/System.IO.Compression.Tests.builds b/src/System.IO.Compression/tests/System.IO.Compression.Tests.builds index ee7d4fd215..7d7447207b 100644 --- a/src/System.IO.Compression/tests/System.IO.Compression.Tests.builds +++ b/src/System.IO.Compression/tests/System.IO.Compression.Tests.builds @@ -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" /> <ItemGroup> 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 ea47b41287..b601896e93 100644 --- a/src/System.IO.Compression/tests/System.IO.Compression.Tests.csproj +++ b/src/System.IO.Compression/tests/System.IO.Compression.Tests.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -48,4 +48,4 @@ </SupplementalTestData> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO.FileSystem.AccessControl/pkg/System.IO.FileSystem.AccessControl.builds b/src/System.IO.FileSystem.AccessControl/pkg/System.IO.FileSystem.AccessControl.builds index dc6ff97b68..6d04944e30 100644 --- a/src/System.IO.FileSystem.AccessControl/pkg/System.IO.FileSystem.AccessControl.builds +++ b/src/System.IO.FileSystem.AccessControl/pkg/System.IO.FileSystem.AccessControl.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.IO.FileSystem.AccessControl.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.IO.FileSystem.AccessControl/pkg/System.IO.FileSystem.AccessControl.pkgproj b/src/System.IO.FileSystem.AccessControl/pkg/System.IO.FileSystem.AccessControl.pkgproj index 7e85ab3a43..92ae5e245f 100644 --- a/src/System.IO.FileSystem.AccessControl/pkg/System.IO.FileSystem.AccessControl.pkgproj +++ b/src/System.IO.FileSystem.AccessControl/pkg/System.IO.FileSystem.AccessControl.pkgproj @@ -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" /> - <ItemGroup> <ProjectReference Include="..\ref\System.IO.FileSystem.AccessControl.csproj"> <SupportedFramework>net46;netcoreapp1.0</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.IO.FileSystem.AccessControl.builds" /> - <NotSupportedOnTargetFramework Include="netcore50"> <PackageTargetRuntime>win</PackageTargetRuntime> </NotSupportedOnTargetFramework> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj b/src/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj index b79d22d017..f65e735d99 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,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" /> <ItemGroup> @@ -13,4 +13,4 @@ <ProjectReference Include="..\..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ 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 index a6c74d0e58..437e6acc34 100644 --- a/src/System.IO.FileSystem.AccessControl/src/Configurations.props +++ b/src/System.IO.FileSystem.AccessControl/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ netstandard1.3-Unix; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ 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 index 5d77dc616e..5f482b878b 100644 --- a/src/System.IO.FileSystem.AccessControl/tests/Configurations.props +++ b/src/System.IO.FileSystem.AccessControl/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.builds b/src/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.builds index fb582c569b..ed27335eab 100644 --- a/src/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.builds +++ b/src/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.builds @@ -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" /> <ItemGroup> <Project Include="System.IO.FileSystem.AccessControl.Tests.csproj"> <OSGroup>Windows_NT</OSGroup> - <TestTFMs>netcoreapp1.1;netcoreapp1.0;net46</TestTFMs> + <TestTFMs>netcoreapp;netcoreapp1.0;net46</TestTFMs> </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> diff --git a/src/System.IO.FileSystem.DriveInfo/pkg/System.IO.FileSystem.DriveInfo.builds b/src/System.IO.FileSystem.DriveInfo/pkg/System.IO.FileSystem.DriveInfo.builds index ed795893c6..d76506f3e2 100644 --- a/src/System.IO.FileSystem.DriveInfo/pkg/System.IO.FileSystem.DriveInfo.builds +++ b/src/System.IO.FileSystem.DriveInfo/pkg/System.IO.FileSystem.DriveInfo.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.IO.FileSystem.DriveInfo.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.IO.FileSystem.DriveInfo/pkg/System.IO.FileSystem.DriveInfo.pkgproj b/src/System.IO.FileSystem.DriveInfo/pkg/System.IO.FileSystem.DriveInfo.pkgproj index ab187b251b..b6c71d7948 100644 --- a/src/System.IO.FileSystem.DriveInfo/pkg/System.IO.FileSystem.DriveInfo.pkgproj +++ b/src/System.IO.FileSystem.DriveInfo/pkg/System.IO.FileSystem.DriveInfo.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.IO.FileSystem.DriveInfo.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.IO.FileSystem.DriveInfo.builds" /> </ItemGroup> @@ -14,9 +14,9 @@ <InboxOnTargetFramework Include="xamarinmac20" /> <InboxOnTargetFramework Include="xamarintvos10" /> <InboxOnTargetFramework Include="xamarinwatchos10" /> - <NotSupportedOnTargetFramework Include="netcore50"> <PackageTargetRuntime>win7</PackageTargetRuntime> - </NotSupportedOnTargetFramework> </ItemGroup> + </NotSupportedOnTargetFramework> + </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 ef3586a78d..05bd2aa535 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,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" /> <ItemGroup> @@ -11,4 +11,4 @@ <ProjectReference Include="..\..\System.IO.FileSystem\ref\System.IO.FileSystem.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO.FileSystem.DriveInfo/src/Configurations.props b/src/System.IO.FileSystem.DriveInfo/src/Configurations.props index 3bb6330d9e..4701fcd772 100644 --- a/src/System.IO.FileSystem.DriveInfo/src/Configurations.props +++ b/src/System.IO.FileSystem.DriveInfo/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ net463-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO.FileSystem.DriveInfo/tests/Configurations.props b/src/System.IO.FileSystem.DriveInfo/tests/Configurations.props index 2a160a39e8..211cd2bec8 100644 --- a/src/System.IO.FileSystem.DriveInfo/tests/Configurations.props +++ b/src/System.IO.FileSystem.DriveInfo/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> netstandard1.3-Windows_NT; - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.builds b/src/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.builds index 3c752b4a68..c11c58a180 100644 --- a/src/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.builds +++ b/src/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.builds @@ -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" /> <ItemGroup> 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 19ffca7f20..f8df48928d 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 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -15,4 +15,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.IO.FileSystem.Primitives/pkg/System.IO.FileSystem.Primitives.builds b/src/System.IO.FileSystem.Primitives/pkg/System.IO.FileSystem.Primitives.builds index d31be7fba9..353761751a 100644 --- a/src/System.IO.FileSystem.Primitives/pkg/System.IO.FileSystem.Primitives.builds +++ b/src/System.IO.FileSystem.Primitives/pkg/System.IO.FileSystem.Primitives.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.IO.FileSystem.Primitives.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.IO.FileSystem.Primitives/pkg/System.IO.FileSystem.Primitives.pkgproj b/src/System.IO.FileSystem.Primitives/pkg/System.IO.FileSystem.Primitives.pkgproj index 8b62841a89..cec8b54885 100644 --- a/src/System.IO.FileSystem.Primitives/pkg/System.IO.FileSystem.Primitives.pkgproj +++ b/src/System.IO.FileSystem.Primitives/pkg/System.IO.FileSystem.Primitives.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.IO.FileSystem.Primitives.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.IO.FileSystem.Primitives.builds" /> </ItemGroup> @@ -16,4 +16,4 @@ <InboxOnTargetFramework Include="xamarinwatchos10" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</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 fe9f9314f8..cc5c1e617b 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,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" /> <ItemGroup> @@ -8,4 +8,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO.FileSystem.Primitives/src/Configurations.props b/src/System.IO.FileSystem.Primitives/src/Configurations.props index 9c336c0be9..dc837f9152 100644 --- a/src/System.IO.FileSystem.Primitives/src/Configurations.props +++ b/src/System.IO.FileSystem.Primitives/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO.FileSystem.Primitives/tests/Configurations.props b/src/System.IO.FileSystem.Primitives/tests/Configurations.props index 98f53209d4..c398e42e89 100644 --- a/src/System.IO.FileSystem.Primitives/tests/Configurations.props +++ b/src/System.IO.FileSystem.Primitives/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO.FileSystem.Primitives/tests/System.IO.FileSystem.Primitives.Tests.builds b/src/System.IO.FileSystem.Primitives/tests/System.IO.FileSystem.Primitives.Tests.builds index c50a8f1b4b..895fc45242 100644 --- a/src/System.IO.FileSystem.Primitives/tests/System.IO.FileSystem.Primitives.Tests.builds +++ b/src/System.IO.FileSystem.Primitives/tests/System.IO.FileSystem.Primitives.Tests.builds @@ -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" /> <ItemGroup> @@ -14,4 +14,4 @@ </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file 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 02b34d731d..24a444792f 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 @@ -13,4 +13,4 @@ <Compile Include="FileShareTests.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO.FileSystem.Watcher/pkg/System.IO.FileSystem.Watcher.builds b/src/System.IO.FileSystem.Watcher/pkg/System.IO.FileSystem.Watcher.builds index 493e64f54c..19638575c3 100644 --- a/src/System.IO.FileSystem.Watcher/pkg/System.IO.FileSystem.Watcher.builds +++ b/src/System.IO.FileSystem.Watcher/pkg/System.IO.FileSystem.Watcher.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.IO.FileSystem.Watcher.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.IO.FileSystem.Watcher/pkg/System.IO.FileSystem.Watcher.pkgproj b/src/System.IO.FileSystem.Watcher/pkg/System.IO.FileSystem.Watcher.pkgproj index 5530d3d2ac..ba38691588 100644 --- a/src/System.IO.FileSystem.Watcher/pkg/System.IO.FileSystem.Watcher.pkgproj +++ b/src/System.IO.FileSystem.Watcher/pkg/System.IO.FileSystem.Watcher.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.IO.FileSystem.Watcher.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.IO.FileSystem.Watcher.builds" /> </ItemGroup> @@ -14,9 +14,9 @@ <InboxOnTargetFramework Include="xamarinmac20" /> <InboxOnTargetFramework Include="xamarintvos10" /> <InboxOnTargetFramework Include="xamarinwatchos10" /> - <NotSupportedOnTargetFramework Include="netcore50"> <PackageTargetRuntime>win7</PackageTargetRuntime> - </NotSupportedOnTargetFramework> </ItemGroup> + </NotSupportedOnTargetFramework> + </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </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 494e5671cf..913dea5c11 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,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" /> <ItemGroup> @@ -10,4 +10,4 @@ <ProjectReference Include="..\..\System.ComponentModel.TypeConverter\ref\System.ComponentModel.TypeConverter.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO.FileSystem.Watcher/src/Configurations.props b/src/System.IO.FileSystem.Watcher/src/Configurations.props index d192a53e46..8682673c53 100644 --- a/src/System.IO.FileSystem.Watcher/src/Configurations.props +++ b/src/System.IO.FileSystem.Watcher/src/Configurations.props @@ -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> <BuildConfigurations> @@ -8,4 +8,4 @@ net463-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO.FileSystem.Watcher/tests/Configurations.props b/src/System.IO.FileSystem.Watcher/tests/Configurations.props index df25450ab0..be31938f47 100644 --- a/src/System.IO.FileSystem.Watcher/tests/Configurations.props +++ b/src/System.IO.FileSystem.Watcher/tests/Configurations.props @@ -1,13 +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> <BuildConfigurations> netstandard1.3-Linux; netstandard1.3-OSX; netstandard1.3-Windows_NT; - netstandard1.7-Linux; - netstandard1.7-OSX; - netstandard1.7-Windows_NT; + netstandard-Linux; + netstandard-OSX; + netstandard-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.builds b/src/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.builds index bc5390472e..0a31998134 100644 --- a/src/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.builds +++ b/src/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.builds @@ -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" /> <ItemGroup> 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 1604f4c4f5..32f8a07230 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 @@ -49,4 +49,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.IO.FileSystem/pkg/System.IO.FileSystem.builds b/src/System.IO.FileSystem/pkg/System.IO.FileSystem.builds index 87af5d606b..e680a1318e 100644 --- a/src/System.IO.FileSystem/pkg/System.IO.FileSystem.builds +++ b/src/System.IO.FileSystem/pkg/System.IO.FileSystem.builds @@ -1,8 +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" /> <ItemGroup> - <Project Include="System.IO.FileSystem.pkgproj"/> + <Project Include="System.IO.FileSystem.pkgproj" /> <Project Include="win\System.IO.FileSystem.pkgproj"> <OSGroup>Windows_NT</OSGroup> </Project> diff --git a/src/System.IO.FileSystem/pkg/System.IO.FileSystem.pkgproj b/src/System.IO.FileSystem/pkg/System.IO.FileSystem.pkgproj index 051d826c99..423d56757b 100644 --- a/src/System.IO.FileSystem/pkg/System.IO.FileSystem.pkgproj +++ b/src/System.IO.FileSystem/pkg/System.IO.FileSystem.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.IO.FileSystem.csproj"> - <SupportedFramework>netcoreapp1.1;net463;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>netcoreapp2.0;net463;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.IO.FileSystem.csproj"> <TargetGroup>net463</TargetGroup> diff --git a/src/System.IO.FileSystem/pkg/unix/System.IO.FileSystem.pkgproj b/src/System.IO.FileSystem/pkg/unix/System.IO.FileSystem.pkgproj index 77971ff05f..8b4d9b1169 100644 --- a/src/System.IO.FileSystem/pkg/unix/System.IO.FileSystem.pkgproj +++ b/src/System.IO.FileSystem/pkg/unix/System.IO.FileSystem.pkgproj @@ -1,17 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> <PackageTargetRuntime>unix</PackageTargetRuntime> <PreventImplementationReference>true</PreventImplementationReference> </PropertyGroup> - <ItemGroup> <ProjectReference Include="..\..\src\System.IO.FileSystem.csproj"> <OSGroup>Unix</OSGroup> </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/pkg/win/System.IO.FileSystem.pkgproj b/src/System.IO.FileSystem/pkg/win/System.IO.FileSystem.pkgproj index 87c09cedad..6aef01697c 100644 --- a/src/System.IO.FileSystem/pkg/win/System.IO.FileSystem.pkgproj +++ b/src/System.IO.FileSystem/pkg/win/System.IO.FileSystem.pkgproj @@ -1,26 +1,20 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> <PackageTargetRuntime>win</PackageTargetRuntime> <PreventImplementationReference>true</PreventImplementationReference> </PropertyGroup> - <ItemGroup> <ProjectReference Include="..\..\src\System.IO.FileSystem.csproj"> <OSGroup>Windows_NT</OSGroup> </ProjectReference> - <!-- No implementation on platforms where our P-Invokes are not allowed --> <NotSupportedOnTargetFramework Include="win8" /> <NotSupportedOnTargetFramework Include="wp8" /> <NotSupportedOnTargetFramework Include="wpa81" /> - <!-- don't use the dotnet implementation for any version of desktop, it's implementation comes from the reference package --> <ExternalOnTargetFramework Include="net" /> </ItemGroup> - - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.IO.FileSystem/ref/4.0.1/System.IO.FileSystem.depproj b/src/System.IO.FileSystem/ref/4.0.1/System.IO.FileSystem.depproj index a057e94de8..36b93c3576 100644 --- a/src/System.IO.FileSystem/ref/4.0.1/System.IO.FileSystem.depproj +++ b/src/System.IO.FileSystem/ref/4.0.1/System.IO.FileSystem.depproj @@ -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> diff --git a/src/System.IO.FileSystem/ref/System.IO.FileSystem.csproj b/src/System.IO.FileSystem/ref/System.IO.FileSystem.csproj index 949503ef1f..d327df1b5d 100644 --- a/src/System.IO.FileSystem/ref/System.IO.FileSystem.csproj +++ b/src/System.IO.FileSystem/ref/System.IO.FileSystem.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -14,4 +14,4 @@ <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO.FileSystem/src/Configurations.props b/src/System.IO.FileSystem/src/Configurations.props index 3bb6330d9e..4701fcd772 100644 --- a/src/System.IO.FileSystem/src/Configurations.props +++ b/src/System.IO.FileSystem/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ net463-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO.FileSystem/tests/Configurations.props b/src/System.IO.FileSystem/tests/Configurations.props index 981075fcc5..fa9e1005a0 100644 --- a/src/System.IO.FileSystem/tests/Configurations.props +++ b/src/System.IO.FileSystem/tests/Configurations.props @@ -1,11 +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> <BuildConfigurations> netstandard1.3-Unix; netstandard1.3-Windows_NT; - netstandard1.7-Unix; - netstandard1.7-Windows_NT; + netstandard-Unix; + netstandard-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file 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 1298befd0e..95f7c58f4f 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 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <PropertyGroup> <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> diff --git a/src/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.builds b/src/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.builds index e457f84456..eae0df7274 100644 --- a/src/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.builds +++ b/src/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.builds @@ -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" /> <ItemGroup> 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 1140b22e5d..5d73eebcc1 100644 --- a/src/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj +++ b/src/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.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> @@ -156,4 +156,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.IO.IsolatedStorage/pkg/System.IO.IsolatedStorage.builds b/src/System.IO.IsolatedStorage/pkg/System.IO.IsolatedStorage.builds index aaa31bdad8..26f75ca773 100644 --- a/src/System.IO.IsolatedStorage/pkg/System.IO.IsolatedStorage.builds +++ b/src/System.IO.IsolatedStorage/pkg/System.IO.IsolatedStorage.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.IO.IsolatedStorage.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.IO.IsolatedStorage/pkg/System.IO.IsolatedStorage.pkgproj b/src/System.IO.IsolatedStorage/pkg/System.IO.IsolatedStorage.pkgproj index b38d23338e..a34a9be42d 100644 --- a/src/System.IO.IsolatedStorage/pkg/System.IO.IsolatedStorage.pkgproj +++ b/src/System.IO.IsolatedStorage/pkg/System.IO.IsolatedStorage.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.IO.IsolatedStorage.csproj"> - <SupportedFramework>uap10.1;netcoreapp1.1;net461;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>uap10.1;netcoreapp2.0;net461;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.IO.IsolatedStorage.builds" /> </ItemGroup> diff --git a/src/System.IO.IsolatedStorage/ref/System.IO.IsolatedStorage.csproj b/src/System.IO.IsolatedStorage/ref/System.IO.IsolatedStorage.csproj index 458229792e..e38c6fd87b 100644 --- a/src/System.IO.IsolatedStorage/ref/System.IO.IsolatedStorage.csproj +++ b/src/System.IO.IsolatedStorage/ref/System.IO.IsolatedStorage.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -17,4 +17,4 @@ <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO.IsolatedStorage/src/Configurations.props b/src/System.IO.IsolatedStorage/src/Configurations.props index 53b62c64fe..bcfec4bbde 100644 --- a/src/System.IO.IsolatedStorage/src/Configurations.props +++ b/src/System.IO.IsolatedStorage/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj b/src/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj index 33d8b64976..d23708dec3 100644 --- a/src/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj +++ b/src/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj @@ -7,7 +7,7 @@ <EnableWinRT Condition="'$(TargetGroup)' == 'uap101'">true</EnableWinRT> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net461'">true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net461'">None</ResourcesSourceOutputDirectory> - <PackageTargetFramework Condition="'$(TargetGroup)'=='netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)'=='netstandard'">netstandard;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Default configurations to help VS understand the options --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> diff --git a/src/System.IO.IsolatedStorage/tests/Configurations.props b/src/System.IO.IsolatedStorage/tests/Configurations.props index 90648972ae..cfc57211a4 100644 --- a/src/System.IO.IsolatedStorage/tests/Configurations.props +++ b/src/System.IO.IsolatedStorage/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> - netstandard1.7-Unix; - netstandard1.7-Windows_NT; + netstandard-Unix; + netstandard-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.builds b/src/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.builds index d416575ee4..5b93935b0a 100644 --- a/src/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.builds +++ b/src/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.IO.MemoryMappedFiles/pkg/System.IO.MemoryMappedFiles.builds b/src/System.IO.MemoryMappedFiles/pkg/System.IO.MemoryMappedFiles.builds index 19695e6b50..7ac3c0458e 100644 --- a/src/System.IO.MemoryMappedFiles/pkg/System.IO.MemoryMappedFiles.builds +++ b/src/System.IO.MemoryMappedFiles/pkg/System.IO.MemoryMappedFiles.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.IO.MemoryMappedFiles.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.IO.MemoryMappedFiles/pkg/System.IO.MemoryMappedFiles.pkgproj b/src/System.IO.MemoryMappedFiles/pkg/System.IO.MemoryMappedFiles.pkgproj index c1587b4cd0..3771f4a6a7 100644 --- a/src/System.IO.MemoryMappedFiles/pkg/System.IO.MemoryMappedFiles.pkgproj +++ b/src/System.IO.MemoryMappedFiles/pkg/System.IO.MemoryMappedFiles.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.IO.MemoryMappedFiles.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.IO.MemoryMappedFiles.builds" /> </ItemGroup> diff --git a/src/System.IO.MemoryMappedFiles/ref/System.IO.MemoryMappedFiles.csproj b/src/System.IO.MemoryMappedFiles/ref/System.IO.MemoryMappedFiles.csproj index 138a8b18e7..2ec531dfc9 100644 --- a/src/System.IO.MemoryMappedFiles/ref/System.IO.MemoryMappedFiles.csproj +++ b/src/System.IO.MemoryMappedFiles/ref/System.IO.MemoryMappedFiles.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -14,4 +14,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO.MemoryMappedFiles/src/Configurations.props b/src/System.IO.MemoryMappedFiles/src/Configurations.props index 3bb6330d9e..4701fcd772 100644 --- a/src/System.IO.MemoryMappedFiles/src/Configurations.props +++ b/src/System.IO.MemoryMappedFiles/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ net463-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO.MemoryMappedFiles/tests/Configurations.props b/src/System.IO.MemoryMappedFiles/tests/Configurations.props index 0c2d77f6b7..566c16a6e1 100644 --- a/src/System.IO.MemoryMappedFiles/tests/Configurations.props +++ b/src/System.IO.MemoryMappedFiles/tests/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard1.3-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.builds b/src/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.builds index 8a3e31db74..1020a374c0 100644 --- a/src/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.builds +++ b/src/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.builds @@ -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" /> <ItemGroup> 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 a40f8df70f..7bc57e5c34 100644 --- a/src/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj +++ b/src/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -37,4 +37,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.IO.Packaging/pkg/System.IO.Packaging.builds b/src/System.IO.Packaging/pkg/System.IO.Packaging.builds index 173451fab3..23ba2a13b8 100644 --- a/src/System.IO.Packaging/pkg/System.IO.Packaging.builds +++ b/src/System.IO.Packaging/pkg/System.IO.Packaging.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.IO.Packaging.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.IO.Packaging/pkg/System.IO.Packaging.pkgproj b/src/System.IO.Packaging/pkg/System.IO.Packaging.pkgproj index 34254a75b9..0d403d9c38 100644 --- a/src/System.IO.Packaging/pkg/System.IO.Packaging.pkgproj +++ b/src/System.IO.Packaging/pkg/System.IO.Packaging.pkgproj @@ -1,13 +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" /> - <ItemGroup> <ProjectReference Include="..\ref\System.IO.Packaging.csproj"> <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.IO.Packaging.builds" /> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.IO.Packaging/ref/System.IO.Packaging.csproj b/src/System.IO.Packaging/ref/System.IO.Packaging.csproj index 3acede6833..28f429398b 100644 --- a/src/System.IO.Packaging/ref/System.IO.Packaging.csproj +++ b/src/System.IO.Packaging/ref/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" /> <ItemGroup> @@ -11,4 +11,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO.Packaging/src/Configurations.props b/src/System.IO.Packaging/src/Configurations.props index 24e575d57f..f9df021aef 100644 --- a/src/System.IO.Packaging/src/Configurations.props +++ b/src/System.IO.Packaging/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO.Packaging/tests/Configurations.props b/src/System.IO.Packaging/tests/Configurations.props index f0ebe53119..c3266e1e93 100644 --- a/src/System.IO.Packaging/tests/Configurations.props +++ b/src/System.IO.Packaging/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO.Packaging/tests/System.IO.Packaging.Tests.builds b/src/System.IO.Packaging/tests/System.IO.Packaging.Tests.builds index dc267e1f27..0e474eb421 100644 --- a/src/System.IO.Packaging/tests/System.IO.Packaging.Tests.builds +++ b/src/System.IO.Packaging/tests/System.IO.Packaging.Tests.builds @@ -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" /> <ItemGroup> 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 b513b747b2..fc5a51d038 100644 --- a/src/System.IO.Packaging/tests/System.IO.Packaging.Tests.csproj +++ b/src/System.IO.Packaging/tests/System.IO.Packaging.Tests.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,4 +13,4 @@ <SupplementalTestData Include="$(PackagesDir)System.IO.Packaging.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.IO.Pipes.AccessControl/pkg/System.IO.Pipes.AccessControl.builds b/src/System.IO.Pipes.AccessControl/pkg/System.IO.Pipes.AccessControl.builds index 83cff72b1c..2915cd9ef9 100644 --- a/src/System.IO.Pipes.AccessControl/pkg/System.IO.Pipes.AccessControl.builds +++ b/src/System.IO.Pipes.AccessControl/pkg/System.IO.Pipes.AccessControl.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.IO.Pipes.AccessControl.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.IO.Pipes.AccessControl/pkg/System.IO.Pipes.AccessControl.pkgproj b/src/System.IO.Pipes.AccessControl/pkg/System.IO.Pipes.AccessControl.pkgproj index 7c13ffc98b..b3474ef24a 100644 --- a/src/System.IO.Pipes.AccessControl/pkg/System.IO.Pipes.AccessControl.pkgproj +++ b/src/System.IO.Pipes.AccessControl/pkg/System.IO.Pipes.AccessControl.pkgproj @@ -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" /> - <ItemGroup> <ProjectReference Include="..\ref\System.IO.Pipes.AccessControl.csproj"> <SupportedFramework>net46;netcoreapp1.0</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.IO.Pipes.AccessControl.builds" /> - <NotSupportedOnTargetFramework Include="netcore50"> <PackageTargetRuntime>win</PackageTargetRuntime> </NotSupportedOnTargetFramework> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.csproj b/src/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.csproj index db47a219ee..7dbcdd0d4d 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,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" /> <ItemGroup> @@ -13,4 +13,4 @@ <ProjectReference Include="..\..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ 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 index a6c74d0e58..437e6acc34 100644 --- a/src/System.IO.Pipes.AccessControl/src/Configurations.props +++ b/src/System.IO.Pipes.AccessControl/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ netstandard1.3-Unix; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ 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 index 5d77dc616e..5f482b878b 100644 --- a/src/System.IO.Pipes.AccessControl/tests/Configurations.props +++ b/src/System.IO.Pipes.AccessControl/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.builds b/src/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.builds index 99ce057adb..304eb6d556 100644 --- a/src/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.builds +++ b/src/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.builds @@ -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" /> <ItemGroup> <Project Include="System.IO.Pipes.AccessControl.Tests.csproj"> <OSGroup>Windows_NT</OSGroup> - <TestTFMs>netcoreapp1.1;netcoreapp1.0;net46</TestTFMs> + <TestTFMs>netcoreapp;netcoreapp1.0;net46</TestTFMs> </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> diff --git a/src/System.IO.Pipes/pkg/System.IO.Pipes.builds b/src/System.IO.Pipes/pkg/System.IO.Pipes.builds index 446c807280..45bcfd664d 100644 --- a/src/System.IO.Pipes/pkg/System.IO.Pipes.builds +++ b/src/System.IO.Pipes/pkg/System.IO.Pipes.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.IO.Pipes.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.IO.Pipes/pkg/System.IO.Pipes.pkgproj b/src/System.IO.Pipes/pkg/System.IO.Pipes.pkgproj index b4cb100f46..64d73d03e3 100644 --- a/src/System.IO.Pipes/pkg/System.IO.Pipes.pkgproj +++ b/src/System.IO.Pipes/pkg/System.IO.Pipes.pkgproj @@ -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" /> - <ItemGroup> <ProjectReference Include="..\ref\System.IO.Pipes.csproj"> - <SupportedFramework>net463;netcoreapp1.1</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.IO.Pipes.builds" /> - <NotSupportedOnTargetFramework Include="netcore50"> <PackageTargetRuntime>win7</PackageTargetRuntime> </NotSupportedOnTargetFramework> </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 0cb825bf3f..678d2da542 100644 --- a/src/System.IO.Pipes/ref/System.IO.Pipes.csproj +++ b/src/System.IO.Pipes/ref/System.IO.Pipes.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -13,4 +13,4 @@ <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO.Pipes/src/Configurations.props b/src/System.IO.Pipes/src/Configurations.props index 3bb6330d9e..4701fcd772 100644 --- a/src/System.IO.Pipes/src/Configurations.props +++ b/src/System.IO.Pipes/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ net463-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO.Pipes/tests/Configurations.props b/src/System.IO.Pipes/tests/Configurations.props index 981075fcc5..fa9e1005a0 100644 --- a/src/System.IO.Pipes/tests/Configurations.props +++ b/src/System.IO.Pipes/tests/Configurations.props @@ -1,11 +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> <BuildConfigurations> netstandard1.3-Unix; netstandard1.3-Windows_NT; - netstandard1.7-Unix; - netstandard1.7-Windows_NT; + netstandard-Unix; + netstandard-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file 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 8815dc6eac..82c0730b88 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 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> @@ -28,4 +28,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.IO.Pipes/tests/System.IO.Pipes.Tests.builds b/src/System.IO.Pipes/tests/System.IO.Pipes.Tests.builds index c1b89c196d..6b5ed137ed 100644 --- a/src/System.IO.Pipes/tests/System.IO.Pipes.Tests.builds +++ b/src/System.IO.Pipes/tests/System.IO.Pipes.Tests.builds @@ -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" /> <ItemGroup> @@ -10,7 +10,7 @@ </Project> <Project Include="System.IO.Pipes.Tests.csproj"> <TargetGroup>netstandard1.3</TargetGroup> - <OSGroup>Unix</OSGroup> + <OSGroup>Unix</OSGroup> <TestTFMs>netcoreapp1.0</TestTFMs> </Project> <Project Include="System.IO.Pipes.Tests.csproj"> 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 c644622a0b..ddb4d6f088 100644 --- a/src/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj +++ b/src/System.IO.Pipes/tests/System.IO.Pipes.Tests.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> @@ -55,4 +55,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.IO.UnmanagedMemoryStream/pkg/System.IO.UnmanagedMemoryStream.builds b/src/System.IO.UnmanagedMemoryStream/pkg/System.IO.UnmanagedMemoryStream.builds index abd8532d3a..41dfab798c 100644 --- a/src/System.IO.UnmanagedMemoryStream/pkg/System.IO.UnmanagedMemoryStream.builds +++ b/src/System.IO.UnmanagedMemoryStream/pkg/System.IO.UnmanagedMemoryStream.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.IO.UnmanagedMemoryStream.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.IO.UnmanagedMemoryStream/pkg/System.IO.UnmanagedMemoryStream.pkgproj b/src/System.IO.UnmanagedMemoryStream/pkg/System.IO.UnmanagedMemoryStream.pkgproj index 37c2aa1ec8..562f3f4894 100644 --- a/src/System.IO.UnmanagedMemoryStream/pkg/System.IO.UnmanagedMemoryStream.pkgproj +++ b/src/System.IO.UnmanagedMemoryStream/pkg/System.IO.UnmanagedMemoryStream.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.IO.UnmanagedMemoryStream.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.IO.UnmanagedMemoryStream.builds" /> </ItemGroup> @@ -16,4 +16,4 @@ <InboxOnTargetFramework Include="xamarinwatchos10" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</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 2c4999b05c..57fc44748c 100644 --- a/src/System.IO.UnmanagedMemoryStream/ref/System.IO.UnmanagedMemoryStream.csproj +++ b/src/System.IO.UnmanagedMemoryStream/ref/System.IO.UnmanagedMemoryStream.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -12,4 +12,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO.UnmanagedMemoryStream/src/Configurations.props b/src/System.IO.UnmanagedMemoryStream/src/Configurations.props index 9c336c0be9..dc837f9152 100644 --- a/src/System.IO.UnmanagedMemoryStream/src/Configurations.props +++ b/src/System.IO.UnmanagedMemoryStream/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO.UnmanagedMemoryStream/tests/Configurations.props b/src/System.IO.UnmanagedMemoryStream/tests/Configurations.props index 512c938bad..b2db637110 100644 --- a/src/System.IO.UnmanagedMemoryStream/tests/Configurations.props +++ b/src/System.IO.UnmanagedMemoryStream/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> netstandard1.3; - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO.UnmanagedMemoryStream/tests/System.IO.UnmanagedMemoryStream.Tests.builds b/src/System.IO.UnmanagedMemoryStream/tests/System.IO.UnmanagedMemoryStream.Tests.builds index bc00aab3b0..2f135a37b4 100644 --- a/src/System.IO.UnmanagedMemoryStream/tests/System.IO.UnmanagedMemoryStream.Tests.builds +++ b/src/System.IO.UnmanagedMemoryStream/tests/System.IO.UnmanagedMemoryStream.Tests.builds @@ -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" /> <ItemGroup> 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 5723aa39aa..6123f0487f 100644 --- a/src/System.IO.UnmanagedMemoryStream/tests/System.IO.UnmanagedMemoryStream.Tests.csproj +++ b/src/System.IO.UnmanagedMemoryStream/tests/System.IO.UnmanagedMemoryStream.Tests.csproj @@ -7,10 +7,10 @@ </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> - <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'" > + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="Uma.TestStructs.cs" /> <Compile Include="Uma.ReadWriteStruct.cs" /> - <Compile Include="Uma.ReadWriteStructArray.cs"/> + <Compile Include="Uma.ReadWriteStructArray.cs" /> </ItemGroup> <ItemGroup> <Compile Include="ArrayHelpers.cs" /> @@ -28,4 +28,4 @@ <Compile Include="UmsSecurityTest.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO/pkg/System.IO.pkgproj b/src/System.IO/pkg/System.IO.pkgproj index ef90b8f1b0..63fc3ade91 100644 --- a/src/System.IO/pkg/System.IO.pkgproj +++ b/src/System.IO/pkg/System.IO.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.IO.csproj"> - <SupportedFramework>net461;netcoreapp1.1;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net461;netcoreapp2.0;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.IO.csproj"> <TargetGroup>net461</TargetGroup> @@ -29,4 +29,4 @@ <HarvestSuppressPaths Include="ref/net462;lib/net462" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</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 7d1e17a96c..ab0801cc86 100644 --- a/src/System.IO/ref/System.IO.csproj +++ b/src/System.IO/ref/System.IO.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" /> <ItemGroup> @@ -10,4 +10,4 @@ <ProjectReference Include="..\..\System.Text.Encoding\ref\System.Text.Encoding.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO/src/Configurations.props b/src/System.IO/src/Configurations.props index d561a2dc29..cf22127dc5 100644 --- a/src/System.IO/src/Configurations.props +++ b/src/System.IO/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</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 2888cf8182..4b80349b46 100644 --- a/src/System.IO/src/System.IO.csproj +++ b/src/System.IO/src/System.IO.csproj @@ -5,7 +5,7 @@ <AssemblyName>System.IO</AssemblyName> <ProjectGuid>{07390899-C8F6-4e83-A3A9-6867B8CB46A0}</ProjectGuid> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard;uap10.1</PackageTargetFramework> <DefineConstants Condition="'$(TargetGroup)'=='netstandard'">$(DefineConstants);netstandard17</DefineConstants> <NoWarn Condition="'$(TargetGroup)' == 'netstandard' or '$(TargetGroup)' == 'uap101aot'">CS0436</NoWarn> </PropertyGroup> diff --git a/src/System.IO/tests/Configurations.props b/src/System.IO/tests/Configurations.props index c5ec56bec2..793828d6a3 100644 --- a/src/System.IO/tests/Configurations.props +++ b/src/System.IO/tests/Configurations.props @@ -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"> <PropertyGroup> <BuildConfigurations> netstandard1.5; - netcoreapp1.1; - netstandard1.7; + netcoreapp; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO/tests/System.IO.Tests.builds b/src/System.IO/tests/System.IO.Tests.builds index 2a55ee1a18..288f1cdfc1 100644 --- a/src/System.IO/tests/System.IO.Tests.builds +++ b/src/System.IO/tests/System.IO.Tests.builds @@ -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" /> <ItemGroup> @@ -8,8 +8,8 @@ <TestTFMs>netcoreapp1.0</TestTFMs> </Project> <Project Include="System.IO.Tests.csproj"> - <TargetGroup>netcoreapp1.1</TargetGroup> - <TestTFMs>netcoreapp1.1</TestTFMs> + <TargetGroup>netcoreapp</TargetGroup> + <TestTFMs>netcoreapp</TestTFMs> </Project> <Project Include="System.IO.Tests.csproj"> <OSGroup>Windows_NT</OSGroup> diff --git a/src/System.IO/tests/System.IO.Tests.csproj b/src/System.IO/tests/System.IO.Tests.csproj index cdf89a3537..867f9a8745 100644 --- a/src/System.IO/tests/System.IO.Tests.csproj +++ b/src/System.IO/tests/System.IO.Tests.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,8 +9,8 @@ <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)'=='netstandard'" > - <Compile Include="IndentedTextWriter.cs"/> + <ItemGroup Condition="'$(TargetGroup)'=='netstandard'"> + <Compile Include="IndentedTextWriter.cs" /> <Compile Include="BinaryReader\BinaryReaderTests.cs" /> <Compile Include="MemoryStream\MemoryStream.GetBufferTests.cs" /> <Compile Include="Stream\Stream.netstandard17.cs" /> @@ -59,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.Json/pkg/System.Json.builds b/src/System.Json/pkg/System.Json.builds index db5f4bcceb..8df6176170 100644 --- a/src/System.Json/pkg/System.Json.builds +++ b/src/System.Json/pkg/System.Json.builds @@ -1,8 +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" /> <ItemGroup> <Project Include="System.Json.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Json/pkg/System.Json.pkgproj b/src/System.Json/pkg/System.Json.pkgproj index d90ac9e0e0..1ad70993f5 100644 --- a/src/System.Json/pkg/System.Json.pkgproj +++ b/src/System.Json/pkg/System.Json.pkgproj @@ -5,7 +5,6 @@ <ProjectReference Include="..\src\System.Json.builds"> <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> - <!-- System.Json is a classic reference assembly on Xamarin platforms --> <InboxOnTargetFramework Include="monoandroid10"> <AsFrameworkReference>true</AsFrameworkReference> @@ -27,4 +26,4 @@ </InboxOnTargetFramework> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Json/src/Configurations.props b/src/System.Json/src/Configurations.props index 2ec0365c0d..66fc3409d3 100644 --- a/src/System.Json/src/Configurations.props +++ b/src/System.Json/src/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.0; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Json/tests/Configurations.props b/src/System.Json/tests/Configurations.props index ec110beba6..fa32899de2 100644 --- a/src/System.Json/tests/Configurations.props +++ b/src/System.Json/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netcoreapp1.0; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Json/tests/System.Json.Tests.builds b/src/System.Json/tests/System.Json.Tests.builds index 023f49b19d..ade21f2f77 100644 --- a/src/System.Json/tests/System.Json.Tests.builds +++ b/src/System.Json/tests/System.Json.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Linq.Expressions/pkg/System.Linq.Expressions.builds b/src/System.Linq.Expressions/pkg/System.Linq.Expressions.builds index 1e48cc34fd..b2b6789f03 100644 --- a/src/System.Linq.Expressions/pkg/System.Linq.Expressions.builds +++ b/src/System.Linq.Expressions/pkg/System.Linq.Expressions.builds @@ -1,8 +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" /> <ItemGroup> - <Project Include="System.Linq.Expressions.pkgproj"/> + <Project Include="System.Linq.Expressions.pkgproj" /> </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.Expressions/pkg/System.Linq.Expressions.pkgproj b/src/System.Linq.Expressions/pkg/System.Linq.Expressions.pkgproj index 5db552454f..33abbf2038 100644 --- a/src/System.Linq.Expressions/pkg/System.Linq.Expressions.pkgproj +++ b/src/System.Linq.Expressions/pkg/System.Linq.Expressions.pkgproj @@ -6,7 +6,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.Linq.Expressions.csproj"> - <SupportedFramework>net461;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Linq.Expressions.builds" /> <InboxOnTargetFramework Include="MonoAndroid10" /> diff --git a/src/System.Linq.Expressions/ref/4.1.0/System.Linq.Expressions.depproj b/src/System.Linq.Expressions/ref/4.1.0/System.Linq.Expressions.depproj index a26dc33038..eb9b218fc4 100644 --- a/src/System.Linq.Expressions/ref/4.1.0/System.Linq.Expressions.depproj +++ b/src/System.Linq.Expressions/ref/4.1.0/System.Linq.Expressions.depproj @@ -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> diff --git a/src/System.Linq.Expressions/ref/System.Linq.Expressions.csproj b/src/System.Linq.Expressions/ref/System.Linq.Expressions.csproj index d74a38084e..cc68e19fc2 100644 --- a/src/System.Linq.Expressions/ref/System.Linq.Expressions.csproj +++ b/src/System.Linq.Expressions/ref/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" /> <ItemGroup> @@ -9,4 +9,4 @@ <ProjectReference Include="..\..\System.ObjectModel\ref\System.ObjectModel.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Linq.Expressions/src/Configurations.props b/src/System.Linq.Expressions/src/Configurations.props index 53b62c64fe..bcfec4bbde 100644 --- a/src/System.Linq.Expressions/src/Configurations.props +++ b/src/System.Linq.Expressions/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Linq.Expressions/tests/Configurations.props b/src/System.Linq.Expressions/tests/Configurations.props index 98f53209d4..c398e42e89 100644 --- a/src/System.Linq.Expressions/tests/Configurations.props +++ b/src/System.Linq.Expressions/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.builds b/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.builds index 6a3893eba6..09ad778291 100644 --- a/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.builds +++ b/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.builds @@ -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" /> <ItemGroup> 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 4501155e16..b515719c5c 100644 --- a/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj +++ b/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj @@ -18,12 +18,10 @@ <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" /> diff --git a/src/System.Linq.Parallel/pkg/System.Linq.Parallel.builds b/src/System.Linq.Parallel/pkg/System.Linq.Parallel.builds index 72c77ebbbd..a0b13479c4 100644 --- a/src/System.Linq.Parallel/pkg/System.Linq.Parallel.builds +++ b/src/System.Linq.Parallel/pkg/System.Linq.Parallel.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Linq.Parallel.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Linq.Parallel/pkg/System.Linq.Parallel.pkgproj b/src/System.Linq.Parallel/pkg/System.Linq.Parallel.pkgproj index 873276af64..c2a0b12e4c 100644 --- a/src/System.Linq.Parallel/pkg/System.Linq.Parallel.pkgproj +++ b/src/System.Linq.Parallel/pkg/System.Linq.Parallel.pkgproj @@ -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" /> <ItemGroup> diff --git a/src/System.Linq.Parallel/ref/System.Linq.Parallel.csproj b/src/System.Linq.Parallel/ref/System.Linq.Parallel.csproj index 145f350afd..66631e5a03 100644 --- a/src/System.Linq.Parallel/ref/System.Linq.Parallel.csproj +++ b/src/System.Linq.Parallel/ref/System.Linq.Parallel.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -12,4 +12,4 @@ <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Linq.Parallel/src/Configurations.props b/src/System.Linq.Parallel/src/Configurations.props index f0ebe53119..c3266e1e93 100644 --- a/src/System.Linq.Parallel/src/Configurations.props +++ b/src/System.Linq.Parallel/src/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Linq.Parallel/tests/Configurations.props b/src/System.Linq.Parallel/tests/Configurations.props index 3007f723e5..a5a130bbdb 100644 --- a/src/System.Linq.Parallel/tests/Configurations.props +++ b/src/System.Linq.Parallel/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.6; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.builds b/src/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.builds index f6a25ef231..ecf9236d38 100644 --- a/src/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.builds +++ b/src/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.builds @@ -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" /> <ItemGroup> 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 9ee1796304..e2170c334e 100644 --- a/src/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.csproj +++ b/src/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.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> diff --git a/src/System.Linq.Queryable/pkg/System.Linq.Queryable.builds b/src/System.Linq.Queryable/pkg/System.Linq.Queryable.builds index 54673d9d46..006639bf93 100644 --- a/src/System.Linq.Queryable/pkg/System.Linq.Queryable.builds +++ b/src/System.Linq.Queryable/pkg/System.Linq.Queryable.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Linq.Queryable.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Linq.Queryable/pkg/System.Linq.Queryable.pkgproj b/src/System.Linq.Queryable/pkg/System.Linq.Queryable.pkgproj index 8f46b65481..fe36984b9b 100644 --- a/src/System.Linq.Queryable/pkg/System.Linq.Queryable.pkgproj +++ b/src/System.Linq.Queryable/pkg/System.Linq.Queryable.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Linq.Queryable.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Linq.Queryable.builds" /> <InboxOnTargetFramework Include="monoandroid10" /> diff --git a/src/System.Linq.Queryable/ref/System.Linq.Queryable.csproj b/src/System.Linq.Queryable/ref/System.Linq.Queryable.csproj index 5f458637c2..7873ee6d0d 100644 --- a/src/System.Linq.Queryable/ref/System.Linq.Queryable.csproj +++ b/src/System.Linq.Queryable/ref/System.Linq.Queryable.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -10,4 +10,4 @@ <ProjectReference Include="..\..\System.Linq\ref\System.Linq.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Linq.Queryable/src/Configurations.props b/src/System.Linq.Queryable/src/Configurations.props index fc9ef9822c..c398e42e89 100644 --- a/src/System.Linq.Queryable/src/Configurations.props +++ b/src/System.Linq.Queryable/src/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Linq.Queryable/tests/Configurations.props b/src/System.Linq.Queryable/tests/Configurations.props index 98f53209d4..c398e42e89 100644 --- a/src/System.Linq.Queryable/tests/Configurations.props +++ b/src/System.Linq.Queryable/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.builds b/src/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.builds index 33e810ff76..89e1e125d6 100644 --- a/src/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.builds +++ b/src/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.builds @@ -1,11 +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" /> <ItemGroup> <Project Include="System.Linq.Queryable.Tests.csproj" /> <Project Include="System.Linq.Queryable.Tests.csproj"> <OSGroup>Windows_NT</OSGroup> - <TestTFMs>net463</TestTFMs> + <TestTFMs>net463</TestTFMs> </Project> <Project Include="System.Linq.Queryable.Tests.csproj"> <OSGroup>Windows_NT</OSGroup> 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 77b11bb873..17b3977ad6 100644 --- a/src/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.csproj +++ b/src/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.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> diff --git a/src/System.Linq/pkg/System.Linq.builds b/src/System.Linq/pkg/System.Linq.builds index ba7db2adf6..ef561797bb 100644 --- a/src/System.Linq/pkg/System.Linq.builds +++ b/src/System.Linq/pkg/System.Linq.builds @@ -5,4 +5,4 @@ <Project Include="System.Linq.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Linq/pkg/System.Linq.pkgproj b/src/System.Linq/pkg/System.Linq.pkgproj index eb6fcfbcc3..69fcdf81e2 100644 --- a/src/System.Linq/pkg/System.Linq.pkgproj +++ b/src/System.Linq/pkg/System.Linq.pkgproj @@ -25,4 +25,4 @@ <HarvestSuppressPaths Include="ref/net463;lib/net463" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Linq/ref/Configurations.props b/src/System.Linq/ref/Configurations.props index ea9ea79f78..8b803e0772 100644 --- a/src/System.Linq/ref/Configurations.props +++ b/src/System.Linq/ref/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Linq/ref/System.Linq.builds b/src/System.Linq/ref/System.Linq.builds index 9d0b645197..bc894e5509 100644 --- a/src/System.Linq/ref/System.Linq.builds +++ b/src/System.Linq/ref/System.Linq.builds @@ -4,8 +4,8 @@ <ItemGroup> <Project Include="System.Linq.csproj" /> <Project Include="System.Linq.csproj"> - <TargetGroup>netcoreapp1.1</TargetGroup> + <TargetGroup>netcoreapp</TargetGroup> </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Linq/ref/System.Linq.csproj b/src/System.Linq/ref/System.Linq.csproj index 78f9a07458..38ef826585 100644 --- a/src/System.Linq/ref/System.Linq.csproj +++ b/src/System.Linq/ref/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> @@ -12,4 +12,4 @@ <ProjectReference Include="..\..\System.Collections\ref\System.Collections.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Linq/src/Configurations.props b/src/System.Linq/src/Configurations.props index a502feeae3..95f6174dda 100644 --- a/src/System.Linq/src/Configurations.props +++ b/src/System.Linq/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard1.6; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Linq/tests/Configurations.props b/src/System.Linq/tests/Configurations.props index 094b5230ab..236495ef50 100644 --- a/src/System.Linq/tests/Configurations.props +++ b/src/System.Linq/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> - netcoreapp1.1; + netcoreapp; netstandard1.6; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file 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 f8d2f9c73d..f1ea0c1fad 100644 --- a/src/System.Linq/tests/Performance/System.Linq.Performance.Tests.csproj +++ b/src/System.Linq/tests/Performance/System.Linq.Performance.Tests.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> diff --git a/src/System.Linq/tests/System.Linq.Tests.builds b/src/System.Linq/tests/System.Linq.Tests.builds index dfdebd2eb9..e3f5aa4aaf 100644 --- a/src/System.Linq/tests/System.Linq.Tests.builds +++ b/src/System.Linq/tests/System.Linq.Tests.builds @@ -1,11 +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" /> <ItemGroup> <Project Include="System.Linq.Tests.csproj" /> <Project Include="System.Linq.Tests.csproj"> - <TargetGroup>netcoreapp1.1</TargetGroup> - <TestTFMs>netcoreapp1.1</TestTFMs> + <TargetGroup>netcoreapp</TargetGroup> + <TestTFMs>netcoreapp</TestTFMs> </Project> <Project Include="System.Linq.Tests.csproj"> <OSGroup>Windows_NT</OSGroup> @@ -14,4 +14,4 @@ <Project Include="Performance\System.Linq.Performance.Tests.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</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 d96c2d68a5..ee54f5715c 100644 --- a/src/System.Linq/tests/System.Linq.Tests.csproj +++ b/src/System.Linq/tests/System.Linq.Tests.csproj @@ -76,4 +76,4 @@ <Compile Include="ToHashSetTests.netcoreapp1.1.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Memory/pkg/System.Memory.builds b/src/System.Memory/pkg/System.Memory.builds index ad45fd5075..a7fa40ce3a 100644 --- a/src/System.Memory/pkg/System.Memory.builds +++ b/src/System.Memory/pkg/System.Memory.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Memory.pkgproj" Condition="'$(OS)'=='Windows_NT'" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Memory/pkg/System.Memory.pkgproj b/src/System.Memory/pkg/System.Memory.pkgproj index b240b0eb96..7fe6548444 100644 --- a/src/System.Memory/pkg/System.Memory.pkgproj +++ b/src/System.Memory/pkg/System.Memory.pkgproj @@ -9,4 +9,4 @@ <ProjectReference Include="..\src\System.Memory.builds" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Memory/ref/System.Memory.builds b/src/System.Memory/ref/System.Memory.builds index 87b2f7a053..0c6f508814 100644 --- a/src/System.Memory/ref/System.Memory.builds +++ b/src/System.Memory/ref/System.Memory.builds @@ -1,8 +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" /> <ItemGroup> <Project Include="System.Memory.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</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 d29e499520..609b009e84 100644 --- a/src/System.Memory/ref/System.Memory.csproj +++ b/src/System.Memory/ref/System.Memory.csproj @@ -1,10 +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> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <CLSCompliant>false</CLSCompliant> - <AssemblyVersion>4.0.0.0</AssemblyVersion> + <AssemblyVersion>4.0.0.0</AssemblyVersion> <ProjectGuid>{0EF9D369-7097-44F9-BEBA-C32AF5EB4756}</ProjectGuid> </PropertyGroup> <ItemGroup> @@ -14,4 +14,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Memory/src/Configurations.props b/src/System.Memory/src/Configurations.props index 584c4d47da..69dd81db58 100644 --- a/src/System.Memory/src/Configurations.props +++ b/src/System.Memory/src/Configurations.props @@ -1,9 +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> <BuildConfigurations> netstandard1.0-Windows_NT; - netcoreapp1.1-Windows_NT; + netcoreapp-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Memory/tests/Configurations.props b/src/System.Memory/tests/Configurations.props index 2200b4369a..1d8e980ad7 100644 --- a/src/System.Memory/tests/Configurations.props +++ b/src/System.Memory/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> - netcoreapp1.1-Windows_NT; + netcoreapp-Windows_NT; netcoreapp1.0-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Memory/tests/System.Memory.Tests.builds b/src/System.Memory/tests/System.Memory.Tests.builds index c861eb834d..a6d35a92c1 100644 --- a/src/System.Memory/tests/System.Memory.Tests.builds +++ b/src/System.Memory/tests/System.Memory.Tests.builds @@ -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" /> <ItemGroup> @@ -15,4 +15,4 @@ --> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Http.Rtc/pkg/System.Net.Http.Rtc.builds b/src/System.Net.Http.Rtc/pkg/System.Net.Http.Rtc.builds index 801238a9d4..c7462f2efe 100644 --- a/src/System.Net.Http.Rtc/pkg/System.Net.Http.Rtc.builds +++ b/src/System.Net.Http.Rtc/pkg/System.Net.Http.Rtc.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Net.Http.Rtc.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Net.Http.Rtc/pkg/System.Net.Http.Rtc.pkgproj b/src/System.Net.Http.Rtc/pkg/System.Net.Http.Rtc.pkgproj index 17c4dbc3d1..839bea6026 100644 --- a/src/System.Net.Http.Rtc/pkg/System.Net.Http.Rtc.pkgproj +++ b/src/System.Net.Http.Rtc/pkg/System.Net.Http.Rtc.pkgproj @@ -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" /> - <ItemGroup> <!-- only bring in the ref-asm on netcore --> <ProjectReference Include="..\ref\System.Net.Http.Rtc.csproj"> <SupportedFramework>netcore45</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Net.Http.Rtc.builds" /> - - <InboxOnTargetFramework Include="win8"/> + <InboxOnTargetFramework Include="win8" /> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </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 99ff7e09b7..a89c7532fe 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,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" /> <ItemGroup> @@ -10,4 +10,4 @@ <ProjectReference Include="..\..\System.Net.Http\ref\System.Net.Http.csproj" /> </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/src/System.Net.Http.Rtc.builds b/src/System.Net.Http.Rtc/src/System.Net.Http.Rtc.builds index cf2567f406..ffa24bff24 100644 --- a/src/System.Net.Http.Rtc/src/System.Net.Http.Rtc.builds +++ b/src/System.Net.Http.Rtc/src/System.Net.Http.Rtc.builds @@ -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" /> <ItemGroup> @@ -8,5 +8,4 @@ </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Net.Http.WinHttpHandler/pkg/System.Net.Http.WinHttpHandler.builds b/src/System.Net.Http.WinHttpHandler/pkg/System.Net.Http.WinHttpHandler.builds index 955cc7c7f5..77374ed1f6 100644 --- a/src/System.Net.Http.WinHttpHandler/pkg/System.Net.Http.WinHttpHandler.builds +++ b/src/System.Net.Http.WinHttpHandler/pkg/System.Net.Http.WinHttpHandler.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Net.Http.WinHttpHandler.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Net.Http.WinHttpHandler/pkg/System.Net.Http.WinHttpHandler.pkgproj b/src/System.Net.Http.WinHttpHandler/pkg/System.Net.Http.WinHttpHandler.pkgproj index 9b17326c19..3a5eae106c 100644 --- a/src/System.Net.Http.WinHttpHandler/pkg/System.Net.Http.WinHttpHandler.pkgproj +++ b/src/System.Net.Http.WinHttpHandler/pkg/System.Net.Http.WinHttpHandler.pkgproj @@ -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" /> - <ItemGroup> <ProjectReference Include="..\ref\System.Net.Http.WinHttpHandler.csproj"> <SupportedFramework>net46;netcoreapp1.0</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Net.Http.WinHttpHandler.builds" /> - <NotSupportedOnTargetFramework Include="netcore50"> <PackageTargetRuntime>win</PackageTargetRuntime> </NotSupportedOnTargetFramework> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ 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 5f1380ee9b..47f3a98145 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,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" /> <ItemGroup> @@ -12,4 +12,4 @@ <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </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/src/Configurations.props b/src/System.Net.Http.WinHttpHandler/src/Configurations.props index 06bd657a4b..757b994a00 100644 --- a/src/System.Net.Http.WinHttpHandler/src/Configurations.props +++ b/src/System.Net.Http.WinHttpHandler/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ net46-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ 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 index 5d77dc616e..5f482b878b 100644 --- a/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/Configurations.props +++ b/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.builds b/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.builds index 40cb139561..7118537952 100644 --- a/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.builds +++ b/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.builds @@ -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" /> <ItemGroup> <Project Include="System.Net.Http.WinHttpHandler.Functional.Tests.csproj"> <OSGroup>Windows_NT</OSGroup> - <TestTFMs>netcoreapp1.1;netcoreapp1.0;net46</TestTFMs> + <TestTFMs>netcoreapp;netcoreapp1.0;net46</TestTFMs> </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> diff --git a/src/System.Net.Http.WinHttpHandler/tests/UnitTests/Configurations.props b/src/System.Net.Http.WinHttpHandler/tests/UnitTests/Configurations.props index 5d77dc616e..5f482b878b 100644 --- a/src/System.Net.Http.WinHttpHandler/tests/UnitTests/Configurations.props +++ b/src/System.Net.Http.WinHttpHandler/tests/UnitTests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.builds b/src/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.builds index f9b3e01543..b0b935156e 100644 --- a/src/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.builds +++ b/src/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.builds @@ -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" /> <ItemGroup> <Project Include="System.Net.Http.WinHttpHandler.Unit.Tests.csproj"> <OSGroup>Windows_NT</OSGroup> - <TestTFMs>netcoreapp1.1;netcoreapp1.0;net46</TestTFMs> + <TestTFMs>netcoreapp;netcoreapp1.0;net46</TestTFMs> </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> diff --git a/src/System.Net.Http/pkg/System.Net.Http.builds b/src/System.Net.Http/pkg/System.Net.Http.builds index 3a2c209642..91428fe6fe 100644 --- a/src/System.Net.Http/pkg/System.Net.Http.builds +++ b/src/System.Net.Http/pkg/System.Net.Http.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Net.Http.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Net.Http/pkg/System.Net.Http.pkgproj b/src/System.Net.Http/pkg/System.Net.Http.pkgproj index e05dae3f63..03553dc198 100644 --- a/src/System.Net.Http/pkg/System.Net.Http.pkgproj +++ b/src/System.Net.Http/pkg/System.Net.Http.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.Net.Http.csproj"> - <SupportedFramework>netcoreapp1.1;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>netcoreapp2.0;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\ref\System.Net.Http.csproj"> <TargetGroup>net46</TargetGroup> @@ -43,4 +43,4 @@ <!-- TODO: Bring in Microsoft.Net.Http on older platforms --> </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/ref/System.Net.Http.builds b/src/System.Net.Http/ref/System.Net.Http.builds index 5be15f13ef..f48b916c54 100644 --- a/src/System.Net.Http/ref/System.Net.Http.builds +++ b/src/System.Net.Http/ref/System.Net.Http.builds @@ -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" /> <ItemGroup> @@ -10,5 +10,4 @@ </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</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 84ad0e1d3b..bc2429dee6 100644 --- a/src/System.Net.Http/ref/System.Net.Http.csproj +++ b/src/System.Net.Http/ref/System.Net.Http.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -16,4 +16,4 @@ <TargetingPackReference Include="System" /> </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/src/Configurations.props b/src/System.Net.Http/src/Configurations.props index 58bd23111d..be9ff31447 100644 --- a/src/System.Net.Http/src/Configurations.props +++ b/src/System.Net.Http/src/Configurations.props @@ -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> <BuildConfigurations> @@ -8,4 +8,4 @@ netstandard-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Http/tests/FunctionalTests/Configurations.props b/src/System.Net.Http/tests/FunctionalTests/Configurations.props index 415c6d276e..9348ce4cb3 100644 --- a/src/System.Net.Http/tests/FunctionalTests/Configurations.props +++ b/src/System.Net.Http/tests/FunctionalTests/Configurations.props @@ -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"> <PropertyGroup> <BuildConfigurations> - netstandard1.7-Windows_NT; - netstandard1.7-Unix; + netstandard-Windows_NT; + netstandard-Unix; netstandard1.3-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Http/tests/System.Net.Http.Tests.builds b/src/System.Net.Http/tests/System.Net.Http.Tests.builds index bac2e654c6..f6ffe04f50 100644 --- a/src/System.Net.Http/tests/System.Net.Http.Tests.builds +++ b/src/System.Net.Http/tests/System.Net.Http.Tests.builds @@ -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" /> <ItemGroup> @@ -7,7 +7,7 @@ </Project> <Project Include="FunctionalTests\System.Net.Http.Functional.Tests.csproj"> <OSGroup>Windows_NT</OSGroup> - <TestTFMs>netcoreapp1.1;net463</TestTFMs> + <TestTFMs>netcoreapp;net463</TestTFMs> </Project> <Project Include="FunctionalTests\System.Net.Http.Functional.Tests.csproj"> <TargetGroup>netstandard1.3</TargetGroup> @@ -19,7 +19,7 @@ </Project> <Project Include="UnitTests\System.Net.Http.Unit.Tests.csproj"> <OSGroup>Windows_NT</OSGroup> - <TestTFMs>netcoreapp1.1;net463</TestTFMs> + <TestTFMs>netcoreapp;net463</TestTFMs> </Project> <Project Include="UnitTests\System.Net.Http.Unit.Tests.csproj"> <TargetGroup>netstandard1.3</TargetGroup> diff --git a/src/System.Net.Http/tests/UnitTests/Configurations.props b/src/System.Net.Http/tests/UnitTests/Configurations.props index 512c938bad..b2db637110 100644 --- a/src/System.Net.Http/tests/UnitTests/Configurations.props +++ b/src/System.Net.Http/tests/UnitTests/Configurations.props @@ -1,9 +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> <BuildConfigurations> netstandard1.3; - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file 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 18e0c73ec5..bdb8fb4242 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 @@ -343,4 +343,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.HttpListener/pkg/System.Net.HttpListener.builds b/src/System.Net.HttpListener/pkg/System.Net.HttpListener.builds index 7a024271ac..ab4c949ea7 100644 --- a/src/System.Net.HttpListener/pkg/System.Net.HttpListener.builds +++ b/src/System.Net.HttpListener/pkg/System.Net.HttpListener.builds @@ -1,8 +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" /> <ItemGroup> - <Project Include="System.Net.HttpListener.pkgproj"/> + <Project Include="System.Net.HttpListener.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.HttpListener/pkg/System.Net.HttpListener.pkgproj b/src/System.Net.HttpListener/pkg/System.Net.HttpListener.pkgproj index 800c1149b0..cee3c77874 100644 --- a/src/System.Net.HttpListener/pkg/System.Net.HttpListener.pkgproj +++ b/src/System.Net.HttpListener/pkg/System.Net.HttpListener.pkgproj @@ -1,13 +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" /> - <ItemGroup> <ProjectReference Include="..\ref\System.Net.HttpListener.csproj"> - <SupportedFramework>net461;netcoreapp1.1</SupportedFramework> + <SupportedFramework>net461;netcoreapp2.0</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Net.HttpListener.builds" /> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.HttpListener/ref/System.Net.HttpListener.csproj b/src/System.Net.HttpListener/ref/System.Net.HttpListener.csproj index 57cfffd632..57038921ed 100644 --- a/src/System.Net.HttpListener/ref/System.Net.HttpListener.csproj +++ b/src/System.Net.HttpListener/ref/System.Net.HttpListener.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -19,4 +19,4 @@ <ProjectReference Include="..\..\System.Security.Principal\ref\System.Security.Principal.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.HttpListener/src/Configurations.props b/src/System.Net.HttpListener/src/Configurations.props index 8e79110983..a85f5eb18a 100644 --- a/src/System.Net.HttpListener/src/Configurations.props +++ b/src/System.Net.HttpListener/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ net461-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.HttpListener/tests/Configurations.props b/src/System.Net.HttpListener/tests/Configurations.props index 98f53209d4..c398e42e89 100644 --- a/src/System.Net.HttpListener/tests/Configurations.props +++ b/src/System.Net.HttpListener/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.builds b/src/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.builds index b21094c637..4900675f94 100644 --- a/src/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.builds +++ b/src/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.builds @@ -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" /> <ItemGroup> 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 ed1ccb05ee..c62c89e1a9 100644 --- a/src/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj +++ b/src/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj @@ -11,7 +11,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Release|AnyCPU'" /> <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/pkg/System.Net.Mail.builds b/src/System.Net.Mail/pkg/System.Net.Mail.builds index a4d4bf4a52..e61ce9e6e6 100644 --- a/src/System.Net.Mail/pkg/System.Net.Mail.builds +++ b/src/System.Net.Mail/pkg/System.Net.Mail.builds @@ -1,8 +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" /> <ItemGroup> - <Project Include="System.Net.Mail.pkgproj"/> + <Project Include="System.Net.Mail.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Mail/pkg/System.Net.Mail.pkgproj b/src/System.Net.Mail/pkg/System.Net.Mail.pkgproj index 4318d41e9e..e11fcdf4d3 100644 --- a/src/System.Net.Mail/pkg/System.Net.Mail.pkgproj +++ b/src/System.Net.Mail/pkg/System.Net.Mail.pkgproj @@ -1,14 +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" /> - <ItemGroup> <ProjectReference Include="..\ref\System.Net.Mail.csproj"> - <SupportedFramework>net461;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Net.Mail.builds" /> <InboxOnTargetFramework Include="$(AllXamarinFrameworks)" /> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Mail/ref/System.Net.Mail.csproj b/src/System.Net.Mail/ref/System.Net.Mail.csproj index 986b2a9803..b603a7e2a9 100644 --- a/src/System.Net.Mail/ref/System.Net.Mail.csproj +++ b/src/System.Net.Mail/ref/System.Net.Mail.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" /> <ItemGroup> @@ -17,4 +17,4 @@ <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Mail/src/Configurations.props b/src/System.Net.Mail/src/Configurations.props index 4caac7c12c..4465305911 100644 --- a/src/System.Net.Mail/src/Configurations.props +++ b/src/System.Net.Mail/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ net461-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Mail/tests/Functional/Configurations.props b/src/System.Net.Mail/tests/Functional/Configurations.props index 98f53209d4..c398e42e89 100644 --- a/src/System.Net.Mail/tests/Functional/Configurations.props +++ b/src/System.Net.Mail/tests/Functional/Configurations.props @@ -1,8 +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> <BuildConfigurations> - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.builds b/src/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.builds index 3a0f25db18..a585da169e 100644 --- a/src/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.builds +++ b/src/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Net.Mail/tests/Unit/Configurations.props b/src/System.Net.Mail/tests/Unit/Configurations.props index 98f53209d4..c398e42e89 100644 --- a/src/System.Net.Mail/tests/Unit/Configurations.props +++ b/src/System.Net.Mail/tests/Unit/Configurations.props @@ -1,8 +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> <BuildConfigurations> - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.builds b/src/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.builds index 08f106266c..d3c25cfb57 100644 --- a/src/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.builds +++ b/src/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Net.NameResolution/pkg/System.Net.NameResolution.builds b/src/System.Net.NameResolution/pkg/System.Net.NameResolution.builds index dc841629f9..4e52809e1a 100644 --- a/src/System.Net.NameResolution/pkg/System.Net.NameResolution.builds +++ b/src/System.Net.NameResolution/pkg/System.Net.NameResolution.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Net.NameResolution.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Net.NameResolution/pkg/System.Net.NameResolution.pkgproj b/src/System.Net.NameResolution/pkg/System.Net.NameResolution.pkgproj index 75a0cd5ccb..23588424a4 100644 --- a/src/System.Net.NameResolution/pkg/System.Net.NameResolution.pkgproj +++ b/src/System.Net.NameResolution/pkg/System.Net.NameResolution.pkgproj @@ -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" /> <ItemGroup> diff --git a/src/System.Net.NameResolution/ref/System.Net.NameResolution.csproj b/src/System.Net.NameResolution/ref/System.Net.NameResolution.csproj index 19441db2e4..a9f52b7fc4 100644 --- a/src/System.Net.NameResolution/ref/System.Net.NameResolution.csproj +++ b/src/System.Net.NameResolution/ref/System.Net.NameResolution.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -10,4 +10,4 @@ <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.NameResolution/src/Configurations.props b/src/System.Net.NameResolution/src/Configurations.props index 17d5314bad..6c325c70f5 100644 --- a/src/System.Net.NameResolution/src/Configurations.props +++ b/src/System.Net.NameResolution/src/Configurations.props @@ -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> <BuildConfigurations> @@ -8,4 +8,4 @@ net46-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ 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 index a9c55e67cd..8b21be4cd6 100644 --- a/src/System.Net.NameResolution/tests/FunctionalTests/Configurations.props +++ b/src/System.Net.NameResolution/tests/FunctionalTests/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard1.3-Unix; </BuildConfigurations> </PropertyGroup> -</Project> +</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 index cc0c0fe061..a20c412f56 100644 --- a/src/System.Net.NameResolution/tests/PalTests/Configurations.props +++ b/src/System.Net.NameResolution/tests/PalTests/Configurations.props @@ -1,11 +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> <BuildConfigurations> netstandard1.3-Windows_NT; netstandard1.3-Unix; - netstandard1.7-Windows_NT; - netstandard1.7-Unix; + netstandard-Windows_NT; + netstandard-Unix; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file 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 4d3479654c..9f82f79a78 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 @@ -169,4 +169,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.NameResolution/tests/System.Net.NameResolution.Tests.builds b/src/System.Net.NameResolution/tests/System.Net.NameResolution.Tests.builds index 8f90b926f6..9351ab89cd 100644 --- a/src/System.Net.NameResolution/tests/System.Net.NameResolution.Tests.builds +++ b/src/System.Net.NameResolution/tests/System.Net.NameResolution.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Net.NameResolution/tests/UnitTests/Configurations.props b/src/System.Net.NameResolution/tests/UnitTests/Configurations.props index a9c55e67cd..8b21be4cd6 100644 --- a/src/System.Net.NameResolution/tests/UnitTests/Configurations.props +++ b/src/System.Net.NameResolution/tests/UnitTests/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard1.3-Unix; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.NetworkInformation/pkg/System.Net.NetworkInformation.builds b/src/System.Net.NetworkInformation/pkg/System.Net.NetworkInformation.builds index da8dc3ed4f..c7ebb02d51 100644 --- a/src/System.Net.NetworkInformation/pkg/System.Net.NetworkInformation.builds +++ b/src/System.Net.NetworkInformation/pkg/System.Net.NetworkInformation.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Net.NetworkInformation.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Net.NetworkInformation/pkg/System.Net.NetworkInformation.pkgproj b/src/System.Net.NetworkInformation/pkg/System.Net.NetworkInformation.pkgproj index e9cf2ce03d..ea006483db 100644 --- a/src/System.Net.NetworkInformation/pkg/System.Net.NetworkInformation.pkgproj +++ b/src/System.Net.NetworkInformation/pkg/System.Net.NetworkInformation.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.Net.NetworkInformation.csproj"> - <SupportedFramework>net463;uap10.1;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;uap10.1;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Net.NetworkInformation.builds" /> </ItemGroup> diff --git a/src/System.Net.NetworkInformation/ref/System.Net.NetworkInformation.csproj b/src/System.Net.NetworkInformation/ref/System.Net.NetworkInformation.csproj index d35900e37a..2e6813b774 100644 --- a/src/System.Net.NetworkInformation/ref/System.Net.NetworkInformation.csproj +++ b/src/System.Net.NetworkInformation/ref/System.Net.NetworkInformation.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -11,4 +11,4 @@ <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </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/src/Configurations.props b/src/System.Net.NetworkInformation/src/Configurations.props index f9c85b7dbb..6f67686d49 100644 --- a/src/System.Net.NetworkInformation/src/Configurations.props +++ b/src/System.Net.NetworkInformation/src/Configurations.props @@ -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> <BuildConfigurations> @@ -9,4 +9,4 @@ net463-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.NetworkInformation/tests/FunctionalTests/Configurations.props b/src/System.Net.NetworkInformation/tests/FunctionalTests/Configurations.props index 512c938bad..b2db637110 100644 --- a/src/System.Net.NetworkInformation/tests/FunctionalTests/Configurations.props +++ b/src/System.Net.NetworkInformation/tests/FunctionalTests/Configurations.props @@ -1,9 +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> <BuildConfigurations> netstandard1.3; - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file 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 b1d216442f..46a0c5152c 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 @@ -141,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/System.Net.NetworkInformation.Tests.builds b/src/System.Net.NetworkInformation/tests/System.Net.NetworkInformation.Tests.builds index c9b3290636..f3411e09bb 100644 --- a/src/System.Net.NetworkInformation/tests/System.Net.NetworkInformation.Tests.builds +++ b/src/System.Net.NetworkInformation/tests/System.Net.NetworkInformation.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Net.NetworkInformation/tests/UnitTests/Configurations.props b/src/System.Net.NetworkInformation/tests/UnitTests/Configurations.props index 512c938bad..b2db637110 100644 --- a/src/System.Net.NetworkInformation/tests/UnitTests/Configurations.props +++ b/src/System.Net.NetworkInformation/tests/UnitTests/Configurations.props @@ -1,9 +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> <BuildConfigurations> netstandard1.3; - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Ping/pkg/System.Net.Ping.builds b/src/System.Net.Ping/pkg/System.Net.Ping.builds index 29d6c742f8..0decc01bec 100644 --- a/src/System.Net.Ping/pkg/System.Net.Ping.builds +++ b/src/System.Net.Ping/pkg/System.Net.Ping.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Net.Ping.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Net.Ping/pkg/System.Net.Ping.pkgproj b/src/System.Net.Ping/pkg/System.Net.Ping.pkgproj index 546791ece2..6556bb06b0 100644 --- a/src/System.Net.Ping/pkg/System.Net.Ping.pkgproj +++ b/src/System.Net.Ping/pkg/System.Net.Ping.pkgproj @@ -1,14 +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" /> - <ItemGroup> <ProjectReference Include="..\ref\System.Net.Ping.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Net.Ping.builds" /> </ItemGroup> - <ItemGroup> <InboxOnTargetFramework Include="MonoAndroid10" /> <InboxOnTargetFramework Include="MonoTouch10" /> @@ -16,11 +14,9 @@ <InboxOnTargetFramework Include="xamarinmac20" /> <InboxOnTargetFramework Include="xamarintvos10" /> <InboxOnTargetFramework Include="xamarinwatchos10" /> - <NotSupportedOnTargetFramework Include="netcore50"> <PackageTargetRuntime>win7</PackageTargetRuntime> </NotSupportedOnTargetFramework> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Net.Ping/ref/System.Net.Ping.csproj b/src/System.Net.Ping/ref/System.Net.Ping.csproj index 1ad3fa2cbf..62b3d3ccf7 100644 --- a/src/System.Net.Ping/ref/System.Net.Ping.csproj +++ b/src/System.Net.Ping/ref/System.Net.Ping.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -12,4 +12,4 @@ <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Ping/src/Configurations.props b/src/System.Net.Ping/src/Configurations.props index 3bb6330d9e..4701fcd772 100644 --- a/src/System.Net.Ping/src/Configurations.props +++ b/src/System.Net.Ping/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ net463-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Ping/tests/FunctionalTests/Configurations.props b/src/System.Net.Ping/tests/FunctionalTests/Configurations.props index 4a2b602706..262631c148 100644 --- a/src/System.Net.Ping/tests/FunctionalTests/Configurations.props +++ b/src/System.Net.Ping/tests/FunctionalTests/Configurations.props @@ -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"> <PropertyGroup> <BuildConfigurations> - netstandard1.7-Unix; - netstandard1.7-Windows_NT; + netstandard-Unix; + netstandard-Windows_NT; netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file 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 5f5098991f..30116f116b 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 @@ -32,4 +32,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.Ping/tests/System.Net.Ping.Functional.Tests.builds b/src/System.Net.Ping/tests/System.Net.Ping.Functional.Tests.builds index adf20dcc40..cecccc91e8 100644 --- a/src/System.Net.Ping/tests/System.Net.Ping.Functional.Tests.builds +++ b/src/System.Net.Ping/tests/System.Net.Ping.Functional.Tests.builds @@ -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" /> <ItemGroup> @@ -7,7 +7,7 @@ </Project> <Project Include="FunctionalTests\System.Net.Ping.Functional.Tests.csproj"> <OSGroup>Windows_NT</OSGroup> - <TestTFMs>netcoreapp1.1;net463</TestTFMs> + <TestTFMs>netcoreapp;net463</TestTFMs> </Project> <Project Include="FunctionalTests\System.Net.Ping.Functional.Tests.csproj"> <TargetGroup>netstandard1.3</TargetGroup> diff --git a/src/System.Net.Primitives/pkg/System.Net.Primitives.builds b/src/System.Net.Primitives/pkg/System.Net.Primitives.builds index fbbd00ac2a..d2834ff189 100644 --- a/src/System.Net.Primitives/pkg/System.Net.Primitives.builds +++ b/src/System.Net.Primitives/pkg/System.Net.Primitives.builds @@ -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" /> <ItemGroup> @@ -11,5 +11,4 @@ <Project Include="System.Net.Primitives.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Net.Primitives/pkg/System.Net.Primitives.pkgproj b/src/System.Net.Primitives/pkg/System.Net.Primitives.pkgproj index bc5f0fd17f..c99fdd71f2 100644 --- a/src/System.Net.Primitives/pkg/System.Net.Primitives.pkgproj +++ b/src/System.Net.Primitives/pkg/System.Net.Primitives.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.Net.Primitives.builds"> - <SupportedFramework>net463;netcoreapp1.1;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Net.Primitives.csproj"> <TargetGroup>net463</TargetGroup> diff --git a/src/System.Net.Primitives/pkg/unix/System.Net.Primitives.pkgproj b/src/System.Net.Primitives/pkg/unix/System.Net.Primitives.pkgproj index f557786c60..1e80e74a28 100644 --- a/src/System.Net.Primitives/pkg/unix/System.Net.Primitives.pkgproj +++ b/src/System.Net.Primitives/pkg/unix/System.Net.Primitives.pkgproj @@ -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> <PackageTargetRuntime>unix</PackageTargetRuntime> <PreventImplementationReference>true</PreventImplementationReference> </PropertyGroup> <ItemGroup> - <ProjectReference Include="..\..\src\System.Net.Primitives.csproj" > + <ProjectReference Include="..\..\src\System.Net.Primitives.csproj"> <OSGroup>Unix</OSGroup> </ProjectReference> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Net.Primitives/pkg/win/System.Net.Primitives.pkgproj b/src/System.Net.Primitives/pkg/win/System.Net.Primitives.pkgproj index 730e4b6fd8..5bd67715c9 100644 --- a/src/System.Net.Primitives/pkg/win/System.Net.Primitives.pkgproj +++ b/src/System.Net.Primitives/pkg/win/System.Net.Primitives.pkgproj @@ -1,14 +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> <PackageTargetRuntime>win</PackageTargetRuntime> <PreventImplementationReference>true</PreventImplementationReference> </PropertyGroup> - <ItemGroup> - <ProjectReference Include="..\..\src\System.Net.Primitives.csproj" > + <ProjectReference Include="..\..\src\System.Net.Primitives.csproj"> <OSGroup>Windows_NT</OSGroup> </ProjectReference> <ProjectReference Include="..\..\src\System.Net.Primitives.csproj"> @@ -18,6 +16,5 @@ <!-- don't use the dotnet implementation for any version of desktop, it's implementation comes from the reference package --> <ExternalOnTargetFramework Include="net" /> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </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 index de35842580..77a4b65bc9 100644 --- a/src/System.Net.Primitives/ref/Configurations.props +++ b/src/System.Net.Primitives/ref/Configurations.props @@ -1,9 +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> <BuildConfigurations> - netstandard1.7; - netcoreapp1.1; + netstandard; + netcoreapp; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Primitives/ref/System.Net.Primitives.builds b/src/System.Net.Primitives/ref/System.Net.Primitives.builds index 9a54406510..afca28889b 100644 --- a/src/System.Net.Primitives/ref/System.Net.Primitives.builds +++ b/src/System.Net.Primitives/ref/System.Net.Primitives.builds @@ -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" /> <ItemGroup> <Project Include="System.Net.Primitives.csproj" /> <Project Include="System.Net.Primitives.csproj"> - <TargetGroup>netcoreapp1.1</TargetGroup> + <TargetGroup>netcoreapp</TargetGroup> </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> diff --git a/src/System.Net.Primitives/ref/System.Net.Primitives.csproj b/src/System.Net.Primitives/ref/System.Net.Primitives.csproj index 9b3920db35..a88c03ad5d 100644 --- a/src/System.Net.Primitives/ref/System.Net.Primitives.csproj +++ b/src/System.Net.Primitives/ref/System.Net.Primitives.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -14,4 +14,4 @@ <ProjectReference Include="..\..\System.Runtime.Handles\ref\System.Runtime.Handles.csproj" /> </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/src/Configurations.props b/src/System.Net.Primitives/src/Configurations.props index 277edd8783..411643298f 100644 --- a/src/System.Net.Primitives/src/Configurations.props +++ b/src/System.Net.Primitives/src/Configurations.props @@ -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> <BuildConfigurations> @@ -8,4 +8,4 @@ net463-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Primitives/tests/FunctionalTests/Configurations.props b/src/System.Net.Primitives/tests/FunctionalTests/Configurations.props index fa858a20eb..186604c3fe 100644 --- a/src/System.Net.Primitives/tests/FunctionalTests/Configurations.props +++ b/src/System.Net.Primitives/tests/FunctionalTests/Configurations.props @@ -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"> <PropertyGroup> <BuildConfigurations> - netstandard1.7-Unix; - netstandard1.7-Windows_NT; + netstandard-Unix; + netstandard-Windows_NT; netstandard1.3-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file 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 39d50b7a82..548f3513d0 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 @@ -54,4 +54,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.Net.Primitives/tests/PalTests/Configurations.props b/src/System.Net.Primitives/tests/PalTests/Configurations.props index fa858a20eb..186604c3fe 100644 --- a/src/System.Net.Primitives/tests/PalTests/Configurations.props +++ b/src/System.Net.Primitives/tests/PalTests/Configurations.props @@ -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"> <PropertyGroup> <BuildConfigurations> - netstandard1.7-Unix; - netstandard1.7-Windows_NT; + netstandard-Unix; + netstandard-Windows_NT; netstandard1.3-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file 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 8c8a2ae877..7ca0772cef 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 @@ -170,4 +170,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.Primitives/tests/PerformanceTests/Configurations.props b/src/System.Net.Primitives/tests/PerformanceTests/Configurations.props index fa858a20eb..186604c3fe 100644 --- a/src/System.Net.Primitives/tests/PerformanceTests/Configurations.props +++ b/src/System.Net.Primitives/tests/PerformanceTests/Configurations.props @@ -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"> <PropertyGroup> <BuildConfigurations> - netstandard1.7-Unix; - netstandard1.7-Windows_NT; + netstandard-Unix; + netstandard-Windows_NT; netstandard1.3-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Primitives/tests/System.Net.Primitives.Tests.builds b/src/System.Net.Primitives/tests/System.Net.Primitives.Tests.builds index 4b17ae30b1..539f86b939 100644 --- a/src/System.Net.Primitives/tests/System.Net.Primitives.Tests.builds +++ b/src/System.Net.Primitives/tests/System.Net.Primitives.Tests.builds @@ -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" /> <ItemGroup> @@ -7,7 +7,7 @@ </Project> <Project Include="FunctionalTests\System.Net.Primitives.Functional.Tests.csproj"> <OSGroup>Windows_NT</OSGroup> - <TestTFMs>netcoreapp1.1;net463</TestTFMs> + <TestTFMs>netcoreapp;net463</TestTFMs> </Project> <Project Include="FunctionalTests\System.Net.Primitives.Functional.Tests.csproj"> <TargetGroup>netstandard1.3</TargetGroup> @@ -19,7 +19,7 @@ </Project> <Project Include="PalTests\System.Net.Primitives.Pal.Tests.csproj"> <OSGroup>Windows_NT</OSGroup> - <TestTFMs>netcoreapp1.1;net463</TestTFMs> + <TestTFMs>netcoreapp;net463</TestTFMs> </Project> <Project Include="PalTests\System.Net.Primitives.Pal.Tests.csproj"> <TargetGroup>netstandard1.3</TargetGroup> @@ -31,7 +31,7 @@ </Project> <Project Include="PerformanceTests\System.Net.Primitives.Performance.Tests.csproj"> <OSGroup>Windows_NT</OSGroup> - <TestTFMs>netcoreapp1.1;net463</TestTFMs> + <TestTFMs>netcoreapp;net463</TestTFMs> </Project> <Project Include="PerformanceTests\System.Net.Primitives.Performance.Tests.csproj"> <TargetGroup>netstandard1.3</TargetGroup> @@ -43,7 +43,7 @@ </Project> <Project Include="UnitTests\System.Net.Primitives.UnitTests.Tests.csproj"> <OSGroup>Windows_NT</OSGroup> - <TestTFMs>netcoreapp1.1;net463</TestTFMs> + <TestTFMs>netcoreapp;net463</TestTFMs> </Project> <Project Include="UnitTests\System.Net.Primitives.UnitTests.Tests.csproj"> <TargetGroup>netstandard1.3</TargetGroup> diff --git a/src/System.Net.Primitives/tests/UnitTests/Configurations.props b/src/System.Net.Primitives/tests/UnitTests/Configurations.props index 415c6d276e..9348ce4cb3 100644 --- a/src/System.Net.Primitives/tests/UnitTests/Configurations.props +++ b/src/System.Net.Primitives/tests/UnitTests/Configurations.props @@ -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"> <PropertyGroup> <BuildConfigurations> - netstandard1.7-Windows_NT; - netstandard1.7-Unix; + netstandard-Windows_NT; + netstandard-Unix; netstandard1.3-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file 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 e91540f72c..5e1325dacf 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 @@ -129,4 +129,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.Requests/pkg/System.Net.Requests.builds b/src/System.Net.Requests/pkg/System.Net.Requests.builds index 4e44341fd0..ba16e03adb 100644 --- a/src/System.Net.Requests/pkg/System.Net.Requests.builds +++ b/src/System.Net.Requests/pkg/System.Net.Requests.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Net.Requests.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Net.Requests/pkg/System.Net.Requests.pkgproj b/src/System.Net.Requests/pkg/System.Net.Requests.pkgproj index efc55c00a0..fa73acdb15 100644 --- a/src/System.Net.Requests/pkg/System.Net.Requests.pkgproj +++ b/src/System.Net.Requests/pkg/System.Net.Requests.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.Net.Requests.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Net.Requests.builds" /> </ItemGroup> diff --git a/src/System.Net.Requests/ref/System.Net.Requests.csproj b/src/System.Net.Requests/ref/System.Net.Requests.csproj index 9d5d660309..3bbafc3a3b 100644 --- a/src/System.Net.Requests/ref/System.Net.Requests.csproj +++ b/src/System.Net.Requests/ref/System.Net.Requests.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -18,4 +18,4 @@ <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Requests/src/Configurations.props b/src/System.Net.Requests/src/Configurations.props index 3bb6330d9e..4701fcd772 100644 --- a/src/System.Net.Requests/src/Configurations.props +++ b/src/System.Net.Requests/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ net463-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Requests/tests/Configurations.props b/src/System.Net.Requests/tests/Configurations.props index 512c938bad..b2db637110 100644 --- a/src/System.Net.Requests/tests/Configurations.props +++ b/src/System.Net.Requests/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> netstandard1.3; - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Requests/tests/System.Net.Requests.Tests.builds b/src/System.Net.Requests/tests/System.Net.Requests.Tests.builds index d4b9ffceea..7abee784a7 100644 --- a/src/System.Net.Requests/tests/System.Net.Requests.Tests.builds +++ b/src/System.Net.Requests/tests/System.Net.Requests.Tests.builds @@ -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" /> <ItemGroup> 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 fa96b07adb..8e32215109 100644 --- a/src/System.Net.Requests/tests/System.Net.Requests.Tests.csproj +++ b/src/System.Net.Requests/tests/System.Net.Requests.Tests.csproj @@ -56,4 +56,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/pkg/System.Net.Security.builds b/src/System.Net.Security/pkg/System.Net.Security.builds index 16ab53070d..93055eda0f 100644 --- a/src/System.Net.Security/pkg/System.Net.Security.builds +++ b/src/System.Net.Security/pkg/System.Net.Security.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Net.Security.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Net.Security/pkg/System.Net.Security.pkgproj b/src/System.Net.Security/pkg/System.Net.Security.pkgproj index a57469bbea..49bfbca1d4 100644 --- a/src/System.Net.Security/pkg/System.Net.Security.pkgproj +++ b/src/System.Net.Security/pkg/System.Net.Security.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Net.Security.builds"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Net.Security.builds" /> </ItemGroup> @@ -14,11 +14,9 @@ <InboxOnTargetFramework Include="xamarinmac20" /> <InboxOnTargetFramework Include="xamarintvos10" /> <InboxOnTargetFramework Include="xamarinwatchos10" /> - <NotSupportedOnTargetFramework Include="netcore50"> <PackageTargetRuntime>win7</PackageTargetRuntime> </NotSupportedOnTargetFramework> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </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 index de35842580..77a4b65bc9 100644 --- a/src/System.Net.Security/ref/Configurations.props +++ b/src/System.Net.Security/ref/Configurations.props @@ -1,9 +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> <BuildConfigurations> - netstandard1.7; - netcoreapp1.1; + netstandard; + netcoreapp; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Security/ref/System.Net.Security.builds b/src/System.Net.Security/ref/System.Net.Security.builds index 17b0b64743..71efd4e2ed 100644 --- a/src/System.Net.Security/ref/System.Net.Security.builds +++ b/src/System.Net.Security/ref/System.Net.Security.builds @@ -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" /> <ItemGroup> <Project Include="System.Net.Security.csproj" /> <Project Include="System.Net.Security.csproj"> - <TargetGroup>netcoreapp1.1</TargetGroup> + <TargetGroup>netcoreapp</TargetGroup> </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> diff --git a/src/System.Net.Security/ref/System.Net.Security.csproj b/src/System.Net.Security/ref/System.Net.Security.csproj index f34255481b..87061c1764 100644 --- a/src/System.Net.Security/ref/System.Net.Security.csproj +++ b/src/System.Net.Security/ref/System.Net.Security.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -18,4 +18,4 @@ <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </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/src/Configurations.props b/src/System.Net.Security/src/Configurations.props index 3bb6330d9e..4701fcd772 100644 --- a/src/System.Net.Security/src/Configurations.props +++ b/src/System.Net.Security/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ net463-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Security/tests/FunctionalTests/Configurations.props b/src/System.Net.Security/tests/FunctionalTests/Configurations.props index 2b3220d696..6e69be526f 100644 --- a/src/System.Net.Security/tests/FunctionalTests/Configurations.props +++ b/src/System.Net.Security/tests/FunctionalTests/Configurations.props @@ -1,13 +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> <BuildConfigurations> - netstandard1.7-Unix; - netstandard1.7-Windows_NT; - netstandard1.7-OSX; - netcoreapp1.1-Windows_NT; - netcoreapp1.1-Unix; - netcoreapp1.1-OSX; + netstandard-Unix; + netstandard-Windows_NT; + netstandard-OSX; + netcoreapp-Windows_NT; + netcoreapp-Unix; + netcoreapp-OSX; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file 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 9698f9c414..d4ac8f82ea 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 @@ -150,4 +150,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.Net.Security/tests/System.Net.Security.Tests.builds b/src/System.Net.Security/tests/System.Net.Security.Tests.builds index 342b29c48b..e9291ef79c 100644 --- a/src/System.Net.Security/tests/System.Net.Security.Tests.builds +++ b/src/System.Net.Security/tests/System.Net.Security.Tests.builds @@ -1,37 +1,37 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-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="FunctionalTests\System.Net.Security.Tests.csproj"> <OSGroup>Linux</OSGroup> - <TargetGroup>netcoreapp1.1</TargetGroup> - <TestTFMs>netcoreapp1.1</TestTFMs> + <TargetGroup>netcoreapp</TargetGroup> + <TestTFMs>netcoreapp</TestTFMs> </Project> <Project Include="FunctionalTests\System.Net.Security.Tests.csproj"> <OSGroup>Linux</OSGroup> - <TargetGroup>netstandard1.7</TargetGroup> - <TestTFMs>netcoreapp1.1</TestTFMs> + <TargetGroup>netstandard</TargetGroup> + <TestTFMs>netcoreapp</TestTFMs> </Project> <Project Include="FunctionalTests\System.Net.Security.Tests.csproj"> <OSGroup>OSX</OSGroup> - <TargetGroup>netcoreapp1.1</TargetGroup> - <TestTFMs>netcoreapp1.1</TestTFMs> + <TargetGroup>netcoreapp</TargetGroup> + <TestTFMs>netcoreapp</TestTFMs> </Project> <Project Include="FunctionalTests\System.Net.Security.Tests.csproj"> <OSGroup>OSX</OSGroup> - <TargetGroup>netstandard1.7</TargetGroup> - <TestTFMs>netcoreapp1.1</TestTFMs> + <TargetGroup>netstandard</TargetGroup> + <TestTFMs>netcoreapp</TestTFMs> </Project> <Project Include="FunctionalTests\System.Net.Security.Tests.csproj"> <OSGroup>Windows_NT</OSGroup> - <TargetGroup>netcoreapp1.1</TargetGroup> + <TargetGroup>netcoreapp</TargetGroup> <!-- TODO #13070 Add net463 once the TFM is actually .Net 4.6.3 --> - <TestTFMs>netcoreapp1.1</TestTFMs> + <TestTFMs>netcoreapp</TestTFMs> </Project> <Project Include="FunctionalTests\System.Net.Security.Tests.csproj"> <OSGroup>Windows_NT</OSGroup> - <TargetGroup>netstandard1.7</TargetGroup> - <TestTFMs>netcoreapp1.1;net462</TestTFMs> + <TargetGroup>netstandard</TargetGroup> + <TestTFMs>netcoreapp;net462</TestTFMs> </Project> <Project Include="UnitTests\System.Net.Security.Unit.Tests.csproj"> <OSGroup>Unix</OSGroup> diff --git a/src/System.Net.Security/tests/UnitTests/Configurations.props b/src/System.Net.Security/tests/UnitTests/Configurations.props index 90648972ae..cfc57211a4 100644 --- a/src/System.Net.Security/tests/UnitTests/Configurations.props +++ b/src/System.Net.Security/tests/UnitTests/Configurations.props @@ -1,9 +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> <BuildConfigurations> - netstandard1.7-Unix; - netstandard1.7-Windows_NT; + netstandard-Unix; + netstandard-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.ServicePoint/pkg/System.Net.ServicePoint.builds b/src/System.Net.ServicePoint/pkg/System.Net.ServicePoint.builds index d82852a2d9..84aacf5395 100644 --- a/src/System.Net.ServicePoint/pkg/System.Net.ServicePoint.builds +++ b/src/System.Net.ServicePoint/pkg/System.Net.ServicePoint.builds @@ -1,8 +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" /> <ItemGroup> - <Project Include="System.Net.ServicePoint.pkgproj"/> + <Project Include="System.Net.ServicePoint.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.ServicePoint/pkg/System.Net.ServicePoint.pkgproj b/src/System.Net.ServicePoint/pkg/System.Net.ServicePoint.pkgproj index 7f72c06e93..7f05994ec0 100644 --- a/src/System.Net.ServicePoint/pkg/System.Net.ServicePoint.pkgproj +++ b/src/System.Net.ServicePoint/pkg/System.Net.ServicePoint.pkgproj @@ -1,14 +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" /> - <ItemGroup> <ProjectReference Include="..\ref\System.Net.ServicePoint.builds"> - <SupportedFramework>net461;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Net.ServicePoint.builds" /> </ItemGroup> - <ItemGroup> <InboxOnTargetFramework Include="MonoAndroid10" /> <InboxOnTargetFramework Include="MonoTouch10" /> @@ -17,6 +15,5 @@ <InboxOnTargetFramework Include="xamarintvos10" /> <InboxOnTargetFramework Include="xamarinwatchos10" /> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.ServicePoint/ref/System.Net.ServicePoint.builds b/src/System.Net.ServicePoint/ref/System.Net.ServicePoint.builds index 4c8d0efd65..d3b89c3f9e 100644 --- a/src/System.Net.ServicePoint/ref/System.Net.ServicePoint.builds +++ b/src/System.Net.ServicePoint/ref/System.Net.ServicePoint.builds @@ -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" /> <ItemGroup> <Project Include="System.Net.ServicePoint.csproj" /> <Project Include="System.Net.ServicePoint.csproj"> - <TargetGroup>netcoreapp1.1</TargetGroup> + <TargetGroup>netcoreapp</TargetGroup> </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> diff --git a/src/System.Net.ServicePoint/ref/System.Net.ServicePoint.csproj b/src/System.Net.ServicePoint/ref/System.Net.ServicePoint.csproj index a5d114694c..7d5a508003 100644 --- a/src/System.Net.ServicePoint/ref/System.Net.ServicePoint.csproj +++ b/src/System.Net.ServicePoint/ref/System.Net.ServicePoint.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -14,4 +14,4 @@ <ProjectReference Include="..\..\System.Security.Cryptography.X509Certificates\ref\System.Security.Cryptography.X509Certificates.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.ServicePoint/src/Configurations.props b/src/System.Net.ServicePoint/src/Configurations.props index 53b62c64fe..bcfec4bbde 100644 --- a/src/System.Net.ServicePoint/src/Configurations.props +++ b/src/System.Net.ServicePoint/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.ServicePoint/tests/Configurations.props b/src/System.Net.ServicePoint/tests/Configurations.props index de35842580..77a4b65bc9 100644 --- a/src/System.Net.ServicePoint/tests/Configurations.props +++ b/src/System.Net.ServicePoint/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> - netstandard1.7; - netcoreapp1.1; + netstandard; + netcoreapp; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.builds b/src/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.builds index e8db26023e..f4b3861967 100644 --- a/src/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.builds +++ b/src/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.builds @@ -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" /> <ItemGroup> <Project Include="System.Net.ServicePoint.Tests.csproj"> - <TargetGroup>netstandard1.7</TargetGroup> - <TestTFMs>netcoreapp1.1</TestTFMs> + <TargetGroup>netstandard</TargetGroup> + <TestTFMs>netcoreapp</TestTFMs> </Project> <Project Include="System.Net.ServicePoint.Tests.csproj"> - <TargetGroup>netcoreapp1.1</TargetGroup> + <TargetGroup>netcoreapp</TargetGroup> <!-- TODO #13070: Add net463 once the TFM is actually .Net 4.6.3 --> - <TestTFMs>netcoreapp1.1</TestTFMs> + <TestTFMs>netcoreapp</TestTFMs> </Project> <Project Include="System.Net.ServicePoint.Tests.csproj"> <OSGroup>Windows_NT</OSGroup> 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 23429b3d14..510c709bee 100644 --- a/src/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.csproj +++ b/src/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.csproj @@ -14,4 +14,4 @@ <Compile Include="TlsSystemDefault.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.Sockets/pkg/System.Net.Sockets.builds b/src/System.Net.Sockets/pkg/System.Net.Sockets.builds index cce03bb883..7367f9db94 100644 --- a/src/System.Net.Sockets/pkg/System.Net.Sockets.builds +++ b/src/System.Net.Sockets/pkg/System.Net.Sockets.builds @@ -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" /> <ItemGroup> @@ -11,5 +11,4 @@ <Project Include="System.Net.Sockets.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Net.Sockets/pkg/System.Net.Sockets.pkgproj b/src/System.Net.Sockets/pkg/System.Net.Sockets.pkgproj index d5e633b5fd..a573bde526 100644 --- a/src/System.Net.Sockets/pkg/System.Net.Sockets.pkgproj +++ b/src/System.Net.Sockets/pkg/System.Net.Sockets.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Net.Sockets.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Net.Sockets.csproj"> <TargetGroup>net463</TargetGroup> diff --git a/src/System.Net.Sockets/pkg/unix/System.Net.Sockets.pkgproj b/src/System.Net.Sockets/pkg/unix/System.Net.Sockets.pkgproj index 66b092b922..c1396e68da 100644 --- a/src/System.Net.Sockets/pkg/unix/System.Net.Sockets.pkgproj +++ b/src/System.Net.Sockets/pkg/unix/System.Net.Sockets.pkgproj @@ -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> <PackageTargetRuntime>unix</PackageTargetRuntime> <PreventImplementationReference>true</PreventImplementationReference> </PropertyGroup> - <ItemGroup> - <ProjectReference Include="..\..\src\System.Net.Sockets.csproj" > + <ProjectReference Include="..\..\src\System.Net.Sockets.csproj"> <OSGroup>Unix</OSGroup> </ProjectReference> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Net.Sockets/pkg/win/System.Net.Sockets.pkgproj b/src/System.Net.Sockets/pkg/win/System.Net.Sockets.pkgproj index 7f2a108a23..28f119b0f4 100644 --- a/src/System.Net.Sockets/pkg/win/System.Net.Sockets.pkgproj +++ b/src/System.Net.Sockets/pkg/win/System.Net.Sockets.pkgproj @@ -1,12 +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> <PackageTargetRuntime>win</PackageTargetRuntime> <PreventImplementationReference>true</PreventImplementationReference> </PropertyGroup> - <ItemGroup> <ProjectReference Include="..\..\src\System.Net.Sockets.csproj"> <OSGroup>Windows_NT</OSGroup> @@ -18,6 +16,5 @@ <!-- don't use the dotnet implementation for any version of desktop, it's implementation comes from the reference package --> <ExternalOnTargetFramework Include="net" /> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ 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 c04b4915fb..825aae248f 100644 --- a/src/System.Net.Sockets/ref/System.Net.Sockets.csproj +++ b/src/System.Net.Sockets/ref/System.Net.Sockets.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -12,4 +12,4 @@ <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Sockets/src/Configurations.props b/src/System.Net.Sockets/src/Configurations.props index a2712c363b..5c4fd7778a 100644 --- a/src/System.Net.Sockets/src/Configurations.props +++ b/src/System.Net.Sockets/src/Configurations.props @@ -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> <BuildConfigurations> @@ -8,4 +8,4 @@ net463-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Sockets/tests/FunctionalTests/Configurations.props b/src/System.Net.Sockets/tests/FunctionalTests/Configurations.props index 98f53209d4..c398e42e89 100644 --- a/src/System.Net.Sockets/tests/FunctionalTests/Configurations.props +++ b/src/System.Net.Sockets/tests/FunctionalTests/Configurations.props @@ -1,8 +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> <BuildConfigurations> - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file 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 cdebd96900..ca015306b7 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 @@ -104,7 +104,7 @@ </Compile> </ItemGroup> <ItemGroup> - <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 index a9c55e67cd..8b21be4cd6 100644 --- a/src/System.Net.Sockets/tests/PerformanceTests/Configurations.props +++ b/src/System.Net.Sockets/tests/PerformanceTests/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard1.3-Unix; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Sockets/tests/System.Net.Sockets.Tests.builds b/src/System.Net.Sockets/tests/System.Net.Sockets.Tests.builds index 112bdc3272..1ec047c621 100644 --- a/src/System.Net.Sockets/tests/System.Net.Sockets.Tests.builds +++ b/src/System.Net.Sockets/tests/System.Net.Sockets.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Net.WebClient/pkg/System.Net.WebClient.builds b/src/System.Net.WebClient/pkg/System.Net.WebClient.builds index ec53b94c0c..2a5d63c967 100644 --- a/src/System.Net.WebClient/pkg/System.Net.WebClient.builds +++ b/src/System.Net.WebClient/pkg/System.Net.WebClient.builds @@ -1,8 +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" /> <ItemGroup> - <Project Include="System.Net.WebClient.pkgproj"/> + <Project Include="System.Net.WebClient.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.WebClient/pkg/System.Net.WebClient.pkgproj b/src/System.Net.WebClient/pkg/System.Net.WebClient.pkgproj index c096c97d8c..f9bbdbc704 100644 --- a/src/System.Net.WebClient/pkg/System.Net.WebClient.pkgproj +++ b/src/System.Net.WebClient/pkg/System.Net.WebClient.pkgproj @@ -1,13 +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" /> - <ItemGroup> <ProjectReference Include="..\ref\System.Net.WebClient.csproj"> - <SupportedFramework>net461;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Net.WebClient.builds" /> </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/ref/System.Net.WebClient.csproj b/src/System.Net.WebClient/ref/System.Net.WebClient.csproj index 1e791d02eb..93f99e503d 100644 --- a/src/System.Net.WebClient/ref/System.Net.WebClient.csproj +++ b/src/System.Net.WebClient/ref/System.Net.WebClient.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -18,4 +18,4 @@ <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </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/src/Configurations.props b/src/System.Net.WebClient/src/Configurations.props index 53b62c64fe..bcfec4bbde 100644 --- a/src/System.Net.WebClient/src/Configurations.props +++ b/src/System.Net.WebClient/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.WebClient/tests/Configurations.props b/src/System.Net.WebClient/tests/Configurations.props index 98f53209d4..c398e42e89 100644 --- a/src/System.Net.WebClient/tests/Configurations.props +++ b/src/System.Net.WebClient/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.WebClient/tests/System.Net.WebClient.Tests.builds b/src/System.Net.WebClient/tests/System.Net.WebClient.Tests.builds index e456e44a6f..e39edecdfa 100644 --- a/src/System.Net.WebClient/tests/System.Net.WebClient.Tests.builds +++ b/src/System.Net.WebClient/tests/System.Net.WebClient.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Net.WebHeaderCollection/pkg/System.Net.WebHeaderCollection.builds b/src/System.Net.WebHeaderCollection/pkg/System.Net.WebHeaderCollection.builds index a8ee0763ef..e670549227 100644 --- a/src/System.Net.WebHeaderCollection/pkg/System.Net.WebHeaderCollection.builds +++ b/src/System.Net.WebHeaderCollection/pkg/System.Net.WebHeaderCollection.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Net.WebHeaderCollection.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Net.WebHeaderCollection/pkg/System.Net.WebHeaderCollection.pkgproj b/src/System.Net.WebHeaderCollection/pkg/System.Net.WebHeaderCollection.pkgproj index f954a82522..e71d6adb05 100644 --- a/src/System.Net.WebHeaderCollection/pkg/System.Net.WebHeaderCollection.pkgproj +++ b/src/System.Net.WebHeaderCollection/pkg/System.Net.WebHeaderCollection.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Net.WebHeaderCollection.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Net.WebHeaderCollection.builds" /> <InboxOnTargetFramework Include="MonoAndroid10" /> diff --git a/src/System.Net.WebHeaderCollection/ref/System.Net.WebHeaderCollection.csproj b/src/System.Net.WebHeaderCollection/ref/System.Net.WebHeaderCollection.csproj index 99b045400c..4809e5aa5d 100644 --- a/src/System.Net.WebHeaderCollection/ref/System.Net.WebHeaderCollection.csproj +++ b/src/System.Net.WebHeaderCollection/ref/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" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -9,4 +9,4 @@ <ProjectReference Include="..\..\System.Collections.Specialized\ref\System.Collections.Specialized.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.WebHeaderCollection/src/Configurations.props b/src/System.Net.WebHeaderCollection/src/Configurations.props index 9c336c0be9..dc837f9152 100644 --- a/src/System.Net.WebHeaderCollection/src/Configurations.props +++ b/src/System.Net.WebHeaderCollection/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.WebHeaderCollection/tests/Configurations.props b/src/System.Net.WebHeaderCollection/tests/Configurations.props index 2a160a39e8..211cd2bec8 100644 --- a/src/System.Net.WebHeaderCollection/tests/Configurations.props +++ b/src/System.Net.WebHeaderCollection/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> netstandard1.3-Windows_NT; - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.WebHeaderCollection/tests/System.Net.WebHeaderCollection.Tests.builds b/src/System.Net.WebHeaderCollection/tests/System.Net.WebHeaderCollection.Tests.builds index 55b11e71aa..017a22f312 100644 --- a/src/System.Net.WebHeaderCollection/tests/System.Net.WebHeaderCollection.Tests.builds +++ b/src/System.Net.WebHeaderCollection/tests/System.Net.WebHeaderCollection.Tests.builds @@ -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" /> <ItemGroup> 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 717969ab08..489c57b657 100644 --- a/src/System.Net.WebHeaderCollection/tests/System.Net.WebHeaderCollection.Tests.csproj +++ b/src/System.Net.WebHeaderCollection/tests/System.Net.WebHeaderCollection.Tests.csproj @@ -18,4 +18,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.WebProxy/pkg/System.Net.WebProxy.builds b/src/System.Net.WebProxy/pkg/System.Net.WebProxy.builds index a03bbc6401..d2efaf4924 100644 --- a/src/System.Net.WebProxy/pkg/System.Net.WebProxy.builds +++ b/src/System.Net.WebProxy/pkg/System.Net.WebProxy.builds @@ -1,8 +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" /> <ItemGroup> - <Project Include="System.Net.WebProxy.pkgproj"/> + <Project Include="System.Net.WebProxy.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.WebProxy/pkg/System.Net.WebProxy.pkgproj b/src/System.Net.WebProxy/pkg/System.Net.WebProxy.pkgproj index 5a16a2f3e6..c7722057ba 100644 --- a/src/System.Net.WebProxy/pkg/System.Net.WebProxy.pkgproj +++ b/src/System.Net.WebProxy/pkg/System.Net.WebProxy.pkgproj @@ -1,13 +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" /> - <ItemGroup> <ProjectReference Include="..\ref\System.Net.WebProxy.csproj"> - <SupportedFramework>net461;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Net.WebProxy.builds" /> </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 3d4b79ab8c..10158db0eb 100644 --- a/src/System.Net.WebProxy/ref/System.Net.WebProxy.csproj +++ b/src/System.Net.WebProxy/ref/System.Net.WebProxy.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -11,4 +11,4 @@ <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" /> </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/src/Configurations.props b/src/System.Net.WebProxy/src/Configurations.props index 53b62c64fe..bcfec4bbde 100644 --- a/src/System.Net.WebProxy/src/Configurations.props +++ b/src/System.Net.WebProxy/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.WebProxy/tests/Configurations.props b/src/System.Net.WebProxy/tests/Configurations.props index 98f53209d4..c398e42e89 100644 --- a/src/System.Net.WebProxy/tests/Configurations.props +++ b/src/System.Net.WebProxy/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.WebProxy/tests/System.Net.WebProxy.Tests.builds b/src/System.Net.WebProxy/tests/System.Net.WebProxy.Tests.builds index fa5f48834f..90bf363abd 100644 --- a/src/System.Net.WebProxy/tests/System.Net.WebProxy.Tests.builds +++ b/src/System.Net.WebProxy/tests/System.Net.WebProxy.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Net.WebSockets.Client/pkg/System.Net.WebSockets.Client.builds b/src/System.Net.WebSockets.Client/pkg/System.Net.WebSockets.Client.builds index 57f06c7880..c030fff6da 100644 --- a/src/System.Net.WebSockets.Client/pkg/System.Net.WebSockets.Client.builds +++ b/src/System.Net.WebSockets.Client/pkg/System.Net.WebSockets.Client.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Net.WebSockets.Client.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Net.WebSockets.Client/pkg/System.Net.WebSockets.Client.pkgproj b/src/System.Net.WebSockets.Client/pkg/System.Net.WebSockets.Client.pkgproj index 3081e1bce2..776f94159c 100644 --- a/src/System.Net.WebSockets.Client/pkg/System.Net.WebSockets.Client.pkgproj +++ b/src/System.Net.WebSockets.Client/pkg/System.Net.WebSockets.Client.pkgproj @@ -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" /> <ItemGroup> 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 9e8cc516e6..55682acf9d 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,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" /> <ItemGroup> @@ -12,4 +12,4 @@ <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </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.Client/src/Configurations.props b/src/System.Net.WebSockets.Client/src/Configurations.props index 7ba33a3388..97415704bb 100644 --- a/src/System.Net.WebSockets.Client/src/Configurations.props +++ b/src/System.Net.WebSockets.Client/src/Configurations.props @@ -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> <BuildConfigurations> @@ -8,4 +8,4 @@ net46-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.WebSockets.Client/tests/Configurations.props b/src/System.Net.WebSockets.Client/tests/Configurations.props index 0c2d77f6b7..566c16a6e1 100644 --- a/src/System.Net.WebSockets.Client/tests/Configurations.props +++ b/src/System.Net.WebSockets.Client/tests/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard1.3-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.builds b/src/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.builds index 6d8cda6126..ae33dead69 100644 --- a/src/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.builds +++ b/src/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Net.WebSockets/pkg/System.Net.WebSockets.builds b/src/System.Net.WebSockets/pkg/System.Net.WebSockets.builds index fdf8453916..8506c9388d 100644 --- a/src/System.Net.WebSockets/pkg/System.Net.WebSockets.builds +++ b/src/System.Net.WebSockets/pkg/System.Net.WebSockets.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Net.WebSockets.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Net.WebSockets/pkg/System.Net.WebSockets.pkgproj b/src/System.Net.WebSockets/pkg/System.Net.WebSockets.pkgproj index f0228f8cb2..e89b627959 100644 --- a/src/System.Net.WebSockets/pkg/System.Net.WebSockets.pkgproj +++ b/src/System.Net.WebSockets/pkg/System.Net.WebSockets.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Net.WebSockets.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Net.WebSockets.builds" /> </ItemGroup> diff --git a/src/System.Net.WebSockets/ref/System.Net.WebSockets.csproj b/src/System.Net.WebSockets/ref/System.Net.WebSockets.csproj index 71dbfebf64..4edd70ab38 100644 --- a/src/System.Net.WebSockets/ref/System.Net.WebSockets.csproj +++ b/src/System.Net.WebSockets/ref/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" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -14,4 +14,4 @@ <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </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/src/Configurations.props b/src/System.Net.WebSockets/src/Configurations.props index 9c336c0be9..dc837f9152 100644 --- a/src/System.Net.WebSockets/src/Configurations.props +++ b/src/System.Net.WebSockets/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.WebSockets/tests/Configurations.props b/src/System.Net.WebSockets/tests/Configurations.props index 98f53209d4..c398e42e89 100644 --- a/src/System.Net.WebSockets/tests/Configurations.props +++ b/src/System.Net.WebSockets/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.builds b/src/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.builds index 9b9dd0127d..e8548b5728 100644 --- a/src/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.builds +++ b/src/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.builds @@ -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" /> <ItemGroup> 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 9327801437..8ffc13af1f 100644 --- a/src/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.csproj +++ b/src/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.csproj @@ -15,4 +15,4 @@ <Compile Include="WebSocketReceiveResultTests.cs" /> </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/pkg/System.Numerics.Vectors.WindowsRuntime.builds b/src/System.Numerics.Vectors.WindowsRuntime/pkg/System.Numerics.Vectors.WindowsRuntime.builds index b4f3e9b9fb..2aa8fc1575 100644 --- a/src/System.Numerics.Vectors.WindowsRuntime/pkg/System.Numerics.Vectors.WindowsRuntime.builds +++ b/src/System.Numerics.Vectors.WindowsRuntime/pkg/System.Numerics.Vectors.WindowsRuntime.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Numerics.Vectors.WindowsRuntime.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Numerics.Vectors.WindowsRuntime/pkg/System.Numerics.Vectors.WindowsRuntime.pkgproj b/src/System.Numerics.Vectors.WindowsRuntime/pkg/System.Numerics.Vectors.WindowsRuntime.pkgproj index b0fb6549eb..b6c34f29a9 100644 --- a/src/System.Numerics.Vectors.WindowsRuntime/pkg/System.Numerics.Vectors.WindowsRuntime.pkgproj +++ b/src/System.Numerics.Vectors.WindowsRuntime/pkg/System.Numerics.Vectors.WindowsRuntime.pkgproj @@ -1,7 +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"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <ItemGroup> <ProjectReference Include="..\src\System.Numerics.Vectors.WindowsRuntime.builds"> <SupportedFramework>uap10.0</SupportedFramework> diff --git a/src/System.Numerics.Vectors.WindowsRuntime/src/System.Numerics.Vectors.WindowsRuntime.builds b/src/System.Numerics.Vectors.WindowsRuntime/src/System.Numerics.Vectors.WindowsRuntime.builds index c78a6022e3..81498874e3 100644 --- a/src/System.Numerics.Vectors.WindowsRuntime/src/System.Numerics.Vectors.WindowsRuntime.builds +++ b/src/System.Numerics.Vectors.WindowsRuntime/src/System.Numerics.Vectors.WindowsRuntime.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Numerics.Vectors.WindowsRuntime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Numerics.Vectors/pkg/System.Numerics.Vectors.builds b/src/System.Numerics.Vectors/pkg/System.Numerics.Vectors.builds index 1e08c3e5ee..0205f9ff36 100644 --- a/src/System.Numerics.Vectors/pkg/System.Numerics.Vectors.builds +++ b/src/System.Numerics.Vectors/pkg/System.Numerics.Vectors.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Numerics.Vectors.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Numerics.Vectors/pkg/System.Numerics.Vectors.pkgproj b/src/System.Numerics.Vectors/pkg/System.Numerics.Vectors.pkgproj index f16a9985b6..fc850b3b6a 100644 --- a/src/System.Numerics.Vectors/pkg/System.Numerics.Vectors.pkgproj +++ b/src/System.Numerics.Vectors/pkg/System.Numerics.Vectors.pkgproj @@ -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> diff --git a/src/System.Numerics.Vectors/ref/System.Numerics.Vectors.csproj b/src/System.Numerics.Vectors/ref/System.Numerics.Vectors.csproj index 5a1489d30e..75ccd8fde3 100644 --- a/src/System.Numerics.Vectors/ref/System.Numerics.Vectors.csproj +++ b/src/System.Numerics.Vectors/ref/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" /> <ItemGroup> @@ -8,4 +8,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </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/src/Configurations.props b/src/System.Numerics.Vectors/src/Configurations.props index 67b41e2049..40a36ccda6 100644 --- a/src/System.Numerics.Vectors/src/Configurations.props +++ b/src/System.Numerics.Vectors/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard1.0; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Numerics.Vectors/tests/Configurations.props b/src/System.Numerics.Vectors/tests/Configurations.props index f0ebe53119..c3266e1e93 100644 --- a/src/System.Numerics.Vectors/tests/Configurations.props +++ b/src/System.Numerics.Vectors/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.builds b/src/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.builds index afc50f9f79..f6b80b7c2d 100644 --- a/src/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.builds +++ b/src/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.ObjectModel/pkg/System.ObjectModel.builds b/src/System.ObjectModel/pkg/System.ObjectModel.builds index 94b0a2e8c8..8499df7e2b 100644 --- a/src/System.ObjectModel/pkg/System.ObjectModel.builds +++ b/src/System.ObjectModel/pkg/System.ObjectModel.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.ObjectModel.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.ObjectModel/pkg/System.ObjectModel.pkgproj b/src/System.ObjectModel/pkg/System.ObjectModel.pkgproj index 9e8d34a80f..d6e8922e5a 100644 --- a/src/System.ObjectModel/pkg/System.ObjectModel.pkgproj +++ b/src/System.ObjectModel/pkg/System.ObjectModel.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.ObjectModel.builds"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.ObjectModel.builds" /> <InboxOnTargetFramework Include="MonoAndroid10" /> diff --git a/src/System.ObjectModel/ref/Configurations.props b/src/System.ObjectModel/ref/Configurations.props index ea9ea79f78..8b803e0772 100644 --- a/src/System.ObjectModel/ref/Configurations.props +++ b/src/System.ObjectModel/ref/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</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 f8c8efff1a..ce60d6721d 100644 --- a/src/System.ObjectModel/ref/System.ObjectModel.csproj +++ b/src/System.ObjectModel/ref/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> @@ -12,4 +12,4 @@ <ProjectReference Include="..\..\System.Collections\ref\System.Collections.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.ObjectModel/src/Configurations.props b/src/System.ObjectModel/src/Configurations.props index 9c336c0be9..dc837f9152 100644 --- a/src/System.ObjectModel/src/Configurations.props +++ b/src/System.ObjectModel/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.ObjectModel/tests/Configurations.props b/src/System.ObjectModel/tests/Configurations.props index 11a862f330..4c498002c4 100644 --- a/src/System.ObjectModel/tests/Configurations.props +++ b/src/System.ObjectModel/tests/Configurations.props @@ -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"> <PropertyGroup> <BuildConfigurations> netstandard1.3; - netstandard1.7; - netcoreapp1.1; + netstandard; + netcoreapp; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.ObjectModel/tests/System.ObjectModel.Tests.builds b/src/System.ObjectModel/tests/System.ObjectModel.Tests.builds index d7483f92b3..72d285ec17 100644 --- a/src/System.ObjectModel/tests/System.ObjectModel.Tests.builds +++ b/src/System.ObjectModel/tests/System.ObjectModel.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.ObjectModel/tests/System.ObjectModel.Tests.csproj b/src/System.ObjectModel/tests/System.ObjectModel.Tests.csproj index 757464cfcf..55d772b55f 100644 --- a/src/System.ObjectModel/tests/System.ObjectModel.Tests.csproj +++ b/src/System.ObjectModel/tests/System.ObjectModel.Tests.csproj @@ -54,4 +54,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.Private.DataContractSerialization/pkg/System.Private.DataContractSerialization.builds b/src/System.Private.DataContractSerialization/pkg/System.Private.DataContractSerialization.builds index c55d4307eb..24c45bc040 100644 --- a/src/System.Private.DataContractSerialization/pkg/System.Private.DataContractSerialization.builds +++ b/src/System.Private.DataContractSerialization/pkg/System.Private.DataContractSerialization.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Private.DataContractSerialization.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</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 index fc9ef9822c..c398e42e89 100644 --- a/src/System.Private.DataContractSerialization/src/Configurations.props +++ b/src/System.Private.DataContractSerialization/src/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Private.Uri/pkg/System.Private.Uri.builds b/src/System.Private.Uri/pkg/System.Private.Uri.builds index f10b0b34b0..3a10421841 100644 --- a/src/System.Private.Uri/pkg/System.Private.Uri.builds +++ b/src/System.Private.Uri/pkg/System.Private.Uri.builds @@ -1,8 +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" /> <ItemGroup> - <Project Include="System.Private.Uri.pkgproj"/> + <Project Include="System.Private.Uri.pkgproj" /> <Project Include="win\System.Private.Uri.pkgproj"> <OSGroup>Windows_NT</OSGroup> </Project> diff --git a/src/System.Private.Uri/pkg/unix/System.Private.Uri.pkgproj b/src/System.Private.Uri/pkg/unix/System.Private.Uri.pkgproj index 4dd94eacff..6b47b0b819 100644 --- a/src/System.Private.Uri/pkg/unix/System.Private.Uri.pkgproj +++ b/src/System.Private.Uri/pkg/unix/System.Private.Uri.pkgproj @@ -1,13 +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> <PackageTargetRuntime>unix</PackageTargetRuntime> <PreventImplementationReference>true</PreventImplementationReference> </PropertyGroup> <ItemGroup> - <ProjectReference Include="..\..\src\System.Private.Uri.csproj" > + <ProjectReference Include="..\..\src\System.Private.Uri.csproj"> <OSGroup>Unix</OSGroup> </ProjectReference> <ProjectReference Include="..\..\src\System.Private.Uri.csproj"> @@ -15,6 +14,5 @@ <OSGroup>Unix</OSGroup> </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/pkg/win/System.Private.Uri.pkgproj b/src/System.Private.Uri/pkg/win/System.Private.Uri.pkgproj index fe9ac10f72..45a174b236 100644 --- a/src/System.Private.Uri/pkg/win/System.Private.Uri.pkgproj +++ b/src/System.Private.Uri/pkg/win/System.Private.Uri.pkgproj @@ -19,4 +19,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.Private.Uri/src/Configurations.props b/src/System.Private.Uri/src/Configurations.props index f2122dc3ce..f1d74a5c3e 100644 --- a/src/System.Private.Uri/src/Configurations.props +++ b/src/System.Private.Uri/src/Configurations.props @@ -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> <BuildConfigurations> @@ -9,4 +9,4 @@ netcoreapp1.2corert-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</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 504b5543ab..5e5cf8f6a8 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 @@ -34,4 +34,4 @@ <Compile Include="UriParserTest.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Private.Uri/tests/System.Private.Uri.Tests.builds b/src/System.Private.Uri/tests/System.Private.Uri.Tests.builds index 1cea1b3e8c..702cafe2c3 100644 --- a/src/System.Private.Uri/tests/System.Private.Uri.Tests.builds +++ b/src/System.Private.Uri/tests/System.Private.Uri.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Private.Xml.Linq/pkg/System.Private.Xml.Linq.builds b/src/System.Private.Xml.Linq/pkg/System.Private.Xml.Linq.builds index 497c57c6d5..b3597c9962 100644 --- a/src/System.Private.Xml.Linq/pkg/System.Private.Xml.Linq.builds +++ b/src/System.Private.Xml.Linq/pkg/System.Private.Xml.Linq.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Private.Xml.Linq.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</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 index 9c336c0be9..dc837f9152 100644 --- a/src/System.Private.Xml.Linq/src/Configurations.props +++ b/src/System.Private.Xml.Linq/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Private.Xml.Linq/tests/System.Private.Xml.Linq.Tests.builds b/src/System.Private.Xml.Linq/tests/System.Private.Xml.Linq.Tests.builds index 562f456691..4dfda95e26 100644 --- a/src/System.Private.Xml.Linq/tests/System.Private.Xml.Linq.Tests.builds +++ b/src/System.Private.Xml.Linq/tests/System.Private.Xml.Linq.Tests.builds @@ -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" /> <ItemGroup> 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 2c78626fb6..94d5f4d7a7 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 @@ -60,4 +60,4 @@ <ProjectReference Include="..\XDocument.Test.ModuleCore\XDocument.Test.ModuleCore.csproj" /> </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.Linq/tests/XDocument.Common/Configurations.props b/src/System.Private.Xml.Linq/tests/XDocument.Common/Configurations.props index f0ebe53119..c3266e1e93 100644 --- a/src/System.Private.Xml.Linq/tests/XDocument.Common/Configurations.props +++ b/src/System.Private.Xml.Linq/tests/XDocument.Common/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</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 index f0ebe53119..c3266e1e93 100644 --- a/src/System.Private.Xml.Linq/tests/events/Configurations.props +++ b/src/System.Private.Xml.Linq/tests/events/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Private.Xml/pkg/System.Private.Xml.builds b/src/System.Private.Xml/pkg/System.Private.Xml.builds index d3737b0619..9eba815c82 100644 --- a/src/System.Private.Xml/pkg/System.Private.Xml.builds +++ b/src/System.Private.Xml/pkg/System.Private.Xml.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Private.Xml.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</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 index 58b5995845..f333d20c1a 100644 --- a/src/System.Private.Xml/src/Configurations.props +++ b/src/System.Private.Xml/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard-Unix; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Private.Xml/tests/System.Private.Xml.Tests.builds b/src/System.Private.Xml/tests/System.Private.Xml.Tests.builds index 06b5cf7ebe..c29e81fb96 100644 --- a/src/System.Private.Xml/tests/System.Private.Xml.Tests.builds +++ b/src/System.Private.Xml/tests/System.Private.Xml.Tests.builds @@ -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" /> <ItemGroup> @@ -97,7 +97,7 @@ <TestTFMs>netcoreapp1.0;net46</TestTFMs> </Project> <Project Include="Xslt\XslCompiledTransformApi\System.Xml.Xsl.XslCompiledTransformApi.Tests.csproj"> - <TestTFMs>netcoreapp1.1</TestTFMs> + <TestTFMs>netcoreapp</TestTFMs> </Project> <Project Include="Xslt\XsltCompiler\XsltCompiler.Tests.csproj" /> <Project Include="Xslt\XslTransformApi\System.Xml.Xsl.XslTransformApi.Tests.csproj" /> diff --git a/src/System.Private.Xml/tests/XmlSerializer/ReflectionOnly/System.Xml.XmlSerializer.ReflectionOnly.Tests.csproj b/src/System.Private.Xml/tests/XmlSerializer/ReflectionOnly/System.Xml.XmlSerializer.ReflectionOnly.Tests.csproj index 1db27992b8..b999ccf18c 100644 --- a/src/System.Private.Xml/tests/XmlSerializer/ReflectionOnly/System.Xml.XmlSerializer.ReflectionOnly.Tests.csproj +++ b/src/System.Private.Xml/tests/XmlSerializer/ReflectionOnly/System.Xml.XmlSerializer.ReflectionOnly.Tests.csproj @@ -1,11 +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> + <PropertyGroup> <DefineConstants>$(DefineConstants);ReflectionOnly</DefineConstants> <RootNamespace>System.Xml.XmlSerializer.ReflectionOnly.Tests</RootNamespace> <AssemblyName>System.Xml.XmlSerializer.ReflectionOnly.Tests</AssemblyName> - <ProjectGuid>{4050F1D1-1DD2-4B48-A17B-E3F955518C4B}</ProjectGuid> + <ProjectGuid>{4050F1D1-1DD2-4B48-A17B-E3F955518C4B}</ProjectGuid> + <NuGetTargetMoniker>.NETStandard,Version=v2.0</NuGetTargetMoniker> </PropertyGroup> <ItemGroup> <Compile Include="$(TestSourceFolder)..\..\..\System.Runtime.Serialization.Xml\tests\Utils.cs" /> @@ -18,4 +19,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.Reflection.Context/pkg/System.Reflection.Context.builds b/src/System.Reflection.Context/pkg/System.Reflection.Context.builds index 242a90983d..7cd0fa93ca 100644 --- a/src/System.Reflection.Context/pkg/System.Reflection.Context.builds +++ b/src/System.Reflection.Context/pkg/System.Reflection.Context.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Reflection.Context.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</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 e0aa96f6a1..8775e64b6a 100644 --- a/src/System.Reflection.Context/ref/System.Reflection.Context.csproj +++ b/src/System.Reflection.Context/ref/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> @@ -13,4 +13,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Reflection.Context/src/Configurations.props b/src/System.Reflection.Context/src/Configurations.props index 46f8a8ce69..0a63ad210a 100644 --- a/src/System.Reflection.Context/src/Configurations.props +++ b/src/System.Reflection.Context/src/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.1; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Reflection.Context/tests/Configurations.props b/src/System.Reflection.Context/tests/Configurations.props index f0ebe53119..c3266e1e93 100644 --- a/src/System.Reflection.Context/tests/Configurations.props +++ b/src/System.Reflection.Context/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Reflection.Context/tests/System.Reflection.Context.Tests.builds b/src/System.Reflection.Context/tests/System.Reflection.Context.Tests.builds index 1f0fb9eb83..a004efb1dd 100644 --- a/src/System.Reflection.Context/tests/System.Reflection.Context.Tests.builds +++ b/src/System.Reflection.Context/tests/System.Reflection.Context.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Reflection.DispatchProxy/pkg/System.Reflection.DispatchProxy.builds b/src/System.Reflection.DispatchProxy/pkg/System.Reflection.DispatchProxy.builds index be6753dbdf..6652077af0 100644 --- a/src/System.Reflection.DispatchProxy/pkg/System.Reflection.DispatchProxy.builds +++ b/src/System.Reflection.DispatchProxy/pkg/System.Reflection.DispatchProxy.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Reflection.DispatchProxy.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Reflection.DispatchProxy/pkg/System.Reflection.DispatchProxy.pkgproj b/src/System.Reflection.DispatchProxy/pkg/System.Reflection.DispatchProxy.pkgproj index ef7a75e3a1..054a662200 100644 --- a/src/System.Reflection.DispatchProxy/pkg/System.Reflection.DispatchProxy.pkgproj +++ b/src/System.Reflection.DispatchProxy/pkg/System.Reflection.DispatchProxy.pkgproj @@ -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" /> <ItemGroup> diff --git a/src/System.Reflection.DispatchProxy/ref/System.Reflection.DispatchProxy.csproj b/src/System.Reflection.DispatchProxy/ref/System.Reflection.DispatchProxy.csproj index 453c235dd3..b258a1d273 100644 --- a/src/System.Reflection.DispatchProxy/ref/System.Reflection.DispatchProxy.csproj +++ b/src/System.Reflection.DispatchProxy/ref/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" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -13,4 +13,4 @@ <ProjectReference Include="..\..\System.Reflection\ref\System.Reflection.csproj" /> </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/src/Configurations.props b/src/System.Reflection.DispatchProxy/src/Configurations.props index faaee17d95..385111b849 100644 --- a/src/System.Reflection.DispatchProxy/src/Configurations.props +++ b/src/System.Reflection.DispatchProxy/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Reflection.DispatchProxy/tests/Configurations.props b/src/System.Reflection.DispatchProxy/tests/Configurations.props index f0ebe53119..c3266e1e93 100644 --- a/src/System.Reflection.DispatchProxy/tests/Configurations.props +++ b/src/System.Reflection.DispatchProxy/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Reflection.DispatchProxy/tests/System.Reflection.DispatchProxy.Tests.builds b/src/System.Reflection.DispatchProxy/tests/System.Reflection.DispatchProxy.Tests.builds index 12c39021d4..97a65cab50 100644 --- a/src/System.Reflection.DispatchProxy/tests/System.Reflection.DispatchProxy.Tests.builds +++ b/src/System.Reflection.DispatchProxy/tests/System.Reflection.DispatchProxy.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Reflection.Emit.ILGeneration/pkg/System.Reflection.Emit.ILGeneration.builds b/src/System.Reflection.Emit.ILGeneration/pkg/System.Reflection.Emit.ILGeneration.builds index ed0c12b133..e7448458c5 100644 --- a/src/System.Reflection.Emit.ILGeneration/pkg/System.Reflection.Emit.ILGeneration.builds +++ b/src/System.Reflection.Emit.ILGeneration/pkg/System.Reflection.Emit.ILGeneration.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Reflection.Emit.ILGeneration.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</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 d8396c3a98..e066ba3632 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,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" /> <ItemGroup> @@ -10,4 +10,4 @@ <ProjectReference Include="..\..\System.Reflection.Primitives\ref\System.Reflection.Primitives.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ 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 index f0ebe53119..c3266e1e93 100644 --- a/src/System.Reflection.Emit.ILGeneration/src/Configurations.props +++ b/src/System.Reflection.Emit.ILGeneration/src/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Reflection.Emit.ILGeneration/tests/Configurations.props b/src/System.Reflection.Emit.ILGeneration/tests/Configurations.props index f0ebe53119..c3266e1e93 100644 --- a/src/System.Reflection.Emit.ILGeneration/tests/Configurations.props +++ b/src/System.Reflection.Emit.ILGeneration/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Reflection.Emit.ILGeneration/tests/System.Reflection.Emit.ILGeneration.Tests.builds b/src/System.Reflection.Emit.ILGeneration/tests/System.Reflection.Emit.ILGeneration.Tests.builds index 4b5faaf87a..32cd738786 100644 --- a/src/System.Reflection.Emit.ILGeneration/tests/System.Reflection.Emit.ILGeneration.Tests.builds +++ b/src/System.Reflection.Emit.ILGeneration/tests/System.Reflection.Emit.ILGeneration.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Reflection.Emit.Lightweight/pkg/System.Reflection.Emit.Lightweight.builds b/src/System.Reflection.Emit.Lightweight/pkg/System.Reflection.Emit.Lightweight.builds index 0b9baf6205..966676a5be 100644 --- a/src/System.Reflection.Emit.Lightweight/pkg/System.Reflection.Emit.Lightweight.builds +++ b/src/System.Reflection.Emit.Lightweight/pkg/System.Reflection.Emit.Lightweight.builds @@ -1,8 +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" /> <ItemGroup> <Project Include="System.Reflection.Emit.Lightweight.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Reflection.Emit.Lightweight/pkg/System.Reflection.Emit.Lightweight.pkgproj b/src/System.Reflection.Emit.Lightweight/pkg/System.Reflection.Emit.Lightweight.pkgproj index d6fa0ae25b..94f7306f2b 100644 --- a/src/System.Reflection.Emit.Lightweight/pkg/System.Reflection.Emit.Lightweight.pkgproj +++ b/src/System.Reflection.Emit.Lightweight/pkg/System.Reflection.Emit.Lightweight.pkgproj @@ -29,4 +29,4 @@ </ValidatePackageSuppression> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file 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 8471275d45..908d46002c 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,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" /> <ItemGroup> @@ -9,4 +9,4 @@ <ProjectReference Include="..\..\System.Reflection.Emit.ILGeneration\ref\System.Reflection.Emit.ILGeneration.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ 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 index f0ebe53119..c3266e1e93 100644 --- a/src/System.Reflection.Emit.Lightweight/src/Configurations.props +++ b/src/System.Reflection.Emit.Lightweight/src/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Reflection.Emit.Lightweight/tests/Configurations.props b/src/System.Reflection.Emit.Lightweight/tests/Configurations.props index f0ebe53119..c3266e1e93 100644 --- a/src/System.Reflection.Emit.Lightweight/tests/Configurations.props +++ b/src/System.Reflection.Emit.Lightweight/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Reflection.Emit.Lightweight/tests/System.Reflection.Emit.Lightweight.Tests.builds b/src/System.Reflection.Emit.Lightweight/tests/System.Reflection.Emit.Lightweight.Tests.builds index 28a101c79f..7c20446f45 100644 --- a/src/System.Reflection.Emit.Lightweight/tests/System.Reflection.Emit.Lightweight.Tests.builds +++ b/src/System.Reflection.Emit.Lightweight/tests/System.Reflection.Emit.Lightweight.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Reflection.Emit/pkg/System.Reflection.Emit.builds b/src/System.Reflection.Emit/pkg/System.Reflection.Emit.builds index 540a61d099..2174cb0d38 100644 --- a/src/System.Reflection.Emit/pkg/System.Reflection.Emit.builds +++ b/src/System.Reflection.Emit/pkg/System.Reflection.Emit.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Reflection.Emit.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Reflection.Emit/ref/System.Reflection.Emit.csproj b/src/System.Reflection.Emit/ref/System.Reflection.Emit.csproj index 6941527b23..2660739dbf 100644 --- a/src/System.Reflection.Emit/ref/System.Reflection.Emit.csproj +++ b/src/System.Reflection.Emit/ref/System.Reflection.Emit.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -10,4 +10,4 @@ <ProjectReference Include="..\..\System.Reflection.Emit.ILGeneration\ref\System.Reflection.Emit.ILGeneration.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Reflection.Emit/src/Configurations.props b/src/System.Reflection.Emit/src/Configurations.props index f0ebe53119..c3266e1e93 100644 --- a/src/System.Reflection.Emit/src/Configurations.props +++ b/src/System.Reflection.Emit/src/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Reflection.Emit/tests/Configurations.props b/src/System.Reflection.Emit/tests/Configurations.props index f0ebe53119..c3266e1e93 100644 --- a/src/System.Reflection.Emit/tests/Configurations.props +++ b/src/System.Reflection.Emit/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Reflection.Emit/tests/System.Reflection.Emit.Tests.builds b/src/System.Reflection.Emit/tests/System.Reflection.Emit.Tests.builds index f56457980e..a08c5f61e5 100644 --- a/src/System.Reflection.Emit/tests/System.Reflection.Emit.Tests.builds +++ b/src/System.Reflection.Emit/tests/System.Reflection.Emit.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Reflection.Extensions/pkg/System.Reflection.Extensions.builds b/src/System.Reflection.Extensions/pkg/System.Reflection.Extensions.builds index cd976c3f7a..cdeedb450c 100644 --- a/src/System.Reflection.Extensions/pkg/System.Reflection.Extensions.builds +++ b/src/System.Reflection.Extensions/pkg/System.Reflection.Extensions.builds @@ -5,4 +5,4 @@ <Project Include="System.Reflection.Extensions.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Reflection.Extensions/pkg/System.Reflection.Extensions.pkgproj b/src/System.Reflection.Extensions/pkg/System.Reflection.Extensions.pkgproj index 79825a4aaa..c93a2f6e8a 100644 --- a/src/System.Reflection.Extensions/pkg/System.Reflection.Extensions.pkgproj +++ b/src/System.Reflection.Extensions/pkg/System.Reflection.Extensions.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Reflection.Extensions.csproj"> - <SupportedFramework>net463;netcoreapp1.1;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Reflection.Extensions.builds" /> <InboxOnTargetFramework Include="MonoAndroid10" /> @@ -24,7 +24,7 @@ <HarvestAdditionalPackages Include="runtime.aot.System.Reflection.Extensions"> <ExcludePaths>ref/netstandard</ExcludePaths> <Version>4.3.0</Version> - </HarvestAdditionalPackages> + </HarvestAdditionalPackages> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</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 b27943b305..18afdb09a6 100644 --- a/src/System.Reflection.Extensions/ref/System.Reflection.Extensions.csproj +++ b/src/System.Reflection.Extensions/ref/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" /> <ItemGroup> @@ -10,4 +10,4 @@ <ProjectReference Include="..\..\System.Reflection.Primitives\ref\System.Reflection.Primitives.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Reflection.Extensions/src/Configurations.props b/src/System.Reflection.Extensions/src/Configurations.props index f013d10b8c..ed0bd2acc9 100644 --- a/src/System.Reflection.Extensions/src/Configurations.props +++ b/src/System.Reflection.Extensions/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj b/src/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj index 45d563ebc4..1675e21c5c 100644 --- a/src/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj +++ b/src/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj @@ -8,7 +8,7 @@ <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <!-- all targets but netcore50aot are pure facades. Exclude resources for pure facades --> <ExcludeResourcesImport Condition="'$(TargetGroup)'!='netcore50aot'">true</ExcludeResourcesImport> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> diff --git a/src/System.Reflection.Extensions/tests/Configurations.props b/src/System.Reflection.Extensions/tests/Configurations.props index f0ebe53119..c3266e1e93 100644 --- a/src/System.Reflection.Extensions/tests/Configurations.props +++ b/src/System.Reflection.Extensions/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Reflection.Extensions/tests/System.Reflection.Extensions.Tests.builds b/src/System.Reflection.Extensions/tests/System.Reflection.Extensions.Tests.builds index 100b4aacfe..0a1a36f94b 100644 --- a/src/System.Reflection.Extensions/tests/System.Reflection.Extensions.Tests.builds +++ b/src/System.Reflection.Extensions/tests/System.Reflection.Extensions.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Reflection.Metadata/pkg/System.Reflection.Metadata.builds b/src/System.Reflection.Metadata/pkg/System.Reflection.Metadata.builds index 2ee524940b..7cb2252b17 100644 --- a/src/System.Reflection.Metadata/pkg/System.Reflection.Metadata.builds +++ b/src/System.Reflection.Metadata/pkg/System.Reflection.Metadata.builds @@ -1,8 +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" /> <ItemGroup> - <Project Include="System.Reflection.Metadata.pkgproj"/> + <Project Include="System.Reflection.Metadata.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Reflection.Metadata/pkg/System.Reflection.Metadata.pkgproj b/src/System.Reflection.Metadata/pkg/System.Reflection.Metadata.pkgproj index 1d7a554709..b5c6ffae10 100644 --- a/src/System.Reflection.Metadata/pkg/System.Reflection.Metadata.pkgproj +++ b/src/System.Reflection.Metadata/pkg/System.Reflection.Metadata.pkgproj @@ -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> <!-- we need to be supported on pre-nuget-3 platforms (Dev12, Dev11, etc) --> <MinClientVersion>2.8.6</MinClientVersion> </PropertyGroup> - <ItemGroup> <ProjectReference Include="..\src\System.Reflection.Metadata.csproj"> <SupportedFramework>net45;netcore45;netcoreapp1.0;wpa81;$(AllXamarinFrameworks)</SupportedFramework> @@ -15,6 +14,5 @@ <Version>1.1.37</Version> </Dependency> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </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 index 46f8a8ce69..0a63ad210a 100644 --- a/src/System.Reflection.Metadata/src/Configurations.props +++ b/src/System.Reflection.Metadata/src/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.1; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Reflection.Metadata/tests/Configurations.props b/src/System.Reflection.Metadata/tests/Configurations.props index 30186bb80b..2c5652de53 100644 --- a/src/System.Reflection.Metadata/tests/Configurations.props +++ b/src/System.Reflection.Metadata/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.5; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.builds b/src/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.builds index 18cf7c3756..4b92b459d4 100644 --- a/src/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.builds +++ b/src/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Reflection.Primitives/pkg/System.Reflection.Primitives.pkgproj b/src/System.Reflection.Primitives/pkg/System.Reflection.Primitives.pkgproj index d12153b910..9c9b4dd2b5 100644 --- a/src/System.Reflection.Primitives/pkg/System.Reflection.Primitives.pkgproj +++ b/src/System.Reflection.Primitives/pkg/System.Reflection.Primitives.pkgproj @@ -1,11 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Reflection.Primitives.csproj"> - <SupportedFramework>net463;netcoreapp1.1;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> - <ProjectReference Include="..\src\System.Reflection.Primitives.csproj"> + <ProjectReference Include="..\src\System.Reflection.Primitives.csproj"> <TargetGroup>net463</TargetGroup> </ProjectReference> <ProjectReference Include="any\System.Reflection.Primitives.pkgproj" /> @@ -15,8 +15,8 @@ <InboxOnTargetFramework Include="win8" /> <InboxOnTargetFramework Include="wp80" /> <InboxOnTargetFramework Include="wpa81" /> - <InboxOnTargetFramework Include="portable45-net45+win8+wpa81" /> + <InboxOnTargetFramework Include="portable45-net45+win8+wpa81" /> <InboxOnTargetFramework Include="portable-net45+win8+wp8+wpa81" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Reflection.Primitives/pkg/any/System.Reflection.Primitives.pkgproj b/src/System.Reflection.Primitives/pkg/any/System.Reflection.Primitives.pkgproj index fc802c9279..6fbcf7989a 100644 --- a/src/System.Reflection.Primitives/pkg/any/System.Reflection.Primitives.pkgproj +++ b/src/System.Reflection.Primitives/pkg/any/System.Reflection.Primitives.pkgproj @@ -5,10 +5,8 @@ <PackageTargetRuntime>any</PackageTargetRuntime> <PreventImplementationReference>true</PreventImplementationReference> </PropertyGroup> - <ItemGroup> <ProjectReference Include="..\..\src\System.Reflection.Primitives.csproj" /> - <InboxOnTargetFramework Include="MonoAndroid10" /> <InboxOnTargetFramework Include="MonoTouch10" /> <InboxOnTargetFramework Include="net45" /> @@ -23,4 +21,4 @@ <InboxOnTargetFramework Include="xamarinwatchos10" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Reflection.Primitives/pkg/aot/System.Reflection.Primitives.pkgproj b/src/System.Reflection.Primitives/pkg/aot/System.Reflection.Primitives.pkgproj index ae4bf2b1db..4a406c788c 100644 --- a/src/System.Reflection.Primitives/pkg/aot/System.Reflection.Primitives.pkgproj +++ b/src/System.Reflection.Primitives/pkg/aot/System.Reflection.Primitives.pkgproj @@ -5,12 +5,10 @@ <PackageTargetRuntime>aot</PackageTargetRuntime> <PreventImplementationReference>true</PreventImplementationReference> </PropertyGroup> - <ItemGroup> <ProjectReference Include="..\..\src\System.Reflection.Primitives.csproj"> <TargetGroup>uap101aot</TargetGroup> </ProjectReference> - <InboxOnTargetFramework Include="MonoAndroid10" /> <InboxOnTargetFramework Include="MonoTouch10" /> <InboxOnTargetFramework Include="net45" /> @@ -23,4 +21,4 @@ <InboxOnTargetFramework Include="xamarinwatchos10" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</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 6cfd0adabf..df688a70e3 100644 --- a/src/System.Reflection.Primitives/ref/System.Reflection.Primitives.csproj +++ b/src/System.Reflection.Primitives/ref/System.Reflection.Primitives.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -8,4 +8,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Reflection.Primitives/src/Configurations.props b/src/System.Reflection.Primitives/src/Configurations.props index f013d10b8c..ed0bd2acc9 100644 --- a/src/System.Reflection.Primitives/src/Configurations.props +++ b/src/System.Reflection.Primitives/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj b/src/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj index 183640ab4e..c5992cb6db 100644 --- a/src/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj +++ b/src/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj @@ -4,7 +4,7 @@ <PropertyGroup> <AssemblyName>System.Reflection.Primitives</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <PackageTargetFramework Condition="'$(TargetGroup)'=='netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)'=='netstandard'">netstandard;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> diff --git a/src/System.Reflection.TypeExtensions/pkg/System.Reflection.TypeExtensions.pkgproj b/src/System.Reflection.TypeExtensions/pkg/System.Reflection.TypeExtensions.pkgproj index 9632c093ca..cbc2b74dbc 100644 --- a/src/System.Reflection.TypeExtensions/pkg/System.Reflection.TypeExtensions.pkgproj +++ b/src/System.Reflection.TypeExtensions/pkg/System.Reflection.TypeExtensions.pkgproj @@ -17,4 +17,4 @@ <InboxOnTargetFramework Include="xamarinwatchos10" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Reflection.TypeExtensions/ref/System.Reflection.TypeExtensions.csproj b/src/System.Reflection.TypeExtensions/ref/System.Reflection.TypeExtensions.csproj index 65c3e3dd54..1cc630e804 100644 --- a/src/System.Reflection.TypeExtensions/ref/System.Reflection.TypeExtensions.csproj +++ b/src/System.Reflection.TypeExtensions/ref/System.Reflection.TypeExtensions.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -10,4 +10,4 @@ <ProjectReference Include="..\..\System.Reflection\ref\System.Reflection.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Reflection.TypeExtensions/src/Configurations.props b/src/System.Reflection.TypeExtensions/src/Configurations.props index bd5a53e86b..7849d93508 100644 --- a/src/System.Reflection.TypeExtensions/src/Configurations.props +++ b/src/System.Reflection.TypeExtensions/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ netstandard1.5; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Reflection.TypeExtensions/tests/Configurations.props b/src/System.Reflection.TypeExtensions/tests/Configurations.props index 30186bb80b..2c5652de53 100644 --- a/src/System.Reflection.TypeExtensions/tests/Configurations.props +++ b/src/System.Reflection.TypeExtensions/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.5; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Reflection.TypeExtensions/tests/System.Reflection.TypeExtensions.Tests.builds b/src/System.Reflection.TypeExtensions/tests/System.Reflection.TypeExtensions.Tests.builds index 8a7e645a04..1c4de0d2c8 100644 --- a/src/System.Reflection.TypeExtensions/tests/System.Reflection.TypeExtensions.Tests.builds +++ b/src/System.Reflection.TypeExtensions/tests/System.Reflection.TypeExtensions.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Reflection/pkg/System.Reflection.pkgproj b/src/System.Reflection/pkg/System.Reflection.pkgproj index 8b31beb768..0eb93faf47 100644 --- a/src/System.Reflection/pkg/System.Reflection.pkgproj +++ b/src/System.Reflection/pkg/System.Reflection.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Reflection.csproj"> - <SupportedFramework>net461;netcoreapp1.1;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net461;netcoreapp2.0;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Reflection.csproj"> <TargetGroup>net461</TargetGroup> @@ -27,4 +27,4 @@ <HarvestSuppressPaths Include="ref/net462;lib/net462" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Reflection/pkg/any/System.Reflection.pkgproj b/src/System.Reflection/pkg/any/System.Reflection.pkgproj index 350eb65fab..e7e635a2a5 100644 --- a/src/System.Reflection/pkg/any/System.Reflection.pkgproj +++ b/src/System.Reflection/pkg/any/System.Reflection.pkgproj @@ -5,10 +5,8 @@ <PackageTargetRuntime>any</PackageTargetRuntime> <PreventImplementationReference>true</PreventImplementationReference> </PropertyGroup> - <ItemGroup> <ProjectReference Include="..\..\src\System.Reflection.csproj" /> - <InboxOnTargetFramework Include="MonoAndroid10" /> <InboxOnTargetFramework Include="MonoTouch10" /> <InboxOnTargetFramework Include="net45" /> diff --git a/src/System.Reflection/pkg/aot/System.Reflection.pkgproj b/src/System.Reflection/pkg/aot/System.Reflection.pkgproj index 44ce6fde61..7cf7eed595 100644 --- a/src/System.Reflection/pkg/aot/System.Reflection.pkgproj +++ b/src/System.Reflection/pkg/aot/System.Reflection.pkgproj @@ -1,17 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> <PackageTargetRuntime>aot</PackageTargetRuntime> <PreventImplementationReference>true</PreventImplementationReference> </PropertyGroup> - <ItemGroup> <ProjectReference Include="..\..\src\System.Reflection.csproj"> <TargetGroup>uap101aot</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/ref/System.Reflection.csproj b/src/System.Reflection/ref/System.Reflection.csproj index ac24a564e2..384452fcca 100644 --- a/src/System.Reflection/ref/System.Reflection.csproj +++ b/src/System.Reflection/ref/System.Reflection.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -9,4 +9,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Reflection/src/Configurations.props b/src/System.Reflection/src/Configurations.props index d561a2dc29..cf22127dc5 100644 --- a/src/System.Reflection/src/Configurations.props +++ b/src/System.Reflection/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Reflection/src/System.Reflection.csproj b/src/System.Reflection/src/System.Reflection.csproj index d84d416c2a..90e5b87cb1 100644 --- a/src/System.Reflection/src/System.Reflection.csproj +++ b/src/System.Reflection/src/System.Reflection.csproj @@ -4,7 +4,7 @@ <PropertyGroup> <AssemblyName>System.Reflection</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> diff --git a/src/System.Reflection/tests/Configurations.props b/src/System.Reflection/tests/Configurations.props index 30186bb80b..2c5652de53 100644 --- a/src/System.Reflection/tests/Configurations.props +++ b/src/System.Reflection/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.5; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Reflection/tests/System.Reflection.Tests.builds b/src/System.Reflection/tests/System.Reflection.Tests.builds index b086d3e434..f3df174644 100644 --- a/src/System.Reflection/tests/System.Reflection.Tests.builds +++ b/src/System.Reflection/tests/System.Reflection.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Resources.Reader/pkg/System.Resources.Reader.builds b/src/System.Resources.Reader/pkg/System.Resources.Reader.builds index 93bb4d8081..a10c4880bc 100644 --- a/src/System.Resources.Reader/pkg/System.Resources.Reader.builds +++ b/src/System.Resources.Reader/pkg/System.Resources.Reader.builds @@ -1,8 +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" /> <ItemGroup> - <Project Include="System.Resources.Reader.pkgproj"/> + <Project Include="System.Resources.Reader.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Resources.Reader/pkg/System.Resources.Reader.pkgproj b/src/System.Resources.Reader/pkg/System.Resources.Reader.pkgproj index da2db612a4..120098f6f9 100644 --- a/src/System.Resources.Reader/pkg/System.Resources.Reader.pkgproj +++ b/src/System.Resources.Reader/pkg/System.Resources.Reader.pkgproj @@ -1,12 +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" /> - <ItemGroup> <ProjectReference Include="..\src\System.Resources.Reader.builds"> <SupportedFramework>net461;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> </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.Reader/ref/System.Resources.Reader.csproj b/src/System.Resources.Reader/ref/System.Resources.Reader.csproj index 33781f940d..f4088a0fb9 100644 --- a/src/System.Resources.Reader/ref/System.Resources.Reader.csproj +++ b/src/System.Resources.Reader/ref/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" /> <ItemGroup> @@ -10,4 +10,4 @@ <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Resources.Reader/src/Configurations.props b/src/System.Resources.Reader/src/Configurations.props index fc9ef9822c..c398e42e89 100644 --- a/src/System.Resources.Reader/src/Configurations.props +++ b/src/System.Resources.Reader/src/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Resources.Reader/tests/Configurations.props b/src/System.Resources.Reader/tests/Configurations.props index 512c938bad..b2db637110 100644 --- a/src/System.Resources.Reader/tests/Configurations.props +++ b/src/System.Resources.Reader/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> netstandard1.3; - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Resources.Reader/tests/System.Resources.Reader.Tests.builds b/src/System.Resources.Reader/tests/System.Resources.Reader.Tests.builds index eff35d5829..f35801a5c8 100644 --- a/src/System.Resources.Reader/tests/System.Resources.Reader.Tests.builds +++ b/src/System.Resources.Reader/tests/System.Resources.Reader.Tests.builds @@ -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" /> <ItemGroup> @@ -13,4 +13,4 @@ </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Resources.ResourceManager/pkg/System.Resources.ResourceManager.builds b/src/System.Resources.ResourceManager/pkg/System.Resources.ResourceManager.builds index 3484094c4a..fec056f6f4 100644 --- a/src/System.Resources.ResourceManager/pkg/System.Resources.ResourceManager.builds +++ b/src/System.Resources.ResourceManager/pkg/System.Resources.ResourceManager.builds @@ -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" /> <ItemGroup> @@ -7,5 +7,4 @@ <Project Include="aot\System.Resources.ResourceManager.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Resources.ResourceManager/pkg/System.Resources.ResourceManager.pkgproj b/src/System.Resources.ResourceManager/pkg/System.Resources.ResourceManager.pkgproj index dfbd9dcde9..e3f9241aab 100644 --- a/src/System.Resources.ResourceManager/pkg/System.Resources.ResourceManager.pkgproj +++ b/src/System.Resources.ResourceManager/pkg/System.Resources.ResourceManager.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Resources.ResourceManager.csproj"> - <SupportedFramework>net463;netcoreapp1.1;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="any\System.Resources.ResourceManager.pkgproj" /> <ProjectReference Include="aot\System.Resources.ResourceManager.pkgproj" /> @@ -18,4 +18,4 @@ <InboxOnTargetFramework Include="portable-net45+win8+wp8+wpa81" /> </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/pkg/aot/System.Resources.ResourceManager.pkgproj b/src/System.Resources.ResourceManager/pkg/aot/System.Resources.ResourceManager.pkgproj index 60277b2a0a..2a43728f92 100644 --- a/src/System.Resources.ResourceManager/pkg/aot/System.Resources.ResourceManager.pkgproj +++ b/src/System.Resources.ResourceManager/pkg/aot/System.Resources.ResourceManager.pkgproj @@ -11,4 +11,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.Resources.ResourceManager/ref/System.Resources.ResourceManager.csproj b/src/System.Resources.ResourceManager/ref/System.Resources.ResourceManager.csproj index 14551c77a0..e487829ba8 100644 --- a/src/System.Resources.ResourceManager/ref/System.Resources.ResourceManager.csproj +++ b/src/System.Resources.ResourceManager/ref/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" /> <ItemGroup> @@ -11,4 +11,4 @@ <ProjectReference Include="..\..\System.Globalization\ref\System.Globalization.csproj" /> </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/src/Configurations.props b/src/System.Resources.ResourceManager/src/Configurations.props index f013d10b8c..ed0bd2acc9 100644 --- a/src/System.Resources.ResourceManager/src/Configurations.props +++ b/src/System.Resources.ResourceManager/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Resources.ResourceManager/src/System.Resources.ResourceManager.csproj b/src/System.Resources.ResourceManager/src/System.Resources.ResourceManager.csproj index f3aa85261b..c63ba50a8a 100644 --- a/src/System.Resources.ResourceManager/src/System.Resources.ResourceManager.csproj +++ b/src/System.Resources.ResourceManager/src/System.Resources.ResourceManager.csproj @@ -7,7 +7,7 @@ <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' != 'uap101aot'">None</ResourcesSourceOutputDirectory> <SkipCommonResourcesIncludes Condition="'$(TargetGroup)'=='uap101aot'">true</SkipCommonResourcesIncludes> <AllowUnsafeBlocks Condition="'$(TargetGroup)' == 'uap101aot'">true</AllowUnsafeBlocks> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> diff --git a/src/System.Resources.ResourceManager/tests/Configurations.props b/src/System.Resources.ResourceManager/tests/Configurations.props index 512c938bad..b2db637110 100644 --- a/src/System.Resources.ResourceManager/tests/Configurations.props +++ b/src/System.Resources.ResourceManager/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> netstandard1.3; - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.builds b/src/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.builds index f0f367ded0..6ce228ac7b 100644 --- a/src/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.builds +++ b/src/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.builds @@ -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" /> <ItemGroup> @@ -13,4 +13,4 @@ </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file 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 d43a93c5ad..c85d18a279 100644 --- a/src/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj +++ b/src/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj @@ -44,4 +44,4 @@ </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/pkg/System.Resources.Writer.builds b/src/System.Resources.Writer/pkg/System.Resources.Writer.builds index 25dceed06e..575cc0736f 100644 --- a/src/System.Resources.Writer/pkg/System.Resources.Writer.builds +++ b/src/System.Resources.Writer/pkg/System.Resources.Writer.builds @@ -1,8 +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" /> <ItemGroup> - <Project Include="System.Resources.Writer.pkgproj"/> + <Project Include="System.Resources.Writer.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Resources.Writer/pkg/System.Resources.Writer.pkgproj b/src/System.Resources.Writer/pkg/System.Resources.Writer.pkgproj index 403252aff8..1c2bc801d8 100644 --- a/src/System.Resources.Writer/pkg/System.Resources.Writer.pkgproj +++ b/src/System.Resources.Writer/pkg/System.Resources.Writer.pkgproj @@ -1,12 +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" /> - <ItemGroup> <ProjectReference Include="..\src\System.Resources.Writer.builds"> <SupportedFramework>net461;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> </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.Writer/ref/System.Resources.Writer.csproj b/src/System.Resources.Writer/ref/System.Resources.Writer.csproj index 018bb6f66b..b598481bdd 100644 --- a/src/System.Resources.Writer/ref/System.Resources.Writer.csproj +++ b/src/System.Resources.Writer/ref/System.Resources.Writer.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -9,4 +9,4 @@ <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> </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/src/Configurations.props b/src/System.Resources.Writer/src/Configurations.props index fc9ef9822c..c398e42e89 100644 --- a/src/System.Resources.Writer/src/Configurations.props +++ b/src/System.Resources.Writer/src/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Resources.Writer/tests/Configurations.props b/src/System.Resources.Writer/tests/Configurations.props index 512c938bad..b2db637110 100644 --- a/src/System.Resources.Writer/tests/Configurations.props +++ b/src/System.Resources.Writer/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> netstandard1.3; - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Resources.Writer/tests/System.Resources.Writer.Tests.builds b/src/System.Resources.Writer/tests/System.Resources.Writer.Tests.builds index dafb05519d..a48563412c 100644 --- a/src/System.Resources.Writer/tests/System.Resources.Writer.Tests.builds +++ b/src/System.Resources.Writer/tests/System.Resources.Writer.Tests.builds @@ -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" /> <ItemGroup> @@ -13,4 +13,4 @@ </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.builds b/src/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.builds index 39c1b29743..7d9f421110 100644 --- a/src/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.builds +++ b/src/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Runtime.CompilerServices.Unsafe.pkgproj" Condition="'$(OS)'=='Windows_NT'" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.CompilerServices.Unsafe/tests/Configurations.props b/src/System.Runtime.CompilerServices.Unsafe/tests/Configurations.props index f0ebe53119..c3266e1e93 100644 --- a/src/System.Runtime.CompilerServices.Unsafe/tests/Configurations.props +++ b/src/System.Runtime.CompilerServices.Unsafe/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.builds b/src/System.Runtime.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.builds index d16b1c0f2a..2aa47187ed 100644 --- a/src/System.Runtime.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.builds +++ b/src/System.Runtime.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.builds @@ -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" /> <ItemGroup> 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 762ad6b96b..8f74ecabd4 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 @@ -11,4 +11,4 @@ <Compile Include="UnsafeTests.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.CompilerServices.VisualC/pkg/System.Runtime.CompilerServices.VisualC.builds b/src/System.Runtime.CompilerServices.VisualC/pkg/System.Runtime.CompilerServices.VisualC.builds index 31948f85b8..f7cc3e0e68 100644 --- a/src/System.Runtime.CompilerServices.VisualC/pkg/System.Runtime.CompilerServices.VisualC.builds +++ b/src/System.Runtime.CompilerServices.VisualC/pkg/System.Runtime.CompilerServices.VisualC.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Runtime.CompilerServices.VisualC.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.CompilerServices.VisualC/pkg/System.Runtime.CompilerServices.VisualC.pkgproj b/src/System.Runtime.CompilerServices.VisualC/pkg/System.Runtime.CompilerServices.VisualC.pkgproj index c017d5a55b..eb5ae14e30 100644 --- a/src/System.Runtime.CompilerServices.VisualC/pkg/System.Runtime.CompilerServices.VisualC.pkgproj +++ b/src/System.Runtime.CompilerServices.VisualC/pkg/System.Runtime.CompilerServices.VisualC.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Runtime.CompilerServices.VisualC.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Runtime.CompilerServices.VisualC.builds" /> </ItemGroup> @@ -17,4 +17,4 @@ <InboxOnTargetFramework Include="xamarinwatchos10" /> </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.VisualC/ref/System.Runtime.CompilerServices.VisualC.csproj b/src/System.Runtime.CompilerServices.VisualC/ref/System.Runtime.CompilerServices.VisualC.csproj index 22f8583356..462c7154d9 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,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" /> <ItemGroup> @@ -8,4 +8,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </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.VisualC/src/Configurations.props b/src/System.Runtime.CompilerServices.VisualC/src/Configurations.props index 9c336c0be9..dc837f9152 100644 --- a/src/System.Runtime.CompilerServices.VisualC/src/Configurations.props +++ b/src/System.Runtime.CompilerServices.VisualC/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.Extensions/pkg/System.Runtime.Extensions.builds b/src/System.Runtime.Extensions/pkg/System.Runtime.Extensions.builds index d12f4c80eb..651417a95c 100644 --- a/src/System.Runtime.Extensions/pkg/System.Runtime.Extensions.builds +++ b/src/System.Runtime.Extensions/pkg/System.Runtime.Extensions.builds @@ -1,8 +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" /> <ItemGroup> - <Project Include="System.Runtime.Extensions.pkgproj"/> + <Project Include="System.Runtime.Extensions.pkgproj" /> <Project Include="win\System.Runtime.Extensions.pkgproj"> <OSGroup>Windows_NT</OSGroup> </Project> diff --git a/src/System.Runtime.Extensions/pkg/System.Runtime.Extensions.pkgproj b/src/System.Runtime.Extensions/pkg/System.Runtime.Extensions.pkgproj index 4464e4d91c..8669b07e55 100644 --- a/src/System.Runtime.Extensions/pkg/System.Runtime.Extensions.pkgproj +++ b/src/System.Runtime.Extensions/pkg/System.Runtime.Extensions.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.Runtime.Extensions.builds"> - <SupportedFramework>netcoreapp1.1;uap10.1;net461;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>netcoreapp2.0;uap10.1;net461;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Runtime.Extensions.csproj"> <TargetGroup>net461</TargetGroup> diff --git a/src/System.Runtime.Extensions/pkg/unix/System.Runtime.Extensions.pkgproj b/src/System.Runtime.Extensions/pkg/unix/System.Runtime.Extensions.pkgproj index fe8cf2606e..0052ce949d 100644 --- a/src/System.Runtime.Extensions/pkg/unix/System.Runtime.Extensions.pkgproj +++ b/src/System.Runtime.Extensions/pkg/unix/System.Runtime.Extensions.pkgproj @@ -1,17 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> <PackageTargetRuntime>unix</PackageTargetRuntime> <PreventImplementationReference>true</PreventImplementationReference> </PropertyGroup> - <ItemGroup> <ProjectReference Include="..\..\src\System.Runtime.Extensions.csproj"> <OSGroup>Unix</OSGroup> </ProjectReference> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.Extensions/ref/4.1.0/System.Runtime.Extensions.depproj b/src/System.Runtime.Extensions/ref/4.1.0/System.Runtime.Extensions.depproj index ecf00eb3cb..1ff7ec1f85 100644 --- a/src/System.Runtime.Extensions/ref/4.1.0/System.Runtime.Extensions.depproj +++ b/src/System.Runtime.Extensions/ref/4.1.0/System.Runtime.Extensions.depproj @@ -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> diff --git a/src/System.Runtime.Extensions/ref/Configurations.props b/src/System.Runtime.Extensions/ref/Configurations.props index ea9ea79f78..8b803e0772 100644 --- a/src/System.Runtime.Extensions/ref/Configurations.props +++ b/src/System.Runtime.Extensions/ref/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.Extensions/ref/System.Runtime.Extensions.builds b/src/System.Runtime.Extensions/ref/System.Runtime.Extensions.builds index 9034d82ac3..4c8688069c 100644 --- a/src/System.Runtime.Extensions/ref/System.Runtime.Extensions.builds +++ b/src/System.Runtime.Extensions/ref/System.Runtime.Extensions.builds @@ -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" /> <ItemGroup> <Project Include="System.Runtime.Extensions.csproj" /> <Project Include="System.Runtime.Extensions.csproj"> - <TargetGroup>netstandard1.7</TargetGroup> + <TargetGroup>netstandard</TargetGroup> </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> diff --git a/src/System.Runtime.Extensions/ref/System.Runtime.Extensions.csproj b/src/System.Runtime.Extensions/ref/System.Runtime.Extensions.csproj index 4eb594ad36..0efde6ac42 100644 --- a/src/System.Runtime.Extensions/ref/System.Runtime.Extensions.csproj +++ b/src/System.Runtime.Extensions/ref/System.Runtime.Extensions.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -13,4 +13,4 @@ <ProjectReference Include="..\..\System.Security.Principal\ref\System.Security.Principal.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.Extensions/src/Configurations.props b/src/System.Runtime.Extensions/src/Configurations.props index 8659b03c29..0aa95fe1ab 100644 --- a/src/System.Runtime.Extensions/src/Configurations.props +++ b/src/System.Runtime.Extensions/src/Configurations.props @@ -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> <BuildConfigurations> @@ -8,4 +8,4 @@ uap101aot-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</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 b2a04d7925..38ae68e10f 100644 --- a/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj +++ b/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj @@ -10,7 +10,7 @@ <!-- System.IO.Path conflicts between type in partial facade and in mscorlib --> <NoWarn>0436</NoWarn> <!-- copy to uap10.1 until nuget makes the change to map that to ns1.7 --> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard;uap10.1</PackageTargetFramework> <TargetsWindowsUap Condition="'$(TargetGroup)'=='uap101aot'">true</TargetsWindowsUap> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> diff --git a/src/System.Runtime.Extensions/tests/AssemblyResolveTests/AssemblyResolveTests.csproj b/src/System.Runtime.Extensions/tests/AssemblyResolveTests/AssemblyResolveTests.csproj index f2cd5ffd74..b0d7ff791c 100644 --- a/src/System.Runtime.Extensions/tests/AssemblyResolveTests/AssemblyResolveTests.csproj +++ b/src/System.Runtime.Extensions/tests/AssemblyResolveTests/AssemblyResolveTests.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -27,4 +27,4 @@ <TargetingPackReference Include="System.Runtime" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.Extensions/tests/Configurations.props b/src/System.Runtime.Extensions/tests/Configurations.props index dec1ed007e..ad85f94e9e 100644 --- a/src/System.Runtime.Extensions/tests/Configurations.props +++ b/src/System.Runtime.Extensions/tests/Configurations.props @@ -1,11 +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> <BuildConfigurations> - netcoreapp1.1-Windows_NT; - netcoreapp1.1-Unix; + netcoreapp-Windows_NT; + netcoreapp-Unix; netstandard1.5-Unix; netstandard1.5-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.builds b/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.builds index a47a51584e..dd247a0173 100644 --- a/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.builds +++ b/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.builds @@ -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" /> <ItemGroup> @@ -22,11 +22,11 @@ </Project> --> <Project Include="System.Runtime.Extensions.Tests.csproj"> - <TargetGroup>netcoreapp1.1</TargetGroup> + <TargetGroup>netcoreapp</TargetGroup> <OSGroup>Windows_NT</OSGroup> </Project> <Project Include="System.Runtime.Extensions.Tests.csproj"> - <TargetGroup>netcoreapp1.1</TargetGroup> + <TargetGroup>netcoreapp</TargetGroup> <OSGroup>Unix</OSGroup> </Project> <Project Include="System.Runtime.Extensions.Tests.csproj"> 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 58bf73f74e..edc63fdb81 100644 --- a/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj +++ b/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj @@ -133,4 +133,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.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj b/src/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj index bdfdc1bf42..2cc3736ddb 100644 --- a/src/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj +++ b/src/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj @@ -17,7 +17,7 @@ <Compile Include="VoidMainWithExitCodeApp.cs" /> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' != 'net46'"> - <Compile Include="AssemblyAttributes.cs"/> + <Compile Include="AssemblyAttributes.cs" /> <Compile Include="$(CommonPath)\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs"> <Link>Common\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs</Link> </Compile> @@ -28,4 +28,4 @@ <TargetingPackReference Include="System.Runtime" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.Handles/pkg/System.Runtime.Handles.pkgproj b/src/System.Runtime.Handles/pkg/System.Runtime.Handles.pkgproj index 41a0254c2a..03592255d8 100644 --- a/src/System.Runtime.Handles/pkg/System.Runtime.Handles.pkgproj +++ b/src/System.Runtime.Handles/pkg/System.Runtime.Handles.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Runtime.Handles.csproj"> - <SupportedFramework>net463;netcoreapp1.1;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Runtime.Handles.csproj"> <TargetGroup>net463</TargetGroup> @@ -18,4 +18,4 @@ <InboxOnTargetFramework Include="xamarinwatchos10" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.Handles/pkg/any/System.Runtime.Handles.pkgproj b/src/System.Runtime.Handles/pkg/any/System.Runtime.Handles.pkgproj index 0072c035f8..09ca8eae08 100644 --- a/src/System.Runtime.Handles/pkg/any/System.Runtime.Handles.pkgproj +++ b/src/System.Runtime.Handles/pkg/any/System.Runtime.Handles.pkgproj @@ -5,16 +5,13 @@ <PackageTargetRuntime>any</PackageTargetRuntime> <PreventImplementationReference>true</PreventImplementationReference> </PropertyGroup> - <ItemGroup> <ProjectReference Include="..\..\src\System.Runtime.Handles.csproj" /> - <!-- AOT implementation comes from AOT package --> <File Include="$(PlaceholderFile)"> <TargetPath>runtimes/aot/lib/netcore50</TargetPath> <TargetFramework>aot</TargetFramework> </File> - <InboxOnTargetFramework Include="MonoAndroid10" /> <InboxOnTargetFramework Include="MonoTouch10" /> <InboxOnTargetFramework Include="xamarinios10" /> diff --git a/src/System.Runtime.Handles/pkg/aot/System.Runtime.Handles.pkgproj b/src/System.Runtime.Handles/pkg/aot/System.Runtime.Handles.pkgproj index df4808f505..c796ab01b4 100644 --- a/src/System.Runtime.Handles/pkg/aot/System.Runtime.Handles.pkgproj +++ b/src/System.Runtime.Handles/pkg/aot/System.Runtime.Handles.pkgproj @@ -1,17 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> <PackageTargetRuntime>aot</PackageTargetRuntime> <PreventImplementationReference>true</PreventImplementationReference> </PropertyGroup> - <ItemGroup> <ProjectReference Include="..\..\src\System.Runtime.Handles.csproj"> <TargetGroup>uap101aot</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.Runtime.Handles/ref/System.Runtime.Handles.csproj b/src/System.Runtime.Handles/ref/System.Runtime.Handles.csproj index 99493e3f15..aa4f54e73e 100644 --- a/src/System.Runtime.Handles/ref/System.Runtime.Handles.csproj +++ b/src/System.Runtime.Handles/ref/System.Runtime.Handles.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -8,4 +8,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.Handles/src/Configurations.props b/src/System.Runtime.Handles/src/Configurations.props index f013d10b8c..ed0bd2acc9 100644 --- a/src/System.Runtime.Handles/src/Configurations.props +++ b/src/System.Runtime.Handles/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.Handles/src/System.Runtime.Handles.csproj b/src/System.Runtime.Handles/src/System.Runtime.Handles.csproj index 39fc936e06..0a33f6eff2 100644 --- a/src/System.Runtime.Handles/src/System.Runtime.Handles.csproj +++ b/src/System.Runtime.Handles/src/System.Runtime.Handles.csproj @@ -5,7 +5,7 @@ <ProjectGuid>{D85EE71C-F05B-4331-9300-8E2833D49E19}</ProjectGuid> <AssemblyName>System.Runtime.Handles</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <PackageTargetFramework Condition="'$(TargetGroup)'=='netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)'=='netstandard'">netstandard;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> diff --git a/src/System.Runtime.Handles/tests/Configurations.props b/src/System.Runtime.Handles/tests/Configurations.props index 98f53209d4..c398e42e89 100644 --- a/src/System.Runtime.Handles/tests/Configurations.props +++ b/src/System.Runtime.Handles/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.builds b/src/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.builds index f8f4552dde..3f457a5c50 100644 --- a/src/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.builds +++ b/src/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.builds @@ -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" /> <ItemGroup> 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 836b12e3be..39b0f1a94f 100644 --- a/src/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.csproj +++ b/src/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.csproj @@ -20,4 +20,4 @@ <Compile Include="SafeHandle.netstandard1.7.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.RuntimeInformation/pkg/System.Runtime.InteropServices.RuntimeInformation.builds b/src/System.Runtime.InteropServices.RuntimeInformation/pkg/System.Runtime.InteropServices.RuntimeInformation.builds index fb3f824b63..1db434bfe6 100644 --- a/src/System.Runtime.InteropServices.RuntimeInformation/pkg/System.Runtime.InteropServices.RuntimeInformation.builds +++ b/src/System.Runtime.InteropServices.RuntimeInformation/pkg/System.Runtime.InteropServices.RuntimeInformation.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Runtime.InteropServices.RuntimeInformation.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.InteropServices.RuntimeInformation/pkg/System.Runtime.InteropServices.RuntimeInformation.pkgproj b/src/System.Runtime.InteropServices.RuntimeInformation/pkg/System.Runtime.InteropServices.RuntimeInformation.pkgproj index 2000079257..e416032775 100644 --- a/src/System.Runtime.InteropServices.RuntimeInformation/pkg/System.Runtime.InteropServices.RuntimeInformation.pkgproj +++ b/src/System.Runtime.InteropServices.RuntimeInformation/pkg/System.Runtime.InteropServices.RuntimeInformation.pkgproj @@ -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" /> <ItemGroup> 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 ca07fc756e..337da775ed 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,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" /> <ItemGroup> @@ -8,4 +8,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </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.RuntimeInformation/src/Configurations.props b/src/System.Runtime.InteropServices.RuntimeInformation/src/Configurations.props index 3178cd309f..9ac6930b15 100644 --- a/src/System.Runtime.InteropServices.RuntimeInformation/src/Configurations.props +++ b/src/System.Runtime.InteropServices.RuntimeInformation/src/Configurations.props @@ -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> <BuildConfigurations> @@ -11,4 +11,4 @@ netstandard1.1-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ 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 index 0c2d77f6b7..566c16a6e1 100644 --- a/src/System.Runtime.InteropServices.RuntimeInformation/tests/Configurations.props +++ b/src/System.Runtime.InteropServices.RuntimeInformation/tests/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard1.3-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.builds b/src/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.builds index a02e68c430..938b643adb 100644 --- a/src/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.builds +++ b/src/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Runtime.InteropServices.WindowsRuntime/pkg/System.Runtime.InteropServices.WindowsRuntime.builds b/src/System.Runtime.InteropServices.WindowsRuntime/pkg/System.Runtime.InteropServices.WindowsRuntime.builds index 58684e14f5..b9814f0bca 100644 --- a/src/System.Runtime.InteropServices.WindowsRuntime/pkg/System.Runtime.InteropServices.WindowsRuntime.builds +++ b/src/System.Runtime.InteropServices.WindowsRuntime/pkg/System.Runtime.InteropServices.WindowsRuntime.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Runtime.InteropServices.WindowsRuntime.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.InteropServices.WindowsRuntime/pkg/System.Runtime.InteropServices.WindowsRuntime.pkgproj b/src/System.Runtime.InteropServices.WindowsRuntime/pkg/System.Runtime.InteropServices.WindowsRuntime.pkgproj index 8f6901c963..99672d1604 100644 --- a/src/System.Runtime.InteropServices.WindowsRuntime/pkg/System.Runtime.InteropServices.WindowsRuntime.pkgproj +++ b/src/System.Runtime.InteropServices.WindowsRuntime/pkg/System.Runtime.InteropServices.WindowsRuntime.pkgproj @@ -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" /> <ItemGroup> 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 1f54d3ed2e..78cbedea50 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,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" /> <ItemGroup> @@ -8,4 +8,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </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/src/Configurations.props b/src/System.Runtime.InteropServices.WindowsRuntime/src/Configurations.props index faaee17d95..385111b849 100644 --- a/src/System.Runtime.InteropServices.WindowsRuntime/src/Configurations.props +++ b/src/System.Runtime.InteropServices.WindowsRuntime/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.InteropServices/pkg/System.Runtime.InteropServices.pkgproj b/src/System.Runtime.InteropServices/pkg/System.Runtime.InteropServices.pkgproj index d27acfc81e..f9eb49e73f 100644 --- a/src/System.Runtime.InteropServices/pkg/System.Runtime.InteropServices.pkgproj +++ b/src/System.Runtime.InteropServices/pkg/System.Runtime.InteropServices.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Runtime.InteropServices.builds"> - <SupportedFramework>net461;netcoreapp1.1;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net461;netcoreapp2.0;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Runtime.InteropServices.csproj"> <TargetGroup>net461</TargetGroup> diff --git a/src/System.Runtime.InteropServices/pkg/any/System.Runtime.InteropServices.pkgproj b/src/System.Runtime.InteropServices/pkg/any/System.Runtime.InteropServices.pkgproj index 0b5c2510d5..d748093ffb 100644 --- a/src/System.Runtime.InteropServices/pkg/any/System.Runtime.InteropServices.pkgproj +++ b/src/System.Runtime.InteropServices/pkg/any/System.Runtime.InteropServices.pkgproj @@ -5,10 +5,8 @@ <PackageTargetRuntime>any</PackageTargetRuntime> <PreventImplementationReference>true</PreventImplementationReference> </PropertyGroup> - <ItemGroup> <ProjectReference Include="..\..\src\System.Runtime.InteropServices.csproj" /> - <InboxOnTargetFramework Include="MonoAndroid10" /> <InboxOnTargetFramework Include="MonoTouch10" /> <InboxOnTargetFramework Include="net45" /> diff --git a/src/System.Runtime.InteropServices/pkg/aot/System.Runtime.InteropServices.pkgproj b/src/System.Runtime.InteropServices/pkg/aot/System.Runtime.InteropServices.pkgproj index f5af615735..2325ce35d1 100644 --- a/src/System.Runtime.InteropServices/pkg/aot/System.Runtime.InteropServices.pkgproj +++ b/src/System.Runtime.InteropServices/pkg/aot/System.Runtime.InteropServices.pkgproj @@ -1,18 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> <PackageTargetRuntime>aot</PackageTargetRuntime> <PreventImplementationReference>true</PreventImplementationReference> </PropertyGroup> - <ItemGroup> <ProjectReference Include="..\..\src\System.Runtime.InteropServices.csproj"> <OSGroup>Windows_NT</OSGroup> <TargetGroup>uap101aot</TargetGroup> </ProjectReference> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.builds b/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.builds index 9108ddf37f..cdde6952c1 100644 --- a/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.builds +++ b/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.builds @@ -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" /> <ItemGroup> <Project Include="System.Runtime.InteropServices.csproj" /> <Project Include="System.Runtime.InteropServices.csproj"> - <TargetGroup>netstandard1.7</TargetGroup> + <TargetGroup>netstandard</TargetGroup> </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> diff --git a/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj b/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj index eb2df3faa0..e1c4dd09c3 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> @@ -18,4 +18,4 @@ <ProjectReference Include="..\..\System.Runtime.Handles\ref\System.Runtime.Handles.csproj" /> </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/src/Configurations.props b/src/System.Runtime.InteropServices/src/Configurations.props index f2a0c6d114..df6e10bdc7 100644 --- a/src/System.Runtime.InteropServices/src/Configurations.props +++ b/src/System.Runtime.InteropServices/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj b/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj index 3907772524..859375bd45 100644 --- a/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj +++ b/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj @@ -9,7 +9,7 @@ <GenFacadesArgs Condition="'$(TargetGroup)' == 'uap101aot'">$(GenFacadesArgs) -ignoreMissingTypes</GenFacadesArgs> <!-- Force string resources to be excluded for full facades. --> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net463' or '$(TargetGroup)' == 'uap101aot'">None</ResourcesSourceOutputDirectory> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> diff --git a/src/System.Runtime.InteropServices/tests/Configurations.props b/src/System.Runtime.InteropServices/tests/Configurations.props index 98f53209d4..c398e42e89 100644 --- a/src/System.Runtime.InteropServices/tests/Configurations.props +++ b/src/System.Runtime.InteropServices/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.builds b/src/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.builds index 619399b6b6..5585152b20 100644 --- a/src/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.builds +++ b/src/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.builds @@ -1,11 +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" /> <ItemGroup> <Project Include="System.Runtime.InteropServices.Tests.csproj" /> <Project Include="System.Runtime.InteropServices.Tests.csproj"> <OSGroup>Windows_NT</OSGroup> - <TargetGroup>netstandard1.7</TargetGroup> + <TargetGroup>netstandard</TargetGroup> <TestTFMs>netcoreapp1.0;netcore50;net46</TestTFMs> </Project> </ItemGroup> diff --git a/src/System.Runtime.Loader/pkg/System.Runtime.Loader.builds b/src/System.Runtime.Loader/pkg/System.Runtime.Loader.builds index abe0426534..cbf9152416 100644 --- a/src/System.Runtime.Loader/pkg/System.Runtime.Loader.builds +++ b/src/System.Runtime.Loader/pkg/System.Runtime.Loader.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Runtime.Loader.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.Loader/pkg/System.Runtime.Loader.pkgproj b/src/System.Runtime.Loader/pkg/System.Runtime.Loader.pkgproj index d4f33b0d0f..4ce96cd2f0 100644 --- a/src/System.Runtime.Loader/pkg/System.Runtime.Loader.pkgproj +++ b/src/System.Runtime.Loader/pkg/System.Runtime.Loader.pkgproj @@ -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" /> - <ItemGroup> <ProjectReference Include="..\ref\System.Runtime.Loader.csproj"> <SupportedFramework>netcoreapp1.0</SupportedFramework> </ProjectReference> - <ProjectReference Include="..\src\System.Runtime.Loader.builds"/> - + <ProjectReference Include="..\src\System.Runtime.Loader.builds" /> <NotSupportedOnTargetFramework Include="net461" /> <NotSupportedOnTargetFramework Include="$(AllXamarinFrameworks)" /> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </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 2a9c25d02c..1fd2a907fa 100644 --- a/src/System.Runtime.Loader/ref/System.Runtime.Loader.csproj +++ b/src/System.Runtime.Loader/ref/System.Runtime.Loader.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -14,4 +14,4 @@ <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> </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/src/Configurations.props b/src/System.Runtime.Loader/src/Configurations.props index 30186bb80b..2c5652de53 100644 --- a/src/System.Runtime.Loader/src/Configurations.props +++ b/src/System.Runtime.Loader/src/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.5; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.Loader/tests/Configurations.props b/src/System.Runtime.Loader/tests/Configurations.props index 3007f723e5..a5a130bbdb 100644 --- a/src/System.Runtime.Loader/tests/Configurations.props +++ b/src/System.Runtime.Loader/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.6; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file 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 0353b91c2d..4ecda1b213 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 @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{396D6EBF-60BD-4DAF-8783-FB403E070A57}</ProjectGuid> - <!-- Test expects an un-signed assembly --> + <!-- Test expects an un-signed assembly --> <SkipSigning>true</SkipSigning> <IsTestProject>true</IsTestProject> <NoWarn>0436</NoWarn> diff --git a/src/System.Runtime.Loader/tests/System.Runtime.Loader.Tests.builds b/src/System.Runtime.Loader/tests/System.Runtime.Loader.Tests.builds index 1f806ed45c..a7b8abb3e2 100644 --- a/src/System.Runtime.Loader/tests/System.Runtime.Loader.Tests.builds +++ b/src/System.Runtime.Loader/tests/System.Runtime.Loader.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Runtime.Numerics/pkg/System.Runtime.Numerics.builds b/src/System.Runtime.Numerics/pkg/System.Runtime.Numerics.builds index 3e7f0b7775..2025d6daab 100644 --- a/src/System.Runtime.Numerics/pkg/System.Runtime.Numerics.builds +++ b/src/System.Runtime.Numerics/pkg/System.Runtime.Numerics.builds @@ -5,4 +5,4 @@ <Project Include="System.Runtime.Numerics.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.Numerics/pkg/System.Runtime.Numerics.pkgproj b/src/System.Runtime.Numerics/pkg/System.Runtime.Numerics.pkgproj index 33dd28436d..eeee713dde 100644 --- a/src/System.Runtime.Numerics/pkg/System.Runtime.Numerics.pkgproj +++ b/src/System.Runtime.Numerics/pkg/System.Runtime.Numerics.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Runtime.Numerics.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Runtime.Numerics.builds" /> <InboxOnTargetFramework Include="MonoAndroid10" /> diff --git a/src/System.Runtime.Numerics/ref/System.Runtime.Numerics.csproj b/src/System.Runtime.Numerics/ref/System.Runtime.Numerics.csproj index dd1fedb0c5..1c302429a5 100644 --- a/src/System.Runtime.Numerics/ref/System.Runtime.Numerics.csproj +++ b/src/System.Runtime.Numerics/ref/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" /> <ItemGroup> @@ -8,4 +8,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.Numerics/src/Configurations.props b/src/System.Runtime.Numerics/src/Configurations.props index 9c336c0be9..dc837f9152 100644 --- a/src/System.Runtime.Numerics/src/Configurations.props +++ b/src/System.Runtime.Numerics/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.Numerics/tests/Configurations.props b/src/System.Runtime.Numerics/tests/Configurations.props index 2a160a39e8..211cd2bec8 100644 --- a/src/System.Runtime.Numerics/tests/Configurations.props +++ b/src/System.Runtime.Numerics/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> netstandard1.3-Windows_NT; - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.Numerics/tests/System.Runtime.Numerics.Tests.builds b/src/System.Runtime.Numerics/tests/System.Runtime.Numerics.Tests.builds index e9111e6075..3032198cda 100644 --- a/src/System.Runtime.Numerics/tests/System.Runtime.Numerics.Tests.builds +++ b/src/System.Runtime.Numerics/tests/System.Runtime.Numerics.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Runtime.Serialization.Formatters/pkg/System.Runtime.Serialization.Formatters.builds b/src/System.Runtime.Serialization.Formatters/pkg/System.Runtime.Serialization.Formatters.builds index f555588b18..16eb8ceabd 100644 --- a/src/System.Runtime.Serialization.Formatters/pkg/System.Runtime.Serialization.Formatters.builds +++ b/src/System.Runtime.Serialization.Formatters/pkg/System.Runtime.Serialization.Formatters.builds @@ -5,4 +5,4 @@ <Project Include="System.Runtime.Serialization.Formatters.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.Serialization.Formatters/pkg/System.Runtime.Serialization.Formatters.pkgproj b/src/System.Runtime.Serialization.Formatters/pkg/System.Runtime.Serialization.Formatters.pkgproj index 19e418b991..e6db74950a 100644 --- a/src/System.Runtime.Serialization.Formatters/pkg/System.Runtime.Serialization.Formatters.pkgproj +++ b/src/System.Runtime.Serialization.Formatters/pkg/System.Runtime.Serialization.Formatters.pkgproj @@ -1,9 +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" /> - <ItemGroup> + <ItemGroup> <ProjectReference Include="..\ref\System.Runtime.Serialization.Formatters.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Runtime.Serialization.Formatters.builds" /> <InboxOnTargetFramework Include="MonoAndroid10" /> 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 23ca3e7da7..0f991f9958 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,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" /> <ItemGroup> @@ -13,4 +13,4 @@ <ProjectReference Include="..\..\System.Runtime.Serialization.Primitives\ref\System.Runtime.Serialization.Primitives.csproj" /> </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.Formatters/src/Configurations.props b/src/System.Runtime.Serialization.Formatters/src/Configurations.props index a548d6bec7..854b83ee23 100644 --- a/src/System.Runtime.Serialization.Formatters/src/Configurations.props +++ b/src/System.Runtime.Serialization.Formatters/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.Serialization.Formatters/tests/Configurations.props b/src/System.Runtime.Serialization.Formatters/tests/Configurations.props index 98f53209d4..c398e42e89 100644 --- a/src/System.Runtime.Serialization.Formatters/tests/Configurations.props +++ b/src/System.Runtime.Serialization.Formatters/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.builds b/src/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.builds index 869ffaaec2..ae2a07ae5c 100644 --- a/src/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.builds +++ b/src/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Runtime.Serialization.Json/pkg/System.Runtime.Serialization.Json.builds b/src/System.Runtime.Serialization.Json/pkg/System.Runtime.Serialization.Json.builds index 6e7903eaa8..e987cee5ec 100644 --- a/src/System.Runtime.Serialization.Json/pkg/System.Runtime.Serialization.Json.builds +++ b/src/System.Runtime.Serialization.Json/pkg/System.Runtime.Serialization.Json.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Runtime.Serialization.Json.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.Serialization.Json/pkg/System.Runtime.Serialization.Json.pkgproj b/src/System.Runtime.Serialization.Json/pkg/System.Runtime.Serialization.Json.pkgproj index 6d59b99038..70df083d2b 100644 --- a/src/System.Runtime.Serialization.Json/pkg/System.Runtime.Serialization.Json.pkgproj +++ b/src/System.Runtime.Serialization.Json/pkg/System.Runtime.Serialization.Json.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Runtime.Serialization.Json.csproj"> - <SupportedFramework>net463;netcoreapp1.1;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Runtime.Serialization.Json.builds" /> <InboxOnTargetFramework Include="MonoAndroid10" /> 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 c181713305..a7850ebcfb 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,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" /> <ItemGroup> @@ -13,4 +13,4 @@ <ProjectReference Include="..\..\System.Runtime.Serialization.Xml\ref\System.Runtime.Serialization.Xml.csproj" /> </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/src/Configurations.props b/src/System.Runtime.Serialization.Json/src/Configurations.props index fc9ef9822c..c398e42e89 100644 --- a/src/System.Runtime.Serialization.Json/src/Configurations.props +++ b/src/System.Runtime.Serialization.Json/src/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.Serialization.Json/tests/Configurations.props b/src/System.Runtime.Serialization.Json/tests/Configurations.props index 98f53209d4..c398e42e89 100644 --- a/src/System.Runtime.Serialization.Json/tests/Configurations.props +++ b/src/System.Runtime.Serialization.Json/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.builds b/src/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.builds index f232a413ed..56a5d7ca85 100644 --- a/src/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.builds +++ b/src/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Runtime.Serialization.Primitives/pkg/System.Runtime.Serialization.Primitives.builds b/src/System.Runtime.Serialization.Primitives/pkg/System.Runtime.Serialization.Primitives.builds index 85cf9046fb..af81430476 100644 --- a/src/System.Runtime.Serialization.Primitives/pkg/System.Runtime.Serialization.Primitives.builds +++ b/src/System.Runtime.Serialization.Primitives/pkg/System.Runtime.Serialization.Primitives.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Runtime.Serialization.Primitives/pkg/System.Runtime.Serialization.Primitives.pkgproj b/src/System.Runtime.Serialization.Primitives/pkg/System.Runtime.Serialization.Primitives.pkgproj index 2acf6b5f0f..01d18a859e 100644 --- a/src/System.Runtime.Serialization.Primitives/pkg/System.Runtime.Serialization.Primitives.pkgproj +++ b/src/System.Runtime.Serialization.Primitives/pkg/System.Runtime.Serialization.Primitives.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.Runtime.Serialization.Primitives.csproj"> - <SupportedFramework>net463;netcoreapp1.1;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Runtime.Serialization.Primitives.builds" /> <InboxOnTargetFramework Include="MonoAndroid10" /> 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 0b331177f6..0130f913fd 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,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" /> <ItemGroup> @@ -8,4 +8,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </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.Primitives/src/Configurations.props b/src/System.Runtime.Serialization.Primitives/src/Configurations.props index 4e4f5d7e7b..b2079602f2 100644 --- a/src/System.Runtime.Serialization.Primitives/src/Configurations.props +++ b/src/System.Runtime.Serialization.Primitives/src/Configurations.props @@ -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> <BuildConfigurations> @@ -9,4 +9,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file 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 71baab0b30..edafd24ea5 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 @@ -12,7 +12,7 @@ <PlatformTarget>AnyCPU</PlatformTarget> <ProjectGuid>{CDF0ACB5-1361-4E48-8ECB-22E8022F5F01}</ProjectGuid> <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net463'">true</IsPartialFacadeAssembly> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard;uap10.1</PackageTargetFramework> <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard1.3'">netstandard1.3;netcore50</PackageTargetFramework> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> diff --git a/src/System.Runtime.Serialization.Xml/pkg/System.Runtime.Serialization.Xml.builds b/src/System.Runtime.Serialization.Xml/pkg/System.Runtime.Serialization.Xml.builds index a4acdb92e9..a4cd370d9a 100644 --- a/src/System.Runtime.Serialization.Xml/pkg/System.Runtime.Serialization.Xml.builds +++ b/src/System.Runtime.Serialization.Xml/pkg/System.Runtime.Serialization.Xml.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Runtime.Serialization.Xml/pkg/System.Runtime.Serialization.Xml.pkgproj b/src/System.Runtime.Serialization.Xml/pkg/System.Runtime.Serialization.Xml.pkgproj index cd6a1c9c85..88bf93b83a 100644 --- a/src/System.Runtime.Serialization.Xml/pkg/System.Runtime.Serialization.Xml.pkgproj +++ b/src/System.Runtime.Serialization.Xml/pkg/System.Runtime.Serialization.Xml.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.Runtime.Serialization.Xml.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Runtime.Serialization.Xml.builds" /> <InboxOnTargetFramework Include="MonoAndroid10" /> 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 165f0640b2..0352983d1f 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,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" /> <ItemGroup> @@ -15,4 +15,4 @@ <ProjectReference Include="..\..\System.Text.Encoding\ref\System.Text.Encoding.csproj" /> </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.Xml/src/Configurations.props b/src/System.Runtime.Serialization.Xml/src/Configurations.props index 9c336c0be9..dc837f9152 100644 --- a/src/System.Runtime.Serialization.Xml/src/Configurations.props +++ b/src/System.Runtime.Serialization.Xml/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.Serialization.Xml/tests/Configurations.props b/src/System.Runtime.Serialization.Xml/tests/Configurations.props index 98f53209d4..c398e42e89 100644 --- a/src/System.Runtime.Serialization.Xml/tests/Configurations.props +++ b/src/System.Runtime.Serialization.Xml/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.builds b/src/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.builds index 3023525cb5..a52e681b1f 100644 --- a/src/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.builds +++ b/src/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Runtime.WindowsRuntime.UI.Xaml/pkg/System.Runtime.WindowsRuntime.UI.Xaml.builds b/src/System.Runtime.WindowsRuntime.UI.Xaml/pkg/System.Runtime.WindowsRuntime.UI.Xaml.builds index 839d1aae9c..b0bc7b8ca9 100644 --- a/src/System.Runtime.WindowsRuntime.UI.Xaml/pkg/System.Runtime.WindowsRuntime.UI.Xaml.builds +++ b/src/System.Runtime.WindowsRuntime.UI.Xaml/pkg/System.Runtime.WindowsRuntime.UI.Xaml.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Runtime.WindowsRuntime.UI.Xaml.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.WindowsRuntime.UI.Xaml/pkg/System.Runtime.WindowsRuntime.UI.Xaml.pkgproj b/src/System.Runtime.WindowsRuntime.UI.Xaml/pkg/System.Runtime.WindowsRuntime.UI.Xaml.pkgproj index 72a06cd6bd..4aa2b2240a 100644 --- a/src/System.Runtime.WindowsRuntime.UI.Xaml/pkg/System.Runtime.WindowsRuntime.UI.Xaml.pkgproj +++ b/src/System.Runtime.WindowsRuntime.UI.Xaml/pkg/System.Runtime.WindowsRuntime.UI.Xaml.pkgproj @@ -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" /> - <ItemGroup> <ProjectReference Include="..\ref\System.Runtime.WindowsRuntime.UI.Xaml.csproj"> <SupportedFramework>netcore45;wpa81</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Runtime.WindowsRuntime.UI.Xaml.builds" /> <!-- Not supported for desktop --> - - <InboxOnTargetFramework Include="win8"/> - <InboxOnTargetFramework Include="wpa81"/> + <InboxOnTargetFramework Include="win8" /> + <InboxOnTargetFramework Include="wpa81" /> <InboxOnTargetFramework Include="portable-win8+wpa81" /> </ItemGroup> <ItemGroup> 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 aa8ab8c02b..fa3f5b713c 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,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> @@ -12,4 +12,4 @@ <ProjectReference Include="..\..\System.Runtime.WindowsRuntime\ref\System.Runtime.WindowsRuntime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.WindowsRuntime.UI.Xaml/src/System.Runtime.WindowsRuntime.UI.Xaml.builds b/src/System.Runtime.WindowsRuntime.UI.Xaml/src/System.Runtime.WindowsRuntime.UI.Xaml.builds index 8883ecbed5..3b6f5952f4 100644 --- a/src/System.Runtime.WindowsRuntime.UI.Xaml/src/System.Runtime.WindowsRuntime.UI.Xaml.builds +++ b/src/System.Runtime.WindowsRuntime.UI.Xaml/src/System.Runtime.WindowsRuntime.UI.Xaml.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Runtime.WindowsRuntime.UI.Xaml.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.WindowsRuntime/pkg/System.Runtime.WindowsRuntime.builds b/src/System.Runtime.WindowsRuntime/pkg/System.Runtime.WindowsRuntime.builds index 484bc3243d..3c3bfc693c 100644 --- a/src/System.Runtime.WindowsRuntime/pkg/System.Runtime.WindowsRuntime.builds +++ b/src/System.Runtime.WindowsRuntime/pkg/System.Runtime.WindowsRuntime.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Runtime.WindowsRuntime.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj b/src/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj index ac384978d6..41885250e6 100644 --- a/src/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj +++ b/src/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -28,4 +28,4 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <!-- Temporarily disable TFM validation until its fixed to ignore windows.winmd --> <Target Name="ValidatePackageTargetFramework" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.builds b/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.builds index 039200da4a..55c28ce390 100644 --- a/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.builds +++ b/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.builds @@ -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" /> <ItemGroup> @@ -11,5 +11,4 @@ </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Runtime/pkg/System.Runtime.pkgproj b/src/System.Runtime/pkg/System.Runtime.pkgproj index f87ccc1094..25750c2bbf 100644 --- a/src/System.Runtime/pkg/System.Runtime.pkgproj +++ b/src/System.Runtime/pkg/System.Runtime.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.Runtime.builds"> - <SupportedFramework>net461;netcoreapp1.1;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net461;netcoreapp2.0;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Runtime.csproj"> <TargetGroup>net461</TargetGroup> @@ -29,4 +29,4 @@ <HarvestSuppressPaths Include="ref/net462;lib/net462" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime/pkg/any/System.Runtime.pkgproj b/src/System.Runtime/pkg/any/System.Runtime.pkgproj index 968fa69639..c6d5bcd3d6 100644 --- a/src/System.Runtime/pkg/any/System.Runtime.pkgproj +++ b/src/System.Runtime/pkg/any/System.Runtime.pkgproj @@ -30,4 +30,4 @@ <InboxOnTargetFramework Include="xamarinwatchos10" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime/ref/4.1.0/System.Runtime.depproj b/src/System.Runtime/ref/4.1.0/System.Runtime.depproj index 98a6cb8982..e3932a41e6 100644 --- a/src/System.Runtime/ref/4.1.0/System.Runtime.depproj +++ b/src/System.Runtime/ref/4.1.0/System.Runtime.depproj @@ -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> diff --git a/src/System.Runtime/ref/Configurations.props b/src/System.Runtime/ref/Configurations.props index ea9ea79f78..8b803e0772 100644 --- a/src/System.Runtime/ref/Configurations.props +++ b/src/System.Runtime/ref/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</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 37a403ccd4..8981eadc6a 100644 --- a/src/System.Runtime/ref/System.Runtime.csproj +++ b/src/System.Runtime/ref/System.Runtime.csproj @@ -15,4 +15,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.Runtime/src/Configurations.props b/src/System.Runtime/src/Configurations.props index 323984f16b..f71bd28c11 100644 --- a/src/System.Runtime/src/Configurations.props +++ b/src/System.Runtime/src/Configurations.props @@ -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> <BuildConfigurations> @@ -9,4 +9,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime/tests/Configurations.props b/src/System.Runtime/tests/Configurations.props index c5ec56bec2..793828d6a3 100644 --- a/src/System.Runtime/tests/Configurations.props +++ b/src/System.Runtime/tests/Configurations.props @@ -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"> <PropertyGroup> <BuildConfigurations> netstandard1.5; - netcoreapp1.1; - netstandard1.7; + netcoreapp; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime/tests/System.Runtime.Tests.builds b/src/System.Runtime/tests/System.Runtime.Tests.builds index e041fc835f..c2d105fb2b 100644 --- a/src/System.Runtime/tests/System.Runtime.Tests.builds +++ b/src/System.Runtime/tests/System.Runtime.Tests.builds @@ -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" /> <ItemGroup> @@ -8,8 +8,8 @@ <TestTFMs>netcoreapp1.0</TestTFMs> </Project> <Project Include="System.Runtime.Tests.csproj"> - <TargetGroup>netcoreapp1.1</TargetGroup> - <TestTFMs>netcoreapp1.1</TestTFMs> + <TargetGroup>netcoreapp</TargetGroup> + <TestTFMs>netcoreapp</TestTFMs> </Project> <Project Include="System.Runtime.Tests.csproj"> <TargetGroup>netstandard1.5</TargetGroup> diff --git a/src/System.Runtime/tests/System.Runtime.Tests.csproj b/src/System.Runtime/tests/System.Runtime.Tests.csproj index cfaa431658..7c00479a82 100644 --- a/src/System.Runtime/tests/System.Runtime.Tests.csproj +++ b/src/System.Runtime/tests/System.Runtime.Tests.csproj @@ -242,4 +242,4 @@ </Reference> </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/TestAssembly/TestAssembly.csproj b/src/System.Runtime/tests/TestAssembly/TestAssembly.csproj index 605a2b1218..d46332d88b 100644 --- a/src/System.Runtime/tests/TestAssembly/TestAssembly.csproj +++ b/src/System.Runtime/tests/TestAssembly/TestAssembly.csproj @@ -16,7 +16,7 @@ <Compile Include="TestAssembly.cs" /> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' != 'net46'"> - <Compile Include="AssemblyAttributes.cs"/> + <Compile Include="AssemblyAttributes.cs" /> <Compile Include="$(CommonPath)\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs"> <Link>Common\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs</Link> </Compile> @@ -30,4 +30,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.Runtime/tests/TestLoadAssembly/TestLoadAssembly.csproj b/src/System.Runtime/tests/TestLoadAssembly/TestLoadAssembly.csproj index 26b4701a44..783319d48e 100644 --- a/src/System.Runtime/tests/TestLoadAssembly/TestLoadAssembly.csproj +++ b/src/System.Runtime/tests/TestLoadAssembly/TestLoadAssembly.csproj @@ -25,4 +25,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.AccessControl/pkg/System.Security.AccessControl.builds b/src/System.Security.AccessControl/pkg/System.Security.AccessControl.builds index eb4340497a..b94a3c10b6 100644 --- a/src/System.Security.AccessControl/pkg/System.Security.AccessControl.builds +++ b/src/System.Security.AccessControl/pkg/System.Security.AccessControl.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Security.AccessControl.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Security.AccessControl/pkg/System.Security.AccessControl.pkgproj b/src/System.Security.AccessControl/pkg/System.Security.AccessControl.pkgproj index f616721af4..dcf0b8bf82 100644 --- a/src/System.Security.AccessControl/pkg/System.Security.AccessControl.pkgproj +++ b/src/System.Security.AccessControl/pkg/System.Security.AccessControl.pkgproj @@ -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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Security.AccessControl.csproj"> - <SupportedFramework>net463;netcoreapp1.1</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Security.AccessControl.builds" /> - <NotSupportedOnTargetFramework Include="netcore50"> <PackageTargetRuntime>win</PackageTargetRuntime> - </NotSupportedOnTargetFramework> + </NotSupportedOnTargetFramework> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </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 efbe83ff6d..ab04991998 100644 --- a/src/System.Security.AccessControl/ref/System.Security.AccessControl.csproj +++ b/src/System.Security.AccessControl/ref/System.Security.AccessControl.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -11,4 +11,4 @@ <ProjectReference Include="..\..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.AccessControl/src/Configurations.props b/src/System.Security.AccessControl/src/Configurations.props index 54621aaa25..ade796f1bf 100644 --- a/src/System.Security.AccessControl/src/Configurations.props +++ b/src/System.Security.AccessControl/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ netstandard-Unix; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.AccessControl/tests/System.Security.AccessControl.builds b/src/System.Security.AccessControl/tests/System.Security.AccessControl.builds index d847468c54..5c38ca9ce9 100644 --- a/src/System.Security.AccessControl/tests/System.Security.AccessControl.builds +++ b/src/System.Security.AccessControl/tests/System.Security.AccessControl.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Security.AccessControl.Tests.csproj"> - <TestTFMs>netcoreapp1.1;net463</TestTFMs> + <TestTFMs>netcoreapp;net463</TestTFMs> <OSGroup>Windows_NT</OSGroup> </Project> <Project Include="System.Security.AccessControl.Tests.csproj"> @@ -13,5 +13,4 @@ </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Security.Claims/pkg/System.Security.Claims.builds b/src/System.Security.Claims/pkg/System.Security.Claims.builds index 34ed30d13c..f057fec707 100644 --- a/src/System.Security.Claims/pkg/System.Security.Claims.builds +++ b/src/System.Security.Claims/pkg/System.Security.Claims.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Security.Claims.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Security.Claims/pkg/System.Security.Claims.pkgproj b/src/System.Security.Claims/pkg/System.Security.Claims.pkgproj index c3143cac97..f5f5ecac61 100644 --- a/src/System.Security.Claims/pkg/System.Security.Claims.pkgproj +++ b/src/System.Security.Claims/pkg/System.Security.Claims.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Security.Claims.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Security.Claims.builds" /> </ItemGroup> diff --git a/src/System.Security.Claims/ref/System.Security.Claims.csproj b/src/System.Security.Claims/ref/System.Security.Claims.csproj index 00d133cf4e..fa0cc06430 100644 --- a/src/System.Security.Claims/ref/System.Security.Claims.csproj +++ b/src/System.Security.Claims/ref/System.Security.Claims.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -12,4 +12,4 @@ <ProjectReference Include="..\..\System.Security.Principal\ref\System.Security.Principal.csproj" /> </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/src/Configurations.props b/src/System.Security.Claims/src/Configurations.props index 9c336c0be9..dc837f9152 100644 --- a/src/System.Security.Claims/src/Configurations.props +++ b/src/System.Security.Claims/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Claims/tests/Configurations.props b/src/System.Security.Claims/tests/Configurations.props index 98f53209d4..c398e42e89 100644 --- a/src/System.Security.Claims/tests/Configurations.props +++ b/src/System.Security.Claims/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Claims/tests/System.Security.Claims.Tests.builds b/src/System.Security.Claims/tests/System.Security.Claims.Tests.builds index fcad90e56d..013e214cf8 100644 --- a/src/System.Security.Claims/tests/System.Security.Claims.Tests.builds +++ b/src/System.Security.Claims/tests/System.Security.Claims.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Security.Cryptography.Algorithms/pkg/System.Security.Cryptography.Algorithms.builds b/src/System.Security.Cryptography.Algorithms/pkg/System.Security.Cryptography.Algorithms.builds index 224887ff06..70ff17e476 100644 --- a/src/System.Security.Cryptography.Algorithms/pkg/System.Security.Cryptography.Algorithms.builds +++ b/src/System.Security.Cryptography.Algorithms/pkg/System.Security.Cryptography.Algorithms.builds @@ -1,8 +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" /> <ItemGroup> - <Project Include="System.Security.Cryptography.Algorithms.pkgproj"/> + <Project Include="System.Security.Cryptography.Algorithms.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Algorithms/pkg/System.Security.Cryptography.Algorithms.pkgproj b/src/System.Security.Cryptography.Algorithms/pkg/System.Security.Cryptography.Algorithms.pkgproj index d26561d20d..8ec38dd1d3 100644 --- a/src/System.Security.Cryptography.Algorithms/pkg/System.Security.Cryptography.Algorithms.pkgproj +++ b/src/System.Security.Cryptography.Algorithms/pkg/System.Security.Cryptography.Algorithms.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Security.Cryptography.Algorithms.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Security.Cryptography.Algorithms.builds" /> <InboxOnTargetFramework Include="MonoAndroid10" /> @@ -14,4 +14,4 @@ <InboxOnTargetFramework Include="xamarinwatchos10" /> </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/ref/System.Security.Cryptography.Algorithms.csproj b/src/System.Security.Cryptography.Algorithms/ref/System.Security.Cryptography.Algorithms.csproj index b56c2f122c..757d5ce898 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,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" /> <ItemGroup> @@ -12,4 +12,4 @@ <ProjectReference Include="..\..\System.Security.Cryptography.Primitives\ref\System.Security.Cryptography.Primitives.csproj" /> </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/src/Configurations.props b/src/System.Security.Cryptography.Algorithms/src/Configurations.props index 6b92af3b02..ecc6342cee 100644 --- a/src/System.Security.Cryptography.Algorithms/src/Configurations.props +++ b/src/System.Security.Cryptography.Algorithms/src/Configurations.props @@ -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> <BuildConfigurations> @@ -8,4 +8,4 @@ netstandard-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Algorithms/tests/Configurations.props b/src/System.Security.Cryptography.Algorithms/tests/Configurations.props index a98856d37e..dbe4492ae3 100644 --- a/src/System.Security.Cryptography.Algorithms/tests/Configurations.props +++ b/src/System.Security.Cryptography.Algorithms/tests/Configurations.props @@ -1,11 +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> <BuildConfigurations> netstandard1.6-Unix; netstandard1.6-Windows_NT; - netstandard1.7-Unix; - netstandard1.7-Windows_NT; + netstandard-Unix; + netstandard-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.builds b/src/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.builds index 69d861d255..323e90a9fc 100644 --- a/src/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.builds +++ b/src/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.builds @@ -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" /> <ItemGroup> @@ -7,7 +7,7 @@ </Project> <Project Include="System.Security.Cryptography.Algorithms.Tests.csproj"> <OSGroup>Windows_NT</OSGroup> - <TestTFMs>netcoreapp1.1;net463</TestTFMs> + <TestTFMs>netcoreapp;net463</TestTFMs> </Project> <Project Include="System.Security.Cryptography.Algorithms.Tests.csproj"> <TargetGroup>netstandard1.6</TargetGroup> 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 81215a39fe..6764224aeb 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 @@ -206,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/pkg/System.Security.Cryptography.Cng.builds b/src/System.Security.Cryptography.Cng/pkg/System.Security.Cryptography.Cng.builds index d24a509759..30ee5f3fb4 100644 --- a/src/System.Security.Cryptography.Cng/pkg/System.Security.Cryptography.Cng.builds +++ b/src/System.Security.Cryptography.Cng/pkg/System.Security.Cryptography.Cng.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Security.Cryptography.Cng.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Cng/pkg/System.Security.Cryptography.Cng.pkgproj b/src/System.Security.Cryptography.Cng/pkg/System.Security.Cryptography.Cng.pkgproj index 35ca0445e2..540120e5dd 100644 --- a/src/System.Security.Cryptography.Cng/pkg/System.Security.Cryptography.Cng.pkgproj +++ b/src/System.Security.Cryptography.Cng/pkg/System.Security.Cryptography.Cng.pkgproj @@ -1,11 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Security.Cryptography.Cng.csproj"> - <SupportedFramework>net463;netcoreapp1.1</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Security.Cryptography.Cng.builds" /> </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/ref/System.Security.Cryptography.Cng.csproj b/src/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.csproj index b78c167933..e67e91b656 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,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" /> <ItemGroup> @@ -12,4 +12,4 @@ <ProjectReference Include="..\..\System.Security.Cryptography.Primitives\ref\System.Security.Cryptography.Primitives.csproj" /> </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/src/Configurations.props b/src/System.Security.Cryptography.Cng/src/Configurations.props index 54621aaa25..ade796f1bf 100644 --- a/src/System.Security.Cryptography.Cng/src/Configurations.props +++ b/src/System.Security.Cryptography.Cng/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ netstandard-Unix; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Cng/tests/Configurations.props b/src/System.Security.Cryptography.Cng/tests/Configurations.props index 8ac8400156..1772b8de4d 100644 --- a/src/System.Security.Cryptography.Cng/tests/Configurations.props +++ b/src/System.Security.Cryptography.Cng/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> netstandard1.6-Windows_NT; - netstandard1.7-Windows_NT; + netstandard-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.builds b/src/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.builds index 1427fe5786..c633af3c0e 100644 --- a/src/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.builds +++ b/src/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.builds @@ -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" /> <ItemGroup> <Project Include="System.Security.Cryptography.Cng.Tests.csproj"> <OSGroup>Windows_NT</OSGroup> - <TestTFMs>netcoreapp1.1;net463</TestTFMs> + <TestTFMs>netcoreapp;net463</TestTFMs> </Project> <Project Include="System.Security.Cryptography.Cng.Tests.csproj"> <TargetGroup>netstandard1.6</TargetGroup> 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 6de4fbd57e..c64ad5cdbe 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 @@ -154,4 +154,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.Security.Cryptography.Csp/pkg/System.Security.Cryptography.Csp.builds b/src/System.Security.Cryptography.Csp/pkg/System.Security.Cryptography.Csp.builds index e0f34f1215..9494f8792b 100644 --- a/src/System.Security.Cryptography.Csp/pkg/System.Security.Cryptography.Csp.builds +++ b/src/System.Security.Cryptography.Csp/pkg/System.Security.Cryptography.Csp.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Security.Cryptography.Csp.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Csp/pkg/System.Security.Cryptography.Csp.pkgproj b/src/System.Security.Cryptography.Csp/pkg/System.Security.Cryptography.Csp.pkgproj index 24b55c28e0..9459c45a47 100644 --- a/src/System.Security.Cryptography.Csp/pkg/System.Security.Cryptography.Csp.pkgproj +++ b/src/System.Security.Cryptography.Csp/pkg/System.Security.Cryptography.Csp.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Security.Cryptography.Csp.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Security.Cryptography.Csp.builds" /> <NotSupportedOnTargetFramework Include="netcore50"> 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 e38c4ebb88..e87ffabe69 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,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" /> <ItemGroup> @@ -12,4 +12,4 @@ <ProjectReference Include="..\..\System.Security.Cryptography.Primitives\ref\System.Security.Cryptography.Primitives.csproj" /> </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.Csp/src/Configurations.props b/src/System.Security.Cryptography.Csp/src/Configurations.props index 54621aaa25..ade796f1bf 100644 --- a/src/System.Security.Cryptography.Csp/src/Configurations.props +++ b/src/System.Security.Cryptography.Csp/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ netstandard-Unix; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Csp/tests/Configurations.props b/src/System.Security.Cryptography.Csp/tests/Configurations.props index 9899767269..cf10431a14 100644 --- a/src/System.Security.Cryptography.Csp/tests/Configurations.props +++ b/src/System.Security.Cryptography.Csp/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> netstandard1.3-Windows_NT; - netstandard1.7-Windows_NT; + netstandard-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.builds b/src/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.builds index 503eb163c6..e37186b49b 100644 --- a/src/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.builds +++ b/src/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.builds @@ -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" /> <ItemGroup> 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 cc5dd26df2..37c9ba4efc 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 @@ -109,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/pkg/System.Security.Cryptography.Encoding.builds b/src/System.Security.Cryptography.Encoding/pkg/System.Security.Cryptography.Encoding.builds index bea58651a7..bbb60403ab 100644 --- a/src/System.Security.Cryptography.Encoding/pkg/System.Security.Cryptography.Encoding.builds +++ b/src/System.Security.Cryptography.Encoding/pkg/System.Security.Cryptography.Encoding.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Security.Cryptography.Encoding.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Encoding/pkg/System.Security.Cryptography.Encoding.pkgproj b/src/System.Security.Cryptography.Encoding/pkg/System.Security.Cryptography.Encoding.pkgproj index e1ead3bbc1..88463cb064 100644 --- a/src/System.Security.Cryptography.Encoding/pkg/System.Security.Cryptography.Encoding.pkgproj +++ b/src/System.Security.Cryptography.Encoding/pkg/System.Security.Cryptography.Encoding.pkgproj @@ -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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Security.Cryptography.Encoding.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Security.Cryptography.Encoding.builds" /> - </ItemGroup> <ItemGroup> <InboxOnTargetFramework Include="MonoAndroid10" /> 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 8e9071fa74..daaca689ce 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,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" /> <ItemGroup> @@ -9,4 +9,4 @@ <ProjectReference Include="..\..\System.Security.Cryptography.Primitives\ref\System.Security.Cryptography.Primitives.csproj" /> </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/src/Configurations.props b/src/System.Security.Cryptography.Encoding/src/Configurations.props index 0decf0d6c0..7a242f16dd 100644 --- a/src/System.Security.Cryptography.Encoding/src/Configurations.props +++ b/src/System.Security.Cryptography.Encoding/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ netstandard-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Encoding/tests/Configurations.props b/src/System.Security.Cryptography.Encoding/tests/Configurations.props index 981075fcc5..fa9e1005a0 100644 --- a/src/System.Security.Cryptography.Encoding/tests/Configurations.props +++ b/src/System.Security.Cryptography.Encoding/tests/Configurations.props @@ -1,11 +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> <BuildConfigurations> netstandard1.3-Unix; netstandard1.3-Windows_NT; - netstandard1.7-Unix; - netstandard1.7-Windows_NT; + netstandard-Unix; + netstandard-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.builds b/src/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.builds index 415df21930..0459ec4475 100644 --- a/src/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.builds +++ b/src/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.builds @@ -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" /> <ItemGroup> @@ -7,7 +7,7 @@ </Project> <Project Include="System.Security.Cryptography.Encoding.Tests.csproj"> <OSGroup>Windows_NT</OSGroup> - <TestTFMs>netcoreapp1.1;net463</TestTFMs> + <TestTFMs>netcoreapp;net463</TestTFMs> </Project> <Project Include="System.Security.Cryptography.Encoding.Tests.csproj"> <TargetGroup>netstandard1.3</TargetGroup> 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 e9533df24a..b3ca593a18 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 @@ -27,4 +27,4 @@ <Compile Include="Base64TransformsTests.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.OpenSsl/pkg/System.Security.Cryptography.OpenSsl.builds b/src/System.Security.Cryptography.OpenSsl/pkg/System.Security.Cryptography.OpenSsl.builds index 54cb074826..8e0011f41a 100644 --- a/src/System.Security.Cryptography.OpenSsl/pkg/System.Security.Cryptography.OpenSsl.builds +++ b/src/System.Security.Cryptography.OpenSsl/pkg/System.Security.Cryptography.OpenSsl.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Security.Cryptography.OpenSsl.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.OpenSsl/pkg/System.Security.Cryptography.OpenSsl.pkgproj b/src/System.Security.Cryptography.OpenSsl/pkg/System.Security.Cryptography.OpenSsl.pkgproj index b4c0484f81..488e9cd23c 100644 --- a/src/System.Security.Cryptography.OpenSsl/pkg/System.Security.Cryptography.OpenSsl.pkgproj +++ b/src/System.Security.Cryptography.OpenSsl/pkg/System.Security.Cryptography.OpenSsl.pkgproj @@ -1,11 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Security.Cryptography.OpenSsl.csproj"> - <SupportedFramework>net461;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Security.Cryptography.OpenSsl.builds" /> </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.OpenSsl/ref/System.Security.Cryptography.OpenSsl.csproj b/src/System.Security.Cryptography.OpenSsl/ref/System.Security.Cryptography.OpenSsl.csproj index ea7bf90077..a61c822a5f 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,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" /> <ItemGroup> @@ -12,4 +12,4 @@ <ProjectReference Include="..\..\System.Security.Cryptography.Primitives\ref\System.Security.Cryptography.Primitives.csproj" /> </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.OpenSsl/src/Configurations.props b/src/System.Security.Cryptography.OpenSsl/src/Configurations.props index 3d4674aeac..cfc57211a4 100644 --- a/src/System.Security.Cryptography.OpenSsl/src/Configurations.props +++ b/src/System.Security.Cryptography.OpenSsl/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.OpenSsl/tests/Configurations.props b/src/System.Security.Cryptography.OpenSsl/tests/Configurations.props index ca3d74da1d..b975ea34b6 100644 --- a/src/System.Security.Cryptography.OpenSsl/tests/Configurations.props +++ b/src/System.Security.Cryptography.OpenSsl/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> netstandard1.6-Unix; - netstandard1.7-Unix; + netstandard-Unix; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.builds b/src/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.builds index 8725013740..74f8de447d 100644 --- a/src/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.builds +++ b/src/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.builds @@ -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" /> <ItemGroup> 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 1bca7912be..435363591f 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 @@ -111,4 +111,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.Security.Cryptography.Pkcs/pkg/System.Security.Cryptography.Pkcs.builds b/src/System.Security.Cryptography.Pkcs/pkg/System.Security.Cryptography.Pkcs.builds index bb8c1cd8ab..4ef5604e0d 100644 --- a/src/System.Security.Cryptography.Pkcs/pkg/System.Security.Cryptography.Pkcs.builds +++ b/src/System.Security.Cryptography.Pkcs/pkg/System.Security.Cryptography.Pkcs.builds @@ -1,8 +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" /> <ItemGroup> <Project Include="System.Security.Cryptography.Pkcs.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Pkcs/pkg/System.Security.Cryptography.Pkcs.pkgproj b/src/System.Security.Cryptography.Pkcs/pkg/System.Security.Cryptography.Pkcs.pkgproj index f85aca1403..3dfd243c7d 100644 --- a/src/System.Security.Cryptography.Pkcs/pkg/System.Security.Cryptography.Pkcs.pkgproj +++ b/src/System.Security.Cryptography.Pkcs/pkg/System.Security.Cryptography.Pkcs.pkgproj @@ -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" /> - <ItemGroup> <ProjectReference Include="..\ref\System.Security.Cryptography.Pkcs.csproj"> <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Security.Cryptography.Pkcs.builds" /> - <_xamarinFrameworks Include="$(AllXamarinFrameworks)" /> <HarvestSuppressPaths Include="@(_xamarinFrameworks->'ref/%(Identity)')" /> <HarvestSuppressPaths Include="@(_xamarinFrameworks->'lib/%(Identity)')" /> </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.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj b/src/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj index 26a71de656..4765c864c5 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,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" /> <ItemGroup> @@ -10,4 +10,4 @@ <ProjectReference Include="..\..\System.Security.Cryptography.X509Certificates\ref\System.Security.Cryptography.X509Certificates.csproj" /> </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.Pkcs/src/Configurations.props b/src/System.Security.Cryptography.Pkcs/src/Configurations.props index 17d5314bad..6c325c70f5 100644 --- a/src/System.Security.Cryptography.Pkcs/src/Configurations.props +++ b/src/System.Security.Cryptography.Pkcs/src/Configurations.props @@ -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> <BuildConfigurations> @@ -8,4 +8,4 @@ net46-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Pkcs/tests/Configurations.props b/src/System.Security.Cryptography.Pkcs/tests/Configurations.props index 33bfeee701..c51fd14e1d 100644 --- a/src/System.Security.Cryptography.Pkcs/tests/Configurations.props +++ b/src/System.Security.Cryptography.Pkcs/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> - netcoreapp1.1-Windows_NT; + netcoreapp-Windows_NT; netstandard1.3-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.builds b/src/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.builds index 96de070dd7..d66aa452a4 100644 --- a/src/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.builds +++ b/src/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.builds @@ -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" /> <ItemGroup> @@ -7,10 +7,10 @@ <TestTFMs>netcore50;netcoreapp1.0;net46</TestTFMs> </Project> <Project Include="System.Security.Cryptography.Pkcs.Tests.csproj"> - <TargetGroup>netcoreapp1.1</TargetGroup> + <TargetGroup>netcoreapp</TargetGroup> <OSGroup>Windows_NT</OSGroup> - <TestTFMs>netcoreapp1.1</TestTFMs> + <TestTFMs>netcoreapp</TestTFMs> </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file 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 7b9af1de1b..c3602e05dc 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 @@ -42,4 +42,4 @@ <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/pkg/System.Security.Cryptography.Primitives.builds b/src/System.Security.Cryptography.Primitives/pkg/System.Security.Cryptography.Primitives.builds index f04223c2bc..114e3d3136 100644 --- a/src/System.Security.Cryptography.Primitives/pkg/System.Security.Cryptography.Primitives.builds +++ b/src/System.Security.Cryptography.Primitives/pkg/System.Security.Cryptography.Primitives.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Security.Cryptography.Primitives.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Primitives/pkg/System.Security.Cryptography.Primitives.pkgproj b/src/System.Security.Cryptography.Primitives/pkg/System.Security.Cryptography.Primitives.pkgproj index 11ddde4e5e..2eae5c74e7 100644 --- a/src/System.Security.Cryptography.Primitives/pkg/System.Security.Cryptography.Primitives.pkgproj +++ b/src/System.Security.Cryptography.Primitives/pkg/System.Security.Cryptography.Primitives.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Security.Cryptography.Primitives.builds"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Security.Cryptography.Primitives.builds" /> </ItemGroup> @@ -16,4 +16,4 @@ <InboxOnTargetFramework Include="xamarinwatchos10" /> </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/ref/Configurations.props b/src/System.Security.Cryptography.Primitives/ref/Configurations.props index 84eaf1100d..77a4b65bc9 100644 --- a/src/System.Security.Cryptography.Primitives/ref/Configurations.props +++ b/src/System.Security.Cryptography.Primitives/ref/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netcoreapp; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.builds b/src/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.builds index cdccdb8113..5c71c7c243 100644 --- a/src/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.builds +++ b/src/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.builds @@ -1,11 +1,11 @@ -<?xml version="1.0" encoding="utf-8"?> +<?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.Security.Cryptography.Primitives.csproj" /> <Project Include="System.Security.Cryptography.Primitives.csproj"> - <TargetGroup>netstandard1.7</TargetGroup> + <TargetGroup>netstandard</TargetGroup> </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.csproj b/src/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.csproj index 88d6888416..0fb1b16e2b 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,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,4 +13,4 @@ <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </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/src/Configurations.props b/src/System.Security.Cryptography.Primitives/src/Configurations.props index 9c336c0be9..dc837f9152 100644 --- a/src/System.Security.Cryptography.Primitives/src/Configurations.props +++ b/src/System.Security.Cryptography.Primitives/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Primitives/tests/Configurations.props b/src/System.Security.Cryptography.Primitives/tests/Configurations.props index c5a04c70ce..d529158e05 100644 --- a/src/System.Security.Cryptography.Primitives/tests/Configurations.props +++ b/src/System.Security.Cryptography.Primitives/tests/Configurations.props @@ -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"> <PropertyGroup> <BuildConfigurations> netstandard1.3-Windows_NT; - netcoreapp1.1; - netstandard1.7; + netcoreapp; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.builds b/src/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.builds index 8d8aae0cba..97db9afdaf 100644 --- a/src/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.builds +++ b/src/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.builds @@ -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" /> <ItemGroup> - <Project Include="System.Security.Cryptography.Primitives.Tests.csproj"/> + <Project Include="System.Security.Cryptography.Primitives.Tests.csproj" /> <Project Include="System.Security.Cryptography.Primitives.Tests.csproj"> <TargetGroup>netstandard1.3</TargetGroup> <OSGroup>Windows_NT</OSGroup> <TestTFMs>netcoreapp1.0</TestTFMs> </Project> <Project Include="System.Security.Cryptography.Primitives.Tests.csproj"> - <TargetGroup>netcoreapp1.1</TargetGroup> - <TestTFMs>netcoreapp1.1</TestTFMs> + <TargetGroup>netcoreapp</TargetGroup> + <TestTFMs>netcoreapp</TestTFMs> </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file 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 babad56a6f..d0a7caa1b4 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 @@ -26,4 +26,4 @@ <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/pkg/System.Security.Cryptography.ProtectedData.builds b/src/System.Security.Cryptography.ProtectedData/pkg/System.Security.Cryptography.ProtectedData.builds index e22c184ab8..e05653ab0e 100644 --- a/src/System.Security.Cryptography.ProtectedData/pkg/System.Security.Cryptography.ProtectedData.builds +++ b/src/System.Security.Cryptography.ProtectedData/pkg/System.Security.Cryptography.ProtectedData.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Security.Cryptography.ProtectedData/pkg/System.Security.Cryptography.ProtectedData.pkgproj b/src/System.Security.Cryptography.ProtectedData/pkg/System.Security.Cryptography.ProtectedData.pkgproj index d827a55884..400606da08 100644 --- a/src/System.Security.Cryptography.ProtectedData/pkg/System.Security.Cryptography.ProtectedData.pkgproj +++ b/src/System.Security.Cryptography.ProtectedData/pkg/System.Security.Cryptography.ProtectedData.pkgproj @@ -1,7 +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"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <ItemGroup> <ProjectReference Include="..\ref\System.Security.Cryptography.ProtectedData.csproj"> <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework> @@ -16,6 +15,5 @@ <InboxOnTargetFramework Include="xamarintvos10" /> <InboxOnTargetFramework Include="xamarinwatchos10" /> </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 90eeb76255..c895be3bb5 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,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" /> <ItemGroup> @@ -8,4 +8,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </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/src/Configurations.props b/src/System.Security.Cryptography.ProtectedData/src/Configurations.props index a6c74d0e58..437e6acc34 100644 --- a/src/System.Security.Cryptography.ProtectedData/src/Configurations.props +++ b/src/System.Security.Cryptography.ProtectedData/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ netstandard1.3-Unix; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.ProtectedData/tests/Configurations.props b/src/System.Security.Cryptography.ProtectedData/tests/Configurations.props index 5d77dc616e..5f482b878b 100644 --- a/src/System.Security.Cryptography.ProtectedData/tests/Configurations.props +++ b/src/System.Security.Cryptography.ProtectedData/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.ProtectedData/tests/System.Security.Cryptography.ProtectedData.Tests.builds b/src/System.Security.Cryptography.ProtectedData/tests/System.Security.Cryptography.ProtectedData.Tests.builds index 8a4e09bdba..2af018bcaf 100644 --- a/src/System.Security.Cryptography.ProtectedData/tests/System.Security.Cryptography.ProtectedData.Tests.builds +++ b/src/System.Security.Cryptography.ProtectedData/tests/System.Security.Cryptography.ProtectedData.Tests.builds @@ -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" /> <ItemGroup> <Project Include="System.Security.Cryptography.ProtectedData.Tests.csproj"> <OSGroup>Windows_NT</OSGroup> - <TestTFMs>netcoreapp1.1;netcore50;netcoreapp1.0;net46</TestTFMs> + <TestTFMs>netcoreapp;netcore50;netcoreapp1.0;net46</TestTFMs> </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> diff --git a/src/System.Security.Cryptography.X509Certificates/pkg/System.Security.Cryptography.X509Certificates.builds b/src/System.Security.Cryptography.X509Certificates/pkg/System.Security.Cryptography.X509Certificates.builds index 50a4c57253..d4ab7f454a 100644 --- a/src/System.Security.Cryptography.X509Certificates/pkg/System.Security.Cryptography.X509Certificates.builds +++ b/src/System.Security.Cryptography.X509Certificates/pkg/System.Security.Cryptography.X509Certificates.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Security.Cryptography.X509Certificates.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.X509Certificates/pkg/System.Security.Cryptography.X509Certificates.pkgproj b/src/System.Security.Cryptography.X509Certificates/pkg/System.Security.Cryptography.X509Certificates.pkgproj index 61f12e2d41..dd0b6cde77 100644 --- a/src/System.Security.Cryptography.X509Certificates/pkg/System.Security.Cryptography.X509Certificates.pkgproj +++ b/src/System.Security.Cryptography.X509Certificates/pkg/System.Security.Cryptography.X509Certificates.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Security.Cryptography.X509Certificates.builds"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Security.Cryptography.X509Certificates.builds" /> </ItemGroup> @@ -18,4 +18,4 @@ <ItemGroup> </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/ref/Configurations.props b/src/System.Security.Cryptography.X509Certificates/ref/Configurations.props index de35842580..77a4b65bc9 100644 --- a/src/System.Security.Cryptography.X509Certificates/ref/Configurations.props +++ b/src/System.Security.Cryptography.X509Certificates/ref/Configurations.props @@ -1,9 +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> <BuildConfigurations> - netstandard1.7; - netcoreapp1.1; + netstandard; + netcoreapp; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.X509Certificates/ref/System.Security.Cryptography.X509Certificates.builds b/src/System.Security.Cryptography.X509Certificates/ref/System.Security.Cryptography.X509Certificates.builds index f67c87c1bb..49f6d04ccb 100644 --- a/src/System.Security.Cryptography.X509Certificates/ref/System.Security.Cryptography.X509Certificates.builds +++ b/src/System.Security.Cryptography.X509Certificates/ref/System.Security.Cryptography.X509Certificates.builds @@ -1,11 +1,11 @@ -<?xml version="1.0" encoding="utf-8"?> +<?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.Security.Cryptography.X509Certificates.csproj" /> <Project Include="System.Security.Cryptography.X509Certificates.csproj"> - <TargetGroup>netcoreapp1.1</TargetGroup> + <TargetGroup>netcoreapp</TargetGroup> </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.X509Certificates/ref/System.Security.Cryptography.X509Certificates.csproj b/src/System.Security.Cryptography.X509Certificates/ref/System.Security.Cryptography.X509Certificates.csproj index 7716141c25..c773f7e804 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,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,4 +16,4 @@ <ProjectReference Include="..\..\System.Security.Cryptography.Primitives\ref\System.Security.Cryptography.Primitives.csproj" /> </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/src/Configurations.props b/src/System.Security.Cryptography.X509Certificates/src/Configurations.props index 8471cda58b..8e905c573a 100644 --- a/src/System.Security.Cryptography.X509Certificates/src/Configurations.props +++ b/src/System.Security.Cryptography.X509Certificates/src/Configurations.props @@ -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> <BuildConfigurations> @@ -9,4 +9,4 @@ netcoreapp-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.X509Certificates/tests/Configurations.props b/src/System.Security.Cryptography.X509Certificates/tests/Configurations.props index 5f727fa2c5..b3d37a4be4 100644 --- a/src/System.Security.Cryptography.X509Certificates/tests/Configurations.props +++ b/src/System.Security.Cryptography.X509Certificates/tests/Configurations.props @@ -1,13 +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> <BuildConfigurations> netstandard1.6-Unix; - netcoreapp1.1-Unix; + netcoreapp-Unix; netstandard1.6-Windows_NT; - netcoreapp1.1-Windows_NT; - netstandard1.7-Unix; - netstandard1.7-Windows_NT; + netcoreapp-Windows_NT; + netstandard-Unix; + netstandard-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.builds b/src/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.builds index 6ff4fb9b73..335c931385 100644 --- a/src/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.builds +++ b/src/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.builds @@ -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" /> <ItemGroup> @@ -11,7 +11,7 @@ <OSGroup>Unix</OSGroup> </Project> <Project Include="System.Security.Cryptography.X509Certificates.Tests.csproj"> - <TargetGroup>netcoreapp1.1</TargetGroup> + <TargetGroup>netcoreapp</TargetGroup> <OSGroup>Unix</OSGroup> </Project> <Project Include="System.Security.Cryptography.X509Certificates.Tests.csproj"> @@ -20,13 +20,13 @@ <TestTFMs>netcoreapp1.0</TestTFMs> </Project> <Project Include="System.Security.Cryptography.X509Certificates.Tests.csproj"> - <TargetGroup>netcoreapp1.1</TargetGroup> + <TargetGroup>netcoreapp</TargetGroup> <OSGroup>Windows_NT</OSGroup> </Project> <Project Include="System.Security.Cryptography.X509Certificates.Tests.csproj"> <OSGroup>Windows_NT</OSGroup> - <TestTFMs>netcoreapp1.1;net463</TestTFMs> + <TestTFMs>netcoreapp;net463</TestTFMs> </Project> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</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.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj b/src/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj index 93077124d3..965995f992 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 @@ -72,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/pkg/System.Security.Cryptography.Xml.builds b/src/System.Security.Cryptography.Xml/pkg/System.Security.Cryptography.Xml.builds index 9533fbb23c..47f0c3bc2b 100644 --- a/src/System.Security.Cryptography.Xml/pkg/System.Security.Cryptography.Xml.builds +++ b/src/System.Security.Cryptography.Xml/pkg/System.Security.Cryptography.Xml.builds @@ -1,8 +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" /> <ItemGroup> - <!-- Disabling the builds for Xml until we get it up and running. This excludes it from being built by build.cmd + <!-- Disabling the builds for Xml until we get it up and running. This excludes it from being built by build.cmd <Project Include="System.Security.Cryptography.Xml.pkgproj"/> --> </ItemGroup> diff --git a/src/System.Security.Cryptography.Xml/pkg/System.Security.Cryptography.Xml.pkgproj b/src/System.Security.Cryptography.Xml/pkg/System.Security.Cryptography.Xml.pkgproj index 84b587e178..4c2ac82cf3 100644 --- a/src/System.Security.Cryptography.Xml/pkg/System.Security.Cryptography.Xml.pkgproj +++ b/src/System.Security.Cryptography.Xml/pkg/System.Security.Cryptography.Xml.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.Security.Cryptography.Xml.builds"> - <SupportedFramework>net462;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net462;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Security.Cryptography.Xml.builds" /> </ItemGroup> @@ -16,4 +16,4 @@ <InboxOnTargetFramework Include="xamarinwatchos10" /> </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/System.Security.Cryptography.Xml.builds b/src/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.builds index f7b01e5eb3..3b9758d5e4 100644 --- a/src/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.builds +++ b/src/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.builds @@ -1,10 +1,10 @@ -<?xml version="1.0" encoding="utf-8"?> +<?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> - <!-- Disabling the builds for Xml until we get it up and running. This excludes it from being built by build.cmd + <!-- Disabling the builds for Xml until we get it up and running. This excludes it from being built by build.cmd <Project Include="System.Security.Cryptography.Xml.csproj" /> --> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.csproj b/src/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.csproj index db4462dab5..1e6bae4486 100644 --- a/src/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.csproj +++ b/src/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.csproj @@ -8,4 +8,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </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/src/System.Security.Cryptography.Xml.builds b/src/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.builds index 1dfbdf3a00..a39023007b 100644 --- a/src/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.builds +++ b/src/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.builds @@ -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" /> <ItemGroup> @@ -7,5 +7,4 @@ --> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj b/src/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj index 6f71be6193..838a9c3619 100644 --- a/src/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj +++ b/src/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj @@ -9,7 +9,7 @@ <AssemblyName>System.Security.Cryptography.Xml</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net462'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> + <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v2.0</NuGetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> diff --git a/src/System.Security.Cryptography.Xml/tests/System.Security.Cryptography.Xml.Tests.builds b/src/System.Security.Cryptography.Xml/tests/System.Security.Cryptography.Xml.Tests.builds index 1c628f1242..9c64fc6fb0 100644 --- a/src/System.Security.Cryptography.Xml/tests/System.Security.Cryptography.Xml.Tests.builds +++ b/src/System.Security.Cryptography.Xml/tests/System.Security.Cryptography.Xml.Tests.builds @@ -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" /> <ItemGroup> - <!-- Disabling the builds for Xml until we get it up and running. This excludes it from being built by build.cmd + <!-- Disabling the builds for Xml until we get it up and running. This excludes it from being built by build.cmd <Project Include="System.Security.Cryptography.Xml.Tests.csproj"/> --> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Xml/tests/System.Security.Cryptography.Xml.Tests.csproj b/src/System.Security.Cryptography.Xml/tests/System.Security.Cryptography.Xml.Tests.csproj index 3dbd1449d4..21c41d288d 100644 --- a/src/System.Security.Cryptography.Xml/tests/System.Security.Cryptography.Xml.Tests.csproj +++ b/src/System.Security.Cryptography.Xml/tests/System.Security.Cryptography.Xml.Tests.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" /> <Import Project="$(CommonTestPath)\Tests.props" /> @@ -23,4 +23,4 @@ --> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Permissions/pkg/System.Security.Permissions.builds b/src/System.Security.Permissions/pkg/System.Security.Permissions.builds index 560b379fb1..c11415233c 100644 --- a/src/System.Security.Permissions/pkg/System.Security.Permissions.builds +++ b/src/System.Security.Permissions/pkg/System.Security.Permissions.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Security.Permissions.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Security.Permissions/pkg/System.Security.Permissions.pkgproj b/src/System.Security.Permissions/pkg/System.Security.Permissions.pkgproj index 3c5efa6ff4..b3ff6e297e 100644 --- a/src/System.Security.Permissions/pkg/System.Security.Permissions.pkgproj +++ b/src/System.Security.Permissions/pkg/System.Security.Permissions.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.Security.Permissions.csproj"> - <SupportedFramework>netcoreapp1.1;net461;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>netcoreapp2.0;net461;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Security.Permissions.builds" /> </ItemGroup> diff --git a/src/System.Security.Permissions/ref/System.Security.Permissions.csproj b/src/System.Security.Permissions/ref/System.Security.Permissions.csproj index b962a1e34c..3a00b602ad 100644 --- a/src/System.Security.Permissions/ref/System.Security.Permissions.csproj +++ b/src/System.Security.Permissions/ref/System.Security.Permissions.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -16,4 +16,4 @@ <ProjectReference Include="..\..\System.Threading\ref\System.Threading.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Permissions/src/Configurations.props b/src/System.Security.Permissions/src/Configurations.props index 53b62c64fe..bcfec4bbde 100644 --- a/src/System.Security.Permissions/src/Configurations.props +++ b/src/System.Security.Permissions/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Permissions/src/System.Security.Permissions.csproj b/src/System.Security.Permissions/src/System.Security.Permissions.csproj index 26dc45e3f8..668bc833f2 100644 --- a/src/System.Security.Permissions/src/System.Security.Permissions.csproj +++ b/src/System.Security.Permissions/src/System.Security.Permissions.csproj @@ -5,7 +5,7 @@ <ProjectGuid>{07390899-C8F6-4E83-A3A9-6867B8CB46A0}</ProjectGuid> <RootNamespace>System.Security.Permissions</RootNamespace> <AssemblyName>System.Security.Permissions</AssemblyName> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard1.7</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard</PackageTargetFramework> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <PackageAsRefAndLib Condition="'$(TargetGroup)' == 'net461'">true</PackageAsRefAndLib> </PropertyGroup> diff --git a/src/System.Security.Permissions/tests/Configurations.props b/src/System.Security.Permissions/tests/Configurations.props index 98f53209d4..c398e42e89 100644 --- a/src/System.Security.Permissions/tests/Configurations.props +++ b/src/System.Security.Permissions/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Permissions/tests/System.Security.Permissions.Tests.builds b/src/System.Security.Permissions/tests/System.Security.Permissions.Tests.builds index 267e782df2..3af080561a 100644 --- a/src/System.Security.Permissions/tests/System.Security.Permissions.Tests.builds +++ b/src/System.Security.Permissions/tests/System.Security.Permissions.Tests.builds @@ -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" /> <ItemGroup> 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 fd2598cc23..13be7ec930 100644 --- a/src/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj +++ b/src/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj @@ -31,4 +31,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.Security.Principal.Windows/pkg/System.Security.Principal.Windows.builds b/src/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.builds index e6df5ad550..475a858592 100644 --- a/src/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.builds +++ b/src/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Security.Principal.Windows.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj b/src/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj index 7a6067538e..59716c104c 100644 --- a/src/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj +++ b/src/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj @@ -1,13 +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" /> - <ItemGroup> <ProjectReference Include="..\ref\System.Security.Principal.Windows.csproj"> - <SupportedFramework>net463;netcoreapp1.1</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Security.Principal.Windows.builds" /> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </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 5642bae11b..f1d83de396 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,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" /> <ItemGroup> @@ -11,4 +11,4 @@ <ProjectReference Include="..\..\System.Security.Principal\ref\System.Security.Principal.csproj" /> </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.Windows/src/Configurations.props b/src/System.Security.Principal.Windows/src/Configurations.props index 2d365bdaa4..78decb9342 100644 --- a/src/System.Security.Principal.Windows/src/Configurations.props +++ b/src/System.Security.Principal.Windows/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ net463-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Principal.Windows/tests/Configurations.props b/src/System.Security.Principal.Windows/tests/Configurations.props index e82727004a..249c8c18b4 100644 --- a/src/System.Security.Principal.Windows/tests/Configurations.props +++ b/src/System.Security.Principal.Windows/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> - netstandard1.7-Windows_NT; + netstandard-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.builds b/src/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.builds index ec4ae7216b..737007cab1 100644 --- a/src/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.builds +++ b/src/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.builds @@ -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" /> <ItemGroup> <Project Include="System.Security.Principal.Windows.Tests.csproj"> <OSGroup>Windows_NT</OSGroup> - <TestTFMs>netcore50;netcoreapp1.0;net46;netcoreapp1.1;net463</TestTFMs> + <TestTFMs>netcore50;netcoreapp1.0;net46;netcoreapp;net463</TestTFMs> </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> diff --git a/src/System.Security.Principal/pkg/System.Security.Principal.builds b/src/System.Security.Principal/pkg/System.Security.Principal.builds index 650cc9b30f..c41c832284 100644 --- a/src/System.Security.Principal/pkg/System.Security.Principal.builds +++ b/src/System.Security.Principal/pkg/System.Security.Principal.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Security.Principal.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Security.Principal/pkg/System.Security.Principal.pkgproj b/src/System.Security.Principal/pkg/System.Security.Principal.pkgproj index a4d6197c2e..bb18ed6492 100644 --- a/src/System.Security.Principal/pkg/System.Security.Principal.pkgproj +++ b/src/System.Security.Principal/pkg/System.Security.Principal.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Security.Principal.csproj"> - <SupportedFramework>net463;netcoreapp1.1;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Security.Principal.builds" /> <InboxOnTargetFramework Include="MonoAndroid10" /> diff --git a/src/System.Security.Principal/ref/System.Security.Principal.csproj b/src/System.Security.Principal/ref/System.Security.Principal.csproj index de83507c1b..8078077032 100644 --- a/src/System.Security.Principal/ref/System.Security.Principal.csproj +++ b/src/System.Security.Principal/ref/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" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -8,4 +8,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </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/src/Configurations.props b/src/System.Security.Principal/src/Configurations.props index f013d10b8c..ed0bd2acc9 100644 --- a/src/System.Security.Principal/src/Configurations.props +++ b/src/System.Security.Principal/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Principal/src/System.Security.Principal.csproj b/src/System.Security.Principal/src/System.Security.Principal.csproj index b5ddfdadd4..d629143c45 100644 --- a/src/System.Security.Principal/src/System.Security.Principal.csproj +++ b/src/System.Security.Principal/src/System.Security.Principal.csproj @@ -8,7 +8,7 @@ <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net463'">None</ResourcesSourceOutputDirectory> <!-- copy to uap10.1 until nuget makes the change to map that to ns1.7 --> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Default configurations to help VS understand the options --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> diff --git a/src/System.Security.SecureString/pkg/System.Security.SecureString.builds b/src/System.Security.SecureString/pkg/System.Security.SecureString.builds index d5b30bb522..a86a948ecd 100644 --- a/src/System.Security.SecureString/pkg/System.Security.SecureString.builds +++ b/src/System.Security.SecureString/pkg/System.Security.SecureString.builds @@ -1,8 +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" /> <ItemGroup> <Project Include="System.Security.SecureString.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.SecureString/pkg/System.Security.SecureString.pkgproj b/src/System.Security.SecureString/pkg/System.Security.SecureString.pkgproj index 30b3cd55a7..22c1f06fec 100644 --- a/src/System.Security.SecureString/pkg/System.Security.SecureString.pkgproj +++ b/src/System.Security.SecureString/pkg/System.Security.SecureString.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Security.SecureString.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Security.SecureString.builds" /> <InboxOnTargetFramework Include="MonoAndroid10" /> @@ -14,4 +14,4 @@ <InboxOnTargetFramework Include="xamarinwatchos10" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.SecureString/ref/System.Security.SecureString.csproj b/src/System.Security.SecureString/ref/System.Security.SecureString.csproj index b1023e1d01..3149deca2d 100644 --- a/src/System.Security.SecureString/ref/System.Security.SecureString.csproj +++ b/src/System.Security.SecureString/ref/System.Security.SecureString.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -12,4 +12,4 @@ <ProjectReference Include="..\..\System.Runtime.InteropServices\ref\System.Runtime.InteropServices.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.SecureString/src/Configurations.props b/src/System.Security.SecureString/src/Configurations.props index 9c336c0be9..dc837f9152 100644 --- a/src/System.Security.SecureString/src/Configurations.props +++ b/src/System.Security.SecureString/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.SecureString/tests/Configurations.props b/src/System.Security.SecureString/tests/Configurations.props index f0ebe53119..c3266e1e93 100644 --- a/src/System.Security.SecureString/tests/Configurations.props +++ b/src/System.Security.SecureString/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Security.SecureString/tests/System.Security.SecureString.Tests.builds b/src/System.Security.SecureString/tests/System.Security.SecureString.Tests.builds index 75073301a5..f58ee8e0da 100644 --- a/src/System.Security.SecureString/tests/System.Security.SecureString.Tests.builds +++ b/src/System.Security.SecureString/tests/System.Security.SecureString.Tests.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Security.SecureString.Tests.csproj"> - <TestTFMs>netcoreapp1.1;netcore50;netcoreapp1.0;net46</TestTFMs> + <TestTFMs>netcoreapp;netcore50;netcoreapp1.0;net46</TestTFMs> </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> diff --git a/src/System.ServiceProcess.ServiceController/pkg/System.ServiceProcess.ServiceController.builds b/src/System.ServiceProcess.ServiceController/pkg/System.ServiceProcess.ServiceController.builds index b7a7648e6c..8170dd862a 100644 --- a/src/System.ServiceProcess.ServiceController/pkg/System.ServiceProcess.ServiceController.builds +++ b/src/System.ServiceProcess.ServiceController/pkg/System.ServiceProcess.ServiceController.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.ServiceProcess.ServiceController.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.ServiceProcess.ServiceController/pkg/System.ServiceProcess.ServiceController.pkgproj b/src/System.ServiceProcess.ServiceController/pkg/System.ServiceProcess.ServiceController.pkgproj index d1c0ff6bfc..a571ea8161 100644 --- a/src/System.ServiceProcess.ServiceController/pkg/System.ServiceProcess.ServiceController.pkgproj +++ b/src/System.ServiceProcess.ServiceController/pkg/System.ServiceProcess.ServiceController.pkgproj @@ -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" /> - <ItemGroup> <ProjectReference Include="..\ref\System.ServiceProcess.ServiceController.csproj"> - <SupportedFramework>net463;netcoreapp1.1</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.ServiceProcess.ServiceController.builds" /> - <NotSupportedOnTargetFramework Include="netcore50"> <PackageTargetRuntime>win</PackageTargetRuntime> </NotSupportedOnTargetFramework> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </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 d9bd903b9a..213270cbc3 100644 --- a/src/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj +++ b/src/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -9,4 +9,4 @@ <ProjectReference Include="..\..\System.Runtime.Handles\ref\System.Runtime.Handles.csproj" /> </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/src/Configurations.props b/src/System.ServiceProcess.ServiceController/src/Configurations.props index 2d365bdaa4..78decb9342 100644 --- a/src/System.ServiceProcess.ServiceController/src/Configurations.props +++ b/src/System.ServiceProcess.ServiceController/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ net463-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file 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 index 502bd149bb..7389b3f5b8 100644 --- a/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests/Configurations.props +++ b/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> netstandard1.4-Windows_NT; - netstandard1.7-Windows_NT; + netstandard-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests/System.ServiceProcess.ServiceController.Tests.builds b/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests/System.ServiceProcess.ServiceController.Tests.builds index dc2c1145de..f3ace706bf 100644 --- a/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests/System.ServiceProcess.ServiceController.Tests.builds +++ b/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests/System.ServiceProcess.ServiceController.Tests.builds @@ -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" /> <ItemGroup> <Project Include="System.ServiceProcess.ServiceController.Tests.csproj"> <OSGroup>Windows_NT</OSGroup> - <TestTFMs>netcoreapp1.1;net463</TestTFMs> + <TestTFMs>netcoreapp;net463</TestTFMs> </Project> <Project Include="System.ServiceProcess.ServiceController.Tests.csproj"> <TargetGroup>netstandard1.4</TargetGroup> diff --git a/src/System.Text.Encoding.CodePages/pkg/System.Text.Encoding.CodePages.builds b/src/System.Text.Encoding.CodePages/pkg/System.Text.Encoding.CodePages.builds index 1f4f75258f..4179e5c316 100644 --- a/src/System.Text.Encoding.CodePages/pkg/System.Text.Encoding.CodePages.builds +++ b/src/System.Text.Encoding.CodePages/pkg/System.Text.Encoding.CodePages.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Text.Encoding.CodePages.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Text.Encoding.CodePages/pkg/System.Text.Encoding.CodePages.pkgproj b/src/System.Text.Encoding.CodePages/pkg/System.Text.Encoding.CodePages.pkgproj index 6f246a87d3..1a25584488 100644 --- a/src/System.Text.Encoding.CodePages/pkg/System.Text.Encoding.CodePages.pkgproj +++ b/src/System.Text.Encoding.CodePages/pkg/System.Text.Encoding.CodePages.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Text.Encoding.CodePages.csproj"> - <SupportedFramework>net461;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Text.Encoding.CodePages.builds" /> </ItemGroup> 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 b323a7a095..8e80236524 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,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" /> <ItemGroup> @@ -9,4 +9,4 @@ <ProjectReference Include="..\..\System.Text.Encoding\ref\System.Text.Encoding.csproj" /> </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/src/Configurations.props b/src/System.Text.Encoding.CodePages/src/Configurations.props index 3d4674aeac..cfc57211a4 100644 --- a/src/System.Text.Encoding.CodePages/src/Configurations.props +++ b/src/System.Text.Encoding.CodePages/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Text.Encoding.CodePages/tests/Configurations.props b/src/System.Text.Encoding.CodePages/tests/Configurations.props index 2a160a39e8..211cd2bec8 100644 --- a/src/System.Text.Encoding.CodePages/tests/Configurations.props +++ b/src/System.Text.Encoding.CodePages/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> netstandard1.3-Windows_NT; - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.builds b/src/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.builds index b0115568be..c3b34a7bfc 100644 --- a/src/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.builds +++ b/src/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.builds @@ -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" /> <ItemGroup> 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 df021fabd5..7582bb26ca 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 @@ -17,4 +17,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.Text.Encoding.Extensions/pkg/System.Text.Encoding.Extensions.pkgproj b/src/System.Text.Encoding.Extensions/pkg/System.Text.Encoding.Extensions.pkgproj index aedd68e82b..9835ead723 100644 --- a/src/System.Text.Encoding.Extensions/pkg/System.Text.Encoding.Extensions.pkgproj +++ b/src/System.Text.Encoding.Extensions/pkg/System.Text.Encoding.Extensions.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.Text.Encoding.Extensions.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Text.Encoding.Extensions.csproj"> <TargetGroup>net463</TargetGroup> diff --git a/src/System.Text.Encoding.Extensions/pkg/any/System.Text.Encoding.Extensions.pkgproj b/src/System.Text.Encoding.Extensions/pkg/any/System.Text.Encoding.Extensions.pkgproj index b12f4b3444..419de086c9 100644 --- a/src/System.Text.Encoding.Extensions/pkg/any/System.Text.Encoding.Extensions.pkgproj +++ b/src/System.Text.Encoding.Extensions/pkg/any/System.Text.Encoding.Extensions.pkgproj @@ -5,19 +5,16 @@ <PackageTargetRuntime>any</PackageTargetRuntime> <PreventImplementationReference>true</PreventImplementationReference> </PropertyGroup> - <ItemGroup> <ProjectReference Include="..\..\src\System.Text.Encoding.Extensions.csproj" /> <ProjectReference Include="..\..\src\System.Text.Encoding.Extensions.csproj"> <TargetGroup>net463</TargetGroup> </ProjectReference> - <!-- AOT implementation comes from AOT package --> <File Include="$(PlaceholderFile)"> <TargetPath>runtimes/aot/lib/netcore50</TargetPath> <TargetFramework>aot</TargetFramework> </File> - <InboxOnTargetFramework Include="MonoAndroid10" /> <InboxOnTargetFramework Include="MonoTouch10" /> <InboxOnTargetFramework Include="net45" /> diff --git a/src/System.Text.Encoding.Extensions/pkg/aot/System.Text.Encoding.Extensions.pkgproj b/src/System.Text.Encoding.Extensions/pkg/aot/System.Text.Encoding.Extensions.pkgproj index 5e4737373f..e250c97205 100644 --- a/src/System.Text.Encoding.Extensions/pkg/aot/System.Text.Encoding.Extensions.pkgproj +++ b/src/System.Text.Encoding.Extensions/pkg/aot/System.Text.Encoding.Extensions.pkgproj @@ -1,11 +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="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> <PackageTargetRuntime>aot</PackageTargetRuntime> <PreventImplementationReference>true</PreventImplementationReference> </PropertyGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </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 740e35dbd5..264665cf8d 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,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> @@ -12,4 +12,4 @@ <ProjectReference Include="..\..\System.Text.Encoding\ref\System.Text.Encoding.csproj" /> </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/src/Configurations.props b/src/System.Text.Encoding.Extensions/src/Configurations.props index 9c336c0be9..dc837f9152 100644 --- a/src/System.Text.Encoding.Extensions/src/Configurations.props +++ b/src/System.Text.Encoding.Extensions/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Text.Encoding.Extensions/tests/Configurations.props b/src/System.Text.Encoding.Extensions/tests/Configurations.props index 512c938bad..b2db637110 100644 --- a/src/System.Text.Encoding.Extensions/tests/Configurations.props +++ b/src/System.Text.Encoding.Extensions/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> netstandard1.3; - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Text.Encoding.Extensions/tests/System.Text.Encoding.Extensions.Tests.builds b/src/System.Text.Encoding.Extensions/tests/System.Text.Encoding.Extensions.Tests.builds index e99c4aff41..2d1b236baf 100644 --- a/src/System.Text.Encoding.Extensions/tests/System.Text.Encoding.Extensions.Tests.builds +++ b/src/System.Text.Encoding.Extensions/tests/System.Text.Encoding.Extensions.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Text.Encoding/pkg/System.Text.Encoding.pkgproj b/src/System.Text.Encoding/pkg/System.Text.Encoding.pkgproj index a3cf1aa63c..39340d7a23 100644 --- a/src/System.Text.Encoding/pkg/System.Text.Encoding.pkgproj +++ b/src/System.Text.Encoding/pkg/System.Text.Encoding.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Text.Encoding.csproj"> - <SupportedFramework>netcoreapp1.1;uap10.1;net463;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>netcoreapp2.0;uap10.1;net463;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Text.Encoding.csproj"> <TargetGroup>net463</TargetGroup> diff --git a/src/System.Text.Encoding/pkg/any/System.Text.Encoding.pkgproj b/src/System.Text.Encoding/pkg/any/System.Text.Encoding.pkgproj index cf4a07f75d..14c86c6803 100644 --- a/src/System.Text.Encoding/pkg/any/System.Text.Encoding.pkgproj +++ b/src/System.Text.Encoding/pkg/any/System.Text.Encoding.pkgproj @@ -5,16 +5,13 @@ <PackageTargetRuntime>any</PackageTargetRuntime> <PreventImplementationReference>true</PreventImplementationReference> </PropertyGroup> - <ItemGroup> <ProjectReference Include="..\..\src\System.Text.Encoding.csproj" /> - <!-- AOT implementation comes from AOT package --> <File Include="$(PlaceholderFile)"> <TargetPath>runtimes/aot/lib/netcore50</TargetPath> <TargetFramework>aot</TargetFramework> </File> - <InboxOnTargetFramework Include="MonoAndroid10" /> <InboxOnTargetFramework Include="MonoTouch10" /> <InboxOnTargetFramework Include="net45" /> diff --git a/src/System.Text.Encoding/pkg/aot/System.Text.Encoding.pkgproj b/src/System.Text.Encoding/pkg/aot/System.Text.Encoding.pkgproj index 3833b11367..35737b689c 100644 --- a/src/System.Text.Encoding/pkg/aot/System.Text.Encoding.pkgproj +++ b/src/System.Text.Encoding/pkg/aot/System.Text.Encoding.pkgproj @@ -1,12 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> <PackageTargetRuntime>aot</PackageTargetRuntime> <PreventImplementationReference>true</PreventImplementationReference> </PropertyGroup> - <ItemGroup> <ProjectReference Include="..\..\src\System.Text.Encoding.csproj"> <OSGroup>Windows_NT</OSGroup> diff --git a/src/System.Text.Encoding/ref/System.Text.Encoding.csproj b/src/System.Text.Encoding/ref/System.Text.Encoding.csproj index 38910a3980..8c71227428 100644 --- a/src/System.Text.Encoding/ref/System.Text.Encoding.csproj +++ b/src/System.Text.Encoding/ref/System.Text.Encoding.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -11,4 +11,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </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/src/Configurations.props b/src/System.Text.Encoding/src/Configurations.props index a25a6691e3..6446d96dd3 100644 --- a/src/System.Text.Encoding/src/Configurations.props +++ b/src/System.Text.Encoding/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Text.Encoding/src/System.Text.Encoding.csproj b/src/System.Text.Encoding/src/System.Text.Encoding.csproj index ab4480a116..37e0bfb2f8 100644 --- a/src/System.Text.Encoding/src/System.Text.Encoding.csproj +++ b/src/System.Text.Encoding/src/System.Text.Encoding.csproj @@ -5,7 +5,7 @@ <AssemblyName>System.Text.Encoding</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <!-- copy to uap10.1 until nuget makes the change to map that to ns1.7 --> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> diff --git a/src/System.Text.Encoding/tests/Configurations.props b/src/System.Text.Encoding/tests/Configurations.props index 512c938bad..b2db637110 100644 --- a/src/System.Text.Encoding/tests/Configurations.props +++ b/src/System.Text.Encoding/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> netstandard1.3; - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Text.Encoding/tests/System.Text.Encoding.Tests.builds b/src/System.Text.Encoding/tests/System.Text.Encoding.Tests.builds index 3a4a111947..471ce0ed35 100644 --- a/src/System.Text.Encoding/tests/System.Text.Encoding.Tests.builds +++ b/src/System.Text.Encoding/tests/System.Text.Encoding.Tests.builds @@ -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" /> <ItemGroup> 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 b5a5a5e4df..07f052e53f 100644 --- a/src/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj +++ b/src/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj @@ -85,4 +85,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.Text.Encodings.Web/pkg/System.Text.Encodings.Web.builds b/src/System.Text.Encodings.Web/pkg/System.Text.Encodings.Web.builds index d5fd30b1b1..36baad39a4 100644 --- a/src/System.Text.Encodings.Web/pkg/System.Text.Encodings.Web.builds +++ b/src/System.Text.Encodings.Web/pkg/System.Text.Encodings.Web.builds @@ -1,8 +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" /> <ItemGroup> - <Project Include="System.Text.Encodings.Web.pkgproj"/> + <Project Include="System.Text.Encodings.Web.pkgproj" /> </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.Encodings.Web/pkg/System.Text.Encodings.Web.pkgproj b/src/System.Text.Encodings.Web/pkg/System.Text.Encodings.Web.pkgproj index dc74ee4902..1c2c71f449 100644 --- a/src/System.Text.Encodings.Web/pkg/System.Text.Encodings.Web.pkgproj +++ b/src/System.Text.Encodings.Web/pkg/System.Text.Encodings.Web.pkgproj @@ -1,12 +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" /> - <ItemGroup> <ProjectReference Include="..\src\System.Text.Encodings.Web.builds"> <SupportedFramework>net45;netcore45;wp8;wpa81;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Text.Encodings.Web/src/Configurations.props b/src/System.Text.Encodings.Web/src/Configurations.props index 2ec0365c0d..66fc3409d3 100644 --- a/src/System.Text.Encodings.Web/src/Configurations.props +++ b/src/System.Text.Encodings.Web/src/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.0; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Text.Encodings.Web/tests/Configurations.props b/src/System.Text.Encodings.Web/tests/Configurations.props index f0ebe53119..c3266e1e93 100644 --- a/src/System.Text.Encodings.Web/tests/Configurations.props +++ b/src/System.Text.Encodings.Web/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.builds b/src/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.builds index 76c86a8636..c9eb22240f 100644 --- a/src/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.builds +++ b/src/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.builds b/src/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.builds index 0a8c06c9ab..96da8c0245 100644 --- a/src/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.builds +++ b/src/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.builds @@ -5,4 +5,4 @@ <Project Include="System.Text.RegularExpressions.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.pkgproj b/src/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.pkgproj index 602af001ca..32f267af64 100644 --- a/src/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.pkgproj +++ b/src/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.Text.RegularExpressions.builds"> - <SupportedFramework>net461;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Text.RegularExpressions.builds" /> <InboxOnTargetFramework Include="MonoAndroid10" /> @@ -25,4 +25,4 @@ <HarvestSuppressPaths Include="ref/net463;lib/net463" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.builds b/src/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.builds index 6abb3c2215..f81515dbf1 100644 --- a/src/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.builds +++ b/src/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.builds @@ -1,11 +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" /> <ItemGroup> <Project Include="System.Text.RegularExpressions.csproj" /> <Project Include="System.Text.RegularExpressions.csproj"> - <TargetGroup>netstandard1.7</TargetGroup> + <TargetGroup>netstandard</TargetGroup> </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</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 fd3f48818f..933ee63632 100644 --- a/src/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.csproj +++ b/src/System.Text.RegularExpressions/ref/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" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -11,4 +11,4 @@ <ProjectReference Include="..\..\System.Collections.NonGeneric\ref\System.Collections.NonGeneric.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Text.RegularExpressions/src/Configurations.props b/src/System.Text.RegularExpressions/src/Configurations.props index 53b62c64fe..bcfec4bbde 100644 --- a/src/System.Text.RegularExpressions/src/Configurations.props +++ b/src/System.Text.RegularExpressions/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Text.RegularExpressions/tests/Configurations.props b/src/System.Text.RegularExpressions/tests/Configurations.props index cf92a56f64..ba950076e5 100644 --- a/src/System.Text.RegularExpressions/tests/Configurations.props +++ b/src/System.Text.RegularExpressions/tests/Configurations.props @@ -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"> <PropertyGroup> <BuildConfigurations> netstandard1.6; - netcoreapp1.1; - netstandard1.7; + netcoreapp; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.builds b/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.builds index c698dcddce..a060e5e410 100644 --- a/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.builds +++ b/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.builds @@ -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" /> <ItemGroup> @@ -8,8 +8,8 @@ <TestTFMs>netcoreapp1.0</TestTFMs> </Project> <Project Include="System.Text.RegularExpressions.Tests.csproj"> - <TargetGroup>netcoreapp1.1</TargetGroup> - <TestTFMs>netcoreapp1.1</TestTFMs> + <TargetGroup>netcoreapp</TargetGroup> + <TestTFMs>netcoreapp</TestTFMs> </Project> <Project Include="System.Text.RegularExpressions.Tests.csproj"> <TargetGroup>netstandard1.6</TargetGroup> 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 fbaa47175d..de765a85cd 100644 --- a/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj +++ b/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj @@ -44,4 +44,4 @@ </ItemGroup> <!-- Automatically added by VS --> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Threading.AccessControl/pkg/System.Threading.AccessControl.builds b/src/System.Threading.AccessControl/pkg/System.Threading.AccessControl.builds index d09cd62f9e..b7dfe3825c 100644 --- a/src/System.Threading.AccessControl/pkg/System.Threading.AccessControl.builds +++ b/src/System.Threading.AccessControl/pkg/System.Threading.AccessControl.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Threading.AccessControl.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Threading.AccessControl/pkg/System.Threading.AccessControl.pkgproj b/src/System.Threading.AccessControl/pkg/System.Threading.AccessControl.pkgproj index 7ea58843a9..8633e60222 100644 --- a/src/System.Threading.AccessControl/pkg/System.Threading.AccessControl.pkgproj +++ b/src/System.Threading.AccessControl/pkg/System.Threading.AccessControl.pkgproj @@ -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" /> - <ItemGroup> <ProjectReference Include="..\ref\System.Threading.AccessControl.csproj"> <SupportedFramework>net46;netcoreapp1.0</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Threading.AccessControl.builds" /> - <NotSupportedOnTargetFramework Include="netcore50"> <PackageTargetRuntime>win</PackageTargetRuntime> </NotSupportedOnTargetFramework> </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 c43ef00ca9..54d66ee151 100644 --- a/src/System.Threading.AccessControl/ref/System.Threading.AccessControl.csproj +++ b/src/System.Threading.AccessControl/ref/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" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -13,4 +13,4 @@ <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Threading.AccessControl/src/Configurations.props b/src/System.Threading.AccessControl/src/Configurations.props index a6c74d0e58..437e6acc34 100644 --- a/src/System.Threading.AccessControl/src/Configurations.props +++ b/src/System.Threading.AccessControl/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ netstandard1.3-Unix; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Threading.AccessControl/tests/Configurations.props b/src/System.Threading.AccessControl/tests/Configurations.props index 5d77dc616e..5f482b878b 100644 --- a/src/System.Threading.AccessControl/tests/Configurations.props +++ b/src/System.Threading.AccessControl/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.builds b/src/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.builds index cd45348b5b..91d84fd1bb 100644 --- a/src/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.builds +++ b/src/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.builds @@ -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" /> <ItemGroup> <Project Include="System.Threading.AccessControl.Tests.csproj"> <OSGroup>Windows_NT</OSGroup> - <TestTFMs>netcoreapp1.1;netcoreapp1.0;net46</TestTFMs> + <TestTFMs>netcoreapp;netcoreapp1.0;net46</TestTFMs> </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> diff --git a/src/System.Threading.Overlapped/pkg/System.Threading.Overlapped.builds b/src/System.Threading.Overlapped/pkg/System.Threading.Overlapped.builds index 2f6a1c296b..b2228b3c61 100644 --- a/src/System.Threading.Overlapped/pkg/System.Threading.Overlapped.builds +++ b/src/System.Threading.Overlapped/pkg/System.Threading.Overlapped.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Threading.Overlapped.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Threading.Overlapped/pkg/System.Threading.Overlapped.pkgproj b/src/System.Threading.Overlapped/pkg/System.Threading.Overlapped.pkgproj index aeb1755afd..663b16eac2 100644 --- a/src/System.Threading.Overlapped/pkg/System.Threading.Overlapped.pkgproj +++ b/src/System.Threading.Overlapped/pkg/System.Threading.Overlapped.pkgproj @@ -1,13 +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" /> - <ItemGroup> <ProjectReference Include="..\ref\System.Threading.Overlapped.csproj"> - <SupportedFramework>net463;netcoreapp1.1</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Threading.Overlapped.builds" /> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </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 3e43ac771a..96ee3e0336 100644 --- a/src/System.Threading.Overlapped/ref/System.Threading.Overlapped.csproj +++ b/src/System.Threading.Overlapped/ref/System.Threading.Overlapped.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -11,4 +11,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </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/src/Configurations.props b/src/System.Threading.Overlapped/src/Configurations.props index 54621aaa25..ade796f1bf 100644 --- a/src/System.Threading.Overlapped/src/Configurations.props +++ b/src/System.Threading.Overlapped/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ netstandard-Unix; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Threading.Overlapped/tests/Configurations.props b/src/System.Threading.Overlapped/tests/Configurations.props index 9899767269..cf10431a14 100644 --- a/src/System.Threading.Overlapped/tests/Configurations.props +++ b/src/System.Threading.Overlapped/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> netstandard1.3-Windows_NT; - netstandard1.7-Windows_NT; + netstandard-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.builds b/src/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.builds index bdc8fad699..9caea57685 100644 --- a/src/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.builds +++ b/src/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.builds @@ -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" /> <ItemGroup> @@ -12,4 +12,4 @@ </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file 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 0499f24083..4ce0cbd4d8 100644 --- a/src/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.csproj +++ b/src/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.csproj @@ -27,4 +27,4 @@ <Compile Include="OverlappedTests.cs" /> </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/pkg/System.Threading.Tasks.Dataflow.builds b/src/System.Threading.Tasks.Dataflow/pkg/System.Threading.Tasks.Dataflow.builds index 18f41cec99..2e4509446f 100644 --- a/src/System.Threading.Tasks.Dataflow/pkg/System.Threading.Tasks.Dataflow.builds +++ b/src/System.Threading.Tasks.Dataflow/pkg/System.Threading.Tasks.Dataflow.builds @@ -1,8 +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" /> <ItemGroup> - <Project Include="System.Threading.Tasks.Dataflow.pkgproj"/> + <Project Include="System.Threading.Tasks.Dataflow.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Threading.Tasks.Dataflow/pkg/System.Threading.Tasks.Dataflow.pkgproj b/src/System.Threading.Tasks.Dataflow/pkg/System.Threading.Tasks.Dataflow.pkgproj index 86a1a110c3..d969844ff2 100644 --- a/src/System.Threading.Tasks.Dataflow/pkg/System.Threading.Tasks.Dataflow.pkgproj +++ b/src/System.Threading.Tasks.Dataflow/pkg/System.Threading.Tasks.Dataflow.pkgproj @@ -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> <!-- we need to be supported on pre-nuget-3 platforms (Dev12, Dev11, etc) --> <MinClientVersion>2.8.6</MinClientVersion> </PropertyGroup> - <ItemGroup> <ProjectReference Include="..\src\System.Threading.Tasks.Dataflow.builds"> <SupportedFramework>net45;netcore45;wp8;wpa81;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework> </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.Dataflow/src/Configurations.props b/src/System.Threading.Tasks.Dataflow/src/Configurations.props index 2467da4a1e..6b3d50a13c 100644 --- a/src/System.Threading.Tasks.Dataflow/src/Configurations.props +++ b/src/System.Threading.Tasks.Dataflow/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard1.1; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Threading.Tasks.Dataflow/tests/Configurations.props b/src/System.Threading.Tasks.Dataflow/tests/Configurations.props index f0ebe53119..c3266e1e93 100644 --- a/src/System.Threading.Tasks.Dataflow/tests/Configurations.props +++ b/src/System.Threading.Tasks.Dataflow/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.builds b/src/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.builds index 7dfed2d470..fbb3959474 100644 --- a/src/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.builds +++ b/src/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Threading.Tasks.Extensions/pkg/System.Threading.Tasks.Extensions.builds b/src/System.Threading.Tasks.Extensions/pkg/System.Threading.Tasks.Extensions.builds index 5c2a62f662..664e9ea1eb 100644 --- a/src/System.Threading.Tasks.Extensions/pkg/System.Threading.Tasks.Extensions.builds +++ b/src/System.Threading.Tasks.Extensions/pkg/System.Threading.Tasks.Extensions.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Threading.Tasks.Extensions.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Threading.Tasks.Extensions/pkg/System.Threading.Tasks.Extensions.pkgproj b/src/System.Threading.Tasks.Extensions/pkg/System.Threading.Tasks.Extensions.pkgproj index 92879410d5..ad0dcf946e 100644 --- a/src/System.Threading.Tasks.Extensions/pkg/System.Threading.Tasks.Extensions.pkgproj +++ b/src/System.Threading.Tasks.Extensions/pkg/System.Threading.Tasks.Extensions.pkgproj @@ -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> <!-- we need to be supported on pre-nuget-3 platforms (Dev12, Dev11, etc) --> <MinClientVersion>2.8.6</MinClientVersion> </PropertyGroup> - <ItemGroup> - <ProjectReference Include="..\src\System.Threading.Tasks.Extensions.builds" > + <ProjectReference Include="..\src\System.Threading.Tasks.Extensions.builds"> <SupportedFramework>net45;netcore45;netcoreapp1.0;wpa81;wp8;$(AllXamarinFrameworks)</SupportedFramework> </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.Tasks.Extensions/src/Configurations.props b/src/System.Threading.Tasks.Extensions/src/Configurations.props index 2ec0365c0d..66fc3409d3 100644 --- a/src/System.Threading.Tasks.Extensions/src/Configurations.props +++ b/src/System.Threading.Tasks.Extensions/src/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.0; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Threading.Tasks.Extensions/tests/Configurations.props b/src/System.Threading.Tasks.Extensions/tests/Configurations.props index f0ebe53119..c3266e1e93 100644 --- a/src/System.Threading.Tasks.Extensions/tests/Configurations.props +++ b/src/System.Threading.Tasks.Extensions/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.builds b/src/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.builds index 2e735693c7..507ee9f72b 100644 --- a/src/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.builds +++ b/src/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Threading.Tasks.Parallel/pkg/System.Threading.Tasks.Parallel.builds b/src/System.Threading.Tasks.Parallel/pkg/System.Threading.Tasks.Parallel.builds index 9355a9b6c8..3f11260f22 100644 --- a/src/System.Threading.Tasks.Parallel/pkg/System.Threading.Tasks.Parallel.builds +++ b/src/System.Threading.Tasks.Parallel/pkg/System.Threading.Tasks.Parallel.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Threading.Tasks.Parallel.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Threading.Tasks.Parallel/pkg/System.Threading.Tasks.Parallel.pkgproj b/src/System.Threading.Tasks.Parallel/pkg/System.Threading.Tasks.Parallel.pkgproj index 661b338216..da58c5bc04 100644 --- a/src/System.Threading.Tasks.Parallel/pkg/System.Threading.Tasks.Parallel.pkgproj +++ b/src/System.Threading.Tasks.Parallel/pkg/System.Threading.Tasks.Parallel.pkgproj @@ -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" /> <ItemGroup> 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 e39f2210ff..6a4fb8329f 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,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" /> <ItemGroup> @@ -10,4 +10,4 @@ <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </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.Parallel/src/Configurations.props b/src/System.Threading.Tasks.Parallel/src/Configurations.props index f0ebe53119..c3266e1e93 100644 --- a/src/System.Threading.Tasks.Parallel/src/Configurations.props +++ b/src/System.Threading.Tasks.Parallel/src/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Threading.Tasks.Parallel/tests/Configurations.props b/src/System.Threading.Tasks.Parallel/tests/Configurations.props index 30186bb80b..2c5652de53 100644 --- a/src/System.Threading.Tasks.Parallel/tests/Configurations.props +++ b/src/System.Threading.Tasks.Parallel/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.5; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.builds b/src/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.builds index 64dc47551e..bdd7a1f283 100644 --- a/src/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.builds +++ b/src/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Threading.Tasks/pkg/System.Threading.Tasks.pkgproj b/src/System.Threading.Tasks/pkg/System.Threading.Tasks.pkgproj index bf3ed5a5a9..962c157618 100644 --- a/src/System.Threading.Tasks/pkg/System.Threading.Tasks.pkgproj +++ b/src/System.Threading.Tasks/pkg/System.Threading.Tasks.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Threading.Tasks.csproj"> - <SupportedFramework>net463;netcoreapp1.1;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Threading.Tasks.csproj"> <TargetGroup>net463</TargetGroup> diff --git a/src/System.Threading.Tasks/pkg/any/System.Threading.Tasks.pkgproj b/src/System.Threading.Tasks/pkg/any/System.Threading.Tasks.pkgproj index 52054bf57f..363dcda5a3 100644 --- a/src/System.Threading.Tasks/pkg/any/System.Threading.Tasks.pkgproj +++ b/src/System.Threading.Tasks/pkg/any/System.Threading.Tasks.pkgproj @@ -5,10 +5,8 @@ <PackageTargetRuntime>any</PackageTargetRuntime> <PreventImplementationReference>true</PreventImplementationReference> </PropertyGroup> - <ItemGroup> <ProjectReference Include="..\..\src\System.Threading.Tasks.csproj" /> - <InboxOnTargetFramework Include="MonoAndroid10" /> <InboxOnTargetFramework Include="MonoTouch10" /> <InboxOnTargetFramework Include="net45" /> diff --git a/src/System.Threading.Tasks/pkg/aot/System.Threading.Tasks.pkgproj b/src/System.Threading.Tasks/pkg/aot/System.Threading.Tasks.pkgproj index 0b879f53a6..86f33d6bd9 100644 --- a/src/System.Threading.Tasks/pkg/aot/System.Threading.Tasks.pkgproj +++ b/src/System.Threading.Tasks/pkg/aot/System.Threading.Tasks.pkgproj @@ -1,17 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> <PackageTargetRuntime>aot</PackageTargetRuntime> <PreventImplementationReference>true</PreventImplementationReference> </PropertyGroup> - <ItemGroup> <ProjectReference Include="..\..\src\System.Threading.Tasks.csproj"> <TargetGroup>uap101aot</TargetGroup> </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/ref/System.Threading.Tasks.csproj b/src/System.Threading.Tasks/ref/System.Threading.Tasks.csproj index 98faf370a8..911018d108 100644 --- a/src/System.Threading.Tasks/ref/System.Threading.Tasks.csproj +++ b/src/System.Threading.Tasks/ref/System.Threading.Tasks.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -8,4 +8,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </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/src/Configurations.props b/src/System.Threading.Tasks/src/Configurations.props index a25a6691e3..6446d96dd3 100644 --- a/src/System.Threading.Tasks/src/Configurations.props +++ b/src/System.Threading.Tasks/src/Configurations.props @@ -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> <BuildConfigurations> @@ -7,4 +7,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Threading.Tasks/src/System.Threading.Tasks.csproj b/src/System.Threading.Tasks/src/System.Threading.Tasks.csproj index f32a7a3c25..c6fd018ca9 100644 --- a/src/System.Threading.Tasks/src/System.Threading.Tasks.csproj +++ b/src/System.Threading.Tasks/src/System.Threading.Tasks.csproj @@ -5,7 +5,7 @@ <ProjectGuid>{3BCAEAA6-3A29-49EC-B334-6E7BE8BE9ABA}</ProjectGuid> <AssemblyName>System.Threading.Tasks</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> diff --git a/src/System.Threading.Tasks/tests/Configurations.props b/src/System.Threading.Tasks/tests/Configurations.props index b744993779..800e963c80 100644 --- a/src/System.Threading.Tasks/tests/Configurations.props +++ b/src/System.Threading.Tasks/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> netstandard1.5; - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.builds b/src/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.builds index 27fa7ead1b..ebde12ed2f 100644 --- a/src/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.builds +++ b/src/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.builds @@ -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" /> <ItemGroup> 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 98851dc3fb..481816574e 100644 --- a/src/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj +++ b/src/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj @@ -53,4 +53,4 @@ <Compile Include="Task\TaskDisposeTests.netstandard1.7.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Threading.Thread/pkg/System.Threading.Thread.builds b/src/System.Threading.Thread/pkg/System.Threading.Thread.builds index da5399c203..9fb34e81eb 100644 --- a/src/System.Threading.Thread/pkg/System.Threading.Thread.builds +++ b/src/System.Threading.Thread/pkg/System.Threading.Thread.builds @@ -1,8 +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" /> <ItemGroup> <Project Include="System.Threading.Thread.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Threading.Thread/pkg/System.Threading.Thread.pkgproj b/src/System.Threading.Thread/pkg/System.Threading.Thread.pkgproj index 75b1faf883..7a0f8dc27c 100644 --- a/src/System.Threading.Thread/pkg/System.Threading.Thread.pkgproj +++ b/src/System.Threading.Thread/pkg/System.Threading.Thread.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.Threading.Thread.csproj"> - <SupportedFramework>net461;netcoreapp1.1;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net461;netcoreapp2.0;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Threading.Thread.builds" /> </ItemGroup> @@ -14,18 +14,16 @@ <File Include="$(PlaceholderFile)"> <TargetPath>lib/netstandard2.0</TargetPath> </File> - <InboxOnTargetFramework Include="MonoAndroid10" /> <InboxOnTargetFramework Include="MonoTouch10" /> <InboxOnTargetFramework Include="xamarinios10" /> <InboxOnTargetFramework Include="xamarinmac20" /> <InboxOnTargetFramework Include="xamarintvos10" /> <InboxOnTargetFramework Include="xamarinwatchos10" /> - <ValidatePackageSuppression Include="SuppressNETStandardInference"> <!-- UAP 10.1 is currently incorrectly mapped by NuGet to ns1.4 --> <Value>UAP,Version=v10.1</Value> </ValidatePackageSuppression> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</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 cf611b21bf..53c8705302 100644 --- a/src/System.Threading.Thread/ref/System.Threading.Thread.csproj +++ b/src/System.Threading.Thread/ref/System.Threading.Thread.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" /> <ItemGroup> @@ -11,4 +11,4 @@ <ProjectReference Include="..\..\System.Threading\ref\System.Threading.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Threading.Thread/src/Configurations.props b/src/System.Threading.Thread/src/Configurations.props index d9529542a7..c600b915db 100644 --- a/src/System.Threading.Thread/src/Configurations.props +++ b/src/System.Threading.Thread/src/Configurations.props @@ -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> <BuildConfigurations> @@ -8,4 +8,4 @@ net461-Windows_NT; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Threading.Thread/src/System.Threading.Thread.csproj b/src/System.Threading.Thread/src/System.Threading.Thread.csproj index 137d6c0963..2b87e2f079 100644 --- a/src/System.Threading.Thread/src/System.Threading.Thread.csproj +++ b/src/System.Threading.Thread/src/System.Threading.Thread.csproj @@ -5,7 +5,7 @@ <AssemblyName>System.Threading.Thread</AssemblyName> <OutputType>Library</OutputType> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard1.7;uap10.1</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard;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 --> diff --git a/src/System.Threading.Thread/tests/Configurations.props b/src/System.Threading.Thread/tests/Configurations.props index 98f53209d4..c398e42e89 100644 --- a/src/System.Threading.Thread/tests/Configurations.props +++ b/src/System.Threading.Thread/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Threading.Thread/tests/System.Threading.Thread.Tests.builds b/src/System.Threading.Thread/tests/System.Threading.Thread.Tests.builds index d70f294226..4ceee39a49 100644 --- a/src/System.Threading.Thread/tests/System.Threading.Thread.Tests.builds +++ b/src/System.Threading.Thread/tests/System.Threading.Thread.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Threading.ThreadPool/pkg/System.Threading.ThreadPool.builds b/src/System.Threading.ThreadPool/pkg/System.Threading.ThreadPool.builds index 9ae14e48a9..44789802a7 100644 --- a/src/System.Threading.ThreadPool/pkg/System.Threading.ThreadPool.builds +++ b/src/System.Threading.ThreadPool/pkg/System.Threading.ThreadPool.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Threading.ThreadPool.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Threading.ThreadPool/pkg/System.Threading.ThreadPool.pkgproj b/src/System.Threading.ThreadPool/pkg/System.Threading.ThreadPool.pkgproj index eefca9bb2b..03f29666bb 100644 --- a/src/System.Threading.ThreadPool/pkg/System.Threading.ThreadPool.pkgproj +++ b/src/System.Threading.ThreadPool/pkg/System.Threading.ThreadPool.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Threading.ThreadPool.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Threading.ThreadPool.builds" /> </ItemGroup> @@ -17,4 +17,4 @@ <InboxOnTargetFramework Include="xamarinwatchos10" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</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 4568c2ed7b..1e97189d36 100644 --- a/src/System.Threading.ThreadPool/ref/System.Threading.ThreadPool.csproj +++ b/src/System.Threading.ThreadPool/ref/System.Threading.ThreadPool.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -13,4 +13,4 @@ <ProjectReference Include="..\..\System.Threading.Overlapped\ref\System.Threading.Overlapped.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Threading.ThreadPool/src/Configurations.props b/src/System.Threading.ThreadPool/src/Configurations.props index 9c336c0be9..dc837f9152 100644 --- a/src/System.Threading.ThreadPool/src/Configurations.props +++ b/src/System.Threading.ThreadPool/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Threading.ThreadPool/tests/Configurations.props b/src/System.Threading.ThreadPool/tests/Configurations.props index 98f53209d4..c398e42e89 100644 --- a/src/System.Threading.ThreadPool/tests/Configurations.props +++ b/src/System.Threading.ThreadPool/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Threading.ThreadPool/tests/System.Threading.ThreadPool.Tests.builds b/src/System.Threading.ThreadPool/tests/System.Threading.ThreadPool.Tests.builds index 8762fb6246..5c93d67cb9 100644 --- a/src/System.Threading.ThreadPool/tests/System.Threading.ThreadPool.Tests.builds +++ b/src/System.Threading.ThreadPool/tests/System.Threading.ThreadPool.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Threading.Timer/pkg/System.Threading.Timer.pkgproj b/src/System.Threading.Timer/pkg/System.Threading.Timer.pkgproj index b6c34d5df5..33370cf52f 100644 --- a/src/System.Threading.Timer/pkg/System.Threading.Timer.pkgproj +++ b/src/System.Threading.Timer/pkg/System.Threading.Timer.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Threading.Timer.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Threading.Timer.csproj"> <TargetGroup>net463</TargetGroup> diff --git a/src/System.Threading.Timer/pkg/any/System.Threading.Timer.pkgproj b/src/System.Threading.Timer/pkg/any/System.Threading.Timer.pkgproj index 922af191f0..b439f36e75 100644 --- a/src/System.Threading.Timer/pkg/any/System.Threading.Timer.pkgproj +++ b/src/System.Threading.Timer/pkg/any/System.Threading.Timer.pkgproj @@ -5,16 +5,13 @@ <PackageTargetRuntime>any</PackageTargetRuntime> <PreventImplementationReference>true</PreventImplementationReference> </PropertyGroup> - <ItemGroup> <ProjectReference Include="..\..\src\System.Threading.Timer.csproj" /> - <!-- AOT implementation comes from AOT package --> <File Include="$(PlaceholderFile)"> <TargetPath>runtimes/aot/lib/netcore50</TargetPath> <TargetFramework>aot</TargetFramework> </File> - <InboxOnTargetFramework Include="MonoAndroid10" /> <InboxOnTargetFramework Include="MonoTouch10" /> <InboxOnTargetFramework Include="net45" /> diff --git a/src/System.Threading.Timer/pkg/aot/System.Threading.Timer.pkgproj b/src/System.Threading.Timer/pkg/aot/System.Threading.Timer.pkgproj index 5e4737373f..e250c97205 100644 --- a/src/System.Threading.Timer/pkg/aot/System.Threading.Timer.pkgproj +++ b/src/System.Threading.Timer/pkg/aot/System.Threading.Timer.pkgproj @@ -1,11 +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="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> <PackageTargetRuntime>aot</PackageTargetRuntime> <PreventImplementationReference>true</PreventImplementationReference> </PropertyGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </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 8fb34f13dc..5ecf841966 100644 --- a/src/System.Threading.Timer/ref/System.Threading.Timer.csproj +++ b/src/System.Threading.Timer/ref/System.Threading.Timer.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -8,4 +8,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Threading.Timer/src/Configurations.props b/src/System.Threading.Timer/src/Configurations.props index 9c336c0be9..dc837f9152 100644 --- a/src/System.Threading.Timer/src/Configurations.props +++ b/src/System.Threading.Timer/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Threading.Timer/tests/Configurations.props b/src/System.Threading.Timer/tests/Configurations.props index 512c938bad..b2db637110 100644 --- a/src/System.Threading.Timer/tests/Configurations.props +++ b/src/System.Threading.Timer/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> netstandard1.3; - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Threading.Timer/tests/System.Threading.Timer.Tests.builds b/src/System.Threading.Timer/tests/System.Threading.Timer.Tests.builds index 8608b46a3c..56f88c103c 100644 --- a/src/System.Threading.Timer/tests/System.Threading.Timer.Tests.builds +++ b/src/System.Threading.Timer/tests/System.Threading.Timer.Tests.builds @@ -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" /> <ItemGroup> 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 17c6b5794d..9834ece4b7 100644 --- a/src/System.Threading.Timer/tests/System.Threading.Timer.Tests.csproj +++ b/src/System.Threading.Timer/tests/System.Threading.Timer.Tests.csproj @@ -18,4 +18,4 @@ <Compile Include="TimerFiringTests.netstandard1.7.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Threading/pkg/System.Threading.builds b/src/System.Threading/pkg/System.Threading.builds index d0a79615be..68f95c6e40 100644 --- a/src/System.Threading/pkg/System.Threading.builds +++ b/src/System.Threading/pkg/System.Threading.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Threading.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Threading/pkg/System.Threading.pkgproj b/src/System.Threading/pkg/System.Threading.pkgproj index 2655b1b8ca..4ad1cb51e5 100644 --- a/src/System.Threading/pkg/System.Threading.pkgproj +++ b/src/System.Threading/pkg/System.Threading.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.Threading.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Threading.builds" /> </ItemGroup> diff --git a/src/System.Threading/ref/System.Threading.csproj b/src/System.Threading/ref/System.Threading.csproj index d599fbf686..5dd8b56bc1 100644 --- a/src/System.Threading/ref/System.Threading.csproj +++ b/src/System.Threading/ref/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" /> <ItemGroup> @@ -8,4 +8,4 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Threading/src/Configurations.props b/src/System.Threading/src/Configurations.props index 9c336c0be9..dc837f9152 100644 --- a/src/System.Threading/src/Configurations.props +++ b/src/System.Threading/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Threading/tests/Configurations.props b/src/System.Threading/tests/Configurations.props index 512c938bad..b2db637110 100644 --- a/src/System.Threading/tests/Configurations.props +++ b/src/System.Threading/tests/Configurations.props @@ -1,9 +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> <BuildConfigurations> netstandard1.3; - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Threading/tests/System.Threading.Tests.builds b/src/System.Threading/tests/System.Threading.Tests.builds index 8b473e6812..d3c383990a 100644 --- a/src/System.Threading/tests/System.Threading.Tests.builds +++ b/src/System.Threading/tests/System.Threading.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Threading/tests/System.Threading.Tests.csproj b/src/System.Threading/tests/System.Threading.Tests.csproj index af449363eb..2fe10cfbe4 100644 --- a/src/System.Threading/tests/System.Threading.Tests.csproj +++ b/src/System.Threading/tests/System.Threading.Tests.csproj @@ -64,4 +64,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.Transactions/pkg/System.Transactions.builds b/src/System.Transactions/pkg/System.Transactions.builds index 047a2fa668..599463dd00 100644 --- a/src/System.Transactions/pkg/System.Transactions.builds +++ b/src/System.Transactions/pkg/System.Transactions.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Transactions/pkg/System.Transactions.pkgproj b/src/System.Transactions/pkg/System.Transactions.pkgproj index 54752ef1d6..9c6082425f 100644 --- a/src/System.Transactions/pkg/System.Transactions.pkgproj +++ b/src/System.Transactions/pkg/System.Transactions.pkgproj @@ -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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Transactions.csproj"> - <SupportedFramework>net461;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Transactions.builds" /> - <InboxOnTargetFramework Include="net461"> <AsFrameworkReference>true</AsFrameworkReference> </InboxOnTargetFramework> - <!-- System.Transactions is a classic reference assembly on Xamarin platforms --> <InboxOnTargetFramework Include="monoandroid10"> <AsFrameworkReference>true</AsFrameworkReference> @@ -30,10 +28,9 @@ <InboxOnTargetFramework Include="xamarinwatchos10"> <AsFrameworkReference>true</AsFrameworkReference> </InboxOnTargetFramework> - <NotSupportedOnTargetFramework Include="netcore50"> <PackageTargetRuntime>win7</PackageTargetRuntime> </NotSupportedOnTargetFramework> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</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 93e504d46e..d69b0830b3 100644 --- a/src/System.Transactions/ref/System.Transactions.csproj +++ b/src/System.Transactions/ref/System.Transactions.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> - <AssemblyVersion>4.0.0.0</AssemblyVersion> - <OutputType>Library</OutputType> - <PackageTargetFramework>netstandard1.7</PackageTargetFramework> + <PropertyGroup> + <AssemblyVersion>4.0.0.0</AssemblyVersion> + <OutputType>Library</OutputType> </PropertyGroup> <ItemGroup> <Compile Include="System.Transactions.cs" /> @@ -15,4 +14,4 @@ <ProjectReference Include="..\..\System.Runtime.Serialization.Formatters\ref\System.Runtime.Serialization.Formatters.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Transactions/src/Configurations.props b/src/System.Transactions/src/Configurations.props index fc9ef9822c..c398e42e89 100644 --- a/src/System.Transactions/src/Configurations.props +++ b/src/System.Transactions/src/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Transactions/src/System.Transactions.csproj b/src/System.Transactions/src/System.Transactions.csproj index c987c65ff9..a92d682e85 100644 --- a/src/System.Transactions/src/System.Transactions.csproj +++ b/src/System.Transactions/src/System.Transactions.csproj @@ -5,7 +5,7 @@ <AssemblyVersion>4.0.0.0</AssemblyVersion> <ProjectGuid>{2ADDB484-6F57-4D71-A3FE-A57EC6329A2B}</ProjectGuid> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <PackageTargetFramework>netstandard1.7</PackageTargetFramework> + <PackageTargetFramework>netstandard</PackageTargetFramework> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> </PropertyGroup> <!-- Default configurations to help VS understand the options --> diff --git a/src/System.Transactions/tests/Configurations.props b/src/System.Transactions/tests/Configurations.props index 98f53209d4..c398e42e89 100644 --- a/src/System.Transactions/tests/Configurations.props +++ b/src/System.Transactions/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> - netstandard1.7; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Transactions/tests/System.Transactions.Tests.builds b/src/System.Transactions/tests/System.Transactions.Tests.builds index 4fe3c31fe8..3fb6aea470 100644 --- a/src/System.Transactions/tests/System.Transactions.Tests.builds +++ b/src/System.Transactions/tests/System.Transactions.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.ValueTuple/pkg/System.ValueTuple.builds b/src/System.ValueTuple/pkg/System.ValueTuple.builds index 132e32be1d..65e4460eae 100644 --- a/src/System.ValueTuple/pkg/System.ValueTuple.builds +++ b/src/System.ValueTuple/pkg/System.ValueTuple.builds @@ -1,8 +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" /> <ItemGroup> - <Project Include="System.ValueTuple.pkgproj"/> + <Project Include="System.ValueTuple.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.ValueTuple/pkg/System.ValueTuple.pkgproj b/src/System.ValueTuple/pkg/System.ValueTuple.pkgproj index b142d27702..18d80db369 100644 --- a/src/System.ValueTuple/pkg/System.ValueTuple.pkgproj +++ b/src/System.ValueTuple/pkg/System.ValueTuple.pkgproj @@ -1,12 +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" /> - <ItemGroup> <ProjectReference Include="..\src\System.ValueTuple.builds"> <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.ValueTuple/src/Configurations.props b/src/System.ValueTuple/src/Configurations.props index a531bf696c..e5cac42e2a 100644 --- a/src/System.ValueTuple/src/Configurations.props +++ b/src/System.ValueTuple/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard1.0; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.ValueTuple/tests/Configurations.props b/src/System.ValueTuple/tests/Configurations.props index f0ebe53119..c3266e1e93 100644 --- a/src/System.ValueTuple/tests/Configurations.props +++ b/src/System.ValueTuple/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.ValueTuple/tests/System.ValueTuple.Tests.builds b/src/System.ValueTuple/tests/System.ValueTuple.Tests.builds index 885f55110f..4fba6a103f 100644 --- a/src/System.ValueTuple/tests/System.ValueTuple.Tests.builds +++ b/src/System.ValueTuple/tests/System.ValueTuple.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Web.HttpUtility/pkg/System.Web.HttpUtility.builds b/src/System.Web.HttpUtility/pkg/System.Web.HttpUtility.builds index 21b0720969..f8d0c2dd16 100644 --- a/src/System.Web.HttpUtility/pkg/System.Web.HttpUtility.builds +++ b/src/System.Web.HttpUtility/pkg/System.Web.HttpUtility.builds @@ -1,8 +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" /> <ItemGroup> - <Project Include="System.Web.HttpUtility.pkgproj"/> + <Project Include="System.Web.HttpUtility.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Web.HttpUtility/pkg/System.Web.HttpUtility.pkgproj b/src/System.Web.HttpUtility/pkg/System.Web.HttpUtility.pkgproj index 5d15f9279b..7d1c2d84f9 100644 --- a/src/System.Web.HttpUtility/pkg/System.Web.HttpUtility.pkgproj +++ b/src/System.Web.HttpUtility/pkg/System.Web.HttpUtility.pkgproj @@ -1,13 +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" /> - <ItemGroup> <ProjectReference Include="..\ref\System.Web.HttpUtility.csproj"> <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> - <ProjectReference Include="..\src\System.Web.HttpUtility.builds"/> + <ProjectReference Include="..\src\System.Web.HttpUtility.builds" /> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</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 0534648a36..45e872767a 100644 --- a/src/System.Web.HttpUtility/ref/System.Web.HttpUtility.csproj +++ b/src/System.Web.HttpUtility/ref/System.Web.HttpUtility.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -12,4 +12,4 @@ <ProjectReference Include="..\..\System.Text.Encoding\ref\System.Text.Encoding.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Web.HttpUtility/src/Configurations.props b/src/System.Web.HttpUtility/src/Configurations.props index 24e575d57f..f9df021aef 100644 --- a/src/System.Web.HttpUtility/src/Configurations.props +++ b/src/System.Web.HttpUtility/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Web.HttpUtility/tests/Configurations.props b/src/System.Web.HttpUtility/tests/Configurations.props index f0ebe53119..c3266e1e93 100644 --- a/src/System.Web.HttpUtility/tests/Configurations.props +++ b/src/System.Web.HttpUtility/tests/Configurations.props @@ -1,8 +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> <BuildConfigurations> netstandard1.3; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Web.HttpUtility/tests/System.Web.HttpUtility.Tests.builds b/src/System.Web.HttpUtility/tests/System.Web.HttpUtility.Tests.builds index db711fefef..035461282c 100644 --- a/src/System.Web.HttpUtility/tests/System.Web.HttpUtility.Tests.builds +++ b/src/System.Web.HttpUtility/tests/System.Web.HttpUtility.Tests.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Web.HttpUtility.Tests.csproj"> - <TestTFMs>netcoreapp1.1;netcoreapp1.0;net46</TestTFMs> + <TestTFMs>netcoreapp;netcoreapp1.0;net46</TestTFMs> </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> diff --git a/src/System.Xml.ReaderWriter/pkg/System.Xml.ReaderWriter.builds b/src/System.Xml.ReaderWriter/pkg/System.Xml.ReaderWriter.builds index 0a6f39567f..b9b605d1cc 100644 --- a/src/System.Xml.ReaderWriter/pkg/System.Xml.ReaderWriter.builds +++ b/src/System.Xml.ReaderWriter/pkg/System.Xml.ReaderWriter.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Xml.ReaderWriter.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Xml.ReaderWriter/pkg/System.Xml.ReaderWriter.pkgproj b/src/System.Xml.ReaderWriter/pkg/System.Xml.ReaderWriter.pkgproj index 1881433157..a9ad42597a 100644 --- a/src/System.Xml.ReaderWriter/pkg/System.Xml.ReaderWriter.pkgproj +++ b/src/System.Xml.ReaderWriter/pkg/System.Xml.ReaderWriter.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.Xml.ReaderWriter.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Xml.ReaderWriter.builds" /> <InboxOnTargetFramework Include="MonoAndroid10" /> diff --git a/src/System.Xml.ReaderWriter/ref/System.Xml.ReaderWriter.csproj b/src/System.Xml.ReaderWriter/ref/System.Xml.ReaderWriter.csproj index 90e1d2d006..0b57e3c94d 100644 --- a/src/System.Xml.ReaderWriter/ref/System.Xml.ReaderWriter.csproj +++ b/src/System.Xml.ReaderWriter/ref/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" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -15,4 +15,4 @@ <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </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/src/Configurations.props b/src/System.Xml.ReaderWriter/src/Configurations.props index 9c336c0be9..dc837f9152 100644 --- a/src/System.Xml.ReaderWriter/src/Configurations.props +++ b/src/System.Xml.ReaderWriter/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Xml.ReaderWriter/tests/System.Xml.ReaderWriter.Tests.builds b/src/System.Xml.ReaderWriter/tests/System.Xml.ReaderWriter.Tests.builds index 58540c8539..d752dd91b5 100644 --- a/src/System.Xml.ReaderWriter/tests/System.Xml.ReaderWriter.Tests.builds +++ b/src/System.Xml.ReaderWriter/tests/System.Xml.ReaderWriter.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Xml.XDocument/pkg/System.Xml.XDocument.builds b/src/System.Xml.XDocument/pkg/System.Xml.XDocument.builds index 52b338f768..a44c6dbd27 100644 --- a/src/System.Xml.XDocument/pkg/System.Xml.XDocument.builds +++ b/src/System.Xml.XDocument/pkg/System.Xml.XDocument.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Xml.XDocument.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Xml.XDocument/pkg/System.Xml.XDocument.pkgproj b/src/System.Xml.XDocument/pkg/System.Xml.XDocument.pkgproj index 02327217ee..7548281588 100644 --- a/src/System.Xml.XDocument/pkg/System.Xml.XDocument.pkgproj +++ b/src/System.Xml.XDocument/pkg/System.Xml.XDocument.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.Xml.XDocument.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Xml.XDocument.builds" /> <InboxOnTargetFramework Include="MonoAndroid10" /> diff --git a/src/System.Xml.XDocument/ref/Configurations.props b/src/System.Xml.XDocument/ref/Configurations.props index 33939fe089..77a4b65bc9 100644 --- a/src/System.Xml.XDocument/ref/Configurations.props +++ b/src/System.Xml.XDocument/ref/Configurations.props @@ -1,9 +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> <BuildConfigurations> - netstandard; - netcoreapp; + netstandard; + netcoreapp; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Xml.XDocument/ref/System.Xml.XDocument.csproj b/src/System.Xml.XDocument/ref/System.Xml.XDocument.csproj index 412c6c3bb5..710ca6b66a 100644 --- a/src/System.Xml.XDocument/ref/System.Xml.XDocument.csproj +++ b/src/System.Xml.XDocument/ref/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" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -15,4 +15,4 @@ <ProjectReference Include="..\..\System.Xml.ReaderWriter\ref\System.Xml.ReaderWriter.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Xml.XDocument/src/Configurations.props b/src/System.Xml.XDocument/src/Configurations.props index 9c336c0be9..dc837f9152 100644 --- a/src/System.Xml.XDocument/src/Configurations.props +++ b/src/System.Xml.XDocument/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Xml.XDocument/tests/System.Xml.XDocument.Tests.builds b/src/System.Xml.XDocument/tests/System.Xml.XDocument.Tests.builds index 58540c8539..d752dd91b5 100644 --- a/src/System.Xml.XDocument/tests/System.Xml.XDocument.Tests.builds +++ b/src/System.Xml.XDocument/tests/System.Xml.XDocument.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Xml.XPath.XDocument/pkg/System.Xml.XPath.XDocument.builds b/src/System.Xml.XPath.XDocument/pkg/System.Xml.XPath.XDocument.builds index a151e0b90f..4901a86ebf 100644 --- a/src/System.Xml.XPath.XDocument/pkg/System.Xml.XPath.XDocument.builds +++ b/src/System.Xml.XPath.XDocument/pkg/System.Xml.XPath.XDocument.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Xml.XPath.XDocument.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Xml.XPath.XDocument/pkg/System.Xml.XPath.XDocument.pkgproj b/src/System.Xml.XPath.XDocument/pkg/System.Xml.XPath.XDocument.pkgproj index 41cf0c0029..cabdedd84f 100644 --- a/src/System.Xml.XPath.XDocument/pkg/System.Xml.XPath.XDocument.pkgproj +++ b/src/System.Xml.XPath.XDocument/pkg/System.Xml.XPath.XDocument.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Xml.XPath.XDocument.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Xml.XPath.XDocument.builds" /> </ItemGroup> 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 4350855048..d5ae3c3e1d 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,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" /> <ItemGroup> @@ -12,4 +12,4 @@ <ProjectReference Include="..\..\System.Xml.ReaderWriter\ref\System.Xml.ReaderWriter.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Xml.XPath.XDocument/src/Configurations.props b/src/System.Xml.XPath.XDocument/src/Configurations.props index 9c336c0be9..dc837f9152 100644 --- a/src/System.Xml.XPath.XDocument/src/Configurations.props +++ b/src/System.Xml.XPath.XDocument/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Xml.XPath.XDocument/tests/System.Xml.XPath.XDocument.Tests.builds b/src/System.Xml.XPath.XDocument/tests/System.Xml.XPath.XDocument.Tests.builds index 58540c8539..d752dd91b5 100644 --- a/src/System.Xml.XPath.XDocument/tests/System.Xml.XPath.XDocument.Tests.builds +++ b/src/System.Xml.XPath.XDocument/tests/System.Xml.XPath.XDocument.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Xml.XPath.XmlDocument/pkg/System.Xml.XPath.XmlDocument.builds b/src/System.Xml.XPath.XmlDocument/pkg/System.Xml.XPath.XmlDocument.builds index 3eb71cc19f..a2b7f9d987 100644 --- a/src/System.Xml.XPath.XmlDocument/pkg/System.Xml.XPath.XmlDocument.builds +++ b/src/System.Xml.XPath.XmlDocument/pkg/System.Xml.XPath.XmlDocument.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Xml.XPath.XmlDocument.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Xml.XPath.XmlDocument/pkg/System.Xml.XPath.XmlDocument.pkgproj b/src/System.Xml.XPath.XmlDocument/pkg/System.Xml.XPath.XmlDocument.pkgproj index ded2e805d2..667eb9873d 100644 --- a/src/System.Xml.XPath.XmlDocument/pkg/System.Xml.XPath.XmlDocument.pkgproj +++ b/src/System.Xml.XPath.XmlDocument/pkg/System.Xml.XPath.XmlDocument.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Xml.XPath.XmlDocument.csproj"> - <SupportedFramework>net461;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Xml.XPath.XmlDocument.builds" /> <!-- nothing special required for desktop - pure plib with no type conflicts. --> 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 24b6327b31..6e0f1014cc 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,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" /> <ItemGroup> @@ -11,4 +11,4 @@ <ProjectReference Include="..\..\System.Xml.ReaderWriter\ref\System.Xml.ReaderWriter.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ 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 index 53b62c64fe..bcfec4bbde 100644 --- a/src/System.Xml.XPath.XmlDocument/src/Configurations.props +++ b/src/System.Xml.XPath.XmlDocument/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Xml.XPath.XmlDocument/tests/System.Xml.XPath.XmlDocument.Tests.builds b/src/System.Xml.XPath.XmlDocument/tests/System.Xml.XPath.XmlDocument.Tests.builds index 58540c8539..d752dd91b5 100644 --- a/src/System.Xml.XPath.XmlDocument/tests/System.Xml.XPath.XmlDocument.Tests.builds +++ b/src/System.Xml.XPath.XmlDocument/tests/System.Xml.XPath.XmlDocument.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Xml.XPath/pkg/System.Xml.XPath.builds b/src/System.Xml.XPath/pkg/System.Xml.XPath.builds index 3846d30b36..53fbdec9d2 100644 --- a/src/System.Xml.XPath/pkg/System.Xml.XPath.builds +++ b/src/System.Xml.XPath/pkg/System.Xml.XPath.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Xml.XPath.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Xml.XPath/pkg/System.Xml.XPath.pkgproj b/src/System.Xml.XPath/pkg/System.Xml.XPath.pkgproj index 1ec6d0ca97..5bb6fefa38 100644 --- a/src/System.Xml.XPath/pkg/System.Xml.XPath.pkgproj +++ b/src/System.Xml.XPath/pkg/System.Xml.XPath.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Xml.XPath.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Xml.XPath.builds" /> </ItemGroup> diff --git a/src/System.Xml.XPath/ref/System.Xml.XPath.csproj b/src/System.Xml.XPath/ref/System.Xml.XPath.csproj index 68b8a812ea..b0f2f3f4d3 100644 --- a/src/System.Xml.XPath/ref/System.Xml.XPath.csproj +++ b/src/System.Xml.XPath/ref/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" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -11,4 +11,4 @@ <ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Xml.XPath/src/Configurations.props b/src/System.Xml.XPath/src/Configurations.props index 9c336c0be9..dc837f9152 100644 --- a/src/System.Xml.XPath/src/Configurations.props +++ b/src/System.Xml.XPath/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Xml.XPath/tests/System.Xml.XPath.Tests.builds b/src/System.Xml.XPath/tests/System.Xml.XPath.Tests.builds index 58540c8539..d752dd91b5 100644 --- a/src/System.Xml.XPath/tests/System.Xml.XPath.Tests.builds +++ b/src/System.Xml.XPath/tests/System.Xml.XPath.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Xml.XmlDocument/pkg/System.Xml.XmlDocument.builds b/src/System.Xml.XmlDocument/pkg/System.Xml.XmlDocument.builds index 75ec8b9c68..046353f98f 100644 --- a/src/System.Xml.XmlDocument/pkg/System.Xml.XmlDocument.builds +++ b/src/System.Xml.XmlDocument/pkg/System.Xml.XmlDocument.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Xml.XmlDocument.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Xml.XmlDocument/pkg/System.Xml.XmlDocument.pkgproj b/src/System.Xml.XmlDocument/pkg/System.Xml.XmlDocument.pkgproj index 7021945e9f..5cc9994e4f 100644 --- a/src/System.Xml.XmlDocument/pkg/System.Xml.XmlDocument.pkgproj +++ b/src/System.Xml.XmlDocument/pkg/System.Xml.XmlDocument.pkgproj @@ -1,9 +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" /> <ItemGroup> <ProjectReference Include="..\ref\System.Xml.XmlDocument.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Xml.XmlDocument.builds" /> </ItemGroup> diff --git a/src/System.Xml.XmlDocument/ref/System.Xml.XmlDocument.csproj b/src/System.Xml.XmlDocument/ref/System.Xml.XmlDocument.csproj index cb12427f19..416147f38e 100644 --- a/src/System.Xml.XmlDocument/ref/System.Xml.XmlDocument.csproj +++ b/src/System.Xml.XmlDocument/ref/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" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -9,4 +9,4 @@ <ProjectReference Include="..\..\System.Xml.ReaderWriter\ref\System.Xml.ReaderWriter.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Xml.XmlDocument/src/Configurations.props b/src/System.Xml.XmlDocument/src/Configurations.props index 9c336c0be9..dc837f9152 100644 --- a/src/System.Xml.XmlDocument/src/Configurations.props +++ b/src/System.Xml.XmlDocument/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Xml.XmlDocument/tests/System.Xml.XmlDocument.Tests.builds b/src/System.Xml.XmlDocument/tests/System.Xml.XmlDocument.Tests.builds index 58540c8539..d752dd91b5 100644 --- a/src/System.Xml.XmlDocument/tests/System.Xml.XmlDocument.Tests.builds +++ b/src/System.Xml.XmlDocument/tests/System.Xml.XmlDocument.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/System.Xml.XmlSerializer/pkg/System.Xml.XmlSerializer.builds b/src/System.Xml.XmlSerializer/pkg/System.Xml.XmlSerializer.builds index 28d784f72d..d2fb014ecf 100644 --- a/src/System.Xml.XmlSerializer/pkg/System.Xml.XmlSerializer.builds +++ b/src/System.Xml.XmlSerializer/pkg/System.Xml.XmlSerializer.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="System.Xml.XmlSerializer.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Xml.XmlSerializer/pkg/System.Xml.XmlSerializer.pkgproj b/src/System.Xml.XmlSerializer/pkg/System.Xml.XmlSerializer.pkgproj index 933cc4026b..6c5cc158bb 100644 --- a/src/System.Xml.XmlSerializer/pkg/System.Xml.XmlSerializer.pkgproj +++ b/src/System.Xml.XmlSerializer/pkg/System.Xml.XmlSerializer.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.Xml.XmlSerializer.csproj"> - <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Xml.XmlSerializer.builds" /> <InboxOnTargetFramework Include="MonoAndroid10" /> diff --git a/src/System.Xml.XmlSerializer/ref/System.Xml.XmlSerializer.csproj b/src/System.Xml.XmlSerializer/ref/System.Xml.XmlSerializer.csproj index 83187fda04..2f2445268d 100644 --- a/src/System.Xml.XmlSerializer/ref/System.Xml.XmlSerializer.csproj +++ b/src/System.Xml.XmlSerializer/ref/System.Xml.XmlSerializer.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" /> <ItemGroup> @@ -15,4 +15,4 @@ <ProjectReference Include="..\..\System.Xml.XmlDocument\ref\System.Xml.XmlDocument.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Xml.XmlSerializer/src/Configurations.props b/src/System.Xml.XmlSerializer/src/Configurations.props index 9c336c0be9..dc837f9152 100644 --- a/src/System.Xml.XmlSerializer/src/Configurations.props +++ b/src/System.Xml.XmlSerializer/src/Configurations.props @@ -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> <BuildConfigurations> @@ -6,4 +6,4 @@ netstandard; </BuildConfigurations> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Xml.XmlSerializer/tests/System.Xml.XmlSerializer.Tests.builds b/src/System.Xml.XmlSerializer/tests/System.Xml.XmlSerializer.Tests.builds index 58540c8539..d752dd91b5 100644 --- a/src/System.Xml.XmlSerializer/tests/System.Xml.XmlSerializer.Tests.builds +++ b/src/System.Xml.XmlSerializer/tests/System.Xml.XmlSerializer.Tests.builds @@ -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" /> <ItemGroup> diff --git a/src/Tools/CoreFx.Tools/CoreFx.Tools.builds b/src/Tools/CoreFx.Tools/CoreFx.Tools.builds index 4f6bd85184..078f8f3531 100644 --- a/src/Tools/CoreFx.Tools/CoreFx.Tools.builds +++ b/src/Tools/CoreFx.Tools/CoreFx.Tools.builds @@ -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" /> <ItemGroup> @@ -8,5 +8,4 @@ </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/Tools/CoreFx.Tools/project.json b/src/Tools/CoreFx.Tools/project.json index 947ee2d4e0..a8c8d252d0 100644 --- a/src/Tools/CoreFx.Tools/project.json +++ b/src/Tools/CoreFx.Tools/project.json @@ -1,4 +1,4 @@ -{ +{ "dependencies": { "Microsoft.DotNet.PlatformAbstractions": "1.2.0-beta-001090", "NETStandard.Library": "1.6.0" @@ -15,7 +15,10 @@ "exclude": "all" } }, - "imports": [ "dnxcore50", "portable-net45+win8+wpa81" ] + "imports": [ + "dnxcore50", + "portable-net45+win8+wpa81" + ] }, "net45": { "dependencies": { diff --git a/src/Tools/tools.builds b/src/Tools/tools.builds index 86086037f1..c1b247146a 100644 --- a/src/Tools/tools.builds +++ b/src/Tools/tools.builds @@ -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> diff --git a/src/mscorlib.WinRT-Facade/mscorlib.WinRT-Facade.builds b/src/mscorlib.WinRT-Facade/mscorlib.WinRT-Facade.builds index ea501d91bb..60bb1873ba 100644 --- a/src/mscorlib.WinRT-Facade/mscorlib.WinRT-Facade.builds +++ b/src/mscorlib.WinRT-Facade/mscorlib.WinRT-Facade.builds @@ -1,9 +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" /> <ItemGroup> <Project Include="mscorlib.WinRT-Facade.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/mscorlib.WinRT-Facade/project.json b/src/mscorlib.WinRT-Facade/project.json index 9673cb677d..6cd2e5b33a 100644 --- a/src/mscorlib.WinRT-Facade/project.json +++ b/src/mscorlib.WinRT-Facade/project.json @@ -5,4 +5,4 @@ "frameworks": { "netcore50": {} } -}
\ No newline at end of file +} |