Skip to content

Commit 5310a3a

Browse files
committed
move to netstandard 1.5
- fix missing exception types - squash a warnings - fix socket code on nix - make it v4 - appveyor config - only build master and stable to avoid pushing conflicting artifacts
1 parent 23c8128 commit 5310a3a

23 files changed

+379
-3137
lines changed

appveyor.yml

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: "3.6.3.{build}"
1+
version: "4.0.0.{build}"
22

33
platform: Any CPU
44
configuration: Release
@@ -13,6 +13,7 @@ environment:
1313
init:
1414
- echo %APPVEYOR_BUILD_VERSION%
1515
- choco install -y rabbitmq
16+
- choco install -y dotnetcore-sdk -pre
1617

1718
install:
1819
- IF DEFINED SNKSECRET (nuget install secure-file -ExcludeVersion)
@@ -30,20 +31,30 @@ install:
3031
3132
before_build:
3233

33-
build_script: fake.bat AppVeyor
34+
build_script:
35+
- ps: .\fake.bat GenerateApi
36+
- ps: dotnet restore "projects\client\RabbitMQ.Client"
37+
- ps: dotnet build "projects\client\RabbitMQ.Client"
38+
- ps: dotnet pack "projects\client\RabbitMQ.Client" -c Release --version-suffix=build-$env:APPVEYOR_BUILD_NUMBER
3439

3540
test: off
3641

3742
after_build:
38-
- ps: |
39-
$semver = ${env:APPVEYOR_BUILD_VERSION} -ireplace '(\d+.\d+.\d+).(\d+)', "`$1-ci`$2-${env:APPVEYOR_REPO_BRANCH}"
40-
$semver = $semver.Substring(0, [System.Math]::Min(20, $semver.Length))
41-
nuget pack RabbitMQ.Client.nuspec -version $semver -symbols
42-
nuget pack RabbitMQ.ServiceModel.nuspec -version $semver -symbols
4343

4444
artifacts:
4545
- path: '*.nupkg'
46+
- path: 'projects\client\RabbitMQ.Client\bin\Release\*.nupkg'
4647
- path: '*.log'
4748
name: Logs
4849

4950
deploy: off
51+
52+
nuget:
53+
account_feed: true
54+
project_feed: true
55+
disable_publish_on_pr: true
56+
57+
branches:
58+
only:
59+
- master
60+
- stable

projects/client/RabbitMQ.Client/project.json

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"version": "1.0.0-*",
2+
"version": "4.0.0-*",
33
"buildOptions": {
4-
"emitEntryPoint": true,
4+
"emitEntryPoint": false,
55
"compile": {
66
"exclude": [
77
"build",
@@ -13,29 +13,46 @@
1313
}
1414
},
1515
"dependencies": {
16-
"Microsoft.NETCore.App": {
17-
"type": "platform",
18-
"version": "1.0.0-rc2-3002702"
19-
}
2016
},
2117
"frameworks": {
22-
"netcoreapp1.0": {
18+
"net45": {},
19+
/*
20+
".NETPortable,Version=v4.0,Profile=Profile32":{
21+
"buildOptions": {
22+
"define": [ "PORTABLE32", "NETFX_CORE" ] },
23+
"frameworkAssemblies":{
24+
"mscorlib":"",
25+
"System":"",
26+
"System.Core":"",
27+
"System.Net":"",
28+
"System.Net.Sockets":"",
29+
"System.Threading":""
30+
}
31+
},
32+
*/
33+
//"netcore45": {},
34+
"netstandard1.5": {
2335
"buildOptions": {
2436
"define": [ "CORECLR" ]
2537
},
26-
"imports": "dnxcore50",
38+
"imports": ["dnxcore50", "portable-net45+win81"],
2739
"dependencies": {
40+
"NETStandard.Library": "1.5.0-rc2-24027",
41+
"System.Net.Security": "4.0.0-rc2-24027",
42+
"System.Net.NameResolution": "4.0.0-rc2-24027",
43+
"System.Threading.Thread": "4.0.0-rc2-24027"
44+
/*
2845
"System.Runtime": "4.1.0-rc2-24027",
2946
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
3047
"System.ComponentModel.EventBasedAsync": "4.0.11-rc2-24027",
3148
"System.Xml.ReaderWriter": "4.0.11-rc2-24027",
3249
"System.Xml.XDocument": "4.0.11-rc2-24027",
3350
"System.Xml.XmlDocument": "4.0.1-rc2-24027",
3451
"System.Xml.XmlSerializer": "4.0.11-rc2-24027",
35-
"System.Net.Security": "4.0.0-rc2-24027",
3652
"System.Net.Sockets": "4.1.0-rc2-24027",
3753
"System.Threading": "4.0.11-rc2-24027",
3854
"System.Threading.Tasks": "4.0.11-rc2-24027"
55+
*/
3956
}
4057
}
4158
}

0 commit comments

Comments
 (0)