optimized Dependency build

Author: Fijo

Dependencies/Dockerfile

@@ -1,34 +1,46 @@
-FROM alpine/git AS retriver
+FROM mcr.microsoft.com/dotnet/sdk:5.0 AS deps-build
+WORKDIR /app/Dependencies
+COPY ./Dependencies ./
+RUN dotnet build
+RUN rm ./bin/Debug/netstandard2.1/System.Runtime.InteropServices.WindowsRuntime.dll
+
+
+FROM alpine/git AS rx-retriver
 WORKDIR /app
 RUN git clone --branch rxnet-v5.0.0 --depth 1 https://github.com/dotnet/reactive.git
-RUN git clone --branch v1.0.2 --depth 1 https://github.com/Cosmic-Shores/Rx.Data.git
 RUN cp ./reactive/Rx.NET/Source/Directory.build.props ./reactive/Rx.NET/Source/src/System.Reactive/Directory.build.props
-COPY ./Patches/Directory.build.props ./Rx.Data/src/Directory.build.props
-COPY ./Patches/SchedulerDefaults.cs ./reactive/Rx.NET/Source/src/System.Reactive/Concurrency/SchedulerDefaults.cs
-COPY ./Patches/InternalsVisibleTo.cs ./reactive/Rx.NET/Source/src/System.Reactive/Properties/InternalsVisibleTo.cs
-COPY ./Patches/global.json ./reactive/Rx.NET/Source/src/global.json
 
-FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:5.0 AS rx-build
 WORKDIR /app
-COPY --from=retriver /app ./
+COPY --from=rx-retriver /app ./
 COPY ./Patcher ./Patcher/
-COPY ./Dependencies ./Dependencies/
-
-WORKDIR /app/Dependencies
-RUN dotnet build
-RUN rm ./bin/Debug/netstandard2.1/System.Runtime.InteropServices.WindowsRuntime.dll
 
 WORKDIR /app/Patcher
 RUN dotnet run
 
+WORKDIR /app
+COPY ./Patches/SchedulerDefaults.cs ./reactive/Rx.NET/Source/src/System.Reactive/Concurrency/SchedulerDefaults.cs
+COPY ./Patches/InternalsVisibleTo.cs ./reactive/Rx.NET/Source/src/System.Reactive/Properties/InternalsVisibleTo.cs
+COPY ./Patches/global.json ./reactive/Rx.NET/Source/src/global.json
+
 WORKDIR /app/reactive/Rx.NET/Source/src/System.Reactive
 RUN dotnet build
 
+
+FROM alpine/git AS rxdata-retriver
+WORKDIR /app
+RUN git clone --branch main --depth 1 https://github.com/Cosmic-Shores/Rx.Data.git
+
+FROM mcr.microsoft.com/dotnet/sdk:5.0 AS rxdata-build
 WORKDIR /app/Rx.Data
+COPY --from=rx-build /app/reactive/Rx.NET/Source/src/System.Reactive/bin/Debug/netstandard2.0 ./src/
+COPY --from=rxdata-retriver /app ../
+COPY ./Patches/Directory.build.props ./src/Directory.build.props
 RUN dotnet build
 
+
 FROM scratch AS export-stage
-COPY --from=build-env /app/Dependencies/bin/Debug/netstandard2.1 ./
-COPY --from=build-env /app/reactive/Rx.NET/Source/src/System.Reactive/bin/Debug/netstandard2.0 ./
-COPY --from=build-env /app/Rx.Data/src/Rx.Extendibility/bin/Debug/netstandard2.0 ./
-COPY --from=build-env /app/Rx.Data/src/Rx.Data/bin/Debug/netstandard2.0 ./
+COPY --from=deps-build /app/Dependencies/bin/Debug/netstandard2.1 ./
+COPY --from=rx-build /app/reactive/Rx.NET/Source/src/System.Reactive/bin/Debug/netstandard2.0 ./
+COPY --from=rxdata-build /app/Rx.Data/src/Rx.Extendibility/bin/Debug/netstandard2.0 ./
+COPY --from=rxdata-build /app/Rx.Data/src/Rx.Data/bin/Debug/netstandard2.0 ./

Dependencies/Patches/Directory.build.props

@@ -1,4 +1,5 @@
 <Project>
+  <Import Project=".\References.build.props" />
   <PropertyGroup>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <DefaultLanguage>en-US</DefaultLanguage>
@@ -8,11 +9,4 @@
     <PackageProjectUrl>https://github.com/Cosmic-Shores/Rx.Data</PackageProjectUrl>
     <RepositoryUrl>https://github.com/Cosmic-Shores/Rx.Data</RepositoryUrl>
   </PropertyGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Reactive">
-      <HintPath>..\..\reactive\Rx.NET\Source\src\System.Reactive\bin\Debug\netstandard2.0\System.Reactive.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
 </Project>

Dependencies/Patches/References.build.props

@@ -0,0 +1,7 @@
+<Project>
+  <ItemGroup>
+    <Reference Include="System.Reactive">
+      <HintPath>..\System.Reactive.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+</Project>

build-dependencies.bat

@@ -1,2 +1,2 @@
 cd ./Dependencies
-docker build --output out .
+docker build --output out . --no-cache