Skip to content

Commit 74cc160

Browse files
Jean-Marc PrieurBrent Schmaltz
Jean-Marc Prieur
authored and
Brent Schmaltz
committed
Merged PR 10242: Update Dev6x to fix the release build
#### AI-Generated Description The pull request contains two changes: - In file **LogMessages.cs**, a line of code that defines a constant string for a JSON depth error message is removed. - In file **Microsoft.IdentityModel.AotCompatibility.Tests.csproj**, a line of code that sets the language version to 10 is added.
1 parent 4845cf1 commit 74cc160

File tree

14 files changed

+99
-398
lines changed

14 files changed

+99
-398
lines changed

‎build.ps1‎

Lines changed: 12 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ param(
55
[string]$root=$PSScriptRoot,
66
[string]$runTests="YES",
77
[string]$failBuildOnTest="YES",
8-
[string]$slnFile="wilson.sln",
9-
[switch]$runApiCompat,
10-
[switch]$generateContractAssemblies)
8+
[string]$slnFile="wilson.sln"
9+
)
1110

1211
################################################# Functions ############################################################
1312

@@ -47,21 +46,6 @@ function CreateArtifactsRoot($folder)
4746
mkdir $folder | Out-Null
4847
}
4948

50-
function GenerateContractAssemblies($root)
51-
{
52-
# clear content of baseline files as it is not relevant for the next version
53-
ClearBaselineFiles($root)
54-
55-
# execute generateContractAssemblies script
56-
& "$root\generateContractAssemblies.ps1".
57-
}
58-
59-
function ClearBaselineFiles($root)
60-
{
61-
Write-Host ">>> Clear-Content $root\Tools\apiCompat\baseline\*.txt"
62-
Clear-Content $root\Tools\apiCompat\baseline\*.txt
63-
}
64-
6549
################################################# Functions ############################################################
6650

6751
if ($env:VSINSTALLDIR)
@@ -79,8 +63,6 @@ Write-Host "root: " $root;
7963
Write-Host "runTests: " $runTests;
8064
Write-Host "failBuildOnTest: " $failBuildOnTest;
8165
Write-Host "slnFile: " $slnFile;
82-
Write-Host "runApiCompat: " $runApiCompat;
83-
Write-Host "generateContractAssemblies: " $generateContractAssemblies;
8466
WriteSectionFooter("End build.ps1 - parameters");
8567

8668
[xml]$buildConfiguration = Get-Content $PSScriptRoot\buildConfiguration.xml
@@ -105,17 +87,17 @@ WriteSectionFooter("End Environment");
10587

10688
$ErrorActionPreference = "Stop"
10789

108-
WriteSectionHeader("VerifyResourceUsage.pl");
90+
WriteSectionHeader("VerifyResourceUsage.pl");
10991

110-
Write-Host ">>> Start-Process -Wait -PassThru -NoNewWindow perl $root\src\VerifyResourceUsage.pl"
111-
$verifyResourceUsageResult = Start-Process -Wait -PassThru -NoNewWindow perl $root\src\VerifyResourceUsage.pl
92+
Write-Host ">>> Start-Process -Wait -PassThru -NoNewWindow perl $root\src\VerifyResourceUsage.pl"
93+
$verifyResourceUsageResult = Start-Process -Wait -PassThru -NoNewWindow perl $root\src\VerifyResourceUsage.pl
11294

113-
if($verifyResourceUsageResult.ExitCode -ne 0)
114-
{
115-
throw "VerifyResourceUsage.pl failed."
116-
}
95+
if($verifyResourceUsageResult.ExitCode -ne 0)
96+
{
97+
throw "VerifyResourceUsage.pl failed."
98+
}
11799

118-
WriteSectionFooter("End VerifyResourceUsage.pl");
100+
WriteSectionFooter("End VerifyResourceUsage.pl");
119101

120102
WriteSectionHeader("Build");
121103

