Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into issue/OSOE-464-executi…
Browse files Browse the repository at this point in the history 
…ng-dotnet-test-with-process-timeout
  • Loading branch information
@sarahelsaig
sarahelsaig committed Jan 26, 2024
2 parents f1876b5 + 026ee56 commit c70aefb
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions NuGetTest/src/Lombiq.OSOCE.NuGet.Web/Lombiq.OSOCE.NuGet.Web.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
<PackageReference Include="Lombiq.HelpfulExtensions" Version="7.0.2" />
<PackageReference Include="Lombiq.Hosting.Azure.ApplicationInsights" Version="7.0.2-alpha.1.osoe-733" />
<PackageReference Include="Lombiq.Hosting.BuildVersionDisplay" Version="4.0.1-alpha.0.osoe-638" />
<PackageReference Include="Lombiq.Hosting.MediaTheme" Version="5.0.1-alpha.0.osoe-638" />
<PackageReference Include="Lombiq.Hosting.MediaTheme.Bridge" Version="5.0.1-alpha.0.osoe-638" />
<PackageReference Include="Lombiq.Hosting.MediaTheme.Targets" Version="5.0.1-alpha.0.osoe-638" />
<PackageReference Include="Lombiq.Hosting.MediaTheme" Version="5.0.1-alpha.1.osoe-775" />
<PackageReference Include="Lombiq.Hosting.MediaTheme.Bridge" Version="5.0.1-alpha.1.osoe-775" />
<PackageReference Include="Lombiq.Hosting.MediaTheme.Targets" Version="5.0.1-alpha.1.osoe-775" />
<PackageReference Include="Lombiq.Hosting.Tenants.Admin.Login" Version="6.3.0-alpha.2.lmbq-249" />
<PackageReference Include="Lombiq.Hosting.Tenants.EnvironmentRobots" Version="6.3.0-alpha.2.lmbq-249" />
<PackageReference Include="Lombiq.Hosting.Tenants.FeaturesGuard" Version="6.3.0-alpha.2.lmbq-249" />
Expand Down
2 changes: 1 addition & 1 deletion NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Lombiq.OSOCE.NuGet.Tests.UI.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<PackageReference Include="Lombiq.DataTables.Tests.UI" Version="7.0.2-alpha.0.osoe-638" />
<PackageReference Include="Lombiq.Hosting.Azure.ApplicationInsights.Tests.UI" Version="7.0.2-alpha.1.osoe-733" />
<PackageReference Include="Lombiq.Hosting.BuildVersionDisplay.Tests.UI" Version="4.0.1-alpha.0.osoe-638" />
<PackageReference Include="Lombiq.Hosting.MediaTheme.Tests.UI" Version="5.0.1-alpha.0.osoe-638" />
<PackageReference Include="Lombiq.Hosting.MediaTheme.Tests.UI" Version="5.0.1-alpha.1.osoe-775" />
<PackageReference Include="Lombiq.Hosting.Tenants.EnvironmentRobots.Tests.UI" Version="6.3.0-alpha.2.lmbq-249" />
<PackageReference Include="Lombiq.Hosting.Tenants.FeaturesGuard.Tests.UI" Version="6.3.0-alpha.2.lmbq-249" />
<PackageReference Include="Lombiq.Hosting.Tenants.IdleTenantManagement.Tests.UI" Version="6.3.0-alpha.2.lmbq-249" />
Expand Down
2 changes: 1 addition & 1 deletion src/Modules/Lombiq.TrainingDemo
Submodule Lombiq.TrainingDemo updated 2 files
+4 −2 Readme.md
+1 −3 StartLearningHere.md
2 changes: 1 addition & 1 deletion src/Themes/Lombiq.Hosting.MediaTheme
Submodule Lombiq.Hosting.MediaTheme updated 5 files
+2 −3 Lombiq.Hosting.MediaTheme.Bridge/Services/FileVersionProviderDecorator.cs
+4 −0 Lombiq.Hosting.MediaTheme/Recipes/Lombiq.Hosting.MediaTheme.Samples.recipe.json
+ − Lombiq.Hosting.MediaTheme/Recipes/_MediaTheme/Assets/example.png
+ − Lombiq.Hosting.MediaTheme/Recipes/_MediaTheme/Assets/example2.png
+6 −0 Lombiq.Hosting.MediaTheme/Recipes/_MediaTheme/Templates/Example.liquid
2 changes: 1 addition & 1 deletion src/Utilities/Lombiq.NodeJs.Extensions
Submodule Lombiq.NodeJs.Extensions updated 2 files
+5 −3 Lombiq.NodeJs.Extensions/Docs/SetupWindows.md
+3 −4 Readme.md

0 comments on commit c70aefb

Please sign in to comment.