Permalink
Browse files

Deploy the netstandard1.6 binaries to the nuget packages and the zip …

…file (#3936)

* RavenDB-4706 "Index name cannot contain // (double slashes)." A bug is creating an auto index with an invalid name.

* RavenDB-4706 Add a test

* WIP - Update DNX client support to dotnet core

* Fix json.net to support dotnet core. Now we do have the MemberTypes in dotnet core, so we should remove it.

* Reference .xproj files of Raven.Abstractions and Sparrow from .csproj

* .xproj doesn't let to set the OutputPath

* Raven.Client.Lightweight now compiles on net45 using .xproj

* Make the code compile on dotnet core by adding a missing reference

* Reference the Raven.Client.Lightweight.xproj from .csproj

* Use .xproj project for Raven.Client.Authorization and Raven.Client.UniqueConstraints

* Make tests compile on dotnet core

* Reference the Raven.Tests.Core.xproj from .csproj

* Add Raven.Tests.Core.xproj

* Update NuGet.exe

* Remove files like: Raven.Abstractions.project.json

* Reference the xproj files

* Better compilation script for dotnet core

* Use common assembly info

* Change the include

* Remove files

* Remove the tryouts

* Remove unused package

* Use netstandard1.6

* Use csproj instead of xproj in sln file

* Add project specific json file for msbuild

* Add Raven.Tests.Core.project.json

* Make the Raven.Tests.Core.csproj compile

* Remove not exist files

* Bring back Aliases to Raven.Tests.Bundles.csproj

* Use csproj instead of xproj in zzz_RavenDB_Release.sln

* Deploy the netstandard1.6 binaries to the nuget packages and the zip file

* Fix not valid json which broke the build script
  • Loading branch information...
1 parent df1ff4d commit ffcdecf93c1f5ce14b941aa8dc00f99045f43476 @fitzchak fitzchak committed with ayende Jul 5, 2016
Showing with 718 additions and 1,313 deletions.
  1. BIN .nuget/NuGet.exe
  2. +1 −1 Bundles/Raven.Bundles.Authorization/Raven.Bundles.Authorization.csproj
  3. +2 −2 Bundles/Raven.Client.Authorization/Raven.Client.Authorization.csproj
  4. +1 −1 Bundles/Raven.Client.Authorization/Raven.Client.Authorization.project.json
  5. +1 −1 Bundles/Raven.Client.Authorization/Raven.Client.Authorization.xproj
  6. +34 −10 Bundles/Raven.Client.Authorization/project.json
  7. +1 −1 Bundles/Raven.Client.UniqueConstraints/Raven.Client.UniqueConstraints.csproj
  8. +1 −1 Bundles/Raven.Client.UniqueConstraints/Raven.Client.UniqueConstraints.project.json
  9. +1 −1 Bundles/Raven.Client.UniqueConstraints/Raven.Client.UniqueConstraints.xproj
  10. +35 −9 Bundles/Raven.Client.UniqueConstraints/project.json
  11. +0 −51 Imports/Newtonsoft.Json/Src/Newtonsoft.Json.Tests/project.json
  12. +0 −11 Imports/Newtonsoft.Json/Src/Newtonsoft.Json/Utilities/ReflectionUtils.cs
  13. +0 −13 Imports/Newtonsoft.Json/Src/Newtonsoft.Json/Utilities/TypeExtensions.cs
  14. +1 −1 Rachis/Rachis.Tests/Rachis.Tests.csproj
  15. +0 −1 Raven.Abstractions/Raven.Abstractions.csproj
  16. +1 −1 Raven.Abstractions/Raven.Abstractions.project.json
  17. +4 −14 Raven.Abstractions/Raven.Abstractions.xproj
  18. +0 −27 Raven.Abstractions/Util/ConfigurationManager.cs
  19. +63 −21 Raven.Abstractions/project.json
  20. +98 −38 Raven.Client.Lightweight/Document/Subscription.cs
  21. +3 −2 Raven.Client.Lightweight/DocumentStoreBase.cs
  22. +28 −8 Raven.Client.Lightweight/FileSystem/AsyncFilesSession.cs
  23. +1 −1 Raven.Client.Lightweight/Raven.Client.Lightweight.csproj
  24. +1 −1 Raven.Client.Lightweight/Raven.Client.Lightweight.project.json
  25. +1 −1 Raven.Client.Lightweight/Raven.Client.Lightweight.xproj
  26. +44 −15 Raven.Client.Lightweight/project.json
  27. +1 −1 Raven.Database/Raven.Database.csproj
  28. +1 −1 Raven.Monitor/Raven.Monitor.csproj
  29. +0 −36 Raven.Sparrow/Sparrow.Tests/Properties/AssemblyInfo.cs
  30. +3 −1 Raven.Sparrow/Sparrow.Tests/Sparrow.Tests.csproj
  31. +0 −36 Raven.Sparrow/Sparrow.Tryout/Properties/AssemblyInfo.cs
  32. +4 −2 Raven.Sparrow/Sparrow.Tryout/Sparrow.Tryout.csproj
  33. +1 −1 Raven.Sparrow/Sparrow/Sparrow.csproj
  34. +1 −1 Raven.Sparrow/Sparrow/Sparrow.project.json
  35. +3 −9 Raven.Sparrow/Sparrow/Sparrow.xproj
  36. +28 −7 Raven.Sparrow/Sparrow/project.json
  37. +2 −2 Raven.Tests.Common/Raven.Tests.Common.csproj
  38. +38 −35 Raven.Tests.Core/BulkInsert/ChunkedBulkInsert.cs
  39. +32 −0 Raven.Tests.Core/ChangesApi/ActionObserver.cs
  40. +96 −60 Raven.Tests.Core/ChangesApi/Subscribing.cs
  41. +1 −0 Raven.Tests.Core/Raven.Tests.Core.csproj
  42. +1 −1 Raven.Tests.Core/Raven.Tests.Core.project.json
  43. +1 −1 Raven.Tests.Core/Raven.Tests.Core.xproj
  44. +20 −13 Raven.Tests.Core/project.json
  45. +1 −1 Raven.Tests.Issues/Raven.Tests.Issues.csproj
  46. +2 −2 Raven.Tests.Raft/Raven.Tests.Raft.csproj
  47. +2 −2 Raven.Tests.Web/Raven.Tests.Web.csproj
  48. +1 −1 Raven.Tests/Raven.Tests.csproj
  49. +1 −1 Raven.Tryouts/Raven.Tryouts.csproj
  50. +0 −571 Raven.Tryouts/Raven.Tryouts.project.json
  51. +1 −1 Raven.Tryouts/Raven.Tryouts.xproj
  52. +0 −32 Raven.Tryouts/project.json
  53. +1 −1 Raven.Voron/Voron.Tests/Voron.Tests.csproj
  54. +1 −2 Raven.Voron/Voron/Voron.csproj
  55. +0 −4 Raven.Voron/Voron/packages.config
  56. +47 −134 RavenDB.sln
  57. +33 −47 default.ps1
  58. +2 −2 global.json
  59. +71 −72 zzz_RavenDB_Release.sln
View
Binary file not shown.
@@ -98,7 +98,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Raven.Abstractions\Raven.Abstractions.csproj">
- <Project>{41ac479e-1eb2-4d23-aaf2-e4c8df1bc2ba}</Project>
+ <Project>{41AC479E-1EB2-4D23-AAF2-E4C8DF1BC2BA}</Project>
<Name>Raven.Abstractions</Name>
</ProjectReference>
<ProjectReference Include="..\..\Raven.Database\Raven.Database.csproj">
@@ -96,7 +96,7 @@
<Name>Raven.Abstractions</Name>
</ProjectReference>
<ProjectReference Include="..\..\Raven.Client.Lightweight\Raven.Client.Lightweight.csproj">
- <Project>{4e087ecb-e7ca-4891-ac3c-3c76702715b6}</Project>
+ <Project>{4E087ECB-E7CA-4891-AC3C-3C76702715B6}</Project>
<Name>Raven.Client.Lightweight</Name>
</ProjectReference>
</ItemGroup>
@@ -105,7 +105,7 @@
<Link>RavenDB.snk</Link>
</None>
<None Include="app.config" />
- <None Include="packages.config" />
+ <None Include="Raven.Client.Authorization.project.json" />
</ItemGroup>
<ItemGroup>
<Content Include="FodyWeavers.xml" />
@@ -1,4 +1,4 @@
-{
+{
"frameworks": {
"net45": { }
},
@@ -9,7 +9,7 @@
<ProjectGuid>43ebd466-4a7b-4cf3-85cd-72fecee22986</ProjectGuid>
<RootNamespace>Raven.Client.Authorization</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
- <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+ <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
@@ -1,19 +1,43 @@
{
"version": "3.5.0",
- "compile": [
- "**/*.cs",
- "../Raven.Bundles.Authorization/Model/*.cs",
- "../Raven.Bundles.Authorization/OperationAllowedResult.cs",
- "../../CommonAssemblyInfo.cs"
- ],
- "frameworks": {
- "dnxcore50": {
- "dependencies": {
+
+ "buildOptions": {
+ "compile": [
+ "**/*.cs",
+ "../Raven.Bundles.Authorization/Model/*.cs",
+ "../Raven.Bundles.Authorization/OperationAllowedResult.cs",
+ "../../CommonAssemblyInfo.cs"
+ ]
+ },
+
+ "configurations": {
+ "Release": {
+ "buildOptions": {
+ "optimize": true
}
}
},
+
"dependencies": {
"Raven.Abstractions": "3.5.0",
"Raven.Client.Lightweight": "3.5.0"
+ },
+
+ "frameworks": {
+ "net45": {
+ "buildOptions": {
+ "define": [ "NET4_5" ]
+ }
+ },
+
+ "netstandard1.6": {
+ "imports": "dnxcore50",
+ "buildOptions": {
+ "define": [ "DNXCORE50", "PORTABLE", "DOTNET" ]
+ }
+ }
+ },
+
+ "runtimes": {
}
-}
+}
@@ -92,7 +92,7 @@
<Link>RavenDB.snk</Link>
</None>
<None Include="app.config" />
- <None Include="packages.config" />
+ <None Include="Raven.Client.UniqueConstraints.project.json" />
</ItemGroup>
<ItemGroup>
<Content Include="FodyWeavers.xml" />
@@ -1,4 +1,4 @@
-{
+{
"frameworks": {
"net45": { }
},
@@ -9,7 +9,7 @@
<ProjectGuid>674195ae-d3eb-47c2-a2d7-f0096414507d</ProjectGuid>
<RootNamespace>Raven.Client.UniqueConstraints2</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
- <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+ <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
@@ -1,19 +1,45 @@
{
"version": "3.5.0",
- "compile": [
- "**/*.cs",
- "../Raven.Bundles.UniqueConstraints/Constants.cs",
- "../../CommonAssemblyInfo.cs"
- ],
- "frameworks": {
- "dnxcore50": {
- "dependencies": {
- "System.Reflection.Extensions": "4.0.1-beta-23516"
+
+ "buildOptions": {
+ "compile": [
+ "**/*.cs",
+ "../Raven.Bundles.UniqueConstraints/Constants.cs",
+ "../../CommonAssemblyInfo.cs"
+ ]
+ },
+
+ "configurations": {
+ "Release": {
+ "buildOptions": {
+ "optimize": true
}
}
},
+
"dependencies": {
"Raven.Abstractions": "3.5.0",
"Raven.Client.Lightweight": "3.5.0"
+ },
+
+ "frameworks": {
+ "net45": {
+ "buildOptions": {
+ "define": [ "NET4_5" ]
+ }
+ },
+
+ "netstandard1.6": {
+ "imports": "dnxcore50",
+ "buildOptions": {
+ "define": [ "DNXCORE50", "PORTABLE", "DOTNET" ]
+ },
+ "dependencies": {
+ "System.Reflection.Extensions": "4.0.1"
+ }
+ }
+ },
+
+ "runtimes": {
}
}
@@ -1,51 +0,0 @@
-{
- "version": "1.0.0-*",
- "compilationOptions": {
- "define": []
- },
- "exclude":[
- "LinqToSql",
- "Documentation",
- "FileSystemEntityModel.Designer.cs"
- ],
- "dependencies": {
- "Newtonsoft.Json": "6.0.6"
- },
- "commands": {
- "test": "Xunit.KRunner"
- },
- "frameworks": {
- "dnxcore50": {
- "dependencies": {
- "Microsoft.CSharp": "4.0.0-beta-*",
- "System.Collections": "4.0.10-beta-*",
- "System.ComponentModel.TypeConverter": "4.0.0-beta-*",
- "System.Diagnostics.Debug": "4.0.10-beta-*",
- "System.Dynamic.Runtime": "4.0.0-beta-*",
- "System.Globalization": "4.0.10-beta-*",
- "System.IO": "4.0.10-beta-*",
- "System.Linq": "4.0.0-beta-*",
- "System.Linq.Expressions": "4.0.0-beta-*",
- "System.Reflection.Extensions": "4.0.0-beta-*",
- "System.Reflection.TypeExtensions": "4.0.0-beta-*",
- "System.Runtime": "4.0.20-beta-*",
- "System.Runtime.Extensions": "4.0.10-beta-*",
- "System.Runtime.Serialization.Primitives": "4.0.0-beta-*",
- "System.Runtime.Numerics": "4.0.0-beta-*",
- "System.Runtime.Serialization.Json": "4.0.0-beta-*",
- "System.Runtime.Serialization.Xml": "4.0.0-beta-*",
- "System.Reflection.Emit.ILGeneration": "4.0.0-beta-*",
- "System.Text.Encoding": "4.0.10-beta-*",
- "System.Text.RegularExpressions": "4.0.0-beta-*",
- "System.Text.Encoding.Extensions": "4.0.10-beta-*",
- "System.Text.Encoding.CodePages": "4.0.0-beta-*",
- "System.Threading": "4.0.0-beta-*",
- "System.Xml.XDocument": "4.0.0-beta-*",
- "System.Xml.XmlDocument": "4.0.0-beta-*",
- "System.Xml.XmlSerializer": "4.0.0-beta-*",
- "System.Xml.ReaderWriter": "4.0.10-beta-*",
- "Microsoft.Bcl.Immutable": "1.1.20-beta"
- }
- }
- }
-}
@@ -43,17 +43,6 @@
namespace Raven.Imports.Newtonsoft.Json.Utilities
{
-#if (NETFX_CORE || PORTABLE || PORTABLE40)
- internal enum MemberTypes
- {
- Property = 0,
- Field = 1,
- Event = 2,
- Method = 3,
- Other = 4
- }
-#endif
-
#if (NETFX_CORE || PORTABLE) && !DNXCORE50
[Flags]
internal enum BindingFlags
@@ -99,20 +99,7 @@ public static MethodInfo Method(this Delegate d)
public static MemberTypes MemberType(this MemberInfo memberInfo)
{
-#if !(NETFX_CORE || PORTABLE || PORTABLE40)
return memberInfo.MemberType;
-#else
- if (memberInfo is PropertyInfo)
- return MemberTypes.Property;
- else if (memberInfo is FieldInfo)
- return MemberTypes.Field;
- else if (memberInfo is EventInfo)
- return MemberTypes.Event;
- else if (memberInfo is MethodInfo)
- return MemberTypes.Method;
- else
- return MemberTypes.Other;
-#endif
}
public static bool ContainsGenericParameters(this Type type)
@@ -139,7 +139,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Raven.Abstractions\Raven.Abstractions.csproj">
- <Project>{41ac479e-1eb2-4d23-aaf2-e4c8df1bc2ba}</Project>
+ <Project>{41AC479E-1EB2-4D23-AAF2-E4C8DF1BC2BA}</Project>
<Name>Raven.Abstractions</Name>
</ProjectReference>
<ProjectReference Include="..\..\Raven.Voron\Voron\Voron.csproj">
@@ -483,7 +483,6 @@
<Compile Include="Util\AsyncManualResetEvent.cs" />
<Compile Include="Util\AtomicDictionary.cs" />
<Compile Include="Util\Base62Util.cs" />
- <Compile Include="Util\ConfigurationManager.cs" />
<Compile Include="Util\EnvironmentUtils.cs" />
<Compile Include="Util\Streams\BufferPoolMemoryStream.cs" />
<Compile Include="Util\ComparableByteArray.cs" />
@@ -1,4 +1,4 @@
-{
+{
"frameworks": {
"net45": {
"dependencies": {
@@ -4,26 +4,16 @@
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
- <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
+ <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>b47725e6-abb2-411f-9487-004d05ff3581</ProjectGuid>
<RootNamespace>Raven.Abstractions</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
- <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+ <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
- <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
- <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
- </PropertyGroup>
- <ItemGroup>
- <Compile Include="..\CommonAssemblyInfo.cs">
- <Link>Properties\CommonAssemblyInfo.cs</Link>
- </Compile>
- </ItemGroup>
- <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
+ <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
@@ -1,27 +0,0 @@
-#if DNXCORE50
-using Microsoft.Framework.ConfigurationModel;
-#endif
-
-namespace Raven.Abstractions.Util
-{
- public static class ConfigurationManager
- {
-#if DNXCORE50
- private static readonly Configuration configuration;
-
- static ConfigurationManager()
- {
- configuration = new Configuration();
- }
-#endif
-
- public static string GetAppSetting(string key)
- {
-#if DNXCORE50
- return configuration.Get(key);
-#else
- return System.Configuration.ConfigurationManager.AppSettings[key];
-#endif
- }
- }
-}
Oops, something went wrong.

0 comments on commit ffcdecf

Please sign in to comment.