Merge pull request #97 from dolittle/7.0.0-meriadoc

Meriadoc: Unbreak event horizon contracts
dolittle · Mar 22, 2022 · 0517ca9 · 0517ca9
2 parents 8988576 + bffd155
commit 0517ca9
Show file tree

Hide file tree

Showing 67 changed files with 225 additions and 779 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -50,8 +50,7 @@ jobs:
         with:
           version: ${{ needs.context.outputs.versioninfo-version }}
           files-to-update: |
-            Generation/CSharp/Fundamentals/VersionInfo.cs
-            Generation/CSharp/Runtime/VersionInfo.cs
+            Generation/CSharp/VersionInfo.cs
       - run: dotnet build -c Release
         working-directory: ./Generation/CSharp
 
@@ -73,16 +72,9 @@ jobs:
         with:
           version: ${{ needs.context.outputs.versioninfo-version }}
           files-to-update: |
-            Generation/JavaScript/Fundamentals/VersionInfo.js
-            Generation/JavaScript/Runtime/VersionInfo.js
-      - name: Build
-        working-directory: ./Generation/JavaScript/Build
-        run: yarn build
-      - name: Build Fundamentals
-        working-directory: ./Generation/JavaScript/Fundamentals
-        run: yarn build
-      - name: Build Runtime
-        working-directory: ./Generation/JavaScript/Runtime
+            Generation/JavaScript/VersionInfo.js
+      - name: Build Contracts
+        working-directory: ./Generation/JavaScript
         run: yarn build
 
   golang-build:
@@ -146,8 +138,7 @@ jobs:
         with:
           version: ${{ needs.context.outputs.versioninfo-version }}
           files-to-update: |
-            Generation/CSharp/Fundamentals/VersionInfo.cs
-            Generation/CSharp/Runtime/VersionInfo.cs
+            Generation/CSharp/VersionInfo.cs
       - run: dotnet build
         working-directory: ./Generation/CSharp
       - name: Create packages
@@ -176,39 +167,21 @@ jobs:
         with:
           version: ${{ needs.context.outputs.versioninfo-version }}
           files-to-update: |
-            Generation/JavaScript/Fundamentals/VersionInfo.js
-            Generation/JavaScript/Runtime/VersionInfo.js
-      - name: Build
-        working-directory: ./Generation/JavaScript/Build
-        run: yarn build
-      - name: Build Fundamentals
-        working-directory: ./Generation/JavaScript/Fundamentals
-        run: yarn build
-      - name: Update Fundamentals version
-        working-directory: ./Generation/JavaScript/Fundamentals
-        run: npm version ${{ needs.context.outputs.version }}
-      - name: Build Runtime
-        working-directory: ./Generation/JavaScript/Runtime
+            Generation/JavaScript/VersionInfo.js
+      - name: Build Contracts
+        working-directory: ./Generation/JavaScript
         run: yarn build
-      - name: Add Fundamentals as dependency of Runtime
-        working-directory: ./Generation/JavaScript/Runtime
-        run: jq '.dependencies["@dolittle/contracts"] = "${{ needs.context.outputs.version }}"' package.json > package.json.tmp && mv package.json.tmp package.json
-      - name: Update Runtime version
-        working-directory: ./Generation/JavaScript/Runtime
+      - name: Update Contracts version
+        working-directory: ./Generation/JavaScript
         run: npm version ${{ needs.context.outputs.version }}
       - name: Extract tag from version
         uses: actions-ecosystem/action-regex-match@v2
         id: tag_regex
         with:
           text: ${{ needs.context.outputs.version }}
           regex: '^\d+\.\d+.\d+-([^.]+)\.\d+$'
-      - name: Publish Fundamentals
-        working-directory: ./Generation/JavaScript/Fundamentals
-        run: npm publish --tag ${{ needs.context.outputs.release-type == 'prerelease' && steps.tag_regex.outputs.group1 || 'latest' }}
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-      - name: Publish Runtime
-        working-directory: ./Generation/JavaScript/Runtime
+      - name: Publish Contracts
+        working-directory: ./Generation/JavaScript
         run: npm publish --tag ${{ needs.context.outputs.release-type == 'prerelease' && steps.tag_regex.outputs.group1 || 'latest' }}
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

