Skip to content

Commit

Permalink
Eliminate dependency on .NET 10's non source-buildable Microsoft.AspN…
Browse files Browse the repository at this point in the history
…etCore.App.Internal.Assets package.
  • Loading branch information
tmds committed Jan 22, 2025
1 parent 20a3d72 commit 33a3da6
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion cgroup-limit/cgroup-limit.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>$(TestTargetFramework)</TargetFramework>
Expand Down
4 changes: 2 additions & 2 deletions createdump-aspnet/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ IFS='.-' read -ra VERSION_SPLIT <<< "$1"

version=${VERSION_SPLIT[0]}.${VERSION_SPLIT[1]}

dotnet new web --force
dotnet new web --no-restore --force

sed -i -e 's|.UseStartup|.UseUrls("http://localhost:5000").UseStartup|' Program.cs

# Do not kick off compiler servers that hang around after a build
dotnet build -p:UseRazorBuildServer=false -p:UseSharedCompilation=false /m:1
dotnet build -p:UseRazorBuildServer=false -p:UseSharedCompilation=false /p:UsingMicrosoftNETSdkRazor=false /p:ScopedCssEnabled=false /m:1

dotnet run --no-build --no-restore &
sleep 5
Expand Down
4 changes: 2 additions & 2 deletions debugging-sos-lldb-via-core/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ rm -rf TestDir
mkdir TestDir
cd TestDir

dotnet new web
dotnet new web --no-restore
sed -i -e 's|.UseStartup|.UseUrls("http://localhost:5000").UseStartup|' Program.cs
dotnet build "${no_server[@]}"
dotnet build "${no_server[@]}" /p:UsingMicrosoftNETSdkRazor=false /p:ScopedCssEnabled=false

dotnet bin/Debug/net*/TestDir.dll &
run_pid=$!
Expand Down
4 changes: 2 additions & 2 deletions debugging-via-dotnet-dump/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -94,15 +94,15 @@ dotnet tool install -g dotnet-dump
framework_dir=$(../dotnet-directory --framework "${sdk_version}")
test -f "${framework_dir}/createdump"

no_server=("/nodeReuse:false" "/p:UseSharedCompilation=false" "/p:UseRazorBuildServer=false")
no_server=("/nodeReuse:false" "/p:UseSharedCompilation=false" "/p:UseRazorBuildServer=false" "/p:UsingMicrosoftNETSdkRazor=false" "/p:ScopedCssEnabled=false")

heading "Running test application"

rm -rf TestDir
mkdir TestDir
cd TestDir

dotnet new web
dotnet new web --no-restore
sed -i -e 's|.UseStartup|.UseUrls("http://localhost:5000").UseStartup|' Program.cs
dotnet build "${no_server[@]}"

Expand Down
4 changes: 2 additions & 2 deletions publish-aspnet-selfcontained/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ url="http://localhost:5000"
dir=web
output_dir=output
rm -rf "$dir" "$output_dir"
dotnet new web -o "$dir"
dotnet publish --sc -r "$runtime_id" -o "$output_dir" "$dir"
dotnet new web --no-restore -o "$dir"
dotnet publish --sc -r "$runtime_id" -o "$output_dir" /p:UsingMicrosoftNETSdkRazor=false /p:ScopedCssEnabled=false "$dir"

ASPNETCORE_URLS="$url" "./$output_dir/web" &
run_pid=$!
Expand Down
4 changes: 2 additions & 2 deletions telemetry-is-off-by-default/test-telemetry-tcpdump.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ sleep 2
rm -rf WebTest
mkdir -p WebTest
pushd WebTest
dotnet new web >/dev/null 2>&1 || true
dotnet publish
dotnet new web --no-restore >/dev/null 2>&1 || true
dotnet publish /p:UsingMicrosoftNETSdkRazor=false /p:ScopedCssEnabled=false
popd
sleep 2
sudo --non-interactive pkill tcpdump
Expand Down
2 changes: 1 addition & 1 deletion telemetry-is-off-by-default/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ set -euo pipefail
IFS=$'\n\t'
set -x

no_server=("/nodeReuse:false" "/p:UseSharedCompilation=false" "/p:UseRazorBuildServer=false")
no_server=("/nodeReuse:false" "/p:UseSharedCompilation=false" "/p:UseRazorBuildServer=false" "/p:UsingMicrosoftNETSdkRazor=false" "/p:ScopedCssEnabled=false")

IFS='.-' read -ra VERSION_SPLIT <<< "$1"
DOTNET_MAJOR="${VERSION_SPLIT[0]}"
Expand Down

0 comments on commit 33a3da6

Please sign in to comment.