From cc6ee4b7ff0d35243c88ef0040ff5e9dded7497b Mon Sep 17 00:00:00 2001 From: TheJoKlLa Date: Tue, 10 May 2022 13:01:05 +0000 Subject: [PATCH 1/6] Update .gitmodules --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 4ba83d0..4633df6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,7 +9,7 @@ [submodule "FabAccessAPI/schema"] path = FabAccessAPI/schema url = https://gitlab.com/fabinfra/fabaccess/fabaccess-api.git - branch = v0.3 + branch = v0.3.1 [submodule "external/capnproto-dotnetcore"] path = external/capnproto-dotnetcore url = https://github.com/FabInfra/capnproto-dotnetcore_Runtime.git From d452f5cd28db6179b5df27c603d690f933772acc Mon Sep 17 00:00:00 2001 From: TheJoKlLa Date: Tue, 10 May 2022 15:15:24 +0200 Subject: [PATCH 2/6] Fixed v0.3 schema submodule --- FabAccessAPI/schema | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FabAccessAPI/schema b/FabAccessAPI/schema index aea03aa..244eb9b 160000 --- a/FabAccessAPI/schema +++ b/FabAccessAPI/schema @@ -1 +1 @@ -Subproject commit aea03aabe3d1322892c1896ba757ceeedb92ed73 +Subproject commit 244eb9bd1b59cfcf36c067ff0d6208c0992766ba From 4a784f3cde5a9f716d0fe504a339643bdc019e89 Mon Sep 17 00:00:00 2001 From: TheJoKlLa Date: Tue, 10 May 2022 13:18:25 +0000 Subject: [PATCH 3/6] Update .gitmodules --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 4633df6..b360791 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,7 +9,7 @@ [submodule "FabAccessAPI/schema"] path = FabAccessAPI/schema url = https://gitlab.com/fabinfra/fabaccess/fabaccess-api.git - branch = v0.3.1 + branch = main [submodule "external/capnproto-dotnetcore"] path = external/capnproto-dotnetcore url = https://github.com/FabInfra/capnproto-dotnetcore_Runtime.git From a91abdebed25d853b9940384d5b4623200192ece Mon Sep 17 00:00:00 2001 From: TheJoKlLa Date: Tue, 10 May 2022 16:02:06 +0200 Subject: [PATCH 4/6] Changed .gitmodules --- .gitmodules | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index b360791..4a74daf 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,14 +2,19 @@ path = external/SASL url = https://github.com/kjkriegel/S22.Sasl.git branch = main + ignore = all [submodule "external/NFC"] path = external/NFC url = https://gitlab.com/fabinfra/fabaccess/nfc.git branch = main + ignore = all [submodule "FabAccessAPI/schema"] path = FabAccessAPI/schema url = https://gitlab.com/fabinfra/fabaccess/fabaccess-api.git - branch = main + branch = v0.3 + ignore = all [submodule "external/capnproto-dotnetcore"] path = external/capnproto-dotnetcore url = https://github.com/FabInfra/capnproto-dotnetcore_Runtime.git + branch = main + ignore = all From 13dde430740e988a2f26506045db4dc198932158 Mon Sep 17 00:00:00 2001 From: TheJoKlLa Date: Tue, 10 May 2022 16:05:15 +0200 Subject: [PATCH 5/6] Changed .gitmodules --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 4a74daf..b7c1a78 100644 --- a/.gitmodules +++ b/.gitmodules @@ -11,7 +11,7 @@ [submodule "FabAccessAPI/schema"] path = FabAccessAPI/schema url = https://gitlab.com/fabinfra/fabaccess/fabaccess-api.git - branch = v0.3 + branch = TestTag ignore = all [submodule "external/capnproto-dotnetcore"] path = external/capnproto-dotnetcore From 2981cbb9353d140eee6fbad8cc9aed3fc8281943 Mon Sep 17 00:00:00 2001 From: TheJoKlLa Date: Tue, 10 May 2022 16:18:21 +0200 Subject: [PATCH 6/6] Changed Submodule to main --- .gitmodules | 2 +- FabAccessAPI/schema | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index b7c1a78..648ccf2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -11,7 +11,7 @@ [submodule "FabAccessAPI/schema"] path = FabAccessAPI/schema url = https://gitlab.com/fabinfra/fabaccess/fabaccess-api.git - branch = TestTag + branch = main ignore = all [submodule "external/capnproto-dotnetcore"] path = external/capnproto-dotnetcore diff --git a/FabAccessAPI/schema b/FabAccessAPI/schema index 244eb9b..f1fa024 160000 --- a/FabAccessAPI/schema +++ b/FabAccessAPI/schema @@ -1 +1 @@ -Subproject commit 244eb9bd1b59cfcf36c067ff0d6208c0992766ba +Subproject commit f1fa0246130ff81abc2791b2c1a60b8b020257f7