Skip to content
This repository was archived by the owner on Dec 24, 2022. It is now read-only.

Commit 6d9e8d7

Browse files
OlegNadymovOlegNadymov
authored
Merge pull request #6 from ServiceStack/master
Merge from upstream 30.11.2016
2 parents b7f87f7 + 10b19cf commit 6d9e8d7

File tree

110 files changed

+1122
-572
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+1122
-572
lines changed

‎build/build-core.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,15 @@ echo replace AssemblyFileVersion
2323
find ./src -type f -name "AssemblyInfo.cs" -exec sed -i "s/AssemblyFileVersion(\"[^\"]\+\")/AssemblyFileVersion(\"${Version}\")/g" {} +
2424

2525
echo replace project.json
26-
find ./src -type f -name "project.json" -exec sed -i "s/\"version\": \"[^\"]\+\"/\"version\": \"${Version}\"/g" {} +
26+
sed -i "s/\"version\": \"[^\"]\+\"/\"version\": \"${Version}\"/g" ./src/ServiceStack.OrmLite/project.json
27+
sed -i "s/\"version\": \"[^\"]\+\"/\"version\": \"${Version}\"/g" ./src/ServiceStack.OrmLite.PostgreSQL/project.json
28+
sed -i "s/\"version\": \"[^\"]\+\"/\"version\": \"${Version}\"/g" ./src/ServiceStack.OrmLite.SqlServer/project.json
29+
sed -i "s/\"version\": \"[^\"]\+\"/\"version\": \"${Version}\"/g" ./src/ServiceStack.OrmLite.Sqlite/project.json
30+
sed -i "s/\"version\": \"[^\"]\+\"/\"version\": \"${Version}\"/g" ./src/ServiceStack.Text/project.json
31+
sed -i "s/\"version\": \"[^\"]\+\"/\"version\": \"${Version}\"/g" ./src/ServiceStack.Client/project.json
32+
sed -i "s/\"version\": \"[^\"]\+\"/\"version\": \"${Version}\"/g" ./src/ServiceStack.Common/project.json
33+
sed -i "s/\"version\": \"[^\"]\+\"/\"version\": \"${Version}\"/g" ./src/ServiceStack.Interfaces/project.json
34+
2735

2836
echo replace package
2937
find ./NuGet.Core -type f -name "*.nuspec" -exec sed -i "s/<version>[^<]\+/<version>${PackageVersion}/g" {} +

‎lib/ServiceStack.Client.dll

0 Bytes
Binary file not shown.

‎lib/ServiceStack.Common.dll

0 Bytes
Binary file not shown.

‎lib/ServiceStack.Interfaces.dll

1.5 KB
Binary file not shown.

‎lib/ServiceStack.Text.dll

512 Bytes
Binary file not shown.

‎lib/ServiceStack.Text.pdb

2 KB
Binary file not shown.

