Skip to content

Commit 664453d

Browse files
kroniakkroniak
committed
Revert old project names and optimize only for Release
1 parent 840a690 commit 664453d

File tree

9 files changed

+79
-37
lines changed

9 files changed

+79
-37
lines changed

‎Flurl.sln

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25123.0
4+
VisualStudioVersion = 14.0.25420.1
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{CF0659E1-9C0D-4D35-8FBA-CC5E94619853}"
77
EndProject
@@ -11,9 +11,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flurl.Test.NET45", "test\Fl
1111
EndProject
1212
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flurl.Test.PCL", "test\Flurl.Test.PCL\Flurl.Test.PCL.csproj", "{49CB777F-D13D-401A-9206-48A6B2ECB276}"
1313
EndProject
14-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Flurl.Http.Library", "src\Flurl.Http.Library\Flurl.Http.Library.xproj", "{52C8C00D-9BD2-4642-B103-F0A8C564FE05}"
14+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Flurl.Http", "src\Flurl.Http\Flurl.Http.xproj", "{52C8C00D-9BD2-4642-B103-F0A8C564FE05}"
1515
EndProject
16-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Flurl.Library", "src\Flurl.Library\Flurl.Library.xproj", "{52CE5E08-8F02-4F75-8B64-8E00E3262A0F}"
16+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Flurl", "src\Flurl\Flurl.xproj", "{52CE5E08-8F02-4F75-8B64-8E00E3262A0F}"
1717
EndProject
1818
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "packageTesters", "packageTesters", "{FA115433-6141-4A60-B3F2-8A5972632B50}"
1919
EndProject
@@ -45,18 +45,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuspec", "nuspec", "{E41F60
4545
EndProject
4646
Global
4747
GlobalSection(SharedMSBuildProjectFiles) = preSolution
48-
Test\Flurl.Test.Shared\Flurl.Test.Shared.projitems*{4c7c0861-84f6-436e-8fa6-4c318b336a7b}*SharedItemsImports = 13
48+
PackageTesters\PackageTester.Shared\PackageTester.Shared.projitems*{0a32978c-bc48-4dfb-b1f7-b88541b0d686}*SharedItemsImports = 4
4949
PackageTesters\PackageTester.Shared\PackageTester.Shared.projitems*{19c1befd-9df7-4efa-9d7d-37b0dc6eef54}*SharedItemsImports = 13
50+
src\Flurl.Http.Shared\Flurl.Http.Shared.projitems*{3f6be828-fa29-429e-99e1-f1fcdfdc1205}*SharedItemsImports = 4
51+
src\Flurl.Shared\Flurl.Shared.projitems*{3f6be828-fa29-429e-99e1-f1fcdfdc1205}*SharedItemsImports = 4
52+
Test\Flurl.Test.Shared\Flurl.Test.Shared.projitems*{3f6be828-fa29-429e-99e1-f1fcdfdc1205}*SharedItemsImports = 4
5053
src\Flurl.Http.Shared\Flurl.Http.Shared.projitems*{49cb777f-d13d-401a-9206-48a6b2ecb276}*SharedItemsImports = 4
51-
Test\Flurl.Test.Shared\Flurl.Test.Shared.projitems*{49cb777f-d13d-401a-9206-48a6b2ecb276}*SharedItemsImports = 4
5254
src\Flurl.Shared\Flurl.Shared.projitems*{49cb777f-d13d-401a-9206-48a6b2ecb276}*SharedItemsImports = 4
53-
PackageTesters\PackageTester.Shared\PackageTester.Shared.projitems*{d00a7c13-ab11-46f0-a694-8986dec6ac5d}*SharedItemsImports = 4
54-
PackageTesters\PackageTester.Shared\PackageTester.Shared.projitems*{0a32978c-bc48-4dfb-b1f7-b88541b0d686}*SharedItemsImports = 4
55+
Test\Flurl.Test.Shared\Flurl.Test.Shared.projitems*{49cb777f-d13d-401a-9206-48a6b2ecb276}*SharedItemsImports = 4
56+
Test\Flurl.Test.Shared\Flurl.Test.Shared.projitems*{4c7c0861-84f6-436e-8fa6-4c318b336a7b}*SharedItemsImports = 13
5557
src\Flurl.Http.Shared\Flurl.Http.Shared.projitems*{734e6962-97e2-4318-9a2d-c87e76921afb}*SharedItemsImports = 13
58+
PackageTesters\PackageTester.Shared\PackageTester.Shared.projitems*{d00a7c13-ab11-46f0-a694-8986dec6ac5d}*SharedItemsImports = 4
5659
src\Flurl.Shared\Flurl.Shared.projitems*{ed944c76-9613-474e-9861-54e41a3e77cd}*SharedItemsImports = 13
57-
src\Flurl.Http.Shared\Flurl.Http.Shared.projitems*{3f6be828-fa29-429e-99e1-f1fcdfdc1205}*SharedItemsImports = 4
58-
Test\Flurl.Test.Shared\Flurl.Test.Shared.projitems*{3f6be828-fa29-429e-99e1-f1fcdfdc1205}*SharedItemsImports = 4
59-
src\Flurl.Shared\Flurl.Shared.projitems*{3f6be828-fa29-429e-99e1-f1fcdfdc1205}*SharedItemsImports = 4
6060
EndGlobalSection
6161
GlobalSection(SolutionConfigurationPlatforms) = preSolution
6262
Ad-Hoc|Any CPU = Ad-Hoc|Any CPU

‎NuGet.Config

+6
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@
66
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
77
<add key="flurl feed" value="https://www.myget.org/F/flurl/api/v3/index.json" />
88
</packageSources>
9+
<packageRestore>
10+
<!--Allow NuGet to download missing packages -->
11+
<add key="enabled" value="True" />
12+
<!-- Automatically check for missing packages during build in Visual Studio -->
13+
<add key="automatic" value="True" />
14+
</packageRestore>
915
<disabledPackageSources>
1016
<add key="Microsoft and .NET" value="true" />
1117
</disabledPackageSources>

‎Test/Flurl.Test.NETCore/project.json

+10-4
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,25 @@
11
{
2-
"name": "Flurl.Test.NETCore",
3-
42
"buildOptions": {
53
"compile": {
64
"include": [ "../Flurl.Test.Shared/**/*.cs" ]
75
}
86
},
97

8+
"configurations": {
9+
"Release": {
10+
"buildOptions": {
11+
"optimize": true
12+
}
13+
}
14+
},
15+
1016
"commands": {
1117
"test": "Flurl.Test.NETCore"
1218
},
1319

1420
"dependencies": {
1521
"dotnet-test-nunit": "3.4.0-beta-1",
16-
"Flurl.Http.Library": { "target": "project" },
22+
"Flurl.Http": { "target": "project" },
1723
"NUnit": "3.4.1"
1824
},
1925

@@ -34,4 +40,4 @@
3440
}
3541
}
3642
}
37-
}
43+
}

