Skip to content

Commit 9be14a3

Browse files
committed
Enable building samples on CI
1 parent 9e0f99e commit 9be14a3

File tree

4 files changed

+18
-15
lines changed

4 files changed

+18
-15
lines changed

Directory.Packages.props

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
<Project>
1+
<Project>
22
<PropertyGroup>
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
55
</PropertyGroup>
66
<ItemGroup>
77
<PackageVersion Include="Antlr" Version="3.5.0.2" />
8-
<PackageVersion Include="AspNet.ScriptManager.bootstrap" Version="3.4.1" />
9-
<PackageVersion Include="AspNet.ScriptManager.jQuery" Version="3.7.1" />
8+
<PackageVersion Include="AspNet.ScriptManager.bootstrap" Version="5.2.3" />
9+
<PackageVersion Include="AspNet.ScriptManager.jQuery" Version="3.7.0" />
1010
<PackageVersion Include="AspNet.ScriptManager.jQuery.UI.Combined" Version="1.13.2" />
1111
<PackageVersion Include="Autofac.Extras.Moq" Version="6.0.0" />
1212
<PackageVersion Include="AutoFixture" Version="4.15.0" />
1313
<PackageVersion Include="Basic.Reference.Assemblies" Version="1.4.5" />
14-
<PackageVersion Include="bootstrap" Version="3.4.1" />
14+
<PackageVersion Include="bootstrap" Version="5.2.3" />
1515
<PackageVersion Include="coverlet.collector" Version="3.1.2" />
16-
<PackageVersion Include="jQuery" Version="3.7.1" />
16+
<PackageVersion Include="jQuery" Version="3.7.0" />
1717
<PackageVersion Include="jQuery.Validation" Version="1.19.5" />
1818
<PackageVersion Include="Microsoft.AspNet.FriendlyUrls" Version="1.0.2" />
1919
<PackageVersion Include="Microsoft.AspNet.Identity.EntityFramework" Version="2.2.3" />
@@ -82,4 +82,4 @@
8282
<PackageVersion Include="WebGrease" Version="1.6.0" />
8383
<PackageVersion Include="Yarp.ReverseProxy" Version="2.2.0" />
8484
</ItemGroup>
85-
</Project>
85+
</Project>

eng/Build.props

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<!-- Specify the solutions to build. Add all new solutions/projects here as necessary or the main build won't build them! -->
4-
<ItemGroup>
4+
<ItemGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
5+
<ProjectToBuild Include="$(MSBuildThisFileDirectory)..\Microsoft.AspNetCore.SystemWebAdapters.sln" />
6+
</ItemGroup>
7+
<ItemGroup Condition="!$([MSBuild]::IsOSPlatform('Windows'))">
58
<ProjectToBuild Include="$(MSBuildThisFileDirectory)..\Microsoft.AspNetCore.SystemWebAdapters.slnf" />
69
</ItemGroup>
710
</Project>

global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
}
1919
},
2020
"msbuild-sdks": {
21-
"MSBuild.SDK.SystemWeb": "4.0.88",
21+
"MSBuild.SDK.SystemWeb": "4.0.93",
2222
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24560.1"
2323
}
2424
}

test/Microsoft.AspNetCore.SystemWebAdapters.NuGet.Tests/ContentFileTests.cs

+7-7
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ public void ContentFilesCopied()
1616
// Arrange
1717
var expected = new[]
1818
{
19-
Path.Combine("Scripts", "jquery-3.7.1-vsdoc.js"),
20-
Path.Combine("Scripts", "jquery-3.7.1.js"),
21-
Path.Combine("Scripts", "jquery-3.7.1.min.js"),
22-
Path.Combine("Scripts", "jquery-3.7.1.min.map"),
23-
Path.Combine("Scripts", "jquery-3.7.1.slim.js"),
24-
Path.Combine("Scripts", "jquery-3.7.1.slim.min.js"),
25-
Path.Combine("Scripts", "jquery-3.7.1.slim.min.map"),
19+
Path.Combine("Scripts", "jquery-3.7.0-vsdoc.js"),
20+
Path.Combine("Scripts", "jquery-3.7.0.js"),
21+
Path.Combine("Scripts", "jquery-3.7.0.min.js"),
22+
Path.Combine("Scripts", "jquery-3.7.0.min.map"),
23+
Path.Combine("Scripts", "jquery-3.7.0.slim.js"),
24+
Path.Combine("Scripts", "jquery-3.7.0.slim.min.js"),
25+
Path.Combine("Scripts", "jquery-3.7.0.slim.min.map"),
2626
};
2727

2828
// Act

0 commit comments

Comments
 (0)