From 4da2ad17fff53741220f8c63ff78d41a82b2f3c1 Mon Sep 17 00:00:00 2001 From: YuliiaKovalova Date: Mon, 24 Jun 2024 19:42:25 +0200 Subject: [PATCH 1/6] sing a produced assembly with a strong name --- src/Wasmtime.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Wasmtime.csproj b/src/Wasmtime.csproj index 7708152f..7a73af8c 100644 --- a/src/Wasmtime.csproj +++ b/src/Wasmtime.csproj @@ -97,6 +97,7 @@ The .NET embedding of Wasmtime enables .NET code to instantiate WebAssembly modu $(BaseURL)/v$(WasmtimeVersion) wasmtime-dev wasmtime-v$(WasmtimeVersion) + True From d0e897db7d6b46d559b71262decefe28b64e3a43 Mon Sep 17 00:00:00 2001 From: YuliiaKovalova Date: Tue, 25 Jun 2024 11:11:36 +0200 Subject: [PATCH 2/6] add assemblies signing --- src/AssemblyAttributes.cs | 2 +- src/Utils/wasmtime.snk | Bin 0 -> 596 bytes src/Wasmtime.csproj | 33 +++++++++++++++++---------------- tests/Utils/wasmtime.tests.snk | Bin 0 -> 596 bytes tests/Wasmtime.Tests.csproj | 5 +++++ 5 files changed, 23 insertions(+), 17 deletions(-) create mode 100644 src/Utils/wasmtime.snk create mode 100644 tests/Utils/wasmtime.tests.snk diff --git a/src/AssemblyAttributes.cs b/src/AssemblyAttributes.cs index 1b1f1eae..dffc9237 100644 --- a/src/AssemblyAttributes.cs +++ b/src/AssemblyAttributes.cs @@ -1,3 +1,3 @@ using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("Wasmtime.Tests")] \ No newline at end of file +[assembly: InternalsVisibleTo("Wasmtime.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd9d8818d77c29c70efc6c0c573d0547c68c817daa3367480741c301cbff5faf8e118dbbbaa6d54b5d81232da8f3d94d0de6e957dd712ad5d859497f212f43d92cc16ae545812320b8db34f661c51e254719a1d30c46a13110bd4d7167ebf7119d8fd6f24dcfbcd298ac5806be089cbca5edf9167d28a3c8af3fc08c994972c1")] \ No newline at end of file diff --git a/src/Utils/wasmtime.snk b/src/Utils/wasmtime.snk new file mode 100644 index 0000000000000000000000000000000000000000..14d61b882fa7eeda2b63ff9e6664db9aaa809623 GIT binary patch literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50098q&Jga-Q+{4f8okTQYqmwLko;*rMsRPc zvI;xCz)TiSMopl-)H5j}Ug^O%p0Rh*(Zf45)=s-b>6k zE|vb}?o)$cOc2rDe3GSHhhmH)Bm#!NAReODyMZ@|h62G5oJdGoh$Q&@R;pw=J(b1Z z|K?dU`F!WfWWW2{nLAdG(i>UcQ;4yn5wbt)Vn>LvM2p4m;Y;mf+p>DAYhJ90I6>}W zM;mxicrE_Ni5J?#7{Q$HTaB^t19Bj4qe_2F_UUI?9US171Si95KaxMG0RV5}BVKX^ z7US45DkXR|{(IpHg5t?K{|r4%9PQ_K$ADHy6Xy-U7`<6%GCtF$=);N$=tH92u$wAM z_u5yb-e4+%At-Q?CvD7iZyCV8C64XT*l<_CArXOlJQc_>$4*1J7a*n@@%|Nu-AlhLjyGKk9Cd#Erqd!9;*l i|0|lnoJClzc?_-A9g_^qYwasmtime-dev wasmtime-v$(WasmtimeVersion) True + Utils\wasmtime.snk @@ -149,28 +150,28 @@ The .NET embedding of Wasmtime enables .NET code to instantiate WebAssembly modu - - - - + runtimes/%(Wasmtime.RID)/native/%(Wasmtime.LibraryFilename) diff --git a/tests/Utils/wasmtime.tests.snk b/tests/Utils/wasmtime.tests.snk new file mode 100644 index 0000000000000000000000000000000000000000..c842c388ee8111059f23bc39441b052fca855a2b GIT binary patch literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50098~oroCMd@08c{A>(YJq1U`jDdZsGiOK# zLBj#d|6i|;5skaLrqxSbfg>%b^Vv-e=IK}6aVpi=SxJ8(FGJZZ!D{72fg>Qe+cfrJ z#U3R`8KKh*Mxikfy-jgv>-Q0zkJj={&%Dx@tXKxV2%Nm7?fDjcD5J=)KfsKcNpis> z+6vh9zn;mLg7|J(Z(Z&dDN;#S@t(T7##P@xfviEB(*?yI05((xl(ULfk@ie%P@pS$ zLdv6H5T>^zIXv`V*`5d;vqTBOh-oej95HfXdbST>vyY9r#I+rQoNWFd9ne|4;42is zgQ|!9{jcBYJ3&GKmom9G7e0=l!^6r^NY(>syJ3~{Vo@tQoTKEA*FEr3lx0rbb}Q7eQ`@`@ zXdB9!(hQ6A>9US01{a(ERe2M*w8C6Mx+Brxy!?Q>j8|_ytC@Yundy8<9b<(@@q*?P z(RBLBV)gEnso6b#1K6)wE&7oR4=|(%r#o$pyu_6DRPO7_d-Zq)H~;}`#=f;;nYj;E zjol?@I^4+t8Nr(#zYZLsfscSA>$1-WS0xLgP)D0QM4EVcr?P@XCPIwcv>cKsr0I+C zNJ9roYwoCvM8)Kf6RfaKG;j2x$U$CaI?y|6$kAZ{DKELB_1tyO?aKhA-Zn+#Ca%d) iS|kQ?q3!jqqDTX%Df6e`m03RiZ4lxZj#0)ipJ@%?J|PkS literal 0 HcmV?d00001 diff --git a/tests/Wasmtime.Tests.csproj b/tests/Wasmtime.Tests.csproj index 859eb826..6ffb1e54 100644 --- a/tests/Wasmtime.Tests.csproj +++ b/tests/Wasmtime.Tests.csproj @@ -16,6 +16,11 @@ + + true + Utils\wasmtime.tests.snk + + From eebdcb072f236bbdeefbc6b92d54e256454c90af Mon Sep 17 00:00:00 2001 From: YuliiaKovalova Date: Tue, 25 Jun 2024 11:26:14 +0200 Subject: [PATCH 3/6] undo changes in formatting --- src/Wasmtime.csproj | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Wasmtime.csproj b/src/Wasmtime.csproj index f66d987c..82addb58 100644 --- a/src/Wasmtime.csproj +++ b/src/Wasmtime.csproj @@ -157,18 +157,18 @@ The .NET embedding of Wasmtime enables .NET code to instantiate WebAssembly modu SkipUnchangedFiles="true" /> - + From e15de25488cc0fcda1228bd7052e526c9e52b8fa Mon Sep 17 00:00:00 2001 From: YuliiaKovalova Date: Tue, 25 Jun 2024 11:46:00 +0200 Subject: [PATCH 4/6] pull CI changes to have a green build --- .github/workflows/main.yml | 4 ++-- Directory.Build.props | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index eb5b4ebb..06980e10 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -45,8 +45,8 @@ jobs: # workaround for actions/setup-dotnet#155 - name: Clear package cache run: dotnet clean Wasmtime.sln && dotnet nuget locals all --clear - - name: Enable development builds for the main branch - if: github.ref == 'refs/heads/main' || github.base_ref == 'main' + - name: Enable development builds for the main branch on schedule + if: github.ref == 'refs/heads/main' && github.event_name == 'schedule' shell: bash run: | echo "DevBuild=true" >> $GITHUB_ENV diff --git a/Directory.Build.props b/Directory.Build.props index a3b30540..45dfd232 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,7 @@ - true - 19.0.1 + false + 20.0.2 $(WasmtimeVersion)$(WasmtimeDotnetVersion)-dev $(WasmtimeVersion)$(WasmtimeDotnetVersion) From 4c2685bfe8b3e58e7170b780314113f57d3699e7 Mon Sep 17 00:00:00 2001 From: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com> Date: Tue, 25 Jun 2024 13:58:24 +0200 Subject: [PATCH 5/6] remove extra formatting changes --- src/Wasmtime.csproj | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Wasmtime.csproj b/src/Wasmtime.csproj index 82addb58..5f5a187b 100644 --- a/src/Wasmtime.csproj +++ b/src/Wasmtime.csproj @@ -150,28 +150,28 @@ The .NET embedding of Wasmtime enables .NET code to instantiate WebAssembly modu - - - + - - + runtimes/%(Wasmtime.RID)/native/%(Wasmtime.LibraryFilename) From 1cc932824799b6f7d191cb4ebd785e48f406c300 Mon Sep 17 00:00:00 2001 From: YuliiaKovalova Date: Tue, 25 Jun 2024 14:01:17 +0200 Subject: [PATCH 6/6] fix formatting --- src/Wasmtime.csproj | 6 +++--- tests/Wasmtime.Tests.csproj | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Wasmtime.csproj b/src/Wasmtime.csproj index 5f5a187b..242d6b40 100644 --- a/src/Wasmtime.csproj +++ b/src/Wasmtime.csproj @@ -152,9 +152,9 @@ The .NET embedding of Wasmtime enables .NET code to instantiate WebAssembly modu diff --git a/tests/Wasmtime.Tests.csproj b/tests/Wasmtime.Tests.csproj index 6ffb1e54..ba074a7a 100644 --- a/tests/Wasmtime.Tests.csproj +++ b/tests/Wasmtime.Tests.csproj @@ -18,7 +18,7 @@ true - Utils\wasmtime.tests.snk + Utils\wasmtime.tests.snk