‎src/Flurl.Http.CodeGen/project.json

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
{
22
"buildOptions": {
3-
"emitEntryPoint": true,
4-
"optimize": true
3+
"emitEntryPoint": true
4+
},
5+
6+
"configurations": {
7+
"Release": {
8+
"buildOptions": {
9+
"optimize": true
10+
}
11+
}
512
},
613

714
"dependencies": {

‎src/Flurl.Http.Shared/Content/FileContent.cs

+22-13
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.IO;
1+
using System.IO;
42
using System.Net;
53
using System.Net.Http;
64
using System.Threading.Tasks;
@@ -11,7 +9,7 @@ namespace Flurl.Http.Content
119
/// Represents HTTP content based on a local file. Typically used with PostMultipartAsync for uploading files.
1210
/// </summary>
1311
public class FileContent : HttpContent
14-
{
12+
{
1513
/// <summary>
1614
/// The local file path.
1715
/// </summary>
@@ -29,15 +27,26 @@ public FileContent(string path, int bufferSize = 4096) {
2927
_bufferSize = bufferSize;
3028
}
3129

32-
protected override async Task SerializeToStreamAsync(Stream stream, TransportContext context) {
33-
using (var source = await FileUtil.OpenReadAsync(Path, _bufferSize).ConfigureAwait(false)) {
34-
await source.CopyToAsync(stream, _bufferSize).ConfigureAwait(false);
35-
}
30+
/// <summary>
31+
/// Serializes to stream asynchronous.
32+
/// </summary>
33+
/// <param name="stream">The stream.</param>
34+
/// <param name="context">The context.</param>
35+
/// <returns></returns>
36+
protected override async Task SerializeToStreamAsync(Stream stream, TransportContext context) {
37+
using (var source = await FileUtil.OpenReadAsync(Path, _bufferSize).ConfigureAwait(false)) {
38+
await source.CopyToAsync(stream, _bufferSize).ConfigureAwait(false);
39+
}
3640
}
3741

38-
protected override bool TryComputeLength(out long length) {
39-
length = -1;
42+
/// <summary>
43+
/// Tries the length of the compute.
44+
/// </summary>
45+
/// <param name="length">The length.</param>
46+
/// <returns></returns>
47+
protected override bool TryComputeLength(out long length) {
48+
length = -1;
4049
return false;
41-
}
42-
}
43-
}
50+
}
51+
}
52+
}

‎src/Flurl.Http.Library/Flurl.Http.Library.xproj ‎src/Flurl.Http/Flurl.Http.xproj

File renamed without changes.

‎src/Flurl.Http.Library/project.json ‎src/Flurl.Http/project.json

+12-5
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,26 @@
11
{
22
"title": "Flurl.Http",
3-
"version": "1.0.0",
3+
"version": "1.0.1-beta",
44

55
"dependencies": {
6-
"Flurl": "2.1.0",
6+
"Flurl": "2.1.0",
77
"Newtonsoft.Json": "9.0.1"
88
},
99

1010
"buildOptions": {
1111
"compile": {
1212
"include": [ "../Flurl.Http.Shared/**/*.cs" ]
1313
},
14-
"optimize": true,
15-
"outputName": "Flurl.Http",
16-
"xmlDoc": true
14+
"xmlDoc": true,
15+
"warningsAsErrors": true
16+
},
17+
18+
"configurations": {
19+
"Release": {
20+
"buildOptions": {
21+
"optimize": true
22+
}
23+
}
1724
},
1825

1926
"frameworks": {

‎src/Flurl.Library/Flurl.Library.xproj ‎src/Flurl/Flurl.xproj

File renamed without changes.

‎src/Flurl.Library/project.json ‎src/Flurl/project.json

+10-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,23 @@
11
{
22
"title": "Flurl",
3-
"version": "2.1.0",
3+
"version": "2.1.1-beta",
44

55
"buildOptions": {
66
"compile": {
77
"include": "../Flurl.Shared/**/*.cs"
88
},
9-
"optimize": true,
10-
"outputName": "Flurl",
9+
"warningsAsErrors": true,
1110
"xmlDoc": true
1211
},
1312

13+
"configurations": {
14+
"Release": {
15+
"buildOptions": {
16+
"optimize": true
17+
}
18+
}
19+
},
20+
1421
"frameworks": {
1522
"portable40-net40+win8+wpa81": {
1623
"frameworkAssemblies": {

0 commit comments

Comments
 (0)