diff options
| author | Jose Perez Rodriguez <joperezr@microsoft.com> | 2017-07-04 00:32:24 +0300 |
|---|---|---|
| committer | Jose Perez Rodriguez <joperezr@microsoft.com> | 2017-07-04 00:32:24 +0300 |
| commit | 60fe0c60dc418a6856955c215a9695f6f900acf1 (patch) | |
| tree | 3ae791e6fa56b6637b84bf10c33c55eba72fe68d | |
| parent | f4d12ffbef7ea1c4142f5e039602089b16bb73be (diff) | |
Renaming uap10.1 to uap10.0.15138
31 files changed, 208 insertions, 199 deletions
diff --git a/BuildToolsVersion.txt b/BuildToolsVersion.txt index c8c426f199..a52d470110 100644 --- a/BuildToolsVersion.txt +++ b/BuildToolsVersion.txt @@ -1 +1 @@ -2.0.0-prerelease-01726-03
\ No newline at end of file +2.0.0-prerelease-01803-02
\ No newline at end of file @@ -9,6 +9,13 @@ <MinorVersion>6</MinorVersion> </PropertyGroup> + <!-- Define vNext UAP Moniker --> + <PropertyGroup> + <UAPvNextVersion>10.0.15138</UAPvNextVersion> + <UAPvNextTFMFull>UAP,Version=v$(UAPvNextVersion)</UAPvNextTFMFull> + <UAPvNextTFM>uap$(UAPvNextVersion)</UAPvNextTFM> + </PropertyGroup> + <Import Condition="Exists('$(MSBuildProjectDirectory)/Configurations.props')" Project="$(MSBuildProjectDirectory)/Configurations.props" /> <!-- Informs build tools to apply .NET Framework metadata if not a test project --> diff --git a/dir.targets b/dir.targets index 73c674caa3..0938077faf 100644 --- a/dir.targets +++ b/dir.targets @@ -92,8 +92,8 @@ <Import Project="$(MSBuildThisFileDirectory)illink.targets" /> <ItemGroup Condition="'$(NuGetTargetMoniker)'=='.NETStandard,Version=v1.7'"> - <!-- Temporarily suppress the message until we get a nuget version that knows about the mapping between netstandard1.7 and uap10.1 --> - <SuppressPackageTargetFrameworkCompatibility Include="uap10.1" /> + <!-- Temporarily suppress the message until we get a nuget version that knows about the mapping between netstandard1.7 and uapvNext --> + <SuppressPackageTargetFrameworkCompatibility Include="$(UAPvNextTFM)" /> </ItemGroup> <Target Name="ProducesPackageId" diff --git a/external/runtime/runtime.depproj b/external/runtime/runtime.depproj index ad7ff3fbdf..7423fd37ba 100644 --- a/external/runtime/runtime.depproj +++ b/external/runtime/runtime.depproj @@ -10,6 +10,9 @@ <RidSpecificAssets>true</RidSpecificAssets> </PropertyGroup> <PropertyGroup Condition="'$(TargetGroup)' == 'uapaot'"> + <!-- Temporarily Override restore moniker since NETNative's targeting pack still uses uap10.1 moniker --> + <NuGetTargetMoniker>UAP,Version=v10.1</NuGetTargetMoniker> + <NuGetTargetMonikerShort>uap10.1</NuGetTargetMonikerShort> <!-- System.Private.* can't be on the ILCInputFolder since ilc.exe needs to use the matching one from its toolchain. --> <BinPlaceILCInputFolder>false</BinPlaceILCInputFolder> <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem> diff --git a/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj b/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj index 5882618b23..d7723c7a2a 100644 --- a/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj +++ b/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj @@ -4,7 +4,7 @@ <PropertyGroup> <TargetFrameworkName>uap</TargetFrameworkName> - <TargetFrameworkVersion>10.1</TargetFrameworkVersion> + <TargetFrameworkVersion>$(UAPvNextVersion)</TargetFrameworkVersion> <TargetFramework>$(TargetFrameworkName)$(TargetFrameworkVersion)</TargetFramework> <RefBinDir>$(UAPPackageRefPath)</RefBinDir> diff --git a/pkg/Microsoft.Private.PackageBaseline/Microsoft.Private.PackageBaseline.pkgproj b/pkg/Microsoft.Private.PackageBaseline/Microsoft.Private.PackageBaseline.pkgproj index 0e108d764a..6796f7c7e7 100644 --- a/pkg/Microsoft.Private.PackageBaseline/Microsoft.Private.PackageBaseline.pkgproj +++ b/pkg/Microsoft.Private.PackageBaseline/Microsoft.Private.PackageBaseline.pkgproj @@ -34,7 +34,7 @@ <TargetFramework>netcoreapp2.0</TargetFramework> </FrameworkLayout> <FrameworkLayout Include="$(UAPPackageRefPath)"> - <TargetFramework>uap10.1</TargetFramework> + <TargetFramework>$(UAPvNextTFM)</TargetFramework> </FrameworkLayout> <FrameworkLayout Include="$(PackagesDir)$(NETStandardPackageId)\$(NETStandardPackageVersion)\build\netstandard2.0\ref"> <TargetFramework>netstandard2.0</TargetFramework> diff --git a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json index 43d797ce5b..a11ac2ff95 100644 --- a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json +++ b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json @@ -73,7 +73,7 @@ "portable46-wp81+wpa81": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.0.4.0", + "uap10.0.15138": "4.0.4.0", "win8": "4.0.0.0", "wp8": "4.0.0.0", "wpa81": "4.0.0.0", @@ -172,7 +172,7 @@ "portable46-win81+wpa81": "10.0.0.0", "portable46-net451+win81": "10.0.0.0", "portable45-net45+win8": "10.0.0.0", - "uap10.1": "10.0.0.0", + "uap10.0.15138": "10.0.0.0", "win8": "10.0.0.0", "wpa81": "10.0.0.0" }, @@ -217,7 +217,7 @@ "netstandard2.0": "4.0.1.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -327,7 +327,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.0.0.0", + "uap10.0.15138": "4.0.0.0", "win8": "4.0.0.0", "wp8": "2.0.5.0", "wpa81": "4.0.0.0", @@ -347,7 +347,7 @@ "netcoreapp2.0": "2.0.1.0", "net461": "2.0.0.0", "netstandard2.0": "2.0.0.0", - "uap10.1": "2.0.1.0" + "uap10.0.15138": "2.0.1.0" } }, "NETStandard.Library": { @@ -460,7 +460,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.0.0.0", + "uap10.0.15138": "4.0.0.0", "win8": "4.0.0.0", "wp8": "2.0.5.0", "wpa81": "4.0.0.0", @@ -518,7 +518,7 @@ "netstandard2.0": "4.1.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.2.1.0", + "uap10.0.15138": "4.2.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -538,7 +538,7 @@ "BaselineVersion": "4.4.0", "InboxOn": { "netcoreapp2.0": "4.0.3.0", - "uap10.1": "4.0.3.0" + "uap10.0.15138": "4.0.3.0" }, "AssemblyVersionInPackageVersion": { "4.0.0.0": "4.0.0", @@ -580,7 +580,7 @@ "netstandard2.0": "4.0.10.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "win8": "4.0.0.0", "wp8": "4.0.0.0", "wpa81": "4.0.0.0", @@ -616,7 +616,7 @@ "netstandard2.0": "4.0.10.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.0.14.0", + "uap10.0.15138": "4.0.14.0", "win8": "4.0.0.0", "wpa81": "4.0.0.0", "xamarinios10": "Any", @@ -641,7 +641,7 @@ "BaselineVersion": "1.4.0", "InboxOn": { "netcoreapp2.0": "1.2.3.0", - "uap10.1": "1.2.3.0" + "uap10.0.15138": "1.2.3.0" }, "AssemblyVersionInPackageVersion": { "1.1.36.0": "1.1.36", @@ -665,7 +665,7 @@ "netstandard2.0": "4.0.1.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -690,7 +690,7 @@ "netstandard2.0": "4.0.1.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -726,7 +726,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.0.3.0", + "uap10.0.15138": "4.0.3.0", "win8": "4.0.0.0", "wp8": "4.0.0.0", "wpa81": "4.0.0.0", @@ -757,7 +757,7 @@ "portable45-net45+win8": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.2.1.0", + "uap10.0.15138": "4.2.1.0", "win8": "4.0.0.0", "xamarinios10": "Any", "xamarinmac20": "Any", @@ -780,7 +780,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.0.0.0", + "uap10.0.15138": "4.0.0.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -800,7 +800,7 @@ "portable45-net45+win8": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.0.0.0", + "uap10.0.15138": "4.0.0.0", "win8": "4.0.0.0", "xamarinios10": "Any", "xamarinmac20": "Any", @@ -834,7 +834,7 @@ "netstandard2.0": "4.0.10.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "win8": "4.0.0.0", "wp8": "4.0.0.0", "wpa81": "4.0.0.0", @@ -863,7 +863,7 @@ "netstandard2.0": "4.1.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.2.1.0", + "uap10.0.15138": "4.2.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -888,7 +888,7 @@ "netstandard2.0": "4.1.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.2.1.0", + "uap10.0.15138": "4.2.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -971,7 +971,7 @@ "InboxOn": { "netcoreapp2.0": "4.0.0.0", "net45": "4.0.0.0", - "uap10.1": "4.0.0.0" + "uap10.0.15138": "4.0.0.0" } }, "System.Configuration.ConfigurationManager": { @@ -998,7 +998,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -1027,7 +1027,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.0.0.0", + "uap10.0.15138": "4.0.0.0", "win8": "4.0.0.0", "wp8": "2.0.5.0", "wpa81": "4.0.0.0", @@ -1044,7 +1044,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.0.0.0", + "uap10.0.15138": "4.0.0.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -1064,7 +1064,7 @@ "netstandard2.0": "4.1.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.2.1.0", + "uap10.0.15138": "4.2.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -1191,7 +1191,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.0.3.0", + "uap10.0.15138": "4.0.3.0", "win8": "4.0.0.0", "wp8": "4.0.0.0", "wpa81": "4.0.0.0", @@ -1232,7 +1232,7 @@ "netstandard2.0": "4.0.10.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "win8": "4.0.0.0", "wp8": "4.0.0.0", "wpa81": "4.0.0.0", @@ -1276,7 +1276,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.0.3.0", + "uap10.0.15138": "4.0.3.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -1309,7 +1309,7 @@ "netstandard2.0": "4.1.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.2.1.0", + "uap10.0.15138": "4.2.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -1335,7 +1335,7 @@ "netstandard2.0": "4.0.2.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -1360,7 +1360,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -1395,7 +1395,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "win8": "4.0.0.0", "wp8": "4.0.0.0", "wpa81": "4.0.0.0", @@ -1432,7 +1432,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -1466,7 +1466,7 @@ "netstandard2.0": "4.1.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.2.1.0", + "uap10.0.15138": "4.2.1.0", "win8": "4.0.0.0", "win81": "4.0.10.0", "wpa81": "4.0.10.0", @@ -1512,7 +1512,7 @@ "netcoreapp2.0": "4.0.0.0", "net45": "4.0.0.0", "netstandard2.0": "4.0.0.0", - "uap10.1": "4.0.0.0" + "uap10.0.15138": "4.0.0.0" } }, "System.Drawing.Design": { @@ -1532,7 +1532,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.2.0.0", + "uap10.0.15138": "4.2.0.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -1575,7 +1575,7 @@ "netstandard2.0": "4.0.10.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "win8": "4.0.0.0", "wp8": "4.0.0.0", "wpa81": "4.0.0.0", @@ -1623,7 +1623,7 @@ "netstandard2.0": "4.0.10.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "win8": "4.0.0.0", "wp8": "4.0.0.0", "wpa81": "4.0.0.0", @@ -1652,7 +1652,7 @@ "netstandard2.0": "4.0.1.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -1677,7 +1677,7 @@ "netstandard2.0": "4.0.1.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -1731,7 +1731,7 @@ "netstandard2.0": "4.1.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.2.1.0", + "uap10.0.15138": "4.2.1.0", "win8": "4.0.0.0", "wp8": "4.0.0.0", "wpa81": "4.0.0.0", @@ -1767,7 +1767,7 @@ "netstandard2.0": "4.1.1.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.2.1.0", + "uap10.0.15138": "4.2.1.0", "win8": "4.0.0.0", "wpa81": "4.0.0.0", "xamarinios10": "Any", @@ -1789,7 +1789,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.0.0.0", + "uap10.0.15138": "4.0.0.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -1809,7 +1809,7 @@ "netstandard2.0": "4.0.1.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.0.4.0", + "uap10.0.15138": "4.0.4.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -1834,7 +1834,7 @@ "netstandard2.0": "4.0.1.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -1872,7 +1872,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -1896,7 +1896,7 @@ "netstandard2.0": "4.0.1.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -1920,7 +1920,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -1944,7 +1944,7 @@ "netstandard2.0": "4.0.1.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -1973,7 +1973,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -2008,7 +2008,7 @@ "netcoreapp2.0": "4.1.1.0", "net461": "4.0.0.0", "netstandard2.0": "4.0.0.0", - "uap10.1": "4.1.1.0" + "uap10.0.15138": "4.1.1.0" }, "AssemblyVersionInPackageVersion": { "4.0.0.0": "4.0.0", @@ -2047,7 +2047,7 @@ "netstandard2.0": "4.0.1.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -2099,7 +2099,7 @@ "netstandard2.0": "4.1.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.2.1.0", + "uap10.0.15138": "4.2.1.0", "win8": "4.0.0.0", "wp8": "4.0.0.0", "wpa81": "4.0.0.0", @@ -2141,7 +2141,7 @@ "netstandard2.0": "4.1.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.2.1.0", + "uap10.0.15138": "4.2.1.0", "win8": "4.0.0.0", "wp8": "4.0.0.0", "wpa81": "4.0.0.0", @@ -2175,7 +2175,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.0.3.0", + "uap10.0.15138": "4.0.3.0", "win8": "4.0.0.0", "wpa81": "4.0.0.0", "xamarinios10": "Any", @@ -2213,7 +2213,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.0.3.0", + "uap10.0.15138": "4.0.3.0", "win8": "4.0.0.0", "wp8": "4.0.0.0", "wpa81": "4.0.0.0", @@ -2267,7 +2267,7 @@ "portable46-wp81+wpa81": "3.9.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.0.0.0", + "uap10.0.15138": "4.0.0.0", "win8": "4.0.0.0", "wp8": "3.9.0.0", "wpa81": "4.0.0.0", @@ -2317,7 +2317,7 @@ "netstandard2.0": "4.1.1.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.2.1.0", + "uap10.0.15138": "4.2.1.0", "win8": "4.0.0.0", "wpa81": "4.0.0.0", "xamarinios10": "Any", @@ -2340,7 +2340,7 @@ ], "BaselineVersion": "4.4.0", "InboxOn": { - "uap10.1": "4.0.4.0", + "uap10.0.15138": "4.0.4.0", "win8": "4.0.0.0" }, "AssemblyVersionInPackageVersion": { @@ -2386,7 +2386,7 @@ "netcoreapp2.0": "4.0.1.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.0.1.0", + "uap10.0.15138": "4.0.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -2398,7 +2398,7 @@ "netcoreapp2.0": "4.0.1.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.0.1.0", + "uap10.0.15138": "4.0.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -2417,7 +2417,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -2454,7 +2454,7 @@ "netstandard2.0": "4.1.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.2.1.0", + "uap10.0.15138": "4.2.1.0", "win8": "4.0.0.0", "wp8": "4.0.0.0", "wpa81": "4.0.0.0", @@ -2481,7 +2481,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -2519,7 +2519,7 @@ "netstandard2.0": "4.0.10.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "win8": "4.0.0.0", "wp8": "3.9.0.0", "wpa81": "4.0.0.0", @@ -2563,7 +2563,7 @@ "netstandard2.0": "4.0.10.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "win8": "4.0.0.0", "wp8": "3.9.0.0", "wpa81": "4.0.0.0", @@ -2592,7 +2592,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -2608,7 +2608,7 @@ "netcoreapp2.0": "4.0.1.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.0.1.0", + "uap10.0.15138": "4.0.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -2628,7 +2628,7 @@ "netstandard2.0": "4.1.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.2.1.0", + "uap10.0.15138": "4.2.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -2654,7 +2654,7 @@ "System.Net.WebClient": { "InboxOn": { "netcoreapp2.0": "4.0.1.0", - "uap10.1": "4.0.1.0" + "uap10.0.15138": "4.0.1.0" } }, "System.Net.WebHeaderCollection": { @@ -2670,7 +2670,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -2685,7 +2685,7 @@ "System.Net.WebProxy": { "InboxOn": { "netcoreapp2.0": "4.0.1.0", - "uap10.1": "4.0.1.0" + "uap10.0.15138": "4.0.1.0" } }, "System.Net.WebSockets": { @@ -2700,7 +2700,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -2723,7 +2723,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -2746,7 +2746,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.0.0.0", + "uap10.0.15138": "4.0.0.0", "win8": "4.0.0.0", "wpa81": "4.0.0.0", "xamarinios10": "Any", @@ -2769,7 +2769,7 @@ "net461": "4.1.2.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.4.0", + "uap10.0.15138": "4.1.4.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -2792,7 +2792,7 @@ ], "BaselineVersion": "4.4.0", "InboxOn": { - "uap10.1": "4.0.4.0" + "uap10.0.15138": "4.0.4.0" }, "AssemblyVersionInPackageVersion": { "4.0.0.0": "4.0.0", @@ -2827,7 +2827,7 @@ "netstandard2.0": "4.0.10.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "win8": "4.0.0.0", "wp8": "4.0.0.0", "wpa81": "4.0.0.0", @@ -2906,7 +2906,7 @@ "netstandard2.0": "4.1.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.2.1.0", + "uap10.0.15138": "4.2.1.0", "win8": "4.0.0.0", "wp8": "4.0.0.0", "wpa81": "4.0.0.0", @@ -2933,7 +2933,7 @@ "net45": "4.0.0.0", "portable46-net451+win81": "4.0.0.0", "portable45-net45+win8": "4.0.0.0", - "uap10.1": "4.0.3.0", + "uap10.0.15138": "4.0.3.0", "win8": "4.0.0.0" }, "AssemblyVersionInPackageVersion": { @@ -2954,7 +2954,7 @@ "netcoreapp2.0": "4.0.4.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.0.4.0", + "uap10.0.15138": "4.0.4.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -3062,7 +3062,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "win8": "4.0.0.0", "wp8": "4.0.0.0", "wpa81": "4.0.0.0", @@ -3088,7 +3088,7 @@ "BaselineVersion": "1.5.0", "InboxOn": { "netcoreapp2.0": "1.4.3.0", - "uap10.1": "1.4.3.0" + "uap10.0.15138": "1.4.3.0" }, "AssemblyVersionInPackageVersion": { "1.0.22.0": "1.0.22", @@ -3124,7 +3124,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "win8": "4.0.0.0", "wp8": "4.0.0.0", "wpa81": "4.0.0.0", @@ -3150,7 +3150,7 @@ "netcoreapp2.0": "4.1.3.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.3.0", + "uap10.0.15138": "4.1.3.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -3174,7 +3174,7 @@ "netcoreapp2.0": "4.1.1.0", "net461": "4.0.1.0", "netstandard2.0": "4.0.1.0", - "uap10.1": "4.1.1.0" + "uap10.0.15138": "4.1.1.0" }, "AssemblyVersionInPackageVersion": { "4.0.0.0": "4.0.0", @@ -3215,7 +3215,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "win8": "4.0.0.0", "wp8": "4.0.0.0", "wpa81": "4.0.0.0", @@ -3240,7 +3240,7 @@ "netcoreapp2.0": "4.1.1.0", "net461": "4.0.1.0", "netstandard2.0": "4.0.1.0", - "uap10.1": "4.1.1.0" + "uap10.0.15138": "4.1.1.0" }, "AssemblyVersionInPackageVersion": { "4.0.0.0": "4.0.0", @@ -3276,7 +3276,7 @@ "netstandard2.0": "4.1.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.2.1.0", + "uap10.0.15138": "4.2.1.0", "win8": "4.0.0.0", "win81": "4.0.10.0", "wp8": "4.0.0.0", @@ -3325,7 +3325,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -3368,7 +3368,7 @@ "netstandard2.0": "4.1.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.2.1.0", + "uap10.0.15138": "4.2.1.0", "win8": "4.0.0.0", "wp8": "4.0.0.0", "wpa81": "4.0.0.0", @@ -3397,7 +3397,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -3432,7 +3432,7 @@ "netstandard2.0": "4.1.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.2.1.0", + "uap10.0.15138": "4.2.1.0", "win8": "4.0.0.0", "win81": "4.0.10.0", "wpa81": "4.0.10.0", @@ -3459,7 +3459,7 @@ "netcoreapp2.0": "4.0.3.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.0.3.0", + "uap10.0.15138": "4.0.3.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -3494,7 +3494,7 @@ "portable46-wp81+wpa81": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.0.3.0", + "uap10.0.15138": "4.0.3.0", "win8": "4.0.0.0", "wp8": "4.0.0.0", "wpa81": "4.0.0.0", @@ -3541,7 +3541,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "win8": "4.0.0.0", "wpa81": "4.0.0.0", "xamarinios10": "Any", @@ -3578,7 +3578,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.0.0.0", + "uap10.0.15138": "4.0.0.0", "win8": "4.0.0.0", "wp8": "2.0.5.0", "wpa81": "4.0.0.0", @@ -3599,7 +3599,7 @@ "netstandard2.0": "4.0.1.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.0.3.0", + "uap10.0.15138": "4.0.3.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -3639,7 +3639,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.0.4.0", + "uap10.0.15138": "4.0.4.0", "win8": "4.0.0.0", "wp8": "4.0.0.0", "wpa81": "4.0.0.0", @@ -3683,7 +3683,7 @@ "netstandard2.0": "4.1.1.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.2.1.0", + "uap10.0.15138": "4.2.1.0", "win8": "4.0.0.0", "wp8": "4.0.0.0", "wpa81": "4.0.0.0", @@ -3728,7 +3728,7 @@ "netstandard2.0": "4.1.1.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.4.0", + "uap10.0.15138": "4.1.4.0", "win8": "4.0.0.0", "wp8": "4.0.0.0", "wpa81": "4.0.0.0", @@ -3758,7 +3758,7 @@ "portable46-win81+wp81": "4.0.0.0", "portable46-win81+wpa81": "4.0.10.0", "portable46-wp81+wpa81": "4.0.0.0", - "uap10.1": "4.0.14.0", + "uap10.0.15138": "4.0.14.0", "win8": "4.0.0.0", "win81": "4.0.10.0", "wp8": "4.0.0.0", @@ -3781,7 +3781,7 @@ "BaselineVersion": "4.4.0", "InboxOn": { "portable46-win81+wpa81": "4.0.0.0", - "uap10.1": "4.0.4.0", + "uap10.0.15138": "4.0.4.0", "win8": "4.0.0.0", "wpa81": "4.0.0.0" }, @@ -3796,7 +3796,7 @@ "InboxOn": { "netcoreapp2.0": "4.0.0.0", "net45": "4.0.0.0", - "uap10.1": "4.0.0.0" + "uap10.0.15138": "4.0.0.0" } }, "System.Security.AccessControl": { @@ -3826,7 +3826,7 @@ "netstandard2.0": "4.0.1.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -3850,7 +3850,7 @@ "netstandard2.0": "4.2.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.3.1.0", + "uap10.0.15138": "4.3.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -3891,7 +3891,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -3914,7 +3914,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -3965,7 +3965,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -4009,7 +4009,7 @@ "netstandard2.0": "4.1.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.2.1.0", + "uap10.0.15138": "4.2.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -4060,7 +4060,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "win8": "4.0.0.0", "wp8": "4.0.0.0", "wpa81": "4.0.0.0", @@ -4101,7 +4101,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -4265,7 +4265,7 @@ "portable46-wp81+wpa81": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.0.0.0", + "uap10.0.15138": "4.0.0.0", "win8": "4.0.0.0", "wp8": "2.0.5.0", "wpa81": "4.0.0.0", @@ -4279,7 +4279,7 @@ "InboxOn": { "netcoreapp2.0": "4.0.0.0", "net45": "4.0.0.0", - "uap10.1": "4.0.0.0" + "uap10.0.15138": "4.0.0.0" } }, "System.ServiceProcess.ServiceController": { @@ -4327,7 +4327,7 @@ "netstandard2.0": "4.0.10.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "win8": "4.0.0.0", "wp8": "4.0.0.0", "wpa81": "4.0.0.0", @@ -4353,7 +4353,7 @@ "InboxOn": { "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -4393,7 +4393,7 @@ "netstandard2.0": "4.0.10.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "win8": "4.0.0.0", "wp8": "4.0.0.0", "wpa81": "4.0.0.0", @@ -4450,7 +4450,7 @@ "netstandard2.0": "4.1.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.2.1.0", + "uap10.0.15138": "4.2.1.0", "win8": "4.0.0.0", "wp8": "4.0.0.0", "wpa81": "4.0.0.0", @@ -4492,7 +4492,7 @@ "netstandard2.0": "4.0.10.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "win8": "4.0.0.0", "wp8": "4.0.0.0", "wpa81": "4.0.0.0", @@ -4533,7 +4533,7 @@ "netcoreapp2.0": "4.1.1.0", "net461": "4.0.1.0", "netstandard2.0": "4.0.1.0", - "uap10.1": "4.1.1.0" + "uap10.0.15138": "4.1.1.0" }, "AssemblyVersionInPackageVersion": { "4.0.0.0": "4.0.0", @@ -4567,7 +4567,7 @@ "netstandard2.0": "4.0.10.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "win8": "4.0.0.0", "wp8": "4.0.0.0", "wpa81": "4.0.0.0", @@ -4592,7 +4592,7 @@ "BaselineVersion": "4.8.0", "InboxOn": { "netcoreapp2.0": "4.6.3.0", - "uap10.1": "4.6.3.0" + "uap10.0.15138": "4.6.3.0" }, "AssemblyVersionInPackageVersion": { "4.5.25.0": "4.5.25", @@ -4636,7 +4636,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.0.3.0", + "uap10.0.15138": "4.0.3.0", "win8": "4.0.0.0", "wpa81": "4.0.0.0", "xamarinios10": "Any", @@ -4662,7 +4662,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -4685,7 +4685,7 @@ "netstandard2.0": "4.0.10.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -4712,7 +4712,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "win81": "4.0.0.0", "wpa81": "4.0.0.0", "xamarinios10": "Any", @@ -4733,7 +4733,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.0.0.0", + "uap10.0.15138": "4.0.0.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -4743,7 +4743,7 @@ "System.Transactions.Local": { "InboxOn": { "netcoreapp2.0": "4.0.1.0", - "uap10.1": "4.0.1.0" + "uap10.0.15138": "4.0.1.0" } }, "System.ValueTuple": { @@ -4756,7 +4756,7 @@ "netstandard2.0": "4.0.2.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.0.3.0", + "uap10.0.15138": "4.0.3.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -4773,7 +4773,7 @@ "netcoreapp2.0": "4.0.0.0", "net45": "4.0.0.0", "netstandard2.0": "4.0.0.0", - "uap10.1": "4.0.0.0" + "uap10.0.15138": "4.0.0.0" } }, "System.Web.Abstractions": { @@ -4829,7 +4829,7 @@ "System.Web.HttpUtility": { "InboxOn": { "netcoreapp2.0": "4.0.1.0", - "uap10.1": "4.0.1.0" + "uap10.0.15138": "4.0.1.0" } }, "System.Web.Mobile": { @@ -4875,7 +4875,7 @@ "portable46-wp81+wpa81": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.0.0.0", + "uap10.0.15138": "4.0.0.0", "win8": "4.0.0.0", "wp8": "2.0.6.0", "wpa81": "4.0.0.0", @@ -4958,7 +4958,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.0.0.0", + "uap10.0.15138": "4.0.0.0", "win8": "4.0.0.0", "wp8": "2.0.5.0", "wpa81": "4.0.0.0", @@ -4986,7 +4986,7 @@ "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.0.0.0", + "uap10.0.15138": "4.0.0.0", "win8": "4.0.0.0", "wp8": "2.0.5.0", "wpa81": "4.0.0.0", @@ -5023,7 +5023,7 @@ "netstandard2.0": "4.1.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.2.1.0", + "uap10.0.15138": "4.2.1.0", "win8": "4.0.0.0", "wp8": "4.0.0.0", "wpa81": "4.0.0.0", @@ -5056,7 +5056,7 @@ "portable46-wp81+wpa81": "4.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.0.0.0", + "uap10.0.15138": "4.0.0.0", "win8": "4.0.0.0", "wp8": "2.0.5.0", "wpa81": "4.0.0.0", @@ -5092,7 +5092,7 @@ "netstandard2.0": "4.0.10.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "win8": "4.0.0.0", "wp8": "4.0.0.0", "wpa81": "4.0.0.0", @@ -5121,7 +5121,7 @@ "netstandard2.0": "4.0.1.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -5159,7 +5159,7 @@ "netstandard2.0": "4.0.10.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "win8": "4.0.0.0", "wp8": "4.0.0.0", "wpa81": "4.0.0.0", @@ -5188,7 +5188,7 @@ "netstandard2.0": "4.0.1.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -5213,7 +5213,7 @@ "netstandard2.0": "4.0.1.0", "monoandroid10": "Any", "monotouch10": "Any", - "uap10.1": "4.1.1.0", + "uap10.0.15138": "4.1.1.0", "xamarinios10": "Any", "xamarinmac20": "Any", "xamarintvos10": "Any", @@ -5280,7 +5280,7 @@ "InboxOn": { "netcoreapp2.0": "4.0.0.0", "net45": "4.0.0.0", - "uap10.1": "4.0.0.0" + "uap10.0.15138": "4.0.0.0" } }, "WindowsFormsIntegration": { diff --git a/src/Microsoft.CSharp/pkg/Microsoft.CSharp.pkgproj b/src/Microsoft.CSharp/pkg/Microsoft.CSharp.pkgproj index 515e0c601b..eb6c2fe98f 100644 --- a/src/Microsoft.CSharp/pkg/Microsoft.CSharp.pkgproj +++ b/src/Microsoft.CSharp/pkg/Microsoft.CSharp.pkgproj @@ -19,7 +19,7 @@ <AsFrameworkReference>true</AsFrameworkReference> </InboxOnTargetFramework> <InboxOnTargetFramework Include="netcoreapp2.0" /> - <InboxOnTargetFramework Include="uap10.1" /> + <InboxOnTargetFramework Include="$(UAPvNextTFM)" /> <InboxOnTargetFramework Include="win8" /> <InboxOnTargetFramework Include="wp80" /> <InboxOnTargetFramework Include="wpa81" /> diff --git a/src/Microsoft.VisualBasic/pkg/Microsoft.VisualBasic.pkgproj b/src/Microsoft.VisualBasic/pkg/Microsoft.VisualBasic.pkgproj index d9a3982a23..cdca494df9 100644 --- a/src/Microsoft.VisualBasic/pkg/Microsoft.VisualBasic.pkgproj +++ b/src/Microsoft.VisualBasic/pkg/Microsoft.VisualBasic.pkgproj @@ -13,7 +13,7 @@ <HarvestIncludePaths Include="ref/netstandard1.1" /> <HarvestIncludePaths Include="lib/netstandard1.3" /> <InboxOnTargetFramework Include="netcoreapp2.0" /> - <InboxOnTargetFramework Include="uap10.1" /> + <InboxOnTargetFramework Include="$(UAPvNextTFM)" /> <InboxOnTargetFramework Include="win8" /> <InboxOnTargetFramework Include="wpa81" /> <InboxOnTargetFramework Include="portable-net45+win8+wpa81" /> diff --git a/src/System.Buffers/pkg/System.Buffers.pkgproj b/src/System.Buffers/pkg/System.Buffers.pkgproj index fe4abc8aa0..4312458b78 100644 --- a/src/System.Buffers/pkg/System.Buffers.pkgproj +++ b/src/System.Buffers/pkg/System.Buffers.pkgproj @@ -8,7 +8,7 @@ <ProjectReference Include="..\src\System.Buffers.csproj" /> <InboxOnTargetFramework Include="netcoreapp2.0" /> - <InboxOnTargetFramework Include="uap10.1" /> + <InboxOnTargetFramework Include="$(UAPvNextTFM)" /> <!-- this package is part of the implementation closure of NETStandard.Library therefore it cannot reference NETStandard.Library --> <SuppressMetaPackage Include="NETStandard.Library" /> diff --git a/src/System.Collections.Immutable/pkg/System.Collections.Immutable.pkgproj b/src/System.Collections.Immutable/pkg/System.Collections.Immutable.pkgproj index 9722c4575a..3fc9266e62 100644 --- a/src/System.Collections.Immutable/pkg/System.Collections.Immutable.pkgproj +++ b/src/System.Collections.Immutable/pkg/System.Collections.Immutable.pkgproj @@ -10,7 +10,7 @@ <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <InboxOnTargetFramework Include="netcoreapp2.0" /> - <InboxOnTargetFramework Include="uap10.1" /> + <InboxOnTargetFramework Include="$(UAPvNextTFM)" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </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 9cfba11978..957e23392c 100644 --- a/src/System.ComponentModel.Annotations/pkg/System.ComponentModel.Annotations.pkgproj +++ b/src/System.ComponentModel.Annotations/pkg/System.ComponentModel.Annotations.pkgproj @@ -16,7 +16,7 @@ <FrameworkReference>System.ComponentModel.DataAnnotations</FrameworkReference> </InboxOnTargetFramework> <InboxOnTargetFramework Include="netcoreapp2.0" /> - <InboxOnTargetFramework Include="uap10.1" /> + <InboxOnTargetFramework Include="$(UAPvNextTFM)" /> <InboxOnTargetFramework Include="win8" /> <InboxOnTargetFramework Include="portable-net45+win8" /> <InboxOnTargetFramework Include="xamarinios10" /> diff --git a/src/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj b/src/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj index 937f2ba8d6..4b3b74a1c6 100644 --- a/src/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj +++ b/src/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj @@ -3,8 +3,8 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{FD6AA2B9-56DB-4BCC-85E0-7727506562B0}</ProjectGuid> - <!-- UAP10.1 is not yet mapped to netstandard2.0, manually duplicate this ref --> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard2.0;uap10.1</PackageTargetFramework> + <!-- UAPvNext is not yet mapped to netstandard2.0, manually duplicate this ref --> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard2.0;$(UAPvNextTFM)</PackageTargetFramework> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx'">true</IsPartialFacadeAssembly> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Debug|AnyCPU'" /> @@ -12,7 +12,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> <ItemGroup> - <SuppressPackageTargetFrameworkCompatibility Include="uap10.1" /> + <SuppressPackageTargetFrameworkCompatibility Include="$(UAPvNextTFM)" /> <Compile Include="System.Configuration.cs" /> </ItemGroup> <ItemGroup Condition="'$(IsPartialFacadeAssembly)' == 'true'"> diff --git a/src/System.Data.SqlClient/pkg/System.Data.SqlClient.pkgproj b/src/System.Data.SqlClient/pkg/System.Data.SqlClient.pkgproj index b9db8ddf69..25cf504279 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>net461;netcoreapp2.0;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net461;netcoreapp2.0;$(UAPvNextTFM);$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Data.SqlClient.csproj" /> <HarvestIncludePaths Include="ref/net451;lib/net451;runtimes/win/lib/net451" /> diff --git a/src/System.Data.SqlClient/ref/System.Data.SqlClient.csproj b/src/System.Data.SqlClient/ref/System.Data.SqlClient.csproj index 02599cc2b8..0647919132 100644 --- a/src/System.Data.SqlClient/ref/System.Data.SqlClient.csproj +++ b/src/System.Data.SqlClient/ref/System.Data.SqlClient.csproj @@ -4,15 +4,15 @@ <PropertyGroup> <ProjectGuid>{D58E8D2B-3331-4660-8DFB-512D66F8EC63}</ProjectGuid> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx'">true</IsPartialFacadeAssembly> - <!-- UAP10.1 is not yet mapped to netstandard2.0, manually duplicate this ref --> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard2.0;uap10.1</PackageTargetFramework> + <!-- UAPvNext is not yet mapped to netstandard2.0, manually duplicate this ref --> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard2.0;$(UAPvNextTFM)</PackageTargetFramework> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> <ItemGroup> - <SuppressPackageTargetFrameworkCompatibility Include="uap10.1" /> + <SuppressPackageTargetFrameworkCompatibility Include="$(UAPvNextTFM)" /> <Compile Include="System.Data.SqlClient.cs" /> <Compile Include="System.Data.SqlClient.Manual.cs" /> </ItemGroup> diff --git a/src/System.IO.Packaging/src/System.IO.Packaging.csproj b/src/System.IO.Packaging/src/System.IO.Packaging.csproj index f30527a9e7..df0b4051c0 100644 --- a/src/System.IO.Packaging/src/System.IO.Packaging.csproj +++ b/src/System.IO.Packaging/src/System.IO.Packaging.csproj @@ -7,8 +7,8 @@ <AssemblyName>System.IO.Packaging</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='netfx' OR '$(TargetGroup)'=='net46'">true</IsPartialFacadeAssembly> - <!-- UAP10.1 is not yet mapped to netstandard2.0, manually duplicate this ref --> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard2.0;uap10.1</PackageTargetFramework> + <!-- UAPvNext is not yet mapped to netstandard2.0, manually duplicate this ref --> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard2.0;$(UAPvNextTFM)</PackageTargetFramework> </PropertyGroup> <!-- Default configurations to help VS understand the options --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46-Debug|AnyCPU'" /> @@ -20,7 +20,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> - <SuppressPackageTargetFrameworkCompatibility Include="uap10.1" /> + <SuppressPackageTargetFrameworkCompatibility Include="$(UAPvNextTFM)" /> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)'=='netstandard1.3'"> <Reference Include="System.Collections" /> diff --git a/src/System.Numerics.Vectors/pkg/System.Numerics.Vectors.pkgproj b/src/System.Numerics.Vectors/pkg/System.Numerics.Vectors.pkgproj index b7c8ef8f2f..0a8bbc7c0c 100644 --- a/src/System.Numerics.Vectors/pkg/System.Numerics.Vectors.pkgproj +++ b/src/System.Numerics.Vectors/pkg/System.Numerics.Vectors.pkgproj @@ -16,7 +16,7 @@ </ItemGroup> <ItemGroup> <InboxOnTargetFramework Include="netcoreapp2.0" /> - <InboxOnTargetFramework Include="uap10.1" /> + <InboxOnTargetFramework Include="$(UAPvNextTFM)" /> <InboxOnTargetFramework Include="MonoAndroid10" /> <InboxOnTargetFramework Include="MonoTouch10" /> <InboxOnTargetFramework Include="xamarinios10" /> diff --git a/src/System.Reflection.DispatchProxy/pkg/System.Reflection.DispatchProxy.pkgproj b/src/System.Reflection.DispatchProxy/pkg/System.Reflection.DispatchProxy.pkgproj index 5927e310e6..c7b214e621 100644 --- a/src/System.Reflection.DispatchProxy/pkg/System.Reflection.DispatchProxy.pkgproj +++ b/src/System.Reflection.DispatchProxy/pkg/System.Reflection.DispatchProxy.pkgproj @@ -14,9 +14,9 @@ </ItemGroup> <ItemGroup> <InboxOnTargetFramework Include="netcoreapp2.0" /> - <InboxOnTargetFramework Include="uap10.1" /> + <InboxOnTargetFramework Include="$(UAPvNextTFM)" /> <File Include="$(PlaceholderFile)"> - <TargetPath>runtimes/aot/lib/uap10.1</TargetPath> + <TargetPath>runtimes/aot/lib/$(UAPvNextTFM)</TargetPath> </File> <InboxOnTargetFramework Include="MonoAndroid10" /> <InboxOnTargetFramework Include="MonoTouch10" /> diff --git a/src/System.Reflection.Metadata/pkg/System.Reflection.Metadata.pkgproj b/src/System.Reflection.Metadata/pkg/System.Reflection.Metadata.pkgproj index 1706b98631..ebaecb569b 100644 --- a/src/System.Reflection.Metadata/pkg/System.Reflection.Metadata.pkgproj +++ b/src/System.Reflection.Metadata/pkg/System.Reflection.Metadata.pkgproj @@ -14,7 +14,7 @@ <Version>1.1.37</Version> </FilePackageDependency> <InboxOnTargetFramework Include="netcoreapp2.0" /> - <InboxOnTargetFramework Include="uap10.1" /> + <InboxOnTargetFramework Include="$(UAPvNextTFM)" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Reflection.TypeExtensions/pkg/System.Reflection.TypeExtensions.pkgproj b/src/System.Reflection.TypeExtensions/pkg/System.Reflection.TypeExtensions.pkgproj index 445004a897..cb624f57ca 100644 --- a/src/System.Reflection.TypeExtensions/pkg/System.Reflection.TypeExtensions.pkgproj +++ b/src/System.Reflection.TypeExtensions/pkg/System.Reflection.TypeExtensions.pkgproj @@ -17,9 +17,9 @@ </ItemGroup> <ItemGroup> <InboxOnTargetFramework Include="netcoreapp2.0" /> - <InboxOnTargetFramework Include="uap10.1" /> + <InboxOnTargetFramework Include="$(UAPvNextTFM)" /> <File Include="$(PlaceholderFile)"> - <TargetPath>runtimes/aot/lib/uap10.1</TargetPath> + <TargetPath>runtimes/aot/lib/$(UAPvNextTFM)</TargetPath> </File> <InboxOnTargetFramework Include="MonoAndroid10" /> <InboxOnTargetFramework Include="MonoTouch10" /> diff --git a/src/System.Security.AccessControl/pkg/System.Security.AccessControl.pkgproj b/src/System.Security.AccessControl/pkg/System.Security.AccessControl.pkgproj index afdd21fbcf..f05d73f778 100644 --- a/src/System.Security.AccessControl/pkg/System.Security.AccessControl.pkgproj +++ b/src/System.Security.AccessControl/pkg/System.Security.AccessControl.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.Security.AccessControl.csproj"> - <SupportedFramework>net461;netcoreapp2.0;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net461;netcoreapp2.0;$(UAPvNextTFM);$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Security.AccessControl.csproj" /> <HarvestIncludePaths Include="ref/net46;lib/net46;runtimes/win/lib/net46" /> diff --git a/src/System.Security.AccessControl/ref/System.Security.AccessControl.csproj b/src/System.Security.AccessControl/ref/System.Security.AccessControl.csproj index 416539689f..8e967b026d 100644 --- a/src/System.Security.AccessControl/ref/System.Security.AccessControl.csproj +++ b/src/System.Security.AccessControl/ref/System.Security.AccessControl.csproj @@ -3,8 +3,8 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{F80C478C-48EE-46A5-89C4-EE0CFB23A14F}</ProjectGuid> - <!-- UAP10.1 is not yet mapped to netstandard2.0, manually duplicate this ref --> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard2.0;uap10.1</PackageTargetFramework> + <!-- UAPvNext is not yet mapped to netstandard2.0, manually duplicate this ref --> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard2.0;$(UAPvNextTFM)</PackageTargetFramework> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx'">true</IsPartialFacadeAssembly> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Debug|AnyCPU'" /> @@ -18,7 +18,7 @@ <Reference Include="mscorlib" /> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' != 'netfx'"> - <SuppressPackageTargetFrameworkCompatibility Include="uap10.1" /> + <SuppressPackageTargetFrameworkCompatibility Include="$(UAPvNextTFM)" /> <ProjectReference Include="..\..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> 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 ae5a48cc7b..31f887a973 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 @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.Security.Cryptography.Cng.csproj"> - <SupportedFramework>net461;netcoreapp2.0;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net461;netcoreapp2.0;$(UAPvNextTFM);$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Security.Cryptography.Cng.csproj" /> diff --git a/src/System.Security.Permissions/ref/System.Security.Permissions.csproj b/src/System.Security.Permissions/ref/System.Security.Permissions.csproj index 500235cd23..53bad00887 100644 --- a/src/System.Security.Permissions/ref/System.Security.Permissions.csproj +++ b/src/System.Security.Permissions/ref/System.Security.Permissions.csproj @@ -3,14 +3,14 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{07CAF142-B259-418E-86EF-C4BD8B50253E}</ProjectGuid> - <!-- UAP10.1 is not yet mapped to netstandard2.0, manually duplicate this ref --> - <PackageTargetFramework>netstandard2.0;uap10.1</PackageTargetFramework> + <!-- UAPvNext is not yet mapped to netstandard2.0, manually duplicate this ref --> + <PackageTargetFramework>netstandard2.0;$(UAPvNextTFM)</PackageTargetFramework> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> <ItemGroup> <Compile Include="System.Security.Permissions.cs" /> - <SuppressPackageTargetFrameworkCompatibility Include="uap10.1" /> + <SuppressPackageTargetFrameworkCompatibility Include="$(UAPvNextTFM)" /> </ItemGroup> <ItemGroup> <ProjectReference Include="..\..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj" /> 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 a6770a4acf..7fee70517a 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 @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.Security.Principal.Windows.csproj"> - <SupportedFramework>net461;netcoreapp2.0;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net461;netcoreapp2.0;$(UAPvNextTFM);$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Security.Principal.Windows.csproj" /> <HarvestIncludePaths Include="ref/net46;lib/net46;runtimes/win/lib/net46" /> 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 acd447c2be..9b4a3ef544 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 @@ -3,8 +3,8 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{25A02E40-D12C-4184-B599-E4F954D142DB}</ProjectGuid> - <!-- UAP10.1 is not yet mapped to netstandard2.0, manually duplicate this ref --> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard2.0;uap10.1</PackageTargetFramework> + <!-- UAPvNext is not yet mapped to netstandard2.0, manually duplicate this ref --> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard2.0;$(UAPvNextTFM)</PackageTargetFramework> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx'">true</IsPartialFacadeAssembly> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Debug|AnyCPU'" /> @@ -12,7 +12,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> <ItemGroup> - <SuppressPackageTargetFrameworkCompatibility Include="uap10.1" /> + <SuppressPackageTargetFrameworkCompatibility Include="$(UAPvNextTFM)" /> <Compile Include="System.Security.Principal.Windows.cs" /> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == 'netfx'"> diff --git a/src/System.Security.Principal/src/System.Security.Principal.csproj b/src/System.Security.Principal/src/System.Security.Principal.csproj index b4d1d95dd6..57df563035 100644 --- a/src/System.Security.Principal/src/System.Security.Principal.csproj +++ b/src/System.Security.Principal/src/System.Security.Principal.csproj @@ -5,7 +5,6 @@ <AssemblyName>System.Security.Principal</AssemblyName> <ProjectGuid>{FBE16BC8-AE2D-422C-861E-861814F53AF7}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <!-- copy to uap10.1 until nuget makes the change to map that to ns1.7 --> </PropertyGroup> <!-- Default configurations to help VS understand the options --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" /> 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 fe4d339d29..a61018ac85 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 @@ -14,7 +14,7 @@ </HarvestIncludePaths> </ItemGroup> <ItemGroup> - <InboxOnTargetFramework Include="uap10.1"> + <InboxOnTargetFramework Include="$(UAPvNextTFM)"> <PackageTargetRuntime>win</PackageTargetRuntime> </InboxOnTargetFramework> <InboxOnTargetFramework Include="MonoAndroid10" /> 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 32121a8d74..c8942a024b 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 @@ -10,7 +10,7 @@ <SupportedFramework>net45;netcore45;wp8;wpa81;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <InboxOnTargetFramework Include="netcoreapp2.0" /> - <InboxOnTargetFramework Include="uap10.1" /> + <InboxOnTargetFramework Include="$(UAPvNextTFM)" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.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 c4007e14f2..82167fa9be 100644 --- a/src/System.ValueTuple/pkg/System.ValueTuple.pkgproj +++ b/src/System.ValueTuple/pkg/System.ValueTuple.pkgproj @@ -8,7 +8,7 @@ <ProjectReference Include="..\src\System.ValueTuple.csproj" /> <InboxOnTargetFramework Include="netstandard2.0" /> <InboxOnTargetFramework Include="netcoreapp2.0" /> - <InboxOnTargetFramework Include="uap10.1" /> + <InboxOnTargetFramework Include="$(UAPvNextTFM)" /> <InboxOnTargetFramework Include="$(AllXamarinFrameworks)" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> diff --git a/tools-local/targetgroups.props b/tools-local/targetgroups.props index 730b39bf6d..6b65af586d 100644 --- a/tools-local/targetgroups.props +++ b/tools-local/targetgroups.props @@ -17,36 +17,36 @@ <Imports>netcore50</Imports> <CompatibleWith>netstandard1.4</CompatibleWith> </TargetGroups> - <TargetGroups Include="uap101aot"> + <TargetGroups Include="uapvnextaot"> <PackageTargetRuntimeSuffix>aot</PackageTargetRuntimeSuffix> - <NuGetTargetMoniker>UAP,Version=v10.1</NuGetTargetMoniker> - <NuGetTargetMonikerShort>uap10.1</NuGetTargetMonikerShort> + <NuGetTargetMoniker>$(UAPvNextTFMFull)</NuGetTargetMoniker> + <NuGetTargetMonikerShort>$(UAPvNextTFM)</NuGetTargetMonikerShort> <UWPCompatible>true</UWPCompatible> <Imports>netcore50aot</Imports> - <CompatibleWith>uap101;netstandard2.0</CompatibleWith> + <CompatibleWith>uapvnext;netstandard2.0</CompatibleWith> </TargetGroups> - <TargetGroups Include="uap101"> - <NuGetTargetMoniker>UAP,Version=v10.1</NuGetTargetMoniker> - <NuGetTargetMonikerShort>uap10.1</NuGetTargetMonikerShort> + <TargetGroups Include="uapvnext"> + <NuGetTargetMoniker>$(UAPvNextTFMFull)</NuGetTargetMoniker> + <NuGetTargetMonikerShort>$(UAPvNextTFM)</NuGetTargetMonikerShort> <UWPCompatible>true</UWPCompatible> <Imports>netcore50</Imports> <CompatibleWith>netstandard2.0</CompatibleWith> </TargetGroups> - <!-- uap is an alias for uap10.1 any/coreclr runtime --> + <!-- uap is an alias for uapvNext any/coreclr runtime --> <TargetGroups Include="uap"> - <NuGetTargetMoniker>UAP,Version=v10.1</NuGetTargetMoniker> - <NuGetTargetMonikerShort>uap10.1</NuGetTargetMonikerShort> + <NuGetTargetMoniker>$(UAPvNextTFMFull)</NuGetTargetMoniker> + <NuGetTargetMonikerShort>$(UAPvNextTFM)</NuGetTargetMonikerShort> <UWPCompatible>true</UWPCompatible> - <Imports>uap101</Imports> + <Imports>uapvnext</Imports> <CompatibleWith>netstandard</CompatibleWith> </TargetGroups> - <!-- uapaot is an alias for uap10.1, aot runtime --> + <!-- uapaot is an alias for uapvNext, aot runtime --> <TargetGroups Include="uapaot"> <PackageTargetRuntimeSuffix>aot</PackageTargetRuntimeSuffix> - <NuGetTargetMoniker>UAP,Version=v10.1</NuGetTargetMoniker> - <NuGetTargetMonikerShort>uap10.1</NuGetTargetMonikerShort> + <NuGetTargetMoniker>$(UAPvNextTFMFull)</NuGetTargetMoniker> + <NuGetTargetMonikerShort>$(UAPvNextTFM)</NuGetTargetMonikerShort> <UWPCompatible>true</UWPCompatible> - <Imports>uap101aot</Imports> + <Imports>uapvnextaot</Imports> <CompatibleWith>uap;netstandard</CompatibleWith> </TargetGroups> <TargetGroups Include="netstandard1.0"> |