Skip to content

Commit

Permalink
Update version
Browse files Browse the repository at this point in the history
  • Loading branch information
@martijn00
martijn00 committed Sep 4, 2020
1 parent a1a483d commit 93117ca
Show file tree
Hide file tree
Showing 13 changed files with 22 additions and 19 deletions.
4 changes: 2 additions & 2 deletions Directory.build.props → Directory.Build.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<!--<PackageIcon>icon.png</PackageIcon>
<PackageIconFullPath>$(MSBuildThisFileDirectory)icon.png</PackageIconFullPath>-->
<Authors>Kirill Lyubimov</Authors>
<Owners>Kirill Lyubimov, rotorgames</Owners>
<Owners>Kirill Lyubimov, rotorgames, martijn00</Owners>
<PackageTags>Xamarin.Forms, xamarin, forms, popup, page, modal</PackageTags>
<PackageReleaseNotes>https://github.com/rotorgames/Rg.Plugins.Popup/releases</PackageReleaseNotes>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
Expand All @@ -18,7 +18,7 @@
<RepositoryUrl>https://github.com/rotorgames/Rg.Plugins.Popup</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<Product>$(AssemblyName) ($(TargetFramework))</Product>
<Version>2.0.0.4</Version>
<Version>2.0.0.5</Version>

<!--<Nullable>enable</Nullable>-->
<LangVersion>8.0</LangVersion>
Expand Down
0 Directory.build.targets → Directory.Build.targets
View file
File renamed without changes.
8 changes: 4 additions & 4 deletions Rg.Plugins.Popup.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{0FE9671B-BD9A-4077-8124-70824E440ED8}"
ProjectSection(SolutionItems) = preProject
appveyor.yml = appveyor.yml
Directory.build.props = Directory.build.props
Directory.build.targets = Directory.build.targets
Directory.Build.props = Directory.Build.props
Directory.Build.targets = Directory.Build.targets
global.json = global.json
README.md = README.md
EndProjectSection
Expand All @@ -16,8 +16,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rg.Plugins.Popup", "Rg.Plug
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{04D48DA4-E0DD-4E8A-A124-B656FE163F41}"
ProjectSection(SolutionItems) = preProject
Samples\Directory.build.props = Samples\Directory.build.props
Samples\Directory.build.targets = Samples\Directory.build.targets
Samples\Directory.Build.props = Samples\Directory.Build.props
Samples\Directory.Build.targets = Samples\Directory.Build.targets
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Demo", "Samples\Demo\Demo.csproj", "{9C32B21E-00A0-4539-A691-A8317F55B532}"
Expand Down
4 changes: 2 additions & 2 deletions Rg.Plugins.Popup/Rg.Plugins.Popup.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<None Remove="Platforms\Wpf\**\*.cs" />
<Compile Include="Platforms\Net\**\*.cs" />
<Compile Include="Platforms\Wpf\**\*.cs" />
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="4.5.0.530" />
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="4.5.0.617" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
Expand Down Expand Up @@ -112,7 +112,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.5.0.530" />
<PackageReference Include="Xamarin.Forms" Version="4.5.0.617" />
</ItemGroup>

<!-- There is something not working correctly w.r.t. multi-targetting so adding
Expand Down
2 changes: 1 addition & 1 deletion Samples/Demo.Droid/Demo.Droid.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms">
<Version>4.5.0.530</Version>
<Version>4.5.0.617</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
Expand Down
2 changes: 1 addition & 1 deletion Samples/Demo.Mac/Demo.Mac.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms">
<Version>4.5.0.530</Version>
<Version>4.5.0.617</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
Expand Down
2 changes: 1 addition & 1 deletion Samples/Demo.Tizen/Demo.Tizen.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.5.0.530" />
<PackageReference Include="Xamarin.Forms" Version="4.5.0.617" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Samples/Demo.UWP/Demo.UWP.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
<Version>6.2.10</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms">
<Version>4.7.0.1239</Version>
<Version>4.5.0.617</Version>
</PackageReference>
</ItemGroup>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
Expand Down
2 changes: 1 addition & 1 deletion Samples/Demo.WPF/Demo.WPF.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms.Platform.WPF">
<Version>4.5.0.530</Version>
<Version>4.5.0.617</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Samples/Demo.iOS/Demo.iOS.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms">
<Version>4.5.0.530</Version>
<Version>4.5.0.617</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
Expand Down
2 changes: 1 addition & 1 deletion Samples/Demo/Demo.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.5.0.530" />
<PackageReference Include="Xamarin.Forms" Version="4.5.0.617" />
</ItemGroup>

<ItemGroup>
Expand Down
0 Samples/Directory.build.props → Samples/Directory.Build.props
View file
File renamed without changes.
11 changes: 7 additions & 4 deletions Samples/Directory.build.targets → Samples/Directory.Build.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,15 @@
<PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard'))">
<DefineConstants>$(DefineConstants);NETSTANDARD;PORTABLE</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard2.0'))">
<DefineConstants>$(DefineConstants);NETSTANDARD20</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
<DefineConstants>$(DefineConstants);NET;WPF;XAML</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('net5'))">
<DefineConstants>$(DefineConstants);NET;NET5</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('uap'))">
<DefineConstants>$(DefineConstants);NETFX_CORE;XAML;WINDOWS;WINDOWS_UWP;UWP</DefineConstants>
<TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
Expand All @@ -29,10 +35,7 @@
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('netcoreapp'))">
<DefineConstants>$(DefineConstants);NETCORE;NETCOREAPP</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('netcoreapp3.'))">
<DefineConstants>$(DefineConstants);WPF</DefineConstants>
<DefineConstants>$(DefineConstants);NETCOREAPP</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('tizen'))">
<DefineConstants>$(DefineConstants);TIZEN</DefineConstants>
Expand Down

0 comments on commit 93117ca

Please sign in to comment.