diff --git a/.gitignore b/.gitignore
@@ -351,19 +351,22 @@ MigrationBackup/
 
 yarn.lock
 package-json.lock
-*.cs
-*.ts
-!Generation/JavaScript/Build/*.ts
-Generation/JavaScript/Build/Distribution
 
-!Source/**/Artifacts
+# CSharp
+Artifacts/
+Generation/CSharp/**/*.cs
+!Generation/CSharp/Contracts.csproj
+!Generation/CSharp/VersionInfo.cs
 
-Generation/JavaScript/Fundamentals/**
-Generation/JavaScript/Runtime/**
-!Generation/JavaScript/**/package.json
-!Generation/JavaScript/**/tsconfig.json
+# JavaScript
+Generation/JavaScript/**/*.js
+Generation/JavaScript/**/*.d.ts
+!Generation/JavaScript/package.json
+!Generation/JavaScript/VersionInfo.d.ts
+!Generation/JavaScript/VersionInfo.js
 
+# Go
 Generation/Go/*
 !Generation/Go/generate.sh
 
-Generation/Artifacts
+!Source/Artifacts
diff --git a/Generation/CSharp/Contracts.csproj b/Generation/CSharp/Contracts.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <AssemblyName>Dolittle.Contracts</AssemblyName>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <IncludeSource>True</IncludeSource>
+        <Protobuf_NoWarnMissingExpected>True</Protobuf_NoWarnMissingExpected>
+        <Protobuf_TouchMissingExpected>True</Protobuf_TouchMissingExpected>
+        <DocumentationFile>bin/$(Configuration)/$(TargetFramework)/$(AssemblyName).xml</DocumentationFile>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Dolittle.Common" Version="2.*" PrivateAssets="All"/>
+        <PackageReference Include="Google.Protobuf" Version="3.18.1" />
+        <PackageReference Include="Google.Protobuf.Tools" Version="3.19.4" PrivateAssets="All"/>
+        <PackageReference Include="Grpc.Tools" Version="2.43.0" PrivateAssets="All"/>
+        <PackageReference Include="Grpc.Core.Api" Version="2.43.0" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <Protobuf Include="../../Source/**/*.proto" ProtoRoot="../../Source" OutputDir="%(RecursiveDir)" GrpcServices="Both" />
+    </ItemGroup>
+
+    <Target Name="DeleteSourceFiles" BeforeTargets="BeforeBuild">
+        <ItemGroup>
+            <FilesToDelete Include="**/*.cs" Exclude="VersionInfo.cs"/>
+        </ItemGroup>
+        <Delete Files="@(FilesToDelete)"/>
+    </Target>
+</Project>
diff --git a/Generation/CSharp/Contracts.sln b/Generation/CSharp/Contracts.sln
diff --git a/Generation/CSharp/Fundamentals/Fundamentals.csproj b/Generation/CSharp/Fundamentals/Fundamentals.csproj
diff --git a/Generation/CSharp/Runtime/Runtime.csproj b/Generation/CSharp/Runtime/Runtime.csproj
diff --git a/Generation/CSharp/Runtime/VersionInfo.cs b/Generation/CSharp/Runtime/VersionInfo.cs
diff --git a/...ration/CSharp/Fundamentals/VersionInfo.cs → Generation/CSharp/VersionInfo.cs b/...ration/CSharp/Fundamentals/VersionInfo.cs → Generation/CSharp/VersionInfo.cs
diff --git a/Generation/JavaScript/Build/Compilers.ts b/Generation/JavaScript/Build/Compilers.ts
diff --git a/Generation/JavaScript/Build/GenerateOptions.ts b/Generation/JavaScript/Build/GenerateOptions.ts
diff --git a/Generation/JavaScript/Build/GenerationTarget.ts b/Generation/JavaScript/Build/GenerationTarget.ts