diff options
| author | Jose Perez Rodriguez <joperezr@microsoft.com> | 2017-02-08 21:39:37 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-08 21:39:37 +0300 |
| commit | afaaf450d1869992dcf4f51c627f16145cf9c974 (patch) | |
| tree | 723805c78927d189902ff2f192729da827c9a439 | |
| parent | 5e42bf19f39aaccf24e11c919fb16028d41d06ed (diff) | |
Prepare uap package (#15866)
Prepare uap package
141 files changed, 164 insertions, 9 deletions
diff --git a/binplace.targets b/binplace.targets index 901fc2eab4..971f54d482 100644 --- a/binplace.targets +++ b/binplace.targets @@ -7,6 +7,7 @@ https://github.com/dotnet/corefx/issues/14291 is tracking cleaning this up --> <IsRuntimeAndReferenceAssembly Condition="'$(IsRuntimeAndReferenceAssembly)' == '' and '$(IsRuntimeAssembly)' == 'true' and Exists('$(SourceDir)/$(AssemblyName)') and !Exists('$(SourceDir)/$(AssemblyName)/ref') and !$(AssemblyName.StartsWith('System.Private'))">true</IsRuntimeAndReferenceAssembly> <IsNETCoreAppRef Condition="'$(IsNETCoreAppRef)' == ''">$(IsNETCoreApp)</IsNETCoreAppRef> + <IsUAPRef Condition="'$(IsUAPRef)' == ''">$(IsUAP)</IsUAPRef> <BuildingDesktopFacade Condition="'$(IsDesktopFacade)' == 'true' And ('$(TargetGroup)' == 'netfx' Or $(TargetGroup.StartsWith('net4')))" >true</BuildingDesktopFacade> @@ -30,6 +31,10 @@ <RefPath Condition="'$(IsNETCoreAppRef)' == 'true'">$(NETCoreAppPackageRefPath)</RefPath> <RuntimePath>$(NETCoreAppPackageRuntimePath)</RuntimePath> </BinplaceConfiguration> + <BinplaceConfiguration Condition="'$(IsUAP)' == 'true'" Include="uap-$(OSGroup)"> + <RefPath Condition="'$(IsUAPRef)'=='true'">$(UAPPackageRefPath)</RefPath> + <RuntimePath>$(UAPPackageRuntimePath)</RuntimePath> + </BinplaceConfiguration> <!-- binplace targeting packs which may be different from BuildConfiguration --> <BinplaceConfiguration Include="netstandard-$(OSGroup)"> <RefPath>$(RefRootPath)netstandard</RefPath> @@ -253,8 +253,10 @@ <RuntimeProjectFile Condition="'$(RuntimeProjectFile)' == ''">$(ProjectDir)\external\runtime\runtime.depproj</RuntimeProjectFile> <!-- Paths to binplace package content --> - <NETCoreAppPackageRefPath>$(BinDir)netcoreapp\pkg\ref</NETCoreAppPackageRefPath> - <NETCoreAppPackageRuntimePath>$(BinDir)netcoreapp\pkg\lib</NETCoreAppPackageRuntimePath> + <NETCoreAppPackageRefPath>$(BinDir)pkg\netcoreapp\ref</NETCoreAppPackageRefPath> + <NETCoreAppPackageRuntimePath>$(BinDir)pkg\netcoreapp\lib</NETCoreAppPackageRuntimePath> + <UAPPackageRefPath>$(BinDir)pkg\uap\ref</UAPPackageRefPath> + <UAPPackageRuntimePath>$(BinDir)pkg\uap\lib</UAPPackageRuntimePath> <!-- Constructed shared fx path for testing --> <TestSharedFxDir>$(ToolsDir)testdotnetcli</TestSharedFxDir> diff --git a/src/Microsoft.CSharp/dir.props b/src/Microsoft.CSharp/dir.props index 14527fd4b3..78ba728102 100644 --- a/src/Microsoft.CSharp/dir.props +++ b/src/Microsoft.CSharp/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.0.3.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/Microsoft.VisualBasic/dir.props b/src/Microsoft.VisualBasic/dir.props index e80e25c7f3..f9f2de199a 100644 --- a/src/Microsoft.VisualBasic/dir.props +++ b/src/Microsoft.VisualBasic/dir.props @@ -5,5 +5,6 @@ <PackageVersion>10.2.0</PackageVersion> <AssemblyVersion>10.0.3.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/Microsoft.Win32.Primitives/dir.props b/src/Microsoft.Win32.Primitives/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/Microsoft.Win32.Primitives/dir.props +++ b/src/Microsoft.Win32.Primitives/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/Microsoft.Win32.Registry/dir.props b/src/Microsoft.Win32.Registry/dir.props index 125e95ee7e..91f06d03e6 100644 --- a/src/Microsoft.Win32.Registry/dir.props +++ b/src/Microsoft.Win32.Registry/dir.props @@ -5,6 +5,8 @@ <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> <IsNETCoreAppRef>false</IsNETCoreAppRef> + <IsUAP>true</IsUAP> + <IsUAPRef>false</IsUAPRef> <IsDesktopFacade>true</IsDesktopFacade> </PropertyGroup> </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 b1bed8d017..988a1a18ca 100644 --- a/src/Microsoft.Win32.Registry/src/Configurations.props +++ b/src/Microsoft.Win32.Registry/src/Configurations.props @@ -2,6 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <BuildConfigurations> + uap-Windows_NT; netcoreapp-Windows_NT; netcoreapp-Unix; netfx; diff --git a/src/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj b/src/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj index ee73172685..18f91f31a6 100644 --- a/src/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj +++ b/src/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj @@ -16,7 +16,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp' or '$(TargetGroup)' == 'uap'"> <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.RegistryOptions.cs"> <Link>Common\Interop\Windows\Interop.RegistryOptions.cs</Link> </Compile> @@ -31,7 +31,7 @@ <Compile Include="Microsoft\Win32\SafeHandles\SafeRegistryHandle.cs" /> <Compile Include="System\Security\AccessControl\RegistryRights.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp' AND '$(TargetsWindows)' == 'true'"> + <ItemGroup Condition="('$(TargetGroup)' == 'netcoreapp' or '$(TargetGroup)' == 'uap') AND '$(TargetsWindows)' == 'true'"> <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs"> <Link>Common\Interop\Windows\Interop.Libraries.cs</Link> </Compile> diff --git a/src/System.AppContext/dir.props b/src/System.AppContext/dir.props index a960cef1a3..e35a1e8a9f 100644 --- a/src/System.AppContext/dir.props +++ b/src/System.AppContext/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.2.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Buffers/dir.props b/src/System.Buffers/dir.props index cfbc7971a2..7091ba2d80 100644 --- a/src/System.Buffers/dir.props +++ b/src/System.Buffers/dir.props @@ -4,5 +4,7 @@ <PropertyGroup> <AssemblyVersion>4.0.2.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> + <IsUAPRef>false</IsUAPRef> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Collections.Concurrent/dir.props b/src/System.Collections.Concurrent/dir.props index eeb9f31f5a..e416c68c64 100644 --- a/src/System.Collections.Concurrent/dir.props +++ b/src/System.Collections.Concurrent/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.0.14.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Collections.Immutable/dir.props b/src/System.Collections.Immutable/dir.props index 3074a6b9a0..e632347384 100644 --- a/src/System.Collections.Immutable/dir.props +++ b/src/System.Collections.Immutable/dir.props @@ -5,5 +5,6 @@ <PackageVersion>1.4.0</PackageVersion> <AssemblyVersion>1.2.2</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Collections.NonGeneric/dir.props b/src/System.Collections.NonGeneric/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Collections.NonGeneric/dir.props +++ b/src/System.Collections.NonGeneric/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Collections.Specialized/dir.props b/src/System.Collections.Specialized/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Collections.Specialized/dir.props +++ b/src/System.Collections.Specialized/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Collections/dir.props b/src/System.Collections/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Collections/dir.props +++ b/src/System.Collections/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.ComponentModel.Annotations/dir.props b/src/System.ComponentModel.Annotations/dir.props index bc65ed25f8..f958a88757 100644 --- a/src/System.ComponentModel.Annotations/dir.props +++ b/src/System.ComponentModel.Annotations/dir.props @@ -5,5 +5,6 @@ <AssemblyVersion>4.2.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> <IsDesktopFacade>true</IsDesktopFacade> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.ComponentModel.EventBasedAsync/dir.props b/src/System.ComponentModel.EventBasedAsync/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.ComponentModel.EventBasedAsync/dir.props +++ b/src/System.ComponentModel.EventBasedAsync/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.ComponentModel.Primitives/dir.props b/src/System.ComponentModel.Primitives/dir.props index a960cef1a3..e35a1e8a9f 100644 --- a/src/System.ComponentModel.Primitives/dir.props +++ b/src/System.ComponentModel.Primitives/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.2.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.ComponentModel.TypeConverter/dir.props b/src/System.ComponentModel.TypeConverter/dir.props index a960cef1a3..e35a1e8a9f 100644 --- a/src/System.ComponentModel.TypeConverter/dir.props +++ b/src/System.ComponentModel.TypeConverter/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.2.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.ComponentModel/dir.props b/src/System.ComponentModel/dir.props index 14527fd4b3..78ba728102 100644 --- a/src/System.ComponentModel/dir.props +++ b/src/System.ComponentModel/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.0.3.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Console/dir.props b/src/System.Console/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Console/dir.props +++ b/src/System.Console/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Data.Common/dir.props b/src/System.Data.Common/dir.props index bc65ed25f8..f958a88757 100644 --- a/src/System.Data.Common/dir.props +++ b/src/System.Data.Common/dir.props @@ -5,5 +5,6 @@ <AssemblyVersion>4.2.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> <IsDesktopFacade>true</IsDesktopFacade> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Data.SqlClient/dir.props b/src/System.Data.SqlClient/dir.props index 1f9c2223d9..4d3390f3f6 100644 --- a/src/System.Data.SqlClient/dir.props +++ b/src/System.Data.SqlClient/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.2.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.Contracts/dir.props b/src/System.Diagnostics.Contracts/dir.props index 14527fd4b3..78ba728102 100644 --- a/src/System.Diagnostics.Contracts/dir.props +++ b/src/System.Diagnostics.Contracts/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.0.3.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.Debug/dir.props b/src/System.Diagnostics.Debug/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Diagnostics.Debug/dir.props +++ b/src/System.Diagnostics.Debug/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.DiagnosticSource/dir.props b/src/System.Diagnostics.DiagnosticSource/dir.props index cfbc7971a2..7091ba2d80 100644 --- a/src/System.Diagnostics.DiagnosticSource/dir.props +++ b/src/System.Diagnostics.DiagnosticSource/dir.props @@ -4,5 +4,7 @@ <PropertyGroup> <AssemblyVersion>4.0.2.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> + <IsUAPRef>false</IsUAPRef> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.FileVersionInfo/dir.props b/src/System.Diagnostics.FileVersionInfo/dir.props index cfbc7971a2..d352547194 100644 --- a/src/System.Diagnostics.FileVersionInfo/dir.props +++ b/src/System.Diagnostics.FileVersionInfo/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.0.2.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.Process/dir.props b/src/System.Diagnostics.Process/dir.props index a960cef1a3..e35a1e8a9f 100644 --- a/src/System.Diagnostics.Process/dir.props +++ b/src/System.Diagnostics.Process/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.2.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </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 2f5434cf99..193ee5c3bd 100644 --- a/src/System.Diagnostics.Process/src/Configurations.props +++ b/src/System.Diagnostics.Process/src/Configurations.props @@ -5,6 +5,7 @@ netcoreapp-Linux; netcoreapp-OSX; netcoreapp-Windows_NT; + uap-Windows_NT; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.StackTrace/dir.props b/src/System.Diagnostics.StackTrace/dir.props index c5910ab96d..4fca45a4b8 100644 --- a/src/System.Diagnostics.StackTrace/dir.props +++ b/src/System.Diagnostics.StackTrace/dir.props @@ -5,5 +5,6 @@ <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> <IsDesktopFacade>true</IsDesktopFacade> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.TextWriterTraceListener/dir.props b/src/System.Diagnostics.TextWriterTraceListener/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Diagnostics.TextWriterTraceListener/dir.props +++ b/src/System.Diagnostics.TextWriterTraceListener/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.Tools/dir.props b/src/System.Diagnostics.Tools/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Diagnostics.Tools/dir.props +++ b/src/System.Diagnostics.Tools/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.TraceSource/dir.props b/src/System.Diagnostics.TraceSource/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Diagnostics.TraceSource/dir.props +++ b/src/System.Diagnostics.TraceSource/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.Tracing/dir.props b/src/System.Diagnostics.Tracing/dir.props index a960cef1a3..e35a1e8a9f 100644 --- a/src/System.Diagnostics.Tracing/dir.props +++ b/src/System.Diagnostics.Tracing/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.2.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Drawing.Primitives/dir.props b/src/System.Drawing.Primitives/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Drawing.Primitives/dir.props +++ b/src/System.Drawing.Primitives/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Dynamic.Runtime/dir.props b/src/System.Dynamic.Runtime/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Dynamic.Runtime/dir.props +++ b/src/System.Dynamic.Runtime/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Globalization.Calendars/dir.props b/src/System.Globalization.Calendars/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Globalization.Calendars/dir.props +++ b/src/System.Globalization.Calendars/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Globalization.Extensions/dir.props b/src/System.Globalization.Extensions/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Globalization.Extensions/dir.props +++ b/src/System.Globalization.Extensions/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Globalization/dir.props b/src/System.Globalization/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Globalization/dir.props +++ b/src/System.Globalization/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.IO.Compression.ZipFile/dir.props b/src/System.IO.Compression.ZipFile/dir.props index 14527fd4b3..78ba728102 100644 --- a/src/System.IO.Compression.ZipFile/dir.props +++ b/src/System.IO.Compression.ZipFile/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.0.3.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.IO.Compression/dir.props b/src/System.IO.Compression/dir.props index bc65ed25f8..f958a88757 100644 --- a/src/System.IO.Compression/dir.props +++ b/src/System.IO.Compression/dir.props @@ -5,5 +5,6 @@ <AssemblyVersion>4.2.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> <IsDesktopFacade>true</IsDesktopFacade> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.IO.FileSystem.DriveInfo/dir.props b/src/System.IO.FileSystem.DriveInfo/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.IO.FileSystem.DriveInfo/dir.props +++ b/src/System.IO.FileSystem.DriveInfo/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </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 17d3231f8e..62eb1c4776 100644 --- a/src/System.IO.FileSystem.DriveInfo/src/Configurations.props +++ b/src/System.IO.FileSystem.DriveInfo/src/Configurations.props @@ -4,6 +4,7 @@ <BuildConfigurations> netcoreapp-Unix; netcoreapp-Windows_NT; + uap-Windows_NT; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.IO.FileSystem.Primitives/dir.props b/src/System.IO.FileSystem.Primitives/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.IO.FileSystem.Primitives/dir.props +++ b/src/System.IO.FileSystem.Primitives/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.IO.FileSystem.Watcher/dir.props b/src/System.IO.FileSystem.Watcher/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.IO.FileSystem.Watcher/dir.props +++ b/src/System.IO.FileSystem.Watcher/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </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 2f5434cf99..193ee5c3bd 100644 --- a/src/System.IO.FileSystem.Watcher/src/Configurations.props +++ b/src/System.IO.FileSystem.Watcher/src/Configurations.props @@ -5,6 +5,7 @@ netcoreapp-Linux; netcoreapp-OSX; netcoreapp-Windows_NT; + uap-Windows_NT; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.IO.FileSystem/dir.props b/src/System.IO.FileSystem/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.IO.FileSystem/dir.props +++ b/src/System.IO.FileSystem/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.IO.IsolatedStorage/dir.props b/src/System.IO.IsolatedStorage/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.IO.IsolatedStorage/dir.props +++ b/src/System.IO.IsolatedStorage/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.IO.MemoryMappedFiles/dir.props b/src/System.IO.MemoryMappedFiles/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.IO.MemoryMappedFiles/dir.props +++ b/src/System.IO.MemoryMappedFiles/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.IO.Pipes/dir.props b/src/System.IO.Pipes/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.IO.Pipes/dir.props +++ b/src/System.IO.Pipes/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </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 17d3231f8e..62eb1c4776 100644 --- a/src/System.IO.Pipes/src/Configurations.props +++ b/src/System.IO.Pipes/src/Configurations.props @@ -4,6 +4,7 @@ <BuildConfigurations> netcoreapp-Unix; netcoreapp-Windows_NT; + uap-Windows_NT; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.IO.UnmanagedMemoryStream/dir.props b/src/System.IO.UnmanagedMemoryStream/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.IO.UnmanagedMemoryStream/dir.props +++ b/src/System.IO.UnmanagedMemoryStream/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.IO/dir.props b/src/System.IO/dir.props index a960cef1a3..e35a1e8a9f 100644 --- a/src/System.IO/dir.props +++ b/src/System.IO/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.2.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Linq.Expressions/dir.props b/src/System.Linq.Expressions/dir.props index a960cef1a3..e35a1e8a9f 100644 --- a/src/System.Linq.Expressions/dir.props +++ b/src/System.Linq.Expressions/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.2.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Linq.Parallel/dir.props b/src/System.Linq.Parallel/dir.props index 14527fd4b3..78ba728102 100644 --- a/src/System.Linq.Parallel/dir.props +++ b/src/System.Linq.Parallel/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.0.3.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Linq.Queryable/dir.props b/src/System.Linq.Queryable/dir.props index 14527fd4b3..78ba728102 100644 --- a/src/System.Linq.Queryable/dir.props +++ b/src/System.Linq.Queryable/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.0.3.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Linq/dir.props b/src/System.Linq/dir.props index a960cef1a3..e35a1e8a9f 100644 --- a/src/System.Linq/dir.props +++ b/src/System.Linq/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.2.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Net.Http.Rtc/dir.props b/src/System.Net.Http.Rtc/dir.props index 16a766f83b..c1866a4f50 100644 --- a/src/System.Net.Http.Rtc/dir.props +++ b/src/System.Net.Http.Rtc/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.0.3.0</AssemblyVersion> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Net.Http/dir.props b/src/System.Net.Http/dir.props index a960cef1a3..e35a1e8a9f 100644 --- a/src/System.Net.Http/dir.props +++ b/src/System.Net.Http/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.2.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Net.NameResolution/dir.props b/src/System.Net.NameResolution/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Net.NameResolution/dir.props +++ b/src/System.Net.NameResolution/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Net.NetworkInformation/dir.props b/src/System.Net.NetworkInformation/dir.props index a960cef1a3..e35a1e8a9f 100644 --- a/src/System.Net.NetworkInformation/dir.props +++ b/src/System.Net.NetworkInformation/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.2.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Net.Ping/dir.props b/src/System.Net.Ping/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Net.Ping/dir.props +++ b/src/System.Net.Ping/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </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 17d3231f8e..62eb1c4776 100644 --- a/src/System.Net.Ping/src/Configurations.props +++ b/src/System.Net.Ping/src/Configurations.props @@ -4,6 +4,7 @@ <BuildConfigurations> netcoreapp-Unix; netcoreapp-Windows_NT; + uap-Windows_NT; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Net.Primitives/dir.props b/src/System.Net.Primitives/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Net.Primitives/dir.props +++ b/src/System.Net.Primitives/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Net.Requests/dir.props b/src/System.Net.Requests/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Net.Requests/dir.props +++ b/src/System.Net.Requests/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Net.Security/dir.props b/src/System.Net.Security/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Net.Security/dir.props +++ b/src/System.Net.Security/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </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 17d3231f8e..62eb1c4776 100644 --- a/src/System.Net.Security/src/Configurations.props +++ b/src/System.Net.Security/src/Configurations.props @@ -4,6 +4,7 @@ <BuildConfigurations> netcoreapp-Unix; netcoreapp-Windows_NT; + uap-Windows_NT; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Net.ServicePoint/dir.props b/src/System.Net.ServicePoint/dir.props index 8714c4b9a3..867f6ac8cb 100644 --- a/src/System.Net.ServicePoint/dir.props +++ b/src/System.Net.ServicePoint/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.0.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Net.Sockets/dir.props b/src/System.Net.Sockets/dir.props index a960cef1a3..e35a1e8a9f 100644 --- a/src/System.Net.Sockets/dir.props +++ b/src/System.Net.Sockets/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.2.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Net.Sockets/src/System.Net.Sockets.csproj b/src/System.Net.Sockets/src/System.Net.Sockets.csproj index b403a0fc23..e378795638 100644 --- a/src/System.Net.Sockets/src/System.Net.Sockets.csproj +++ b/src/System.Net.Sockets/src/System.Net.Sockets.csproj @@ -6,7 +6,6 @@ <ProjectGuid>{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <EnableWinRT Condition="'$(TargetGroup)' == 'uap'">true</EnableWinRT> - <AssemblyVersion Condition="'$(TargetGroup)' == 'uap'">4.1.1.0</AssemblyVersion> <DefineConstants Condition="'$(TargetGroup)' == 'uap'">$(DefineConstants);uap</DefineConstants> </PropertyGroup> <!-- Help VS understand available configurations --> diff --git a/src/System.Net.WebClient/dir.props b/src/System.Net.WebClient/dir.props index 8714c4b9a3..867f6ac8cb 100644 --- a/src/System.Net.WebClient/dir.props +++ b/src/System.Net.WebClient/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.0.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Net.WebHeaderCollection/dir.props b/src/System.Net.WebHeaderCollection/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Net.WebHeaderCollection/dir.props +++ b/src/System.Net.WebHeaderCollection/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Net.WebProxy/dir.props b/src/System.Net.WebProxy/dir.props index 8714c4b9a3..867f6ac8cb 100644 --- a/src/System.Net.WebProxy/dir.props +++ b/src/System.Net.WebProxy/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.0.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Net.WebSockets.Client/dir.props b/src/System.Net.WebSockets.Client/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Net.WebSockets.Client/dir.props +++ b/src/System.Net.WebSockets.Client/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Net.WebSockets/dir.props b/src/System.Net.WebSockets/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Net.WebSockets/dir.props +++ b/src/System.Net.WebSockets/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Numerics.Vectors.WindowsRuntime/dir.props b/src/System.Numerics.Vectors.WindowsRuntime/dir.props index 16a766f83b..c1866a4f50 100644 --- a/src/System.Numerics.Vectors.WindowsRuntime/dir.props +++ b/src/System.Numerics.Vectors.WindowsRuntime/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.0.3.0</AssemblyVersion> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Numerics.Vectors/dir.props b/src/System.Numerics.Vectors/dir.props index 08d2b16416..253d53613f 100644 --- a/src/System.Numerics.Vectors/dir.props +++ b/src/System.Numerics.Vectors/dir.props @@ -5,5 +5,6 @@ <AssemblyVersion>4.1.3.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> <IsDesktopFacade>true</IsDesktopFacade> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.ObjectModel/dir.props b/src/System.ObjectModel/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.ObjectModel/dir.props +++ b/src/System.ObjectModel/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Private.DataContractSerialization/dir.props b/src/System.Private.DataContractSerialization/dir.props index bf7c5f0394..924f4ce7a9 100644 --- a/src/System.Private.DataContractSerialization/dir.props +++ b/src/System.Private.DataContractSerialization/dir.props @@ -5,5 +5,7 @@ <AssemblyVersion>4.1.3.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> <IsNETCoreAppRef>false</IsNETCoreAppRef> + <IsUAP>true</IsUAP> + <IsUAPRef>false</IsUAPRef> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Private.Uri/dir.props b/src/System.Private.Uri/dir.props index fda9649dff..c5e248bedc 100644 --- a/src/System.Private.Uri/dir.props +++ b/src/System.Private.Uri/dir.props @@ -4,5 +4,7 @@ <PropertyGroup> <AssemblyVersion>4.0.4.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> + <IsUAPRef>false</IsUAPRef> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Private.Xml.Linq/dir.props b/src/System.Private.Xml.Linq/dir.props index f254b412b5..bfd2a2c6cf 100644 --- a/src/System.Private.Xml.Linq/dir.props +++ b/src/System.Private.Xml.Linq/dir.props @@ -5,5 +5,7 @@ <AssemblyVersion>4.0.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> <IsNETCoreAppRef>false</IsNETCoreAppRef> + <IsUAP>true</IsUAP> + <IsUAPRef>false</IsUAPRef> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Private.Xml/dir.props b/src/System.Private.Xml/dir.props index f254b412b5..bfd2a2c6cf 100644 --- a/src/System.Private.Xml/dir.props +++ b/src/System.Private.Xml/dir.props @@ -5,5 +5,7 @@ <AssemblyVersion>4.0.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> <IsNETCoreAppRef>false</IsNETCoreAppRef> + <IsUAP>true</IsUAP> + <IsUAPRef>false</IsUAPRef> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Reflection.Context/dir.props b/src/System.Reflection.Context/dir.props index 16a766f83b..c1866a4f50 100644 --- a/src/System.Reflection.Context/dir.props +++ b/src/System.Reflection.Context/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.0.3.0</AssemblyVersion> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Reflection.DispatchProxy/dir.props b/src/System.Reflection.DispatchProxy/dir.props index 14527fd4b3..78ba728102 100644 --- a/src/System.Reflection.DispatchProxy/dir.props +++ b/src/System.Reflection.DispatchProxy/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.0.3.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Reflection.Emit.ILGeneration/dir.props b/src/System.Reflection.Emit.ILGeneration/dir.props index 14527fd4b3..9359aae5d8 100644 --- a/src/System.Reflection.Emit.ILGeneration/dir.props +++ b/src/System.Reflection.Emit.ILGeneration/dir.props @@ -4,5 +4,7 @@ <PropertyGroup> <AssemblyVersion>4.0.3.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> + <IsUAPRef>false</IsUAPRef> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Reflection.Emit.Lightweight/dir.props b/src/System.Reflection.Emit.Lightweight/dir.props index 14527fd4b3..9359aae5d8 100644 --- a/src/System.Reflection.Emit.Lightweight/dir.props +++ b/src/System.Reflection.Emit.Lightweight/dir.props @@ -4,5 +4,7 @@ <PropertyGroup> <AssemblyVersion>4.0.3.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> + <IsUAPRef>false</IsUAPRef> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Reflection.Emit/dir.props b/src/System.Reflection.Emit/dir.props index bfbc5bd9e0..62a5f2e095 100644 --- a/src/System.Reflection.Emit/dir.props +++ b/src/System.Reflection.Emit/dir.props @@ -4,5 +4,7 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> + <IsUAPRef>false</IsUAPRef> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Reflection.Extensions/dir.props b/src/System.Reflection.Extensions/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Reflection.Extensions/dir.props +++ b/src/System.Reflection.Extensions/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Reflection.Metadata/dir.props b/src/System.Reflection.Metadata/dir.props index 88be106a94..d398eda8ea 100644 --- a/src/System.Reflection.Metadata/dir.props +++ b/src/System.Reflection.Metadata/dir.props @@ -5,5 +5,6 @@ <PackageVersion>1.5.0</PackageVersion> <AssemblyVersion>1.4.2.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Reflection.Primitives/dir.props b/src/System.Reflection.Primitives/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Reflection.Primitives/dir.props +++ b/src/System.Reflection.Primitives/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Reflection.TypeExtensions/dir.props b/src/System.Reflection.TypeExtensions/dir.props index b797f87cf1..a87425442f 100644 --- a/src/System.Reflection.TypeExtensions/dir.props +++ b/src/System.Reflection.TypeExtensions/dir.props @@ -5,5 +5,6 @@ <AssemblyVersion>4.1.2.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> <IsDesktopFacade>true</IsDesktopFacade> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Reflection/dir.props b/src/System.Reflection/dir.props index a960cef1a3..e35a1e8a9f 100644 --- a/src/System.Reflection/dir.props +++ b/src/System.Reflection/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.2.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Resources.ResourceManager/dir.props b/src/System.Resources.ResourceManager/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Resources.ResourceManager/dir.props +++ b/src/System.Resources.ResourceManager/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Resources.Writer/dir.props b/src/System.Resources.Writer/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Resources.Writer/dir.props +++ b/src/System.Resources.Writer/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.CompilerServices.VisualC/dir.props b/src/System.Runtime.CompilerServices.VisualC/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Runtime.CompilerServices.VisualC/dir.props +++ b/src/System.Runtime.CompilerServices.VisualC/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </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 2845c11c54..b7611d75b7 100644 --- a/src/System.Runtime.CompilerServices.VisualC/src/Configurations.props +++ b/src/System.Runtime.CompilerServices.VisualC/src/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netcoreapp; + uap-Windows_NT; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.Extensions/dir.props b/src/System.Runtime.Extensions/dir.props index a960cef1a3..e35a1e8a9f 100644 --- a/src/System.Runtime.Extensions/dir.props +++ b/src/System.Runtime.Extensions/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.2.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.Handles/dir.props b/src/System.Runtime.Handles/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Runtime.Handles/dir.props +++ b/src/System.Runtime.Handles/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.InteropServices.RuntimeInformation/dir.props b/src/System.Runtime.InteropServices.RuntimeInformation/dir.props index cfbc7971a2..7091ba2d80 100644 --- a/src/System.Runtime.InteropServices.RuntimeInformation/dir.props +++ b/src/System.Runtime.InteropServices.RuntimeInformation/dir.props @@ -4,5 +4,7 @@ <PropertyGroup> <AssemblyVersion>4.0.2.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> + <IsUAPRef>false</IsUAPRef> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.InteropServices.WindowsRuntime/dir.props b/src/System.Runtime.InteropServices.WindowsRuntime/dir.props index 14527fd4b3..78ba728102 100644 --- a/src/System.Runtime.InteropServices.WindowsRuntime/dir.props +++ b/src/System.Runtime.InteropServices.WindowsRuntime/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.0.3.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.InteropServices/dir.props b/src/System.Runtime.InteropServices/dir.props index a960cef1a3..e35a1e8a9f 100644 --- a/src/System.Runtime.InteropServices/dir.props +++ b/src/System.Runtime.InteropServices/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.2.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.Numerics/dir.props b/src/System.Runtime.Numerics/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Runtime.Numerics/dir.props +++ b/src/System.Runtime.Numerics/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.Serialization.Formatters/dir.props b/src/System.Runtime.Serialization.Formatters/dir.props index cfbc7971a2..d352547194 100644 --- a/src/System.Runtime.Serialization.Formatters/dir.props +++ b/src/System.Runtime.Serialization.Formatters/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.0.2.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.Serialization.Json/dir.props b/src/System.Runtime.Serialization.Json/dir.props index fda9649dff..82a0443042 100644 --- a/src/System.Runtime.Serialization.Json/dir.props +++ b/src/System.Runtime.Serialization.Json/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.0.4.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.Serialization.Primitives/dir.props b/src/System.Runtime.Serialization.Primitives/dir.props index bc65ed25f8..f958a88757 100644 --- a/src/System.Runtime.Serialization.Primitives/dir.props +++ b/src/System.Runtime.Serialization.Primitives/dir.props @@ -5,5 +5,6 @@ <AssemblyVersion>4.2.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> <IsDesktopFacade>true</IsDesktopFacade> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.Serialization.Xml/dir.props b/src/System.Runtime.Serialization.Xml/dir.props index 08d2b16416..253d53613f 100644 --- a/src/System.Runtime.Serialization.Xml/dir.props +++ b/src/System.Runtime.Serialization.Xml/dir.props @@ -5,5 +5,6 @@ <AssemblyVersion>4.1.3.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> <IsDesktopFacade>true</IsDesktopFacade> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.WindowsRuntime.UI.Xaml/dir.props b/src/System.Runtime.WindowsRuntime.UI.Xaml/dir.props index 16a766f83b..c1866a4f50 100644 --- a/src/System.Runtime.WindowsRuntime.UI.Xaml/dir.props +++ b/src/System.Runtime.WindowsRuntime.UI.Xaml/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.0.3.0</AssemblyVersion> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.WindowsRuntime/dir.props b/src/System.Runtime.WindowsRuntime/dir.props index 94f31e5bfd..29c684859f 100644 --- a/src/System.Runtime.WindowsRuntime/dir.props +++ b/src/System.Runtime.WindowsRuntime/dir.props @@ -3,5 +3,6 @@ <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.0.13.0</AssemblyVersion> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Runtime/dir.props b/src/System.Runtime/dir.props index f6ce5c7273..e35a1e8a9f 100644 --- a/src/System.Runtime/dir.props +++ b/src/System.Runtime/dir.props @@ -1,8 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> <AssemblyVersion>4.2.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> -</Project> - +</Project>
\ No newline at end of file diff --git a/src/System.Security.Claims/dir.props b/src/System.Security.Claims/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Security.Claims/dir.props +++ b/src/System.Security.Claims/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Algorithms/dir.props b/src/System.Security.Cryptography.Algorithms/dir.props index e48b5c0db9..fe24fadff5 100644 --- a/src/System.Security.Cryptography.Algorithms/dir.props +++ b/src/System.Security.Cryptography.Algorithms/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.3.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Cng/dir.props b/src/System.Security.Cryptography.Cng/dir.props index 2424ac6f7d..21f74e0e9b 100644 --- a/src/System.Security.Cryptography.Cng/dir.props +++ b/src/System.Security.Cryptography.Cng/dir.props @@ -5,5 +5,6 @@ <AssemblyVersion>4.3.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> <IsDesktopFacade>true</IsDesktopFacade> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Csp/dir.props b/src/System.Security.Cryptography.Csp/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Security.Cryptography.Csp/dir.props +++ b/src/System.Security.Cryptography.Csp/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </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 1040c9ba37..bbb5be814e 100644 --- a/src/System.Security.Cryptography.Csp/src/Configurations.props +++ b/src/System.Security.Cryptography.Csp/src/Configurations.props @@ -2,6 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <BuildConfigurations> + uap-Windows_NT; netcoreapp-Windows_NT; netcoreapp-Unix; </BuildConfigurations> diff --git a/src/System.Security.Cryptography.Encoding/dir.props b/src/System.Security.Cryptography.Encoding/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Security.Cryptography.Encoding/dir.props +++ b/src/System.Security.Cryptography.Encoding/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Primitives/dir.props b/src/System.Security.Cryptography.Primitives/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Security.Cryptography.Primitives/dir.props +++ b/src/System.Security.Cryptography.Primitives/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.X509Certificates/dir.props b/src/System.Security.Cryptography.X509Certificates/dir.props index a960cef1a3..e35a1e8a9f 100644 --- a/src/System.Security.Cryptography.X509Certificates/dir.props +++ b/src/System.Security.Cryptography.X509Certificates/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.2.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Security.Principal.Windows/dir.props b/src/System.Security.Principal.Windows/dir.props index 125e95ee7e..91f06d03e6 100644 --- a/src/System.Security.Principal.Windows/dir.props +++ b/src/System.Security.Principal.Windows/dir.props @@ -5,6 +5,8 @@ <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> <IsNETCoreAppRef>false</IsNETCoreAppRef> + <IsUAP>true</IsUAP> + <IsUAPRef>false</IsUAPRef> <IsDesktopFacade>true</IsDesktopFacade> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Security.Principal/dir.props b/src/System.Security.Principal/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Security.Principal/dir.props +++ b/src/System.Security.Principal/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Text.Encoding.CodePages/dir.props b/src/System.Text.Encoding.CodePages/dir.props index 8f2003a937..15ab9bffa7 100644 --- a/src/System.Text.Encoding.CodePages/dir.props +++ b/src/System.Text.Encoding.CodePages/dir.props @@ -5,5 +5,6 @@ <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> <IsNETCoreAppRef>false</IsNETCoreAppRef> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Text.Encoding.Extensions/dir.props b/src/System.Text.Encoding.Extensions/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Text.Encoding.Extensions/dir.props +++ b/src/System.Text.Encoding.Extensions/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Text.Encoding/dir.props b/src/System.Text.Encoding/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Text.Encoding/dir.props +++ b/src/System.Text.Encoding/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Text.RegularExpressions/dir.props b/src/System.Text.RegularExpressions/dir.props index a960cef1a3..e35a1e8a9f 100644 --- a/src/System.Text.RegularExpressions/dir.props +++ b/src/System.Text.RegularExpressions/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.2.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Threading.Overlapped/dir.props b/src/System.Threading.Overlapped/dir.props index c5910ab96d..4fca45a4b8 100644 --- a/src/System.Threading.Overlapped/dir.props +++ b/src/System.Threading.Overlapped/dir.props @@ -5,5 +5,6 @@ <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> <IsDesktopFacade>true</IsDesktopFacade> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Threading.Tasks.Dataflow/dir.props b/src/System.Threading.Tasks.Dataflow/dir.props index 27e83b25d3..010b29df6d 100644 --- a/src/System.Threading.Tasks.Dataflow/dir.props +++ b/src/System.Threading.Tasks.Dataflow/dir.props @@ -5,5 +5,6 @@ <PackageVersion>4.8.0</PackageVersion> <AssemblyVersion>4.6.2.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Threading.Tasks.Extensions/dir.props b/src/System.Threading.Tasks.Extensions/dir.props index 1dadf41f32..4443b03016 100644 --- a/src/System.Threading.Tasks.Extensions/dir.props +++ b/src/System.Threading.Tasks.Extensions/dir.props @@ -4,5 +4,7 @@ <PropertyGroup> <AssemblyVersion>4.1.1.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> + <IsUAPRef>false</IsUAPRef> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Threading.Tasks.Parallel/dir.props b/src/System.Threading.Tasks.Parallel/dir.props index 14527fd4b3..78ba728102 100644 --- a/src/System.Threading.Tasks.Parallel/dir.props +++ b/src/System.Threading.Tasks.Parallel/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.0.3.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Threading.Tasks/dir.props b/src/System.Threading.Tasks/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Threading.Tasks/dir.props +++ b/src/System.Threading.Tasks/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Threading.Thread/dir.props b/src/System.Threading.Thread/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Threading.Thread/dir.props +++ b/src/System.Threading.Thread/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Threading.ThreadPool/dir.props b/src/System.Threading.ThreadPool/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Threading.ThreadPool/dir.props +++ b/src/System.Threading.ThreadPool/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </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 1040c9ba37..bbb5be814e 100644 --- a/src/System.Threading.ThreadPool/src/Configurations.props +++ b/src/System.Threading.ThreadPool/src/Configurations.props @@ -2,6 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <BuildConfigurations> + uap-Windows_NT; netcoreapp-Windows_NT; netcoreapp-Unix; </BuildConfigurations> diff --git a/src/System.Threading.Timer/dir.props b/src/System.Threading.Timer/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Threading.Timer/dir.props +++ b/src/System.Threading.Timer/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Threading/dir.props b/src/System.Threading/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Threading/dir.props +++ b/src/System.Threading/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Transactions/dir.props b/src/System.Transactions/dir.props index 8714c4b9a3..867f6ac8cb 100644 --- a/src/System.Transactions/dir.props +++ b/src/System.Transactions/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.0.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Web.HttpUtility/dir.props b/src/System.Web.HttpUtility/dir.props index 8714c4b9a3..867f6ac8cb 100644 --- a/src/System.Web.HttpUtility/dir.props +++ b/src/System.Web.HttpUtility/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.0.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Xml.ReaderWriter/dir.props b/src/System.Xml.ReaderWriter/dir.props index a960cef1a3..e35a1e8a9f 100644 --- a/src/System.Xml.ReaderWriter/dir.props +++ b/src/System.Xml.ReaderWriter/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.2.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Xml.XDocument/dir.props b/src/System.Xml.XDocument/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Xml.XDocument/dir.props +++ b/src/System.Xml.XDocument/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Xml.XPath.XDocument/dir.props b/src/System.Xml.XPath.XDocument/dir.props index c5910ab96d..4fca45a4b8 100644 --- a/src/System.Xml.XPath.XDocument/dir.props +++ b/src/System.Xml.XPath.XDocument/dir.props @@ -5,5 +5,6 @@ <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> <IsDesktopFacade>true</IsDesktopFacade> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Xml.XPath/dir.props b/src/System.Xml.XPath/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Xml.XPath/dir.props +++ b/src/System.Xml.XPath/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Xml.XmlSerializer/dir.props b/src/System.Xml.XmlSerializer/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Xml.XmlSerializer/dir.props +++ b/src/System.Xml.XmlSerializer/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/shims/shims.proj b/src/shims/shims.proj index a7ab07f967..299c078363 100644 --- a/src/shims/shims.proj +++ b/src/shims/shims.proj @@ -74,8 +74,8 @@ <!-- Copy the facades to the package ref and lib folders to be included in the packages --> <!-- TODO: replace with BinPlacing targets --> <ItemGroup> - <PackageOutputPaths Include="$(BinDir)$(TargetGroup)/pkg/ref" /> - <PackageOutputPaths Include="$(BinDir)$(TargetGroup)/pkg/lib" /> + <PackageOutputPaths Include="$(BinDir)pkg/$(TargetGroup)/ref" /> + <PackageOutputPaths Include="$(BinDir)pkg/$(TargetGroup)/lib" /> <PackageOutputPaths Include="$(RefPath)" /> <PackageOutputPaths Include="$(RuntimePath)" /> <ProducedFacades Include="$(GenFacadesOutputPath)*.dll" /> |