Bump version to 3.0-alpha.6 (#1339)

modelica · Mar 7, 2021 · be9e94b · be9e94b
1 parent 6fa33ab
commit be9e94b
Show file tree

Hide file tree

Showing 20 changed files with 22 additions and 28 deletions.
diff --git a/docs/examples/alias_example.xml b/docs/examples/alias_example.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fmiModelDescription
-  fmiVersion="3.0-alpha.5"
+  fmiVersion="3.0-alpha.6"
   modelName=""
   instantiationToken=""
   description=""

diff --git a/docs/examples/build_description_complex.xml b/docs/examples/build_description_complex.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<fmiBuildDescription fmiVersion="3.0-alpha.5">
+<fmiBuildDescription fmiVersion="3.0-alpha.6">
 
   <BuildConfiguration modelIdentifier="PlantModel" description="Build configuration for desktop platforms">
     <SourceFileSet language="C99">

diff --git a/docs/examples/build_description_simple.xml b/docs/examples/build_description_simple.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<fmiBuildDescription fmiVersion="3.0-alpha.5">
+<fmiBuildDescription fmiVersion="3.0-alpha.6">
 
   <BuildConfiguration modelIdentifier="PIDContoller">
     <SourceFileSet>

diff --git a/docs/examples/co_simulation.xml b/docs/examples/co_simulation.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fmiModelDescription
-  fmiVersion="3.0-alpha.5"
+  fmiVersion="3.0-alpha.6"
   modelName="MyLibrary.SpringMassDamper"
   instantiationToken="{8c4e810f-3df3-4a00-8276-176fa3c9f9e0}"
   description="Rotational Spring Mass Damper System"

diff --git a/docs/examples/co_simulation_early_return.xml b/docs/examples/co_simulation_early_return.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <fmiModelDescription
-  fmiVersion="3.0-alpha.5"
+  fmiVersion="3.0-alpha.6"
   modelName="MyLibrary.SpringMassDamper_Early_Return_example"
   instantiationToken="{8c4e810f-3df3-4a00-8276-176fa3c9f9e0}"
   description="Rotational Spring Mass Damper System"

diff --git a/docs/examples/model_exchange.xml b/docs/examples/model_exchange.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fmiModelDescription
-  fmiVersion="3.0-alpha.5"
+  fmiVersion="3.0-alpha.6"
   modelName="MyLibrary.SpringMassDamper"
   instantiationToken="{8c4e810f-3df3-4a00-8276-176fa3c9f9e0}"
   description="Rotational Spring Mass Damper System"

diff --git a/docs/examples/model_structure_example1.xml b/docs/examples/model_structure_example1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fmiModelDescription
-  fmiVersion="3.0-alpha.5"
+  fmiVersion="3.0-alpha.6"
   modelName=""
   instantiationToken=""
   description=""

diff --git a/docs/examples/model_structure_example2.xml b/docs/examples/model_structure_example2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fmiModelDescription
-  fmiVersion="3.0-alpha.5"
+  fmiVersion="3.0-alpha.6"
   modelName=""
   instantiationToken=""
   description=""

diff --git a/docs/examples/model_structure_example3.xml b/docs/examples/model_structure_example3.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fmiModelDescription
-  fmiVersion="3.0-alpha.5"
+  fmiVersion="3.0-alpha.6"
   modelName=""
   instantiationToken=""
   description=""

diff --git a/docs/examples/model_structure_example4.xml b/docs/examples/model_structure_example4.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fmiModelDescription
-  fmiVersion="3.0-alpha.5"
+  fmiVersion="3.0-alpha.6"
   modelName=""
   instantiationToken=""
   description=""

diff --git a/docs/examples/se_example_modelDescription.xml b/docs/examples/se_example_modelDescription.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<fmiModelDescription fmiVersion="3.0-alpha.5" modelName="ThreeInputClocks" instantiationToken="ThreeInputClocks">
+<fmiModelDescription fmiVersion="3.0-alpha.6" modelName="ThreeInputClocks" instantiationToken="ThreeInputClocks">
 	<LogCategories>
 		<Category name="logStatusError" description="Log error messages"/>
 	</LogCategories>

diff --git a/docs/examples/string_vector_example.xml b/docs/examples/string_vector_example.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fmiModelDescription
-  fmiVersion="3.0-alpha.5"
+  fmiVersion="3.0-alpha.6"
   modelName=""
   instantiationToken=""
   description=""

diff --git a/docs/examples/structural_parameter_example.xml b/docs/examples/structural_parameter_example.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fmiModelDescription
-  fmiVersion="3.0-alpha.5"
+  fmiVersion="3.0-alpha.6"
   modelName=""
   instantiationToken=""
   description=""

diff --git a/docs/examples/unit_definition.xml b/docs/examples/unit_definition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fmiModelDescription
-  fmiVersion="3.0-alpha.5"
+  fmiVersion="3.0-alpha.6"
   modelName=""
   instantiationToken=""
   description=""

diff --git a/docs/examples/variable_types.xml b/docs/examples/variable_types.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<fmiModelDescription fmiVersion="3.0-alpha.5" modelName="VariableTypes" instantiationToken="">
+<fmiModelDescription fmiVersion="3.0-alpha.6" modelName="VariableTypes" instantiationToken="">
 
   <CoSimulation modelIdentifier="VariableTypes"/>
 

diff --git a/docs/index.adoc b/docs/index.adoc
@@ -12,8 +12,8 @@
 :source-highlighter: highlightjs
 :nofooter:
 :favicon: images/favicon.ico
-:revdate: unreleased
-:revnumber: 3.0-alpha.5
+:revdate: 2021-03-07
+:revnumber: 3.0-alpha.6
 :icons: font
 
 include::docs/0___preamble.adoc[]

diff --git a/headers/fmi3FunctionTypes.h b/headers/fmi3FunctionTypes.h
@@ -4,7 +4,7 @@
 #include "fmi3PlatformTypes.h"
 
 /*
-This header file defines the data and function types of FMI 3.0-alpha.5.
+This header file defines the data and function types of FMI 3.0-alpha.6.
 It must be used when compiling an FMU or an FMI importer.
 
 Copyright (C) 2011 MODELISAR consortium,

diff --git a/headers/fmi3Functions.h b/headers/fmi3Functions.h
@@ -2,7 +2,7 @@
 #define fmi3Functions_h
 
 /*
-This header file declares the functions of FMI 3.0-alpha.5.
+This header file declares the functions of FMI 3.0-alpha.6.
 It must be used when compiling an FMU.
 
 In order to have unique function names even if several FMUs
@@ -93,7 +93,7 @@ it may be set to __declspec(dllimport).
 #endif
 
 /* FMI version */
-#define fmi3Version "3.0-alpha.5"
+#define fmi3Version "3.0-alpha.6"
 
 /***************************************************
 Common Functions

diff --git a/headers/fmi3PlatformTypes.h b/headers/fmi3PlatformTypes.h
@@ -2,7 +2,7 @@
 #define fmi3PlatformTypes_h
 
 /*
-This header file defines the data types of FMI 3.0-alpha.5.
+This header file defines the data types of FMI 3.0-alpha.6.
 It must be used by both FMU and FMI master.
 
 Copyright (C) 2008-2011 MODELISAR consortium,

diff --git a/schema/fmi3ModelDescription.xsd b/schema/fmi3ModelDescription.xsd
@@ -122,13 +122,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 				</xs:element>
 				<xs:element ref="Annotations" minOccurs="0"/>
 			</xs:sequence>
-			<xs:attribute name="fmiVersion" use="required">
-				<xs:simpleType>
-					<xs:restriction base="xs:normalizedString">
-						<xs:pattern value="3[.](0-.*)"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:attribute>
+			<xs:attribute name="fmiVersion" fixed="3.0-alpha.6" use="required"/>
 			<xs:attribute name="modelName" type="xs:string" use="required"/>
 			<xs:attribute name="instantiationToken" type="xs:normalizedString" use="required"/>
 			<xs:attribute name="description" type="xs:string"/>