Skip to content

Commit

Permalink
feat (Laerdal.Scripts): move all scripts under the Laerdal.Scripts fo…
Browse files Browse the repository at this point in the history 
…lder
  • Loading branch information
@dsidirop
dsidirop committed Apr 4, 2024
1 parent 45734dd commit ad8c7a7
Show file tree
Hide file tree
Showing 15 changed files with 58 additions and 55 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/github-compile.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
- name: '🏗 📦 Build, Pack & Announce New Release (if appropriate)'
shell: bash
run: |
cd "$build_repository_folderpath" \
cd "$build_repository_folderpath/Laerdal.Scripts" \
&& \
dotnet \
msbuild \
Expand Down
1 change: 1 addition & 0 deletions Laerdal.McuMgr.Bindings.Android.Native/gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
1 change: 1 addition & 0 deletions ...r.Bindings.Android.Native/mcumgr-laerdal-wrapper/gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
8 changes: 4 additions & 4 deletions Laerdal.McuMgr.Bindings.Android/Laerdal.McuMgr.Bindings.Android.NativeBuilder.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@
<Delete Files="$(CoreAarLibrary)"/>

<!-- this builds mcumgr-laerdal-wrapper-release.aar to make life easier we set +x permission on gradlew right before invoking it -->
<Exec WorkingDirectory="$(McuMgrLaerdalWrapperLibSourceDirectory)" Command=" $(GradlePath) --version "/>
<Exec WorkingDirectory="$(McuMgrLaerdalWrapperLibSourceDirectory)" Command=" $(GradlePath) wrapper --distribution-type=BIN --gradle-version=7.6 "/>
<Exec WorkingDirectory="$(McuMgrLaerdalWrapperLibSourceDirectory)" Command=" chmod +x ./gradlew " Condition=" '$(IsUnix)' == 'true' "/>
<Exec WorkingDirectory="$(McuMgrLaerdalWrapperLibSourceDirectory)" Command=" ./gradlew wrapper clean assembleRelease --console plain --warning-mode all "/>
<Exec WorkingDirectory="$(McuMgrLaerdalWrapperLibSourceDirectory)" Command=" $(GradlePath) --version "/>
<Exec WorkingDirectory="$(McuMgrLaerdalWrapperLibSourceDirectory)" Command=" $(GradlePath) wrapper --distribution-type=BIN --gradle-version=7.6 --validate-url "/>
<Exec WorkingDirectory="$(McuMgrLaerdalWrapperLibSourceDirectory)" Command=" chmod +x ./gradlew " Condition=" '$(IsUnix)' == 'true' "/>
<Exec WorkingDirectory="$(McuMgrLaerdalWrapperLibSourceDirectory)" Command=" ./gradlew wrapper clean assembleRelease --console plain --warning-mode all "/>

<Copy SourceFiles="$(McuMgrLaerdalWrapperAarFilePath)" DestinationFiles="$(CoreAarLibrary)"/>
</Target>
Expand Down
8 changes: 4 additions & 4 deletions Laerdal.McuMgr.Bindings.Android/Laerdal.McuMgr.Bindings.Android.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>

<!-- these versions are getting replaced by the build script in one swift pass -->
<Version>1.0.1037.0</Version>
<FileVersion>1.0.1037.0</FileVersion>
<PackageVersion>1.0.1037.0</PackageVersion>
<AssemblyVersion>1.0.1037.0</AssemblyVersion>
<Version>1.0.1039.0</Version>
<FileVersion>1.0.1039.0</FileVersion>
<PackageVersion>1.0.1039.0</PackageVersion>
<AssemblyVersion>1.0.1039.0</AssemblyVersion>

<Title>$(PackageId)</Title>
<Owners>$(Authors)</Owners>
Expand Down
8 changes: 4 additions & 4 deletions Laerdal.McuMgr.Bindings.MacCatalyst/Laerdal.McuMgr.Bindings.MacCatalyst.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@
<AllowedReferenceRelatedFileExtensions>$(AllowedReferenceRelatedFileExtensions);.pdb</AllowedReferenceRelatedFileExtensions>

<!-- these versions are getting replaced by the build script in one swift pass -->
<Version>1.0.1037.0</Version>
<FileVersion>1.0.1037.0</FileVersion>
<PackageVersion>1.0.1037.0</PackageVersion>
<AssemblyVersion>1.0.1037.0</AssemblyVersion>
<Version>1.0.1039.0</Version>
<FileVersion>1.0.1039.0</FileVersion>
<PackageVersion>1.0.1039.0</PackageVersion>
<AssemblyVersion>1.0.1039.0</AssemblyVersion>

<Title>$(PackageId)</Title>
<Summary>McuMgr Bindings for MacCatalyst - MAUI ready</Summary>
Expand Down
8 changes: 4 additions & 4 deletions Laerdal.McuMgr.Bindings.NetStandard/Laerdal.McuMgr.Bindings.NetStandard.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@
<AllowedReferenceRelatedFileExtensions>$(AllowedReferenceRelatedFileExtensions);.pdb</AllowedReferenceRelatedFileExtensions>

