Skip to content

Commit 2123577

Browse files
DamianEdwardsDamianEdwards
authored
Updated to 9.4 (#873)
* Updated to latest 9.4 build * Update NuGet.config * Fix functions & support local build w/ no restore caching Update .gitignore Support restore w/ no-cache in build.cmd/build.sh * Update to final 9.4.0 build
1 parent d22f21b commit 2123577

49 files changed

Lines changed: 102 additions & 93 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ publish/
222222
PublishScripts/
223223

224224
# NuGet Packages
225+
.packages/*
225226
*.nupkg
226227
# NuGet Symbol Packages
227228
*.snupkg

‎.vscode/settings.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"dotnet.defaultSolution": "disable"
3+
}

‎build.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
@ECHO OFF
22

3-
dotnet build .\build\Build.proj
3+
dotnet build .\build\Build.proj %*

‎build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/usr/bin/env bash
22

3-
dotnet build ./build/Build.proj
3+
dotnet build ./build/Build.proj "$@"

‎build/Build.proj‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,12 @@
1515
<Target Name="BuildSamples" BeforeTargets="Build">
1616
<Message Text="Building @(SampleSln->Count()) samples" Importance="High" />
1717

18-
<MSBuild Projects="@(SampleSln)" Targets="Restore" />
18+
<PropertyGroup>
19+
<RestorePackagesPath Condition="'$(NoRestoreCache)' == 'true'">$(MSBuildThisFileDirectory)../.packages</RestorePackagesPath>
20+
<RestoreNoHttpCache Condition="'$(RestoreNoHttpCache)' == '' and '$(NoRestoreCache)' == 'true'">true</RestoreNoHttpCache>
21+
</PropertyGroup>
22+
23+
<MSBuild Projects="@(SampleSln)" Targets="Restore" Properties="RestorePackagesPath=$(RestorePackagesPath);RestoreNoHttpCache=$(RestoreNoHttpCache)" />
1924
<MSBuild Projects="@(SampleSln)" Targets="Build" BuildInParallel="True" />
2025

2126
<Message Text="@(SampleSln->Count()) samples successfully built" Importance="High" />

‎samples/AspireShop/AspireShop.AppHost/AspireShop.AppHost.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Sdk Name="Aspire.AppHost.Sdk" Version="9.3.0" />
3+
<Sdk Name="Aspire.AppHost.Sdk" Version="9.4.0" />
44

55
<PropertyGroup>
66
<OutputType>Exe</OutputType>
@@ -11,9 +11,9 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.3.0" />
15-
<PackageReference Include="Aspire.Hosting.PostgreSQL" Version="9.3.0" />
16-
<PackageReference Include="Aspire.Hosting.Redis" Version="9.3.0" />
14+
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.4.0" />
15+
<PackageReference Include="Aspire.Hosting.PostgreSQL" Version="9.4.0" />
16+
<PackageReference Include="Aspire.Hosting.Redis" Version="9.4.0" />
1717
<ProjectReference Include="..\AspireShop.BasketService\AspireShop.BasketService.csproj" />
1818
<ProjectReference Include="..\AspireShop.CatalogDbManager\AspireShop.CatalogDbManager.csproj" />
1919
<ProjectReference Include="..\AspireShop.CatalogService\AspireShop.CatalogService.csproj" />

‎samples/AspireShop/AspireShop.BasketService/AspireShop.BasketService.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<ItemGroup>
1010
<PackageReference Include="Grpc.AspNetCore" Version="2.70.0" />
1111
<PackageReference Include="Grpc.AspNetCore.HealthChecks" Version="2.70.0" />
12-
<PackageReference Include="Aspire.StackExchange.Redis" Version="9.3.0" />
12+
<PackageReference Include="Aspire.StackExchange.Redis" Version="9.4.0" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

‎samples/AspireShop/AspireShop.CatalogDb/AspireShop.CatalogDb.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.3.0" />
10+
<PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.4.0" />
1111
</ItemGroup>
1212

1313
</Project>

‎samples/AspireShop/AspireShop.CatalogDbManager/AspireShop.CatalogDbManager.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.3.0" />
10+
<PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.4.0" />
1111
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.13">
1212
<PrivateAssets>all</PrivateAssets>
1313
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎samples/AspireShop/AspireShop.CatalogService/AspireShop.CatalogService.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<ItemGroup>
1515
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.14" />
1616
<PackageReference Include="Swashbuckle.AspNetCore" Version="7.3.1" />
17-
<PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.3.0" />
17+
<PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.4.0" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

0 commit comments

Comments
 (0)