Skip to content

Commit

Permalink
Merged new UI into DSTU3
Browse files Browse the repository at this point in the history
  • Loading branch information
Ewout Kramer committed Aug 4, 2017
2 parents 5a00db1 + f1c29b8 commit 6155289
Show file tree
Hide file tree
Showing 15 changed files with 1,135 additions and 264 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,3 +240,5 @@ ModelManifest.xml

# FAKE - F# Make
.fake/

DotNetValidationDemo_v13\.zip
33 changes: 31 additions & 2 deletions App.config
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="Furore.Fhir.ValidationDemo.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
</configSections>
Expand All @@ -16,6 +16,35 @@
<setting name="InstanceXml" serializeAs="String">
<value />
</setting>
<setting name="TerminologyService" serializeAs="String">
<value />
</setting>
<setting name="UseBuiltInTX" serializeAs="String">
<value>True</value>
</setting>
<setting name="TerminologyServiceList" serializeAs="String">
<value>http://ontoserver.csiro.au/stu3-latest|http://tx.fhir.org/r3</value>
</setting>
<setting name="EnableTrace" serializeAs="String">
<value>False</value>
</setting>
<setting name="DoXsdValidation" serializeAs="String">
<value>False</value>
</setting>
<setting name="DisableFP" serializeAs="String">
<value>False</value>
</setting>
<setting name="RegenerateSnapshot" serializeAs="String">
<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>
</configuration>
42 changes: 27 additions & 15 deletions Furore.Fhir.ValidationDemo.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,26 @@
<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>
<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>
<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>
<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>
<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>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<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>
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
Expand All @@ -57,6 +71,12 @@
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="SettingsForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="SettingsForm.Designer.cs">
<DependentUpon>SettingsForm.cs</DependentUpon>
</Compile>
<EmbeddedResource Include="MainForm.resx">
<DependentUpon>MainForm.cs</DependentUpon>
</EmbeddedResource>
Expand All @@ -69,6 +89,9 @@
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<EmbeddedResource Include="SettingsForm.resx">
<DependentUpon>SettingsForm.cs</DependentUpon>
</EmbeddedResource>
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
Expand All @@ -81,24 +104,13 @@
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<None Include="specification.zip">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\fhir-net-api\src\Hl7.Fhir.Core\Hl7.Fhir.Core.csproj">
<Project>{7C9F23BF-498C-40AA-80CF-D495CE58D246}</Project>
<Name>Hl7.Fhir.Core</Name>
</ProjectReference>
<ProjectReference Include="..\fhir-net-api\src\Hl7.Fhir.Specification\Hl7.Fhir.Specification.csproj">
<Project>{61AF8F62-C4AA-4A5F-A7D5-76021A300D09}</Project>
<Name>Hl7.Fhir.Specification</Name>
</ProjectReference>
<ProjectReference Include="..\fhir-net-api\src\Hl7.Fhir.Support\Hl7.Fhir.Support.csproj">
<Project>{8e194124-0629-4059-a084-fd42fcb6ca42}</Project>
<Name>Hl7.Fhir.Support</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
26 changes: 1 addition & 25 deletions Furore.Fhir.ValidationDemo.sln
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26430.14
VisualStudioVersion = 15.0.26430.6
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Furore.Fhir.ValidationDemo", "Furore.Fhir.ValidationDemo.csproj", "{655AE501-2657-42F5-A1B5-4DBE94D5AB05}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hl7.Fhir.Core", "..\fhir-net-api\src\Hl7.Fhir.Core\Hl7.Fhir.Core.csproj", "{7C9F23BF-498C-40AA-80CF-D495CE58D246}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hl7.Fhir.Specification", "..\fhir-net-api\src\Hl7.Fhir.Specification\Hl7.Fhir.Specification.csproj", "{61AF8F62-C4AA-4A5F-A7D5-76021A300D09}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hl7.Fhir.Support", "..\fhir-net-api\src\Hl7.Fhir.Support\Hl7.Fhir.Support.csproj", "{8E194124-0629-4059-A084-FD42FCB6CA42}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hl7.FhirPath", "..\fhir-net-api\src\Hl7.FhirPath\Hl7.FhirPath.csproj", "{2B1B6B23-7FAB-4612-80A4-508C302C75F5}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -23,22 +15,6 @@ Global
{655AE501-2657-42F5-A1B5-4DBE94D5AB05}.Debug|Any CPU.Build.0 = Debug|Any CPU
{655AE501-2657-42F5-A1B5-4DBE94D5AB05}.Release|Any CPU.ActiveCfg = Release|Any CPU
{655AE501-2657-42F5-A1B5-4DBE94D5AB05}.Release|Any CPU.Build.0 = Release|Any CPU
{7C9F23BF-498C-40AA-80CF-D495CE58D246}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7C9F23BF-498C-40AA-80CF-D495CE58D246}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7C9F23BF-498C-40AA-80CF-D495CE58D246}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7C9F23BF-498C-40AA-80CF-D495CE58D246}.Release|Any CPU.Build.0 = Release|Any CPU
{61AF8F62-C4AA-4A5F-A7D5-76021A300D09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{61AF8F62-C4AA-4A5F-A7D5-76021A300D09}.Debug|Any CPU.Build.0 = Debug|Any CPU
{61AF8F62-C4AA-4A5F-A7D5-76021A300D09}.Release|Any CPU.ActiveCfg = Release|Any CPU
{61AF8F62-C4AA-4A5F-A7D5-76021A300D09}.Release|Any CPU.Build.0 = Release|Any CPU
{8E194124-0629-4059-A084-FD42FCB6CA42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8E194124-0629-4059-A084-FD42FCB6CA42}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8E194124-0629-4059-A084-FD42FCB6CA42}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8E194124-0629-4059-A084-FD42FCB6CA42}.Release|Any CPU.Build.0 = Release|Any CPU
{2B1B6B23-7FAB-4612-80A4-508C302C75F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2B1B6B23-7FAB-4612-80A4-508C302C75F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2B1B6B23-7FAB-4612-80A4-508C302C75F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2B1B6B23-7FAB-4612-80A4-508C302C75F5}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Loading

0 comments on commit 6155289

Please sign in to comment.