@@ -138,24 +120,17 @@ CreateArtifactsRoot($artifactsRoot);
138120
pushd
139121
Set-Location $root
140122
Write-Host ""
141-
Write-Host ">>> Start-Process -wait -NoNewWindow $msbuildexe /restore:True /p:UseSharedCompilation=false /nr:false /verbosity:m /p:Configuration=$buildType /p:RunApiCompat=$runApiCompat $slnFile"
123+
Write-Host ">>> Start-Process -wait -NoNewWindow $msbuildexe /restore:True /p:UseSharedCompilation=false /nr:false /verbosity:m /p:Configuration=$buildType $slnFile"
142124
Write-Host ""
143125
Write-Host "msbuildexe: " $msbuildexe
144-
$p = Start-Process -Wait -PassThru -NoNewWindow $msbuildexe "/r:True /p:UseSharedCompilation=false /nr:false /verbosity:m /p:Configuration=$buildType /p:RunApiCompat=$runApiCompat $slnFile"
126+
$p = Start-Process -Wait -PassThru -NoNewWindow $msbuildexe "/r:True /p:UseSharedCompilation=false /nr:false /verbosity:m /p:Configuration=$buildType $slnFile"
145127

146128
if($p.ExitCode -ne 0)
147129
{
148130
throw "Build failed."
149131
}
150132
popd
151133

152-
if ($generateContractAssemblies.IsPresent)
153-
{
154-
WriteSectionHeader("Generating Contract Assemblies");
155-
GenerateContractAssemblies($root);
156-
WriteSectionFooter("End Generating Contract Assemblies");
157-
}
158-
159134
foreach($project in $buildConfiguration.SelectNodes("root/projects/src/project"))
160135
{
161136
$name = $project.name;

‎build/CodeCoverage.runsettings‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<!-- Customised run settings file to exclude test assemblies from coverage.
4+
See https://msdn.microsoft.com/en-us/library/jj159530.aspx for more info. -->
5+
6+
<!-- File name extension must be .runsettings -->
7+
<RunSettings>
8+
<DataCollectionRunSettings>
9+
<DataCollectors>
10+
<DataCollector friendlyName="Code Coverage" uri="datacollector://Microsoft/CodeCoverage/2.0" assemblyQualifiedName="Microsoft.VisualStudio.Coverage.DynamicCoverageDataCollector, Microsoft.VisualStudio.TraceCollector, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
11+
<Configuration>
12+
<CodeCoverage>
13+
14+
<!--
15+
About include/exclude lists:
16+
Empty "Include" clauses imply all; empty "Exclude" clauses imply none.
17+
Each element in the list is a regular expression (ECMAScript syntax). See http://msdn.microsoft.com/library/2k3te2cs.aspx.
18+
An item must first match at least one entry in the include list to be included.
19+
Included items must then not match any entries in the exclude list to remain included.
20+
-->
21+
22+
<!-- Match assembly file paths: -->
23+
<ModulePaths>
24+
<Include>
25+
<ModulePath>.*\microsoft.identitymodel.abstractions.dll</ModulePath>
26+
<ModulePath>.*\microsoft.identitymodel.jsonwebtokens.dll</ModulePath>
27+
<ModulePath>.*\microsoft.identitymodel.keyvaultextensions.dll</ModulePath>
28+
<ModulePath>.*\microsoft.identitymodel.logging.dll</ModulePath>
29+
<ModulePath>.*\microsoft.identitymodel.loggingextensions.dll</ModulePath>
30+
<ModulePath>.*\microsoft.identitymodel.managedkeyvaultsecuritykey.dll</ModulePath>
31+
<ModulePath>.*\microsoft.identitymodel.protocols.openidconnect.dll</ModulePath>
32+
<ModulePath>.*\microsoft.identitymodel.protocols.signedhttprequest.dll</ModulePath>
33+
<ModulePath>.*\microsoft.identitymodel.protocols.wsfederation.dll</ModulePath>
34+
<ModulePath>.*\microsoft.identitymodel.protocols.dll</ModulePath>
35+
<ModulePath>.*\microsoft.identitymodel.testextensions.dll</ModulePath>
36+
<ModulePath>.*\microsoft.identitymodel.tokens.saml.dll</ModulePath>
37+
<ModulePath>.*\microsoft.identitymodel.tokens.dll</ModulePath>
38+
<ModulePath>.*\microsoft.identitymodel.validators.dll</ModulePath>
39+
<ModulePath>.*\microsoft.identitymodel.xml.dll</ModulePath>
40+
<ModulePath>.*\system.identitymodel.tokens.jwt.dll</ModulePath>
41+
</Include>
42+
</ModulePaths>
43+
44+
</CodeCoverage>
45+
</Configuration>
46+
</DataCollector>
47+
</DataCollectors>
48+
</DataCollectionRunSettings>
49+
</RunSettings>

‎build/apiCompat.props‎

Lines changed: 0 additions & 49 deletions
This file was deleted.

0 commit comments

Comments
 (0)