Skip to content

Commit

Permalink
build: Insert missing ampersand issue #432 (#433)
Browse files Browse the repository at this point in the history
* Update README.md

* Create HL7v2-templates.md

* Create HL7v2-FHIRValidator.md

* Create HL7v2-ImportantPoints.md

* Update README.md

* Update README.md

Updated STU3-R4 information for OSS FHIR Server

* Fix StyleCop Dependency (#397)

- Fix build-time dependency on StyleCop.Analyzers to no longer force consumers to use the same analyzers

* Bump Newtonsoft.Json in /src/Microsoft.Health.Fhir.TemplateManagement

Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) from 12.0.3 to 13.0.1.
- [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases)
- [Commits](JamesNK/Newtonsoft.Json@12.0.3...13.0.1)

---
updated-dependencies:
- dependency-name: Newtonsoft.Json
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump Newtonsoft.Json from 12.0.3 to 13.0.1 in src/Microsoft.Health.Fhir.TemplateManagement/Microsoft.Health.Fhir.Liquid.Converter.nuspec

* Exclude data folder

* Update the GeoPol

* Update version

* Remove StyleCop from Nuspec (#410)

- Remove StyleCop from the nuspec to prevent forcing consumers to import StyleCop

* Prepare new release for 5.0.3 (#413)

* Fix more than 3 digits for milliseconds in datetime (#409)

* fix

* fix

* Update version to 5.0.3 (#412)

Co-authored-by: sowu880 <57981365+sowu880@users.noreply.github.com>

* Add NJsonSchema dependency to nuspec file (#423)

* Prepare new release for 5.0.5 (#425)

* Update version to 5.0.5 (#424)

* Interface to convert JObject (#416)

* build: Insert missing ampersand

* build: Fix bin-folder creation

* build: fix mkdir command for windows

* build: unfix mkdir command for windows

* build: remove double binfolder

* build: Ignore error in folder creation

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: yankunhuang-pku <66581117+yankunhuang-pku@users.noreply.github.com>
Co-authored-by: ginalee-dotcom <68250213+ginalee-dotcom@users.noreply.github.com>
Co-authored-by: sowu880 <57981365+sowu880@users.noreply.github.com>
Co-authored-by: Irene Joseph <90474712+irenepjoseph@users.noreply.github.com>
Co-authored-by: Qiwei Jin <qiwjin@microsoft.com>
Co-authored-by: Will Sugarman <will.sugarman@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yankun Huang <yankhuan@microsoft.com>
Co-authored-by: Yue Fei <yufei@microsoft.com>
Co-authored-by: Will Sugarman <will.sugarman@microsoft.com>
Co-authored-by: QuanWanxx <68055742+QuanWanxx@users.noreply.github.com>
  • Loading branch information
12 people committed Oct 27, 2022
1 parent 8660f99 commit cfe5b02
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
<dependency id="Microsoft.IdentityModel.Protocols" version="6.8.0" exclude="Build,Analyzers" />
<dependency id="Microsoft.Azure.ContainerRegistry" version="1.0.0-preview.1" exclude="Build,Analyzers" />
<dependency id="Microsoft.Build" version="16.7.0" exclude="Build,Analyzers" />
<dependency id="Microsoft.Extensions.Caching.Memory" version="3.1.9" exclude="Build,Analyzers" />
<dependency id="Microsoft.Extensions.Caching.Memory" version="3.1.9" exclude="Build,Analyzers" />
<dependency id="Microsoft.Extensions.Logging" version="3.1.9" exclude="Build,Analyzers" />
<dependency id="Microsoft.Extensions.Logging.Abstractions" version="3.1.9" exclude="Build,Analyzers" />
<dependency id="Microsoft.Extensions.Options" version="5.0.0" exclude="Build,Analyzers" />
<dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
<dependency id="NJsonSchema" version="10.7.2" exclude="Build,Analyzers" />
<dependency id="SharpCompress" version="0.29.0" exclude="Build,Analyzers" />
<dependency id="StyleCop.Analyzers" version="1.1.118" exclude="Build,Analyzers" />
<dependency id="System.Runtime" version="4.3.1" exclude="Build,Analyzers" />
<dependency id="System.Runtime.Caching" version="4.7.0" exclude="Build,Analyzers" />
</group>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,15 @@
<DataFolder>$(SolutionFolder)data\</DataFolder>
<BinFolder>$(SolutionFolder)bin\</BinFolder>
<CopyExecutable>copy</CopyExecutable>
<MakeDirectory>mkdir</MakeDirectory>
</PropertyGroup>

<PropertyGroup Condition="'$(OS)' != 'Windows_NT'">
<SolutionFolder>../../</SolutionFolder>
<DataFolder>$(SolutionFolder)data/</DataFolder>
<BinFolder>$(SolutionFolder)bin/</BinFolder>
<CopyExecutable>cp</CopyExecutable>
<MakeDirectory>mkdir -p</MakeDirectory>
</PropertyGroup>

<ItemGroup>
Expand Down Expand Up @@ -76,7 +78,7 @@
</ItemGroup>

<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
<Exec Command="mkdir $(BinFolder) &amp; tar -zcvf $(BinFolder)Hl7v2DefaultTemplates.tar.gz -C $(DataFolder)Templates/Hl7v2 ." />
<Exec Command="$(MakeDirectory) $(BinFolder) &amp; tar -zcvf $(BinFolder)Hl7v2DefaultTemplates.tar.gz -C $(DataFolder)Templates/Hl7v2 ." />
<Exec Command="tar -zcvf $(BinFolder)CcdaDefaultTemplates.tar.gz -C $(DataFolder)Templates/Ccda ." />
<Exec Command="tar -zcvf $(BinFolder)JsonDefaultTemplates.tar.gz -C $(DataFolder)Templates/Json ." />
<Exec Command="tar -zcvf $(BinFolder)Stu3ToR4DefaultTemplates.tar.gz -C $(DataFolder)Templates/Stu3ToR4 ." />
Expand All @@ -86,7 +88,7 @@
<DownloadFile SourceUrl="$(OrasWinUrl)" DestinationFolder="$(BinFolder)" DestinationFileName="$(OrasWinTarGzFile)">
<Output TaskParameter="DownloadedFile" ItemName="Content" />
</DownloadFile>
<Exec Command="tar -xvf $(BinFolder)$(OrasWinTarGzFile) -C $(BinFolder) &amp; $(CopyExecutable) $(BinFolder)oras.exe ." />
<Exec Command="tar -xvf $(BinFolder)$(OrasWinTarGzFile) -C $(BinFolder) &amp;&amp; $(CopyExecutable) $(BinFolder)oras.exe ." />
</Target>

<Target Name="DownloadOSXOrasFile" BeforeTargets="Build">
Expand Down

0 comments on commit cfe5b02

Please sign in to comment.