<!-- these versions are getting replaced by the build script in one swift pass -->
<Version>1.0.1037.0</Version>
<FileVersion>1.0.1037.0</FileVersion>
<PackageVersion>1.0.1037.0</PackageVersion>
<AssemblyVersion>1.0.1037.0</AssemblyVersion>
<Version>1.0.1039.0</Version>
<FileVersion>1.0.1039.0</FileVersion>
<PackageVersion>1.0.1039.0</PackageVersion>
<AssemblyVersion>1.0.1039.0</AssemblyVersion>

<Title>$(PackageId)</Title>
<Summary>McuMgr C# Implementation (WIP)</Summary>
Expand Down
8 changes: 4 additions & 4 deletions Laerdal.McuMgr.Bindings.iOS/Laerdal.McuMgr.Bindings.iOS.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@
<AllowedReferenceRelatedFileExtensions>$(AllowedReferenceRelatedFileExtensions);.pdb</AllowedReferenceRelatedFileExtensions>

<!-- these versions are getting replaced by the build script in one swift pass -->
<Version>1.0.1037.0</Version>
<FileVersion>1.0.1037.0</FileVersion>
<PackageVersion>1.0.1037.0</PackageVersion>
<AssemblyVersion>1.0.1037.0</AssemblyVersion>
<Version>1.0.1039.0</Version>
<FileVersion>1.0.1039.0</FileVersion>
<PackageVersion>1.0.1039.0</PackageVersion>
<AssemblyVersion>1.0.1039.0</AssemblyVersion>

<Title>$(PackageId)</Title>
<Summary>McuMgr Bindings for iOS - MAUI ready</Summary>
Expand Down
8 changes: 4 additions & 4 deletions Laerdal.McuMgr.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Misc", "_Misc", "{2459FC0F
LICENSE = LICENSE
.gitignore = .gitignore
azure-pipelines.yml = azure-pipelines.yml
Laerdal.CreateNewReleaseInGithub.sh = Laerdal.CreateNewReleaseInGithub.sh
Laerdal.McuMgr.Builder.targets = Laerdal.McuMgr.Builder.targets
Laerdal.Version.sh = Laerdal.Version.sh
Laerdal.CreateNewReleaseInGithub.sh = Laerdal.Scripts\Laerdal.CreateNewReleaseInGithub.sh
Laerdal.McuMgr.Builder.targets = Laerdal.Scripts\Laerdal.McuMgr.Builder.targets
Laerdal.Version.sh = Laerdal.Scripts\Laerdal.Version.sh
global.json = global.json
Laerdal.SetupBuildEnvironment.sh = Laerdal.SetupBuildEnvironment.sh
Laerdal.SetupBuildEnvironment.sh = Laerdal.Scripts\Laerdal.SetupBuildEnvironment.sh
.github\workflows\github-compile.yml = .github\workflows\github-compile.yml
.github\workflows\github-deploy.yml = .github\workflows\github-deploy.yml
EndProjectSection
Expand Down
16 changes: 8 additions & 8 deletions Laerdal.McuMgr/Laerdal.McuMgr.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>

<!-- these versions are getting replaced by the build script in one swift pass -->
<Version>1.0.1037.0</Version>
<FileVersion>1.0.1037.0</FileVersion>
<PackageVersion>1.0.1037.0</PackageVersion>
<AssemblyVersion>1.0.1037.0</AssemblyVersion>
<Version>1.0.1039.0</Version>
<FileVersion>1.0.1039.0</FileVersion>
<PackageVersion>1.0.1039.0</PackageVersion>
<AssemblyVersion>1.0.1039.0</AssemblyVersion>

<Title>$(PackageId)</Title>
<Owners>$(Authors)</Owners>
Expand Down Expand Up @@ -149,21 +149,21 @@

<!-- ANDROID -->
<ItemGroup Condition=" '$(IsAndroid)' == 'true' ">
<PackageReference Include="Laerdal.McuMgr.Bindings.Android" Version="1.0.1037.0"/>
<PackageReference Include="Laerdal.McuMgr.Bindings.Android" Version="1.0.1039.0"/>
</ItemGroup>

<!-- IOS/MacCatalyst -->
<ItemGroup Condition=" '$(IsIOS)' == 'true' ">
<PackageReference Include="Laerdal.McuMgr.Bindings.iOS" Version="1.0.1037.0"/>
<PackageReference Include="Laerdal.McuMgr.Bindings.iOS" Version="1.0.1039.0"/>
</ItemGroup>

<ItemGroup Condition=" '$(IsNetXMacCatalyst)' == 'true' and '$(ShouldSkipMacCatalyst)' != 'true' ">
<PackageReference Include="Laerdal.McuMgr.Bindings.MacCatalyst" Version="1.0.1037.0"/>
<PackageReference Include="Laerdal.McuMgr.Bindings.MacCatalyst" Version="1.0.1039.0"/>
</ItemGroup>

<!-- NETSTANDARD -->
<ItemGroup Condition=" '$(IsNetStandard)' == 'true' ">
<PackageReference Include="Laerdal.McuMgr.Bindings.NetStandard" Version="1.0.1037.0"/>
<PackageReference Include="Laerdal.McuMgr.Bindings.NetStandard" Version="1.0.1039.0"/>
</ItemGroup>

</Project>
0 Laerdal.CreateNewReleaseInGithub.sh → ...ripts/Laerdal.CreateNewReleaseInGithub.sh
View file
File renamed without changes.
Loading

0 comments on commit ad8c7a7

Please sign in to comment.