Skip to content

Commit 090ad60

Browse files
fle-bachNicolas ERNY
authored andcommitted
XCOMP-1286: Migrate ReactiveXComponent in .NetStandard with TU in .NetCore (#92)
* migrate library .net framework to .net standart 2.0 * upgrade .net framework version to 6.1 for .net standard 2.0 * modif cake for compile with .net standard * upgrade apiClientHelloWorld version 6.1 * change package with dotnet core * change img docker + name merge * backup tmp img docker compile * test img docker change * test -exclusive * change cache v2 * generate chache shasum * img .net * test with no paths... * restaure paths... * test launch after checkout * test add save_cahe with paths in build_sh_reactiveapi * test comment restore * test all run in checkout_code * back up and modif img checkout * change img checkout * change v1 to v2 cache * test restore circleci/project * cd to directory * path /home/circleci/project * test modif without exit * test if mono exist * test || cmd * test restaure packages * test change env img docker * change path ./ * change order execute * back up last commit with path /home/circleci.. * add packages.csproj * add start cake .dotnet * test find cake.dll * test .netcore * reset modif .sh and cut work yml * path for build .sh * test copy build.sh from cake.xcomponent * test find Cake.dll * test path circleci find Cake.dll * test path circleci for build.cake * delete VsixSignTool * switch TU .net FrameWork to .Net Core and reset build.sh * delete AssemblyInfo.cs tools/package.config && migrate .sh .ps1 to .NetCore * add clean .sln && modif path .sh && delete cleanSolution utilities * change directory img microsoft * change directory img microsoft other way * delete package.config app.config unused for the moment ReactiveXComponentTest * add nuget.exe installation in .ps1 .sh && add nuget.exe in env .ps1 * Test print path nuget.exe * Test print path nuget.exe wiyh $ * new download xcomponent.build.community in packages.csproj && delete download nuget.exe * change reference .dll to .csproj for reactiveXComponentTest.csproj * modif task test for build in .NetCore * change requiered reactiveapi_integrationtest && change img docker && install mono by command * add indentation name command * delete cmd sudo * add apt-get update * add -y for yes auto * update mono version * add key for install mono * change persiste docker to packaging * change path debug to release * .csproj add download all .dll and build.cake add merge all.dll in one .dll in packaging * delete reference rabbitmq in reactivexcomponentTest (ref in ReactiveXComponent) && merge build in .csproj && delete task merge .cake * modif copy .xcapi alwas ReactiveXComponentTest && Change version NSubstitute => compile TU with cake * test launch circleci... * modif files for set version build (add assembly Info Perso) * delete AssemblyInfo Test unused * modif .cproj <packagereference> to <reference> && download old version system.reactive.link * add my AssemblyInfo && download old version system.reactive.link/core/interfaces * add addin Cake.XComponent&version=6.0.0 for get function XcBuilbBuild (and other include) to compile project helloWorld * delete function BuildSolution unused (replace by cmd DotNetCoreBuild) * delete .nuspec * use startProcess for build project HelloWorld because Xcbuildbuild need mono with xcomponent(in .netFramework) project in .sh * delete assemblyInfo, remove Info to .csproj * remove info of the assemblyInfo.cs in ReactiveXComponent.csproj
1 parent a6ff724 commit 090ad60

File tree

25 files changed

+248
-829
lines changed

25 files changed

+248
-829
lines changed

.circleci/config.yml

Lines changed: 38 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ references:
44
restore_cache:
55
name: Restore checked out code
66
keys:
7-
- v1-reactivexcomponent-net-repo-{{ .Branch }}-{{ .Revision }}
8-
- v1-reactivexcomponent-net-repo-{{ .Branch }}-
9-
- v1-reactivexcomponent-net-repo-
7+
- v2-reactivexcomponent-net-repo-{{ .Branch }}-{{ .Revision }}
8+
- v2-reactivexcomponent-net-repo-{{ .Branch }}-
9+
- v2-reactivexcomponent-net-repo-
1010

1111
restore_nuget: &restore_nuget
1212
restore_cache:
1313
name: Restore nuget cache
1414
keys:
15-
- v1-nuget-{{ .Branch }}-{{ checksum "shasum.tmp" }}
16-
- v1-nuget-{{ .Branch }}-
17-
- v1-nuget-
15+
- v2-nuget-{{ .Branch }}-{{ checksum "shasum.tmp" }}
16+
- v2-nuget-{{ .Branch }}-
17+
- v2-nuget-
1818

1919
generate_nuget_shasum: &generate_nuget_shasum
2020
run:
@@ -24,7 +24,7 @@ references:
2424
save_nuget: &save_nuget
2525
save_cache:
2626
name: Save nuget cache
27-
key: v1-nuget-{{ .Branch }}-{{ checksum "shasum.tmp" }}
27+
key: v2-nuget-{{ .Branch }}-{{ checksum "shasum.tmp" }}
2828
paths:
2929
- /home/circleci/.nuget
3030

@@ -36,31 +36,53 @@ jobs:
3636
- *restore_repo
3737
- checkout
3838
- save_cache:
39-
key: v1-reactivexcomponent-net-repo-{{ .Branch }}-{{ .Revision }}
39+
key: v2-reactivexcomponent-net-repo-{{ .Branch }}-{{ .Revision }}
4040
paths:
4141
- .
4242

4343
build_sh_reactiveapi:
4444
docker:
45-
- image: xcomponent/mono-git:1.3.0
45+
- image: microsoft/dotnet:2.1-sdk
4646
steps:
4747
- *restore_repo
4848
- *generate_nuget_shasum
4949
- *restore_nuget
5050
- run:
5151
name: ReactiveApi - Build All
52-
command: ./build.sh -t All
52+
command: cd /home/circleci/project/ && ./build.sh -t All
53+
- *save_nuget
54+
- persist_to_workspace:
55+
root: /home/circleci/project
56+
paths:
57+
- packaging
58+
59+
build_sh_intergration_test_reactiveapi:
60+
docker:
61+
- image: microsoft/dotnet:2.1-sdk
62+
steps:
63+
- *restore_repo
64+
- *generate_nuget_shasum
65+
- *restore_nuget
66+
- run:
67+
name: Install Key for mono
68+
command: apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
69+
- run:
70+
name: Install mono 5.16.0.179
71+
command: echo "deb http://download.mono-project.com/repo/debian stable-stretch/snapshots/5.16.0.179 main" > /etc/apt/sources.list.d/mono-official-stable.list && apt-get update && apt-get install -y mono-devel
72+
- attach_workspace:
73+
at: /home/circleci/project
5374
- run:
5475
name: ReactiveApi - Build BuildIntegrationTests
55-
command: ./build.sh -t BuildIntegrationTests
76+
command: cd /home/circleci/project/ && ./build.sh -t BuildIntegrationTests
5677
- run:
5778
name: ReactiveApi - Build PackageDockerIntegrationTests
58-
command: ./build.sh -t PackageDockerIntegrationTests
79+
command: cd /home/circleci/project/ && ./build.sh -t PackageDockerIntegrationTests
5980
- *save_nuget
6081
- persist_to_workspace:
6182
root: /home/circleci/project
6283
paths:
6384
- docker
85+
6486
reactiveapi_integrationtests:
6587
docker:
6688
- image: circleci/node:10.12
@@ -83,6 +105,9 @@ workflows:
83105
- build_sh_reactiveapi:
84106
requires:
85107
- checkout_code
108+
- build_sh_intergration_test_reactiveapi:
109+
requires:
110+
- build_sh_reactiveapi
86111
- reactiveapi_integrationtests:
87112
requires:
88-
- build_sh_reactiveapi
113+
- build_sh_intergration_test_reactiveapi

ReactiveXComponent.Net.nuspec

Lines changed: 0 additions & 14 deletions
This file was deleted.

ReactiveXComponent.sln

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.28307.271
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveXComponent", "ReactiveXComponent\ReactiveXComponent.csproj", "{C5DC5337-3E5B-4038-87A3-B57272226659}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveXComponent", "ReactiveXComponent\ReactiveXComponent.csproj", "{C5DC5337-3E5B-4038-87A3-B57272226659}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveXComponentTest", "ReactiveXComponentTest\ReactiveXComponentTest.csproj", "{C06144BE-083F-49D3-B938-8A1B926FAC1C}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveXComponentTest", "ReactiveXComponentTest\ReactiveXComponentTest.csproj", "{C06144BE-083F-49D3-B938-8A1B926FAC1C}"
99
EndProject
1010
Global
1111
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -25,4 +25,7 @@ Global
2525
GlobalSection(SolutionProperties) = preSolution
2626
HideSolutionNode = FALSE
2727
EndGlobalSection
28+
GlobalSection(ExtensibilityGlobals) = postSolution
29+
SolutionGuid = {500A4AB4-3A2D-435D-A646-CC7BDCC7DBF5}
30+
EndGlobalSection
2831
EndGlobal

ReactiveXComponent/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 36 deletions
This file was deleted.

ReactiveXComponent/ReactiveXComponent.Net.nuspec

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)