Skip to content

Commit

Permalink
Merge branch 'develop-stu3' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Ewout Kramer committed Dec 18, 2018
2 parents 6155289 + 2cc8273 commit 9bfd0b3
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 41 deletions.
10 changes: 1 addition & 9 deletions App.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,5 @@
<value>False</value>
</setting>
</Furore.Fhir.ValidationDemo.Properties.Settings>
</userSettings>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</userSettings>
</configuration>
38 changes: 26 additions & 12 deletions Furore.Fhir.ValidationDemo.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,25 +32,33 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Hl7.Fhir.DSTU2.Core, Version=0.92.5.0, Culture=neutral, PublicKeyToken=d706911480550fc3, processorArchitecture=MSIL">
<HintPath>packages\Hl7.Fhir.DSTU2.0.92.5-beta3\lib\net45\Hl7.Fhir.DSTU2.Core.dll</HintPath>
<Reference Include="Hl7.Fhir.ElementModel, Version=1.0.0.0, Culture=neutral, PublicKeyToken=d706911480550fc3, processorArchitecture=MSIL">
<HintPath>packages\Hl7.Fhir.ElementModel.1.0.0\lib\net45\Hl7.Fhir.ElementModel.dll</HintPath>
</Reference>
<Reference Include="Hl7.Fhir.DSTU2.Specification, Version=0.92.5.0, Culture=neutral, PublicKeyToken=d706911480550fc3, processorArchitecture=MSIL">
<HintPath>packages\Hl7.Fhir.Specification.DSTU2.0.92.5-beta3\lib\net45\Hl7.Fhir.DSTU2.Specification.dll</HintPath>
<Reference Include="Hl7.Fhir.Serialization, Version=1.0.0.0, Culture=neutral, PublicKeyToken=d706911480550fc3, processorArchitecture=MSIL">
<HintPath>packages\Hl7.Fhir.Serialization.1.0.0\lib\net45\Hl7.Fhir.Serialization.dll</HintPath>
</Reference>
<Reference Include="Hl7.Fhir.Support, Version=0.4.4.0, Culture=neutral, PublicKeyToken=d706911480550fc3, processorArchitecture=MSIL">
<HintPath>packages\Hl7.Fhir.Support.0.4.4-beta3\lib\net45\Hl7.Fhir.Support.dll</HintPath>
<Reference Include="Hl7.Fhir.STU3.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=d706911480550fc3, processorArchitecture=MSIL">
<HintPath>packages\Hl7.Fhir.STU3.1.0.0\lib\net45\Hl7.Fhir.STU3.Core.dll</HintPath>
</Reference>
<Reference Include="Hl7.FhirPath, Version=0.4.4.0, Culture=neutral, PublicKeyToken=d706911480550fc3, processorArchitecture=MSIL">
<HintPath>packages\Hl7.FhirPath.0.4.4-beta3\lib\net45\Hl7.FhirPath.dll</HintPath>
<Reference Include="Hl7.Fhir.STU3.Specification, Version=1.0.0.0, Culture=neutral, PublicKeyToken=d706911480550fc3, processorArchitecture=MSIL">
<HintPath>packages\Hl7.Fhir.Specification.STU3.1.0.0\lib\net45\Hl7.Fhir.STU3.Specification.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<Reference Include="Hl7.Fhir.Support, Version=1.0.0.0, Culture=neutral, PublicKeyToken=d706911480550fc3, processorArchitecture=MSIL">
<HintPath>packages\Hl7.Fhir.Support.1.0.0\lib\net45\Hl7.Fhir.Support.dll</HintPath>
</Reference>
<Reference Include="Hl7.FhirPath, Version=1.0.0.0, Culture=neutral, PublicKeyToken=d706911480550fc3, processorArchitecture=MSIL">
<HintPath>packages\Hl7.FhirPath.1.0.0\lib\net45\Hl7.FhirPath.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Core" />
<Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>packages\System.ValueTuple.4.4.0-preview2-25405-01\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
<Reference Include="System.IO.Compression" />
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
Expand Down Expand Up @@ -107,6 +115,12 @@
<None Include="specification.zip">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="xhtml\fhir-xhtml.xsd">
<SubType>Designer</SubType>
</None>
<None Include="xhtml\xml.xsd">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
Expand Down
20 changes: 10 additions & 10 deletions MainForm.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions MainForm.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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
{
Expand Down
14 changes: 8 additions & 6 deletions packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Hl7.Fhir.Specification.DSTU2" version="0.92.5-beta3" targetFramework="net45" />
<package id="Hl7.Fhir.DSTU2" version="0.92.5-beta3" targetFramework="net45" />
<package id="Hl7.Fhir.Support" version="0.4.4-beta3" targetFramework="net45" />
<package id="Hl7.FhirPath" version="0.4.4-beta3" targetFramework="net45" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
<package id="System.ValueTuple" version="4.4.0-preview2-25405-01" targetFramework="net45" />
<package id="Hl7.Fhir.ElementModel" version="1.0.0" targetFramework="net45" />
<package id="Hl7.Fhir.Serialization" version="1.0.0" targetFramework="net45" />
<package id="Hl7.Fhir.Specification.STU3" version="1.0.0" targetFramework="net45" />
<package id="Hl7.Fhir.STU3" version="1.0.0" targetFramework="net45" />
<package id="Hl7.Fhir.Support" version="1.0.0" targetFramework="net45" />
<package id="Hl7.FhirPath" version="1.0.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net45" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net45" />
</packages>

0 comments on commit 9bfd0b3

Please sign in to comment.