Skip to content

Commit

Permalink
Working on the build
Browse files Browse the repository at this point in the history
  • Loading branch information
jaredpar committed May 16, 2024
1 parent daf2fff commit fa63385
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 8 deletions.
6 changes: 4 additions & 2 deletions eng/SourceBuildPrebuiltBaseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,15 @@
<UsagePattern IdentityGlob="Microsoft.CodeAnalysis.VisualBasic.CodeStyle/*" />
<UsagePattern IdentityGlob="Microsoft.Net.Compilers.Toolset/*" />

<!-- Roslyn's source-build CI builds both NetPrevious and NetCurrent. This 7.0 ref pack shows up as
<!-- Roslyn's source-build CI builds both NetPrevious and NetCurrent. This 7.0 / 8.0 ref pack shows up as
prebuilt only for the repo CI build but not full source-build. -->
<UsagePattern IdentityGlob="Microsoft.AspNetCore.App.Ref/7.0*" />
<UsagePattern IdentityGlob="Microsoft.AspNetCore.App.Ref/8.0*" />

<!-- Roslyn's source-build CI builds both NetPrevious and NetCurrent. This 7.0 ref pack shows up as
<!-- Roslyn's source-build CI builds both NetPrevious and NetCurrent. This 7.0 / 8.0 ref pack shows up as
prebuilt only for the repo CI build but not full source-build. -->
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Ref/7.0*" />
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Ref/8.0*" />

<!-- This is upgraded to latest version in full source-build and can be baselined for repo build -->
<UsagePattern IdentityGlob="Microsoft.Extensions.Configuration*/8.0*" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5520,7 +5520,7 @@ static void Main()
Main: Entered
Main: L'a' = 1
Main: L'b' = 2
Main: L4 = System.Linq.Enumerable+SelectArrayIterator`2[System.Int32,System.Int32]
Main: L4 = System.Linq.Enumerable+ArraySelectIterator`2[System.Int32,System.Int32]
Main: Entered lambda '<Main>b__0'
<Main>b__0: P'item'[0] = 10
<Main>b__0: Returned
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>$(NetRoslyn);net472</TargetFrameworks>
<TargetFrameworks>$(NetRoslynNext);net472</TargetFrameworks>
<RootNamespace>Microsoft.CodeAnalysis.CSharp.UnitTests</RootNamespace>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ static ISymbol F(ISymbol s)
AssertEx.Equal(
$" at Program.<<Main>$>g__F|0_1(ISymbol s) in {FeaturesResources.Query}:line 11" + Environment.NewLine +
$" at Program.<>c.<<Main>$>b__0_2(ISymbol x) in {FeaturesResources.Query}:line 5" + Environment.NewLine +
$" at System.Linq.Enumerable.SelectArrayIterator`2.MoveNext()" + Environment.NewLine,
$" at System.Linq.Enumerable.ArraySelectIterator`2.MoveNext()" + Environment.NewLine,
exception.StackTrace.JoinText());
}
}
2 changes: 1 addition & 1 deletion src/Scripting/CSharpTest/CommandLineRunnerTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ select x * x
> from x in await GetStuffAsync()
. where x > 2
. select x * x
Enumerable.WhereSelectArrayIterator<int, int> {{ 9, 16, 25 }}
Enumerable.ArrayWhereSelectIterator<int, int> {{ 9, 16, 25 }}
> ", runner.Console.Out.ToString());

AssertEx.AssertEqualToleratingWhitespaceDifferences(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<OutputType>Library</OutputType>
<RootNamespace>Microsoft.CodeAnalysis.CSharp.Scripting.UnitTests</RootNamespace>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>$(NetRoslyn);net472</TargetFrameworks>
<TargetFrameworks>$(NetRoslynNext);net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup Label="Project References">
<ProjectReference Include="..\..\Compilers\Core\Portable\Microsoft.CodeAnalysis.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion src/Scripting/CSharpTest/ObjectFormatterTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ public void DebuggerProxy_FrameworkTypes_IEnumerable_Exception()
return i < 7;
});
str = s_formatter.FormatObject(obj, SingleLineOptions);
Assert.Equal("Enumerable.WhereEnumerableIterator<int> { 0, 1, 2, 3, 4, !<Exception> ... }", str);
Assert.Equal("Enumerable.IEnumerableWhereIterator<int> { 0, 1, 2, 3, 4, !<Exception> ... }", str);
}

[Fact]
Expand Down
1 change: 1 addition & 0 deletions src/Tools/BuildBoss/ProjectCheckerUtil.cs
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ private bool CheckTargetFrameworks(TextWriter textWriter)
case "net472":
case "netstandard2.0":
case "$(NetRoslyn)":
case "$(NetRoslynNext)":
case "$(NetRoslynSourceBuild)":
case "$(NetRoslynToolset)":
case "$(NetRoslynAll)":
Expand Down

0 comments on commit fa63385

Please sign in to comment.