‎lib/netstandard1.1/ServiceStack.Interfaces.deps.json

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -284,132 +284,132 @@
284284
"Microsoft.NETCore.Platforms/1.0.1": {
285285
"type": "package",
286286
"serviceable": true,
287-
"sha512": "sha512-AuiI4ZxFqt9sDBiIbgT92TSzC25YOY8cA+2VpfHqyXcXpz9pp7Su//rPZmtGl7ovEE3AFFjRrgMuaqxDxq/p0g=="
287+
"sha512": "sha512-Qkf0b5jVmurSJyGts1NQ6KCrw/ykB+uRSyiZzxNIz0hKJ59drPSY+8Rb8/nXmN3Ar8sO0VL/+91VjlBjbDo+Bw=="
288288
},
289289
"Microsoft.NETCore.Targets/1.0.1": {
290290
"type": "package",
291291
"serviceable": true,
292-
"sha512": "sha512-PPc2oYN8VMKhKkCwyOk94mtf63cutoBgwp9rP6PIoMh8w7gFnUWip/sl8+xtFYexDiPHHbXx+PX5ulZPH0BXaQ=="
292+
"sha512": "sha512-woSgWTniX+PUs0UfTvRyTzZXCx1sbhn0/oeRMNnLPNywMhc7lJWzJwhoK4QdQvuMtefSZXvwEencBVmULSY11A=="
293293
},
294294
"NETStandard.Library/1.6.0": {
295295
"type": "package",
296296
"serviceable": true,
297-
"sha512": "sha512-bNoEfVhCVbgLMYHLcB1gI6AsPiB7r5nDHFsCzCygNCUfFlSgOJL038iqSFhapXVV3V98h60lBfIQ0HHQqj8/8g=="
297+
"sha512": "sha512-1f1f5BElDr9jmgvGIFRFvUTsZK7omNVoVTrfIiHNmN6VHUPQwj6jmiJbRwTZKU6sR/qLjz9bpVKdhMmRcvd7Yg=="
298298
},
299299
"runtime.native.System/4.0.0": {
300300
"type": "package",
301301
"serviceable": true,
302-
"sha512": "sha512-uxDsy7oPffaCxj52dV8rSzNFyvvwpFHHptYWo4ToGvd+MhfaLgM244uGnbzQ1t+hSbZJCkwQilWFMcfXxiIiVQ=="
302+
"sha512": "sha512-dYvT9BZVAXnQDczzkLR7OLqHtx0P8C2u7yPMT0A9lJiaXizeEr0Sq8KGHtWw0vrMGJIhC2tEDnk/rEmix7xvFA=="
303303
},
304304
"System.Collections/4.0.11": {
305305
"type": "package",
306306
"serviceable": true,
307-
"sha512": "sha512-VmHryoBwnRQx3fz6fPtRH2Xl7TC5GQJ5L2H1JIZZGeSMMtcDemBjTDrDzMJCnyN/XBb3nSOXHlQJhKhzU0VRqg=="
307+
"sha512": "sha512-H1xpPt68Ybp+x4vziFVydxl8VqCxplIwQQjUKTLd7teWJ3qyLiAfctntjydePapvxV6LWkSv+w83wlptjjzSGQ=="
308308
},
309309
"System.Collections.Concurrent/4.0.12": {
310310
"type": "package",
311311
"serviceable": true,
312-
"sha512": "sha512-+Ok1+hnWZ5rRhwr6ty1iYCAVH8wXx1aIVSVhVSZcyzlJcG6YNfHxgGXtJi0fm6jh4PEcxpEWdh4lE3877P88Fg=="
312+
"sha512": "sha512-CVwx4AkvIvfaEZL749N/YetFNOpY0gFSaB1YUDvrMsD/spm44Dv6EkRa479RmvL+3CSH65mfjTbOlAFcRy0qzg=="
313313
},
314314
"System.Diagnostics.Debug/4.0.11": {
315315
"type": "package",
316316
"serviceable": true,
317-
"sha512": "sha512-S62MHt4uEhX1CQ49ymUXiRx78eRB/JosH/o62tU0CBnrQaJ9UN3Qg1wiVSOqd9xfgzB981Si1kBokaJhW0N+5g=="
317+
"sha512": "sha512-D+qY0fEVrB0HAgaeqkHyl+lw0j0T7ml41CFMGhDFAyuR70DNUEt0uX9bnZ8NFmgW9OwH4bo6p6mOO5+oEBiIaw=="
318318
},
319319
"System.Diagnostics.Tools/4.0.1": {
320320
"type": "package",
321321
"serviceable": true,
322-
"sha512": "sha512-XQ6KjwwkGIQqPkDi9ru320X5K3scsiBRCDwYVKBvYKUkHOnnjp5dlqLRfLZ7OaCPwql/3EiOXZemZ4nRsC3qrg=="
322+
"sha512": "sha512-50B15ESJFPA9k5Hg59AqYnPJOBxwYde88pu1DeXkQkJUeUercvv4WEAebXTEcI5pzX5gwbTAyjHqVg6wY6ipzQ=="
323323
},
324324
"System.Diagnostics.Tracing/4.1.0": {
325325
"type": "package",
326326
"serviceable": true,
327-
"sha512": "sha512-SgYmK0myHMZD5hXDPRroeviesDAvFpZ6SItj+mzPEdyA/NX8PoEXBx1BvpQsGaxeK2pOQ5IBBl4xNM4I88ufTQ=="
327+
"sha512": "sha512-/GYpoJLNumZAaRu8phpTRdjvSBqJOmefQOOEktaJFUG1bj4IHRXhiyOC1avoVSWBPL7iCJaOBeHxnuv11IGbVw=="
328328
},
329329
"System.Globalization/4.0.11": {
330330
"type": "package",
331331
"serviceable": true,
332-
"sha512": "sha512-MuHuQIxNFC3ndnLcdZkKqBx0wiVbtrUaZ+z7R+stGWdj628/F4bX0XAKj/vT4aV1joBVQDQQig6Of76dBE3r/Q=="
332+
"sha512": "sha512-PhFXoTqNzq85B/VIKl0fRlBazZwaGfhi3zuX9hbjqJwoOVbzUOXbtu39I/RmekzFBA/1crc9M5eZBpIufCt0uw=="
333333
},
334334
"System.IO/4.1.0": {
335335
"type": "package",
336336
"serviceable": true,
337-
"sha512": "sha512-OtfvEnXecJm1DHz5gVwXg0az/+PgihpYEL7vPrpEI6XtSNndHybSODLjXt4rx7RSHuN6vm7DBL0+rUe6LJizsg=="
337+
"sha512": "sha512-v8KrK9Bst0NVG0T6y74495lxx0rMJP2hsxL/wgBo6TXEyc0/RwU3UIziiXsywpWYI4b7g2ZaOmw0JojL/mj0kw=="
338338
},
339339
"System.IO.Compression/4.1.0": {
340340
"type": "package",
341341
"serviceable": true,
342-
"sha512": "sha512-zOVmLCWb3aVDcBP2Oelu8mCS1dCoTaSFOpQbQpijuPeQxQPm6fTLEdwVULLvLVn/cYCS8ywiWEMh4nrO04kWQA=="
342+
"sha512": "sha512-s1TqMzqweaeRh4cj0ziwAOkfeH/9lDFz23r7WPp8sE7aKqB5XQyd/22L1WuCVHxp38TjsK4hcffkFwaBqXdjEg=="
343343
},
344344
"System.Linq/4.1.0": {
345345
"type": "package",
346346
"serviceable": true,
347-
"sha512": "sha512-q0/YgSzkxZo1atYrpJeRWnp/s3kmHkZLHhtLbqhQhXA/FHu3yhSrtaSYNEg3eH/HehNgdGq9XdXEtS23LTIcZw=="
347+
"sha512": "sha512-9YthdfSFmMYPZdpW6aHMVYfg0+/jwkSfeC1aBlTCbJEF1NYYufMBLM5sta+hB0hYKnSDNVwjrgPr/jnTZmUgHg=="
348348
},
349349
"System.Linq.Expressions/4.1.0": {
350350
"type": "package",
351351
"serviceable": true,
352-
"sha512": "sha512-/wBF/fAkXw93UwlLgQso99lk5MQQIXTIk0nvQTiToGchSqs0FwVhH/OmG9X0Zfm7LDeCXXtPKOVJ0tUXEc7Rhw=="
352+
"sha512": "sha512-GhJqkXNnPKOlqg7kM/jt3AhEcMSeo1zhj5n5QN+sgjJOJ47ZdGcOMTcgg9MTWBUfg+zmp8FhctkGVMVQ80WF9A=="
353353
},
354354
"System.Net.Http/4.1.0": {
355355
"type": "package",
356356
"serviceable": true,
357-
"sha512": "sha512-70DAk8tjoKYgYrV/3UArC7xo36hzK/Jaysxhi06SbC4R4aDU8wo7Y0ZrGOtyeRBedAqDaJSJ470JaCdId2TK+g=="
357+
"sha512": "sha512-a9U5YTufuVBBcEZc5ROTZe+J0XLSEDwLJ1/8q1Ox8t6ge5nq03GyeVU0vmjsjUqIj7MhMfiNbGWzUlcluzdFUg=="
358358
},
359359
"System.Net.Primitives/4.0.11": {
360360
"type": "package",
361361
"serviceable": true,
362-
"sha512": "sha512-tl/51pHaQVIMdpeuDx+s5IzfxluITA9ZWcBESpukkM70qKnMFRHcDae20oqW9rruJd60R56iuKjLn/ftua/UxQ=="
362+
"sha512": "sha512-J7RRG8BSh3V5A/mrEbOMjOPhYGCDGP8RMAIUY9kV6Mn0VohVuFTQpcReQ0ysF0L3KTnrhQAZ+oYOW0nBbatH1Q=="
363363
},
364364
"System.ObjectModel/4.0.12": {
365365
"type": "package",
366366
"serviceable": true,
367-
"sha512": "sha512-quRSAXHHbWah/5QPbkmZP4SsAvBi+SO5OVBzCK+cfeBvww1QqKpNXs8SWrCllPO0yC8cgPKoByLZix2+WajAkw=="
367+
"sha512": "sha512-YfRHwBSdp7q4G7wLz8zfQnEnF7qxIYQLlpvsEshUmCYy1h/VvVQMqFkPnmr2xtlNv/bWRELJYdn2Ne9TaE4CfQ=="
368368
},
369369
"System.Reflection/4.1.0": {
370370
"type": "package",
371371
"serviceable": true,
372-
"sha512": "sha512-BHn7GJpu7Wvh2Vh8CQuPIcxkm0tHtdc18VJ65jETI0tyUJlDjmoj5FYk5owpwJK2ecHd1LFexMDjtci2E+fj9g=="
372+
"sha512": "sha512-5kGUF30YxHiqTy/vztTk5XGiEy7/Kd21oA2RmK3SVo+vrwcuInQx+BAvC5+torQNKv9UStWQpOW8T6MhTqBODg=="
373373
},
374374
"System.Reflection.Extensions/4.0.1": {
375375
"type": "package",
376376
"serviceable": true,
377-
"sha512": "sha512-UxdaA7ySJOv/1+7ZDKX6azEaKqq7PcqyByf4pqrM+CCI0Kf4qe6Jy7+Z9/yYp2n/UhfwKNHN6vdrhafQdyywIQ=="
377+
"sha512": "sha512-pbu4mxs9FUfcJfFCiMetbwKU0qXoUQGaAcTcxRVv8+ZKrsrhuIzLdiQ/9mnMe3p1jHvTZ9PTvMV351NUwZ2/iA=="
378378
},
379379
"System.Reflection.Primitives/4.0.1": {
380380
"type": "package",
381381
"serviceable": true,
382-
"sha512": "sha512-VHYeBsjjapUidsdcqf4Pb2Q8Dp51z6JPE5ACoQMM/XzxAkf0NjxVuG3b/WRmx08bX5dSErlXpp7+PIm7pXFVTg=="
382+
"sha512": "sha512-5zUJswVZMUTN/7ge1y2axR9k76fgfM6aBqVNnYMiPa+V2v1xQf5nBfuAxWizqox6JtJFKtAcn9JsV1Fkf0dzpg=="
383383
},
384384
"System.Resources.ResourceManager/4.0.1": {
385385
"type": "package",
386386
"serviceable": true,
387-
"sha512": "sha512-KIRQz3lLz1RboyW9S7+KnwxKJz0WCL7AgD6dDAI1haKOPKpYrlPErQsWxuxDU+G4TVBXrH0bj03THc9JEXiq3Q=="
387+
"sha512": "sha512-i0tRoia6devfLZxJ6X5iMb3htkte0MsPbWPhyNNeFtsbITeqvv2xzlT9Q8oc7XRYkeBwXdPSk7sYwM3AD1kU1g=="
388388
},
389389
"System.Runtime/4.1.0": {
390390
"type": "package",
391391
"serviceable": true,
392-
"sha512": "sha512-d5JHGNNxNcvc0eGihw9SxQeIMO0Jj3zXwG735XwZu7uDNQP9aIHu5XaxqxBlN00LUpildp7rTRY4/ZiK7ZAHNw=="
392+
"sha512": "sha512-mAEjfjsdtet4fpsr7IUHTq0tSMVdaML22AwowcG2Sz3wd+Hx3XW9ZB30phZ3VkFUo3dptR18rag17mzx3Fus4Q=="
393393
},
394394
"System.Runtime.Extensions/4.1.0": {
395395
"type": "package",
396396
"serviceable": true,
397-
"sha512": "sha512-nQRf6j90Q46wMHIjFv1GNLFLUlGHzI0tZHOpPLuZyIpHwBP8UFZyWWmHT6Keuoj0YF8nqtCb6F1GrGD5v54bMw=="
397+
"sha512": "sha512-KLm307+dNR5U0zs8zwyGFoYjfgQAjzsYurVi8QUmQQFZj0G4TUp+pFckkBad/JzMp0eCDjwCssvY+vrDuwovkQ=="
398398
},
399399
"System.Runtime.InteropServices/4.1.0": {
400400
"type": "package",
401401
"serviceable": true,
402-
"sha512": "sha512-sGBGGySub1wdRddl8qFddrNMPYfOv/c79TrREDnjMFvBWzpPubcHozndOoHJpD/4tOyi4dmzuRckAyskjdjgEA=="
402+
"sha512": "sha512-LtfkuvdefkX+I0QDAQxeSaOc+J9jbl9mfcUvsY1E1zM5CWaW1DnDYNP/TIi01mgBvcbWv6EM/R2g8MuEh1xWvQ=="
403403
},
404404
"System.Runtime.InteropServices.RuntimeInformation/4.0.0": {
405405
"type": "package",
406406
"serviceable": true,
407-
"sha512": "sha512-h+udLu2uLKD4y10y/+Uk6Vo55hcXh0scA1vsnXcmtI7NdeoMY1Wm+jFxbCFLB8IjD60Eq4bm3mFY6NjQEuZ2Rg=="
407+
"sha512": "sha512-nzu/g3sMbDThmr0a9HqyNT768clFzQmfFeluH315SWY+2jBMqYX+a1rHdBuQbZZ0EteBt5daX3ZxSAC2bzUI4Q=="
408408
},
409409
"System.Runtime.Numerics/4.0.1": {
410410
"type": "package",
411411
"serviceable": true,
412-
"sha512": "sha512-WtjbB9oVJnc0O3+xjloU7TZjmO3X41jF4ypeuIlvlEJxf1t9wYij89bOIF+0wzz6FO6x7420CFdnDOmyPCRf5A=="
412+
"sha512": "sha512-qLInCPqxB34+VV3SK1UVsUjGAGXYbgxMuCvg9qUqd6+PDyPF7olMUs7CmvuyTNT4tndYzsUW/vbiF97+DjRemA=="
413413
},
414414
"System.Runtime.Serialization.Primitives/4.1.1": {
415415
"type": "package",
@@ -419,37 +419,37 @@
419419
"System.Text.Encoding/4.0.11": {
420420
"type": "package",
421421
"serviceable": true,
422-
"sha512": "sha512-hzeM2B7LYy/HkddegftSFlMD8tqgPpPw+fkw/bhdnMaEPfC+c7+B+VnJzjwILccK158SOJHvKQA84MoTdVzz3w=="
422+
"sha512": "sha512-NZstDbRv2D+HpaOnG9WBa/NimW5/FNAQeUz40/Hps/8XG/HxaMtwszt7m8RBNbzGVU5UtWCLlE2LPQoPNeGAPQ=="
423423
},
424424
"System.Text.Encoding.Extensions/4.0.11": {
425425
"type": "package",
426426
"serviceable": true,
427-
"sha512": "sha512-9EV5G8HSyslKwsO2sNXgOUnRA+Sai5bV7m4WkGOiKNDBzKit2dXQ8nOD34pbt4AMTY33G3LP+JLCMERjp6HSVg=="
427+
"sha512": "sha512-QBDnhgUt/2hwDAolf6Nw0PO/nPrynar2Ri8C92mH3iu5i/6S3i2U4RCFrrUa06RX2Bqo9FpYWT+gPfk1J8GbJA=="
428428
},
429429
"System.Text.RegularExpressions/4.1.0": {
430430
"type": "package",
431431
"serviceable": true,
432-
"sha512": "sha512-CVWIpxR0TE1uCQmpR30VZMRXPXWlAN/1lxGMdBYUBwG9YJIJAFLgp3N5gmt0Y1gp/ZfTilYxwL6KZv4sH81WUQ=="
432+
"sha512": "sha512-RJ2+BU99xwhEstibq07zhGTrCF33t9aKnT558MKRKe8PBNA4NnyKccuJ07xPSY7r8BDDD7zd/1/+jlb9ZoV9tA=="
433433
},
434434
"System.Threading/4.0.11": {
435435
"type": "package",
436436
"serviceable": true,
437-
"sha512": "sha512-XM9KUm5ereNsrSTDxx8qUNyYHCIcSt5trkFY1wXQg+I50DYn+c2DCvhF1gVHEs3lMhBKEvBcIHkDq9HeOHye3w=="
437+
"sha512": "sha512-Mh2NHuUfYze/L//e26YcLzptpHU0ieFQ/Qi62OZ4/gtaP96Z46F8r5qU7BJrlsK/xDbZ3kTRToItkfeG8CcNzg=="
438438
},
439439
"System.Threading.Tasks/4.0.11": {
440440
"type": "package",
441441
"serviceable": true,
442-
"sha512": "sha512-JALRGVfMPNCC2cgQuPPvzH4a0o0yunXmbSlt7Tt2EcRKiYTjdJzJOPTlJnybGXxN0Y1MsgZuxaL8UQKSHvwB8g=="
442+
"sha512": "sha512-GNzFpzEuRu8GVzkz0BqF3x1GWVJctyv0bUOcoXPJ1IKS5eUmqJS0AXe3GA176BS1s45HHpV7Bfgf6/rKknN/2g=="
443443
},
444444
"System.Xml.ReaderWriter/4.0.11": {
445445
"type": "package",
446446
"serviceable": true,
447-
"sha512": "sha512-K1kvZs9CSLy5IOuKdocX9Ktmk1i1QA54h0pS5fIveQW4sRBqTBVVUkRDlp/VTeCRz3f8+sCVxspomiatflIxRg=="
447+
"sha512": "sha512-Meze+GGq2klys0eHZUyMEi8L7ECppJveBG8dveSUhVSqxjhrTUWfzL1fPxoo6wd9sKUHqhPKUjKSJ09EPHZEmw=="
448448
},
449449
"System.Xml.XDocument/4.0.11": {
450450
"type": "package",
451451
"serviceable": true,
452-
"sha512": "sha512-ydVR67d6gEeCt6mpntDAxmdrYkujFLlu4m5pEcqZVy8RtpTHOADxVNT3AxgcTScK3y4WdIJxhROgO8svlexBQw=="
452+
"sha512": "sha512-Oa+Vu3lXK4jhOD/vP3FoC7aHYP0zEYnZ0PZa6aZyBxQGVv+tc57hY1TqiKlyB10sBrH89WOPHHCpYzYVztxpzA=="
453453
}
454454
}
455455
}

‎lib/netstandard1.1/ServiceStack.Interfaces.dll

-2 KB
Binary file not shown.

‎lib/netstandard1.1/ServiceStack.Interfaces.pdb

-227 KB
Binary file not shown.

‎lib/signed/ServiceStack.Common.dll

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)