Merge branch 'master' into huijbers/compiling-fixture

mergify[bot] · web-flow · commit aacd7583c570 · 2021-11-22T11:57:11.000Z
diff --git a/packages/@aws-cdk/cfnspec/spec-source/cfn-lint/StatefulResources/000.json b/packages/@aws-cdk/cfnspec/spec-source/cfn-lint/StatefulResources/000.json
@@ -17,6 +17,7 @@
     "AWS::Logs::LogGroup" : {},
     "AWS::Neptune::DBCluster" : {},
     "AWS::Neptune::DBInstance" : {},
+    "AWS::OpenSearchService::Domain" : {},
     "AWS::QLDB::Ledger" : {},
     "AWS::RDS::DBCluster" : {},
     "AWS::RDS::DBInstance" : {},
diff --git a/scripts/check-build-prerequisites.sh b/scripts/check-build-prerequisites.sh
@@ -95,7 +95,7 @@ app_min="3.1.0"
 check_which $app $app_min
 app_v=$(${app} --list-sdks)
 echo -e "Checking dotnet version... \c"
-if [ $(echo $app_v | grep -c -E "(3\.1\.[0-9]+|5\.[0-9]+\.[0-9]+)") -eq 1 ]
+if [ $(echo $app_v | grep -c -E "(3\.1\.[0-9]+|5\.[0-9]+\.[0-9]+|6\.[0-9]+\.[0-9]+)") -eq 1 ]
 then
     echo "Ok"
 else
