Skip to content

Commit

Permalink
Merge pull request #129 from runceel/releases/v6.1.3
Browse files Browse the repository at this point in the history
update files for v6.1.3
  • Loading branch information
runceel authored Sep 26, 2019
2 parents 43325e4 + 5ee10a7 commit 92ccaa5
Show file tree
Hide file tree
Showing 17 changed files with 687 additions and 553 deletions.
2 changes: 1 addition & 1 deletion BuildTools/ReactiveProperty.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>ReactiveProperty</id>
<version>6.1.2</version>
<version>6.1.3</version>
<title>ReactiveProperty</title>
<authors>neuecc xin9le okazuki</authors>
<owners>neuecc xin9le okazuki</owners>
Expand Down
1 change: 1 addition & 0 deletions BuildTools/pack.bat
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
msbuild ..\ReactiveProperty.sln /p:Configuration=Release /t:Clean;Build
nuget pack ReactiveProperty.nuspec
6 changes: 3 additions & 3 deletions ReactiveProperty.sln
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveProperty.NETStandar
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveProperty.Platform.Android", "Source\ReactiveProperty.Platform.Android\ReactiveProperty.Platform.Android.csproj", "{BF2E72F9-149B-4687-ABCD-7B949430FFDE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveProperty.Platform.NetCore", "Source\ReactiveProperty.Platform.NetCore\ReactiveProperty.Platform.NetCore.csproj", "{7BC40D74-D0B4-4736-B45D-127224D20474}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveProperty.Platform.NetCore", "Source\ReactiveProperty.Platform.NetCore\ReactiveProperty.Platform.NetCore.csproj", "{7BC40D74-D0B4-4736-B45D-127224D20474}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
Expand Down Expand Up @@ -491,9 +491,9 @@ Global
{7BC40D74-D0B4-4736-B45D-127224D20474} = {592AA479-AD7F-476B-AEF8-2B0268EA3BD8}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {5AC43AC2-86FE-46EF-B243-5C8E75EAB89B}
BuildVersion_UseGlobalSettings = True
BuildVersion_AssemblyInfoFilename = Source\NET40\Properties\CommonAssemblyInfo.cs
BuildVersion_UseGlobalSettings = True
SolutionGuid = {5AC43AC2-86FE-46EF-B243-5C8E75EAB89B}
EndGlobalSection
GlobalSection(TestCaseManagementSettings) = postSolution
CategoryFile = ReactiveProperty.vsmdi
Expand Down
36 changes: 36 additions & 0 deletions Source/ReactiveProperty.NETStandard/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("ReactiveProperty")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("ReactiveProperty")]
[assembly: AssemblyCopyright("Copyright © 2019")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("91648038-aa41-4a00-a13b-b276e851cd02")]

// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion(Reactive.Bindings.Version.Number)]
[assembly: AssemblyFileVersion(Reactive.Bindings.Version.Number)]
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<RootNamespace>Reactive.Bindings</RootNamespace>
<Description>ReactiveProperty is MVVM and Asynchronous Extensions for Reactive Extensions(System.Reactive). Target is .NET Standard 2.0.</Description>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<Version>5.5.0</Version>
<Version>6.1.3</Version>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<Authors>neuecc xin9le okazuki</Authors>
Expand All @@ -17,13 +17,18 @@
<PackageReleaseNotes>Update dependency library version to System.Reactive 4.1.0</PackageReleaseNotes>
<NeutralLanguage>en-US</NeutralLanguage>
<AutoGenerateBindingRedirects>True</AutoGenerateBindingRedirects>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<OutputPath>..\..\Binary</OutputPath>
<DocumentationFile>..\..\Binary\netstandard2.0\ReactiveProperty.xml</DocumentationFile>
</PropertyGroup>

<ItemGroup>
<Compile Include="..\ReactiveProperty.Platform.Shared\Version.cs" Link="Version.cs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
<PackageReference Include="System.Reactive" Version="4.1.5" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("5.5.0.0")]
[assembly: AssemblyFileVersion("5.5.0.0")]
[assembly: AssemblyVersion(Reactive.Bindings.Version.Number)]
[assembly: AssemblyFileVersion(Reactive.Bindings.Version.Number)]
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\ReactiveProperty.Platform.Shared\Version.cs">
<Link>Version.cs</Link>
</Compile>
<Compile Include="BindingSupportExtensions.cs" />
<Compile Include="Extensions\ViewEventExtensions.cs" />
<Compile Include="Internal\AccessorCache.cs" />
Expand Down
Loading

0 comments on commit 92ccaa5

Please sign in to comment.