Skip to content

Commit

Permalink
housekeeping: Update splat to use UAP 10.0.17763 to make it compile w…
Browse files Browse the repository at this point in the history
…ith azure devops
  • Loading branch information
glennawatson committed Apr 22, 2019
1 parent 648f764 commit 7e1c461
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 8 deletions.
1 change: 0 additions & 1 deletion src/Directory.build.props
@@ -1,7 +1,6 @@
<Project>
<PropertyGroup>
<Copyright>Copyright (c) .NET Foundation and Contributors</Copyright>
<Product>Splat ($(TargetFramework))</Product>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/reactiveui/splat/</PackageProjectUrl>
<PackageIconUrl>http://f.cl.ly/items/1307401C3x2g3F2p2Z36/Logo.png</PackageIconUrl>
Expand Down
6 changes: 6 additions & 0 deletions src/Directory.build.targets
@@ -1,8 +1,14 @@
<Project>
<PropertyGroup>
<Product>$(AssemblyName) ($(TargetFramework))</Product>
</PropertyGroup>

<PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
<DefineConstants>$(DefineConstants);NET_45;XAML</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('uap'))">
<TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.15063.0</TargetPlatformMinVersion>
<DefineConstants>$(DefineConstants);NETFX_CORE;XAML;WINDOWS_UWP</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('Xamarin.iOS'))">
Expand Down
2 changes: 1 addition & 1 deletion src/Splat.Autofac/Splat.Autofac.csproj
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net461;uap10.0.16299</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net461;uap10.0.17763</TargetFrameworks>
<Description>Autofac adapter for Splat</Description>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Splat.Log4Net/Splat.Log4Net.csproj
@@ -1,7 +1,7 @@
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net461;uap10.0.16299</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net461;uap10.0.17763</TargetFrameworks>
<AssemblyName>Splat.Log4Net</AssemblyName>
<RootNamespace>Splat</RootNamespace>
<Authors>Paul Betts</Authors>
Expand Down
@@ -1,7 +1,7 @@
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net461;uap10.0.16299</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net461;uap10.0.17763</TargetFrameworks>
<AssemblyName>Splat.Microsoft.Extensions.Logging</AssemblyName>
<RootNamespace>Splat</RootNamespace>
<Authors>Paul Betts</Authors>
Expand Down
2 changes: 1 addition & 1 deletion src/Splat.NLog/Splat.NLog.csproj
@@ -1,7 +1,7 @@
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net461;uap10.0.16299</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net461;uap10.0.17763</TargetFrameworks>
<AssemblyName>Splat.NLog</AssemblyName>
<RootNamespace>Splat</RootNamespace>
<Authors>Paul Betts</Authors>
Expand Down
2 changes: 1 addition & 1 deletion src/Splat.Serilog/Splat.Serilog.csproj
@@ -1,7 +1,7 @@
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net461;uap10.0.16299</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net461;uap10.0.17763</TargetFrameworks>
<AssemblyName>Splat.Serilog</AssemblyName>
<RootNamespace>Splat</RootNamespace>
<Authors>Paul Betts</Authors>
Expand Down
2 changes: 1 addition & 1 deletion src/Splat.SimpleInjector/Splat.SimpleInjector.csproj
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net461;uap10.0.16299</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net461;uap10.0.17763</TargetFrameworks>
<Description>SimpleInjector adapter for Splat</Description>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Splat/Splat.csproj
@@ -1,7 +1,7 @@
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>MonoAndroid81;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;Xamarin.WatchOS10;tizen40;netstandard2.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net461;uap10.0.16299</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net461;uap10.0.17763</TargetFrameworks>
<AssemblyName>Splat</AssemblyName>
<RootNamespace>Splat</RootNamespace>
<Authors>Paul Betts</Authors>
Expand Down

0 comments on commit 7e1c461

Please sign in to comment.