diff --git a/App.config b/App.config
index fa344e6..24ddb5b 100644
--- a/App.config
+++ b/App.config
@@ -38,13 +38,5 @@
False
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/Furore.Fhir.ValidationDemo.csproj b/Furore.Fhir.ValidationDemo.csproj
index 47b88ba..a821cff 100644
--- a/Furore.Fhir.ValidationDemo.csproj
+++ b/Furore.Fhir.ValidationDemo.csproj
@@ -32,25 +32,33 @@
4
-
- packages\Hl7.Fhir.DSTU2.0.92.5-beta3\lib\net45\Hl7.Fhir.DSTU2.Core.dll
+
+ packages\Hl7.Fhir.ElementModel.1.0.0\lib\net45\Hl7.Fhir.ElementModel.dll
-
- packages\Hl7.Fhir.Specification.DSTU2.0.92.5-beta3\lib\net45\Hl7.Fhir.DSTU2.Specification.dll
+
+ packages\Hl7.Fhir.Serialization.1.0.0\lib\net45\Hl7.Fhir.Serialization.dll
-
- packages\Hl7.Fhir.Support.0.4.4-beta3\lib\net45\Hl7.Fhir.Support.dll
+
+ packages\Hl7.Fhir.STU3.1.0.0\lib\net45\Hl7.Fhir.STU3.Core.dll
-
- packages\Hl7.FhirPath.0.4.4-beta3\lib\net45\Hl7.FhirPath.dll
+
+ packages\Hl7.Fhir.Specification.STU3.1.0.0\lib\net45\Hl7.Fhir.STU3.Specification.dll
-
- packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll
+
+ packages\Hl7.Fhir.Support.1.0.0\lib\net45\Hl7.Fhir.Support.dll
+
+
+ packages\Hl7.FhirPath.1.0.0\lib\net45\Hl7.FhirPath.dll
+
+
+ packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll
+
-
- packages\System.ValueTuple.4.4.0-preview2-25405-01\lib\netstandard1.0\System.ValueTuple.dll
+
+
+ packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll
@@ -107,6 +115,12 @@
PreserveNewest
+
+ Designer
+
+
+ Designer
+
diff --git a/MainForm.Designer.cs b/MainForm.Designer.cs
index a04c78e..f8d856b 100644
--- a/MainForm.Designer.cs
+++ b/MainForm.Designer.cs
@@ -1,4 +1,4 @@
-namespace Furore.Fhir.ValidationDemo
+namespace Furore.Fhir.ValidationDemo
{
partial class MainForm
{
@@ -250,9 +250,9 @@ private void InitializeComponent()
this.chkGenSnapshot.AutoSize = true;
this.chkGenSnapshot.Checked = global::Furore.Fhir.ValidationDemo.Properties.Settings.Default.RegenerateSnapshot;
this.chkGenSnapshot.DataBindings.Add(new System.Windows.Forms.Binding("Checked", global::Furore.Fhir.ValidationDemo.Properties.Settings.Default, "RegenerateSnapshot", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
- this.chkGenSnapshot.Location = new System.Drawing.Point(418, 9);
+ this.chkGenSnapshot.Location = new System.Drawing.Point(418, 19);
this.chkGenSnapshot.Name = "chkGenSnapshot";
- this.chkGenSnapshot.Size = new System.Drawing.Size(146, 27);
+ this.chkGenSnapshot.Size = new System.Drawing.Size(133, 17);
this.chkGenSnapshot.TabIndex = 24;
this.chkGenSnapshot.Text = "Regenerate snapshots";
this.chkGenSnapshot.UseVisualStyleBackColor = true;
@@ -263,9 +263,9 @@ private void InitializeComponent()
this.chkDisableFP.AutoSize = true;
this.chkDisableFP.Checked = global::Furore.Fhir.ValidationDemo.Properties.Settings.Default.DisableFP;
this.chkDisableFP.DataBindings.Add(new System.Windows.Forms.Binding("Checked", global::Furore.Fhir.ValidationDemo.Properties.Settings.Default, "DisableFP", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
- this.chkDisableFP.Location = new System.Drawing.Point(248, 9);
+ this.chkDisableFP.Location = new System.Drawing.Point(248, 19);
this.chkDisableFP.Name = "chkDisableFP";
- this.chkDisableFP.Size = new System.Drawing.Size(154, 27);
+ this.chkDisableFP.Size = new System.Drawing.Size(141, 17);
this.chkDisableFP.TabIndex = 23;
this.chkDisableFP.Text = "Disable Fhir&Path checks";
this.chkDisableFP.UseVisualStyleBackColor = true;
@@ -276,9 +276,9 @@ private void InitializeComponent()
this.chkShowTraceInfo.AutoSize = true;
this.chkShowTraceInfo.Checked = global::Furore.Fhir.ValidationDemo.Properties.Settings.Default.EnableTrace;
this.chkShowTraceInfo.DataBindings.Add(new System.Windows.Forms.Binding("Checked", global::Furore.Fhir.ValidationDemo.Properties.Settings.Default, "EnableTrace", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
- this.chkShowTraceInfo.Location = new System.Drawing.Point(13, 9);
+ this.chkShowTraceInfo.Location = new System.Drawing.Point(13, 19);
this.chkShowTraceInfo.Name = "chkShowTraceInfo";
- this.chkShowTraceInfo.Size = new System.Drawing.Size(121, 27);
+ this.chkShowTraceInfo.Size = new System.Drawing.Size(108, 17);
this.chkShowTraceInfo.TabIndex = 21;
this.chkShowTraceInfo.Text = "&Trace information";
this.chkShowTraceInfo.UseVisualStyleBackColor = true;
@@ -289,9 +289,9 @@ private void InitializeComponent()
this.chkXsdValidation.AutoSize = true;
this.chkXsdValidation.Checked = global::Furore.Fhir.ValidationDemo.Properties.Settings.Default.DoXsdValidation;
this.chkXsdValidation.DataBindings.Add(new System.Windows.Forms.Binding("Checked", global::Furore.Fhir.ValidationDemo.Properties.Settings.Default, "DoXsdValidation", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
- this.chkXsdValidation.Location = new System.Drawing.Point(135, 9);
+ this.chkXsdValidation.Location = new System.Drawing.Point(135, 19);
this.chkXsdValidation.Name = "chkXsdValidation";
- this.chkXsdValidation.Size = new System.Drawing.Size(105, 27);
+ this.chkXsdValidation.Size = new System.Drawing.Size(92, 17);
this.chkXsdValidation.TabIndex = 22;
this.chkXsdValidation.Text = "&Xsd validation";
this.chkXsdValidation.UseVisualStyleBackColor = true;
@@ -375,7 +375,7 @@ private void InitializeComponent()
this.Controls.Add(this.instanceBox);
this.Controls.Add(this.groupBox3);
this.Name = "MainForm";
- this.Text = ".NET Profile Validation Tool 1.4 (DSTU2)";
+ this.Text = ".NET Profile Validation Tool 1.5.1 (DSTU2)";
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.MainForm_FormClosed);
this.Load += new System.EventHandler(this.MainForm_Load);
this.instanceBox.ResumeLayout(false);
diff --git a/MainForm.cs b/MainForm.cs
index da1981c..b884514 100644
--- a/MainForm.cs
+++ b/MainForm.cs
@@ -41,7 +41,7 @@ public MainForm()
private void btnReload_Click(object sender, EventArgs e)
{
- refreshProfileSource();
+ ProfileSource = refreshProfileSource();
}
private void MainForm_Load(object sender, EventArgs e)
@@ -142,7 +142,7 @@ private void btnValidate_Click(object sender, EventArgs e)
// Configure the validator based on the user's settings
// This includes a reference to the resolver that we have constructed in previous methods
// and which helps the validator to look for profiles
- ValidationSettings settings = ValidationSettings.Default;
+ ValidationSettings settings = ValidationSettings.CreateDefault();
settings.EnableXsdValidation = chkXsdValidation.Checked;
settings.Trace = chkShowTraceInfo.Checked;
settings.ResourceResolver = this.ProfileSource;
@@ -205,7 +205,7 @@ private IResourceResolver refreshProfileSource()
{
// We not only have a source for core data, we also read data from a user-specified directory. We also cache the contents of this source, like
// we did with the CoreSource above.
- var directorySource = new CachedResolver(new DirectorySource(profilePath, includeSubdirectories: true));
+ var directorySource = new CachedResolver(new DirectorySource(profilePath, new DirectorySourceSettings { IncludeSubDirectories = true }));
// Finally, we combine both sources, so we will find profiles both from the core zip as well as from the directory.
// By mentioning the directory source first, anything in the user directory will override what is in the core zip.
@@ -285,7 +285,7 @@ private void onGetExampleResource(object sender, OnResolveResourceReferenceEvent
// i.e. DSTU2/STU3/release 4 etcetera.
// For now, we have just implemented this interface for POCO's so, let's
// create one.
- e.Result = new PocoNavigator(poco);
+ e.Result = poco.ToTypedElement();
}
else
{
diff --git a/packages.config b/packages.config
index eac7bcb..e250c14 100644
--- a/packages.config
+++ b/packages.config
@@ -1,9 +1,11 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file