mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enable dotnet-watch test and remove prep.sh workaround (#15319)

Browse source
This commit is contained in:
Michael Simons 2023-01-23 15:58:59 -06:00 committed by GitHub
parent a6d4473dff
commit db9d5a33c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/SourceBuild/content/build.proj
View file

@ -119,7 +119,7 @@
<Target Name="CheckIfCreateSmokeTestPrereqsExistToPack"> <Target Name="CheckIfCreateSmokeTestPrereqsExistToPack">
<PropertyGroup> <PropertyGroup>
<SmokeTestsArtifactsDir>$(SmokeTestsDir)bin/$(Configuration)/net7.0/</SmokeTestsArtifactsDir> <SmokeTestsArtifactsDir>$(SmokeTestsDir)bin/$(Configuration)/net8.0/</SmokeTestsArtifactsDir>
<SmokeTestsPackagesDir>$(SmokeTestsArtifactsDir)packages/</SmokeTestsPackagesDir> <SmokeTestsPackagesDir>$(SmokeTestsArtifactsDir)packages/</SmokeTestsPackagesDir>
</PropertyGroup> </PropertyGroup>

3
src/SourceBuild/content/prep.sh
View file

@ -108,9 +108,6 @@ fi
if [ "$installDotnet" == "true" ]; then if [ "$installDotnet" == "true" ]; then
echo " Installing dotnet..." echo " Installing dotnet..."
(source ./eng/common/tools.sh && InitializeDotNetCli true) (source ./eng/common/tools.sh && InitializeDotNetCli true)
# TODO: Remove once runtime dependency is gone
bash .dotnet/dotnet-install.sh --install-dir "$SCRIPT_ROOT/.dotnet" --version 7.0.0 --runtime dotnet
fi fi
# Build bootstrap, if specified # Build bootstrap, if specified

2
src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs
View file

@ -13,7 +13,7 @@ public class DotNetWatchTests : SmokeTests
{ {
public DotNetWatchTests(ITestOutputHelper outputHelper) : base(outputHelper) { } public DotNetWatchTests(ITestOutputHelper outputHelper) : base(outputHelper) { }
// [Fact] - Renable with https://github.com/dotnet/source-build/issues/3195 [Fact]
public void WatchTests() public void WatchTests()
{ {
string projectDirectory = DotNetHelper.ExecuteNew(DotNetTemplate.Console.GetName(), nameof(DotNetWatchTests)); string projectDirectory = DotNetHelper.ExecuteNew(DotNetTemplate.Console.GetName(), nameof(DotNetWatchTests));

2
src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj
View file

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>