Merge
This commit is contained in:
Will Godbe
commit
7773901e7d
15 changed files with 811 additions and 3245 deletions
16
.vsts-ci.yml
16
.vsts-ci.yml
|
|
@ -47,10 +47,10 @@ stages:
|
|||
- job: Publish_Build_Configuration
|
||||
pool:
|
||||
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||
name: NetCore1ESPool-Public
|
||||
name: NetCore1ESPool-Svc-Public
|
||||
demands: ImageOverride -equals build.windows.10.amd64.vs2019.open
|
||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||
name: NetCore1ESPool-Internal
|
||||
name: NetCore1ESPool-Svc-Internal
|
||||
demands: ImageOverride -equals build.windows.10.amd64.vs2019
|
||||
steps:
|
||||
- publish: $(Build.SourcesDirectory)\eng\BuildConfiguration
|
||||
|
|
@ -61,10 +61,10 @@ stages:
|
|||
agentOs: Windows_NT
|
||||
pool:
|
||||
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||
name: NetCore1ESPool-Public
|
||||
name: NetCore1ESPool-Svc-Public
|
||||
demands: ImageOverride -equals build.windows.10.amd64.vs2019.open
|
||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||
name: NetCore1ESPool-Internal
|
||||
name: NetCore1ESPool-Svc-Internal
|
||||
demands: ImageOverride -equals build.windows.10.amd64.vs2019
|
||||
timeoutInMinutes: 180
|
||||
strategy:
|
||||
|
|
@ -105,7 +105,7 @@ stages:
|
|||
agentOs: Windows_NT
|
||||
pool:
|
||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||
name: NetCore1ESPool-Internal
|
||||
name: NetCore1ESPool-Svc-Internal
|
||||
demands: ImageOverride -equals build.windows.10.amd64.vs2019
|
||||
timeoutInMinutes: 180
|
||||
strategy:
|
||||
|
|
@ -137,10 +137,10 @@ stages:
|
|||
agentOs: Linux
|
||||
pool:
|
||||
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||
name: NetCore1ESPool-Public
|
||||
name: NetCore1ESPool-Svc-Public
|
||||
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
|
||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||
name: NetCore1ESPool-Internal
|
||||
name: NetCore1ESPool-Svc-Internal
|
||||
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
|
||||
timeoutInMinutes: 180
|
||||
strategy:
|
||||
|
|
@ -281,7 +281,7 @@ stages:
|
|||
agentOs: Linux
|
||||
pool:
|
||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||
name: NetCore1ESPool-Internal
|
||||
name: NetCore1ESPool-Svc-Internal
|
||||
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
|
||||
timeoutInMinutes: 180
|
||||
strategy:
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
</Dependency>
|
||||
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter" Version="1.0.0-alpha.1.22411.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/llvm-project</Uri>
|
||||
<Sha>754d13817d834b716d339183e21aac7d2489c496</Sha>
|
||||
<Sha>e73d65f0f80655b463162bd41a8365377ba6565d</Sha>
|
||||
<SourceBuildTarball RepoName="llvm-project" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.22423.18" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
|
|
@ -90,17 +90,17 @@
|
|||
<Uri>https://github.com/dotnet/test-templates</Uri>
|
||||
<Sha>0385265f4d0b6413d64aea0223172366a9b9858c</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.5.0" Version="1.0.2-beta4.22409.1">
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.5.0" Version="1.0.2-beta4.22425.1">
|
||||
<Uri>https://github.com/dotnet/test-templates</Uri>
|
||||
<Sha>a47740f5f3936da8dcebe9e8868b6311bc4402f8</Sha>
|
||||
<Sha>8a75efaa853cd17f1336f5e99e626ab3e0fa68d1</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.6.0" Version="1.0.2-beta4.22409.1">
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.6.0" Version="1.0.2-beta4.22425.1">
|
||||
<Uri>https://github.com/dotnet/test-templates</Uri>
|
||||
<Sha>a47740f5f3936da8dcebe9e8868b6311bc4402f8</Sha>
|
||||
<Sha>8a75efaa853cd17f1336f5e99e626ab3e0fa68d1</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.7.0" Version="1.0.2-beta4.22409.1">
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.7.0" Version="1.0.2-beta4.22425.1">
|
||||
<Uri>https://github.com/dotnet/test-templates</Uri>
|
||||
<Sha>a47740f5f3936da8dcebe9e8868b6311bc4402f8</Sha>
|
||||
<Sha>8a75efaa853cd17f1336f5e99e626ab3e0fa68d1</Sha>
|
||||
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.100-rc.1.22425.9">
|
||||
|
|
@ -186,17 +186,17 @@
|
|||
<Dependency Name="Microsoft.SourceBuild.Intermediate.diagnostics" Version="5.0.0-preview.21506.1">
|
||||
<Uri>https://github.com/dotnet/diagnostics</Uri>
|
||||
<Sha>ab3eb7a525e31dc6fb4d9cc0b7154fa2be58dac1</Sha>
|
||||
<SourceBuildTarball RepoName="diagnostics" ManagedOnly="true" />
|
||||
<SourceBuild RepoName="diagnostics" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="7.0.0-alpha.1.22409.1">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="7.0.0-alpha.1.22425.2">
|
||||
<Uri>https://github.com/dotnet/source-build-externals</Uri>
|
||||
<Sha>ee790b0477953dd30ea83e0e47af909a04fd0ca3</Sha>
|
||||
<Sha>e53b62ccc6a887987efdb820334594b674f6071d</Sha>
|
||||
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.symreader" Version="1.4.0-beta2-21475-02">
|
||||
<Uri>https://github.com/dotnet/symreader</Uri>
|
||||
<Sha>7b9791daa3a3477eb22ec805946c9fff8b42d8ca</Sha>
|
||||
<SourceBuildTarball RepoName="symreader" ManagedOnly="true" />
|
||||
<SourceBuild RepoName="symreader" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
|
|
|
|||
|
|
@ -43,9 +43,9 @@
|
|||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/test-templates -->
|
||||
<MicrosoftDotNetTestProjectTemplates30PackageVersion>1.0.2-beta4.22406.1</MicrosoftDotNetTestProjectTemplates30PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates50PackageVersion>1.0.2-beta4.22409.1</MicrosoftDotNetTestProjectTemplates50PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates60PackageVersion>1.0.2-beta4.22409.1</MicrosoftDotNetTestProjectTemplates60PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates70PackageVersion>1.0.2-beta4.22409.1</MicrosoftDotNetTestProjectTemplates70PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates50PackageVersion>1.0.2-beta4.22425.1</MicrosoftDotNetTestProjectTemplates50PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates60PackageVersion>1.0.2-beta4.22425.1</MicrosoftDotNetTestProjectTemplates60PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates70PackageVersion>1.0.2-beta4.22425.1</MicrosoftDotNetTestProjectTemplates70PackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- NUnit3.DotNetNew.Template versions do not 'flow in' -->
|
||||
|
|
@ -205,7 +205,7 @@
|
|||
necessary, and this property is removed from the file.
|
||||
-->
|
||||
<PrivateSourceBuiltArtifactsPackageVersion>0.1.0-7.0.100-bootstrap.11</PrivateSourceBuiltArtifactsPackageVersion>
|
||||
<PrivateSourceBuiltPrebuiltsPackageVersion>0.1.0-7.0.100-5</PrivateSourceBuiltPrebuiltsPackageVersion>
|
||||
<PrivateSourceBuiltPrebuiltsPackageVersion>0.1.0-7.0.100-8</PrivateSourceBuiltPrebuiltsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<!-- Workload manifest package versions -->
|
||||
<PropertyGroup>
|
||||
|
|
|
|||
|
|
@ -6,10 +6,10 @@ jobs:
|
|||
displayName: Source-Build Create Tarball
|
||||
pool:
|
||||
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||
name: NetCore1ESPool-Public
|
||||
name: NetCore1ESPool-Svc-Public
|
||||
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
|
||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||
name: NetCore1ESPool-Internal
|
||||
name: NetCore1ESPool-Svc-Internal
|
||||
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
|
||||
variables:
|
||||
- name: _BuildConfig
|
||||
|
|
|
|||
|
|
@ -13,12 +13,10 @@ parameters:
|
|||
# The following parameters aren't expected to be passed in rather they are used for encapsulation
|
||||
# -----------------------------------------------------------------------------------------------
|
||||
centOSStream8Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-20220809204800-17a4aab
|
||||
centOS8Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-8-source-build-20211118190102-9355e7b
|
||||
centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9-20220107135047-4cd394c
|
||||
debian9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch-20211001171226-047508b
|
||||
debian9Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-9-arm64v8-20220405201138-a251961
|
||||
fedora33Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2
|
||||
ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-20210924170306-047508b
|
||||
debian11Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-arm64v8-20220812185233-b286fae
|
||||
fedora36Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36-20220818134137-a09384f
|
||||
ubuntu2004Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-20220813234344-4c008dd
|
||||
poolInternalAmd64:
|
||||
name: NetCore1ESPool-Svc-Internal
|
||||
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
|
||||
|
|
@ -51,27 +49,21 @@ jobs:
|
|||
_EnablePoison: false
|
||||
_ExcludeOmniSharpTests: true
|
||||
_RunOnline: false
|
||||
CentOS8-Offline:
|
||||
_BootstrapPrep: false
|
||||
_Container: ${{ parameters.centOS8Container }}
|
||||
_EnablePoison: false
|
||||
_ExcludeOmniSharpTests: false
|
||||
_RunOnline: false
|
||||
CentOSStream9-Offline:
|
||||
_BootstrapPrep: false
|
||||
_Container: ${{ parameters.centOSStream9Container }}
|
||||
_EnablePoison: false
|
||||
_ExcludeOmniSharpTests: false
|
||||
_RunOnline: false
|
||||
Fedora33-Offline:
|
||||
Fedora36-Offline:
|
||||
_BootstrapPrep: false
|
||||
_Container: ${{ parameters.fedora33Container }}
|
||||
_Container: ${{ parameters.fedora36Container }}
|
||||
_EnablePoison: true
|
||||
_ExcludeOmniSharpTests: false
|
||||
_RunOnline: false
|
||||
Ubuntu1804-Offline:
|
||||
Ubuntu2004-Offline:
|
||||
_BootstrapPrep: false
|
||||
_Container: ${{ parameters.ubuntu1804Container }}
|
||||
_Container: ${{ parameters.ubuntu2004Container }}
|
||||
_EnablePoison: false
|
||||
_ExcludeOmniSharpTests: false
|
||||
_RunOnline: false
|
||||
|
|
@ -93,9 +85,9 @@ jobs:
|
|||
installerBuildResourceId: ${{ parameters.installerBuildResourceId }}
|
||||
matrix:
|
||||
${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
|
||||
Debian9-Offline:
|
||||
Debian11-Offline:
|
||||
_BootstrapPrep: true
|
||||
_Container: ${{ parameters.debian9Arm64Container }}
|
||||
_Container: ${{ parameters.debian11Arm64Container }}
|
||||
_EnablePoison: false
|
||||
_ExcludeOmniSharpTests: false
|
||||
_RunOnline: false
|
||||
|
|
@ -113,9 +105,9 @@ jobs:
|
|||
excludeSdkContentTests: true
|
||||
installerBuildResourceId: ${{ parameters.installerBuildResourceId }}
|
||||
matrix:
|
||||
Fedora33-Offline:
|
||||
_PreviousSourceBuildArtifact: Build_Tarball_x64 Fedora33-Offline_Artifacts
|
||||
_Container: ${{ parameters.fedora33Container }}
|
||||
Fedora36-Offline:
|
||||
_PreviousSourceBuildArtifact: Build_Tarball_x64 Fedora36-Offline_Artifacts
|
||||
_Container: ${{ parameters.fedora36Container }}
|
||||
_EnablePoison: false
|
||||
_ExcludeOmniSharpTests: false
|
||||
_RunOnline: false
|
||||
|
|
|
|||
|
|
@ -12,27 +12,36 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<!-- These packages will be replaced with ms-built packages downloaded from official package feeds-->
|
||||
<PackageReference Include="Microsoft.NET.HostModel" Version="$(MicrosoftNETHostModelVersion)" />
|
||||
<PackageReference Include="Microsoft.ILVerification" Version="$(MicrosoftILVerificationVersion)" />
|
||||
<PackageReference Include="Microsoft.NET.Sdk.IL" Version="$(MicrosoftNETSdkILVersion)" />
|
||||
<PackageReference Include="Microsoft.NETCore.ILAsm" Version="$(MicrosoftNETCoreILAsmVersion)" />
|
||||
<PackageReference Include="Microsoft.NETCore.ILDAsm" Version="$(MicrosoftNETCoreILDAsmVersion)" />
|
||||
<PackageReference Include="Microsoft.NETCore.TestHost" Version="$(MicrosoftNETCoreTestHostVersion)" />
|
||||
<PackageReference Include="runtime.linux-arm64.Microsoft.NETCore.ILAsm" Version="$(RuntimeLinuxX64MicrosoftNETCoreILAsmVersion)" />
|
||||
<PackageReference Include="runtime.linux-arm64.Microsoft.NETCore.ILDAsm" Version="$(RuntimeLinuxX64MicrosoftNETCoreILDAsmVersion)" />
|
||||
<PackageReference Include="runtime.linux-arm64.Microsoft.NETCore.TestHost" Version="$(RuntimeLinuxX64MicrosoftNETCoreTestHostVersion)" />
|
||||
<PackageReference Include="runtime.linux-arm64.runtime.native.System.IO.Ports" Version="$(RuntimeLinuxX64RuntimeNativeSystemIOPortsVersion)" />
|
||||
<PackageReference Include="runtime.linux-x64.Microsoft.NETCore.ILAsm" Version="$(RuntimeLinuxX64MicrosoftNETCoreILAsmVersion)" />
|
||||
<PackageReference Include="runtime.linux-x64.Microsoft.NETCore.ILDAsm" Version="$(RuntimeLinuxX64MicrosoftNETCoreILDAsmVersion)" />
|
||||
<PackageReference Include="runtime.linux-x64.Microsoft.NETCore.TestHost" Version="$(RuntimeLinuxX64MicrosoftNETCoreTestHostVersion)" />
|
||||
<PackageReference Include="runtime.linux-x64.runtime.native.System.IO.Ports" Version="$(RuntimeLinuxX64RuntimeNativeSystemIOPortsVersion)" />
|
||||
<PackageReference Include="runtime.linux-musl-x64.Microsoft.NETCore.ILAsm" Version="$(RuntimeLinuxX64MicrosoftNETCoreILAsmVersion)" />
|
||||
<PackageReference Include="runtime.linux-musl-x64.Microsoft.NETCore.ILDAsm" Version="$(RuntimeLinuxX64MicrosoftNETCoreILDAsmVersion)" />
|
||||
<PackageReference Include="runtime.linux-musl-x64.Microsoft.NETCore.TestHost" Version="$(RuntimeLinuxX64MicrosoftNETCoreTestHostVersion)" />
|
||||
<!-- These packages will be replaced with ms-built packages downloaded from official package feeds-->
|
||||
<PackageDownload Include="Microsoft.NET.HostModel" Version="[$(MicrosoftNETHostModelVersion)]" />
|
||||
<PackageDownload Include="Microsoft.NET.Sdk.IL" Version="[$(MicrosoftNETSdkILVersion)]" />
|
||||
<PackageDownload Include="Microsoft.NETCore.ILAsm" Version="[$(MicrosoftNETCoreILAsmVersion)]" />
|
||||
<PackageDownload Include="Microsoft.NETCore.ILDAsm" Version="[$(MicrosoftNETCoreILDAsmVersion)]" />
|
||||
<PackageDownload Include="Microsoft.NETCore.TestHost" Version="[$(MicrosoftNETCoreTestHostVersion)]" />
|
||||
<PackageDownload Include="runtime.linux-x64.Microsoft.NETCore.ILAsm" Version="[$(RuntimeLinuxX64MicrosoftNETCoreILAsmVersion)]" />
|
||||
<PackageDownload Include="runtime.linux-x64.Microsoft.NETCore.ILDAsm" Version="[$(RuntimeLinuxX64MicrosoftNETCoreILDAsmVersion)]" />
|
||||
<PackageDownload Include="runtime.linux-x64.Microsoft.NETCore.TestHost" Version="[$(RuntimeLinuxX64MicrosoftNETCoreTestHostVersion)]" />
|
||||
<PackageDownload Include="runtime.linux-x64.runtime.native.System.IO.Ports" Version="[$(RuntimeLinuxX64RuntimeNativeSystemIOPortsVersion)]" />
|
||||
<PackageDownload Include="runtime.linux-musl-x64.Microsoft.NETCore.ILAsm" Version="[$(RuntimeLinuxX64MicrosoftNETCoreILAsmVersion)]" />
|
||||
<PackageDownload Include="runtime.linux-musl-x64.Microsoft.NETCore.ILDAsm" Version="[$(RuntimeLinuxX64MicrosoftNETCoreILDAsmVersion)]" />
|
||||
<PackageDownload Include="runtime.linux-musl-x64.Microsoft.NETCore.TestHost" Version="[$(RuntimeLinuxX64MicrosoftNETCoreTestHostVersion)]" />
|
||||
<!-- There's no nuget package for runtime.linux-musl-x64.runtime.native.System.IO.Ports
|
||||
<PackageReference Include="runtime.linux-musl-x64.runtime.native.System.IO.Ports" Version="$(RuntimeLinuxX64RuntimeNativeSystemIOPortsVersion)" />
|
||||
-->
|
||||
<!-- Packages needed to bootstrap arm64 -->
|
||||
<PackageDownload Include="Microsoft.Aspnetcore.App.Runtime.linux-arm64" Version="[$(MicrosoftAspNetCoreAppRuntimeLinuxx64Version)]" />
|
||||
<PackageDownload Include="Microsoft.NETCore.App.Crossgen2.linux-arm64" Version="[$(MicrosoftNETCoreAppCrossgen2LinuxX64Version)]" />
|
||||
<PackageDownload Include="Microsoft.NETCore.App.Host.linux-arm64" Version="[$(MicrosoftNETCoreAppHostLinuxX64Version)]" />
|
||||
<PackageDownload Include="Microsoft.NETCore.App.Runtime.linux-arm64" Version="[$(MicrosoftNETCoreAppRuntimeLinuxX64Version)]" />
|
||||
<PackageDownload Include="runtime.linux-arm64.Microsoft.DotNet.IlCompiler" Version="[$(RuntimeLinuxX64MicrosoftDotNetIlCompilerVersion)]" />
|
||||
<PackageDownload Include="runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost" Version="[$(RuntimeLinuxX64MicrosoftNETCoreDotNetAppHostVersion)]" />
|
||||
<PackageDownload Include="runtime.linux-arm64.Microsoft.NETCore.DotNetHost" Version="[$(RuntimeLinuxX64MicrosoftNETCoreDotNetHostVersion)]" />
|
||||
<PackageDownload Include="runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy" Version="[$(RuntimeLinuxX64MicrosoftNETCoreDotNetHostPolicyVersion)]" />
|
||||
<PackageDownload Include="runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver" Version="[$(RuntimeLinuxX64MicrosoftNETCoreDotNetHostResolverVersion)]" />
|
||||
<PackageDownload Include="runtime.linux-arm64.Microsoft.NETCore.ILAsm" Version="[$(RuntimeLinuxX64MicrosoftNETCoreILAsmVersion)]" />
|
||||
<PackageDownload Include="runtime.linux-arm64.Microsoft.NETCore.ILDAsm" Version="[$(RuntimeLinuxX64MicrosoftNETCoreILDAsmVersion)]" />
|
||||
<PackageDownload Include="runtime.linux-arm64.Microsoft.NETCore.TestHost" Version="[$(RuntimeLinuxX64MicrosoftNETCoreTestHostVersion)]" />
|
||||
<PackageDownload Include="runtime.linux-arm64.runtime.native.System.IO.Ports" Version="[$(RuntimeLinuxX64RuntimeNativeSystemIOPortsVersion)]" />
|
||||
</ItemGroup>
|
||||
|
||||
<Target Name="BuildBoostrapPreviouslySourceBuilt" AfterTargets="Restore">
|
||||
|
|
@ -61,7 +70,7 @@
|
|||
<Message Text=" Replacing restored files in $(UnpackedTarPath)" Importance="High" />
|
||||
<MSBuild Projects="$(MSBuildProjectFile)"
|
||||
Targets="CopyDownloadedPackage"
|
||||
Properties="SourcePath=$(RestorePackagesPath);DestinationPath=$(UnpackedTarPath);PackageName=%(PackageReference.Identity);PackageVersion=%(PackageReference.Version)" />
|
||||
Properties="SourcePath=$(RestorePackagesPath);DestinationPath=$(UnpackedTarPath);PackageName=%(PackageDownload.Identity);PackageVersion=%(PackageDownload.Version)" />
|
||||
|
||||
<!-- Repack tarball with new bootstrap name -->
|
||||
<Message Text=" Repacking tarball to $(NewTarballName)" Importance="High" />
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ namespace Microsoft.DotNet.SourceBuild.SmokeTests
|
|||
string currentPoisonReport = File.ReadAllText(Config.PoisonReportPath);
|
||||
currentPoisonReport = RemoveHashes(currentPoisonReport);
|
||||
currentPoisonReport = BaselineHelper.RemoveRids(currentPoisonReport);
|
||||
currentPoisonReport = BaselineHelper.RemoveRids(currentPoisonReport, true);
|
||||
currentPoisonReport = BaselineHelper.RemoveVersions(currentPoisonReport);
|
||||
|
||||
BaselineHelper.CompareContents("PoisonUsage.txt", currentPoisonReport, OutputHelper, Config.WarnOnPoisonDiffs);
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -79,7 +79,6 @@ namespace Microsoft.DotNet.SourceBuild.Tasks.LeakDetection
|
|||
"_._",
|
||||
"-.-",
|
||||
".bowerrc",
|
||||
".editorconfig",
|
||||
".gitignore",
|
||||
".gitkeep",
|
||||
".rels",
|
||||
|
|
@ -97,9 +96,11 @@ namespace Microsoft.DotNet.SourceBuild.Tasks.LeakDetection
|
|||
".csproj",
|
||||
".css",
|
||||
".db",
|
||||
".editorconfig",
|
||||
".eot",
|
||||
".fs",
|
||||
".fsproj",
|
||||
".h",
|
||||
".html",
|
||||
".ico",
|
||||
".js",
|
||||
|
|
@ -107,18 +108,26 @@ namespace Microsoft.DotNet.SourceBuild.Tasks.LeakDetection
|
|||
".map",
|
||||
".md",
|
||||
".nuspec",
|
||||
".otf",
|
||||
".png",
|
||||
".props",
|
||||
".proto",
|
||||
".proj",
|
||||
".psmdcp",
|
||||
".pubxml",
|
||||
".razor",
|
||||
".rtf",
|
||||
".scss",
|
||||
".sln",
|
||||
".svg",
|
||||
".targets",
|
||||
".transform",
|
||||
".ts",
|
||||
".ttf",
|
||||
".txt",
|
||||
".vb",
|
||||
".vbproj",
|
||||
".win32manifest",
|
||||
".woff",
|
||||
".woff2",
|
||||
".xaml",
|
||||
|
|
@ -209,7 +218,8 @@ namespace Microsoft.DotNet.SourceBuild.Tasks.LeakDetection
|
|||
// skip some common files that get copied verbatim from nupkgs - LICENSE, _._, etc as well as
|
||||
// file types that we never care about - text files, .gitconfig, etc.
|
||||
if (FileNamesToSkip.Any(f => Path.GetFileName(fileToCheck).ToLowerInvariant() == f.ToLowerInvariant()) ||
|
||||
FileExtensionsToSkip.Any(e => Path.GetExtension(fileToCheck).ToLowerInvariant() == e.ToLowerInvariant()))
|
||||
FileExtensionsToSkip.Any(e => Path.GetExtension(fileToCheck).ToLowerInvariant() == e.ToLowerInvariant()) ||
|
||||
(new FileInfo(fileToCheck).Length == 0))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,22 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Logan Bussell <loganbussell@microsoft.com>
|
||||
Date: Mon, 15 Aug 2022 16:21:57 -0700
|
||||
Subject: [PATCH] Don't override BuildNodeJS in build.sh
|
||||
|
||||
Backport: https://github.com/dotnet/aspnetcore/issues/43310
|
||||
---
|
||||
eng/build.sh | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/eng/build.sh b/eng/build.sh
|
||||
index a6b6ba99be..0e4daad48c 100755
|
||||
--- a/eng/build.sh
|
||||
+++ b/eng/build.sh
|
||||
@@ -271,7 +271,6 @@ fi
|
||||
# Only set these MSBuild properties if they were explicitly set by build parameters.
|
||||
[ ! -z "$build_java" ] && msbuild_args[${#msbuild_args[*]}]="-p:BuildJava=$build_java"
|
||||
[ ! -z "$build_native" ] && msbuild_args[${#msbuild_args[*]}]="-p:BuildNative=$build_native"
|
||||
-[ ! -z "$build_nodejs" ] && msbuild_args[${#msbuild_args[*]}]="-p:BuildNodeJS=$build_nodejs"
|
||||
[ ! -z "$build_managed" ] && msbuild_args[${#msbuild_args[*]}]="-p:BuildManaged=$build_managed"
|
||||
[ ! -z "$build_installers" ] && msbuild_args[${#msbuild_args[*]}]="-p:BuildInstallers=$build_installers"
|
||||
|
||||
|
|
@ -16,8 +16,8 @@ index df77e9a199d6..19b99be1f71b 100644
|
|||
+++ b/global.json
|
||||
@@ -5,6 +5,6 @@
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22358.3",
|
||||
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22358.3",
|
||||
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22405.6",
|
||||
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22405.6",
|
||||
- "Microsoft.Build.Traversal": "2.0.2"
|
||||
+ "Microsoft.Build.Traversal": "2.0.34"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,28 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: MichaelSimons <msimons@microsoft.com>
|
||||
Date: Wed, 24 Aug 2022 12:21:13 +0000
|
||||
Subject: [PATCH] Lift System.Memory version
|
||||
|
||||
System.Memory version needs to align with the runtime since System.Collections.Immutable is lifted in order to prevent the following situation:
|
||||
error NU1605: Detected package downgrade: System.Memory from 4.5.5 to 4.5.4. Reference the package directly from the project to select a different version. [/repos/tarball-rc1/src/razor-compiler/artifacts/source-build/self/src/razor-compiler.sln]
|
||||
error NU1605: Microsoft.CodeAnalysis.Razor -> Microsoft.CodeAnalysis.CSharp 4.4.0 -> Microsoft.CodeAnalysis.Common 4.4.0 -> System.Collections.Immutable 7.0.0-rc.1.22422.23 -> System.Memory (>= 4.5.5) [/repos/tarball-rc1/src/razor-compiler/artifacts/source-build/self/src/razor-compiler.sln]
|
||||
error NU1605: Microsoft.CodeAnalysis.Razor -> Microsoft.CodeAnalysis.CSharp 4.4.0 -> Microsoft.CodeAnalysis.Common 4.4.0 -> System.Memory (>= 4.5.4) [/repos/tarball-rc1/src/razor-compiler/artifacts/source-build/self/src/razor-compiler.sln]
|
||||
|
||||
Requires https://github.com/dotnet/source-build/issues/2482 in order to eliminate this patch
|
||||
---
|
||||
eng/Versions.props | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/eng/Versions.props b/eng/Versions.props
|
||||
index 627f9c46824..711593e2a1e 100644
|
||||
--- a/eng/Versions.props
|
||||
+++ b/eng/Versions.props
|
||||
@@ -214,7 +214,7 @@
|
||||
<SystemIOPipesAccessControlVersion>5.0.0</SystemIOPipesAccessControlVersion>
|
||||
<SystemIOPipelinesVersion>6.0.1</SystemIOPipelinesVersion>
|
||||
<SystemManagementVersion>5.0.0-preview.8.20407.11</SystemManagementVersion>
|
||||
- <SystemMemoryVersion>4.5.4</SystemMemoryVersion>
|
||||
+ <SystemMemoryVersion>4.5.5</SystemMemoryVersion>
|
||||
<SystemResourcesExtensionsVersion>6.0.0</SystemResourcesExtensionsVersion>
|
||||
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
|
||||
<SystemRuntimeInteropServicesNFloatInternalVersion>6.0.1</SystemRuntimeInteropServicesNFloatInternalVersion>
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,47 +0,0 @@
|
|||
From 67062893af45f36d9b4ed1d0a46dca64aa427f7c Mon Sep 17 00:00:00 2001
|
||||
From: Charles Stoner <10732005+cston@users.noreply.github.com>
|
||||
Date: Fri, 12 Aug 2022 20:34:14 -0700
|
||||
Subject: [PATCH 1/2] Add scoped
|
||||
|
||||
Original PR is https://github.com/dotnet/runtime/pull/73883.
|
||||
|
||||
---
|
||||
.../Runtime.Base/src/System/Runtime/ExceptionHandling.cs | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/ExceptionHandling.cs b/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/ExceptionHandling.cs
|
||||
index 9e576853a44cb..81242191d1aab 100644
|
||||
--- a/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/ExceptionHandling.cs
|
||||
+++ b/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/ExceptionHandling.cs
|
||||
@@ -588,7 +588,7 @@ public static void RhRethrow(ref ExInfo activeExInfo, ref ExInfo exInfo)
|
||||
FallbackFailFast(RhFailFastReason.InternalError, null);
|
||||
}
|
||||
|
||||
- private static void DispatchEx(ref StackFrameIterator frameIter, ref ExInfo exInfo, uint startIdx)
|
||||
+ private static void DispatchEx(scoped ref StackFrameIterator frameIter, ref ExInfo exInfo, uint startIdx)
|
||||
{
|
||||
Debug.Assert(exInfo._passNumber == 1, "expected asm throw routine to set the pass");
|
||||
object exceptionObj = exInfo.ThrownException;
|
||||
|
||||
From 86f07e350629aacf17db6b3f539eca214579a479 Mon Sep 17 00:00:00 2001
|
||||
From: Charles Stoner <10732005+cston@users.noreply.github.com>
|
||||
Date: Fri, 12 Aug 2022 20:49:01 -0700
|
||||
Subject: [PATCH 2/2] More scoped
|
||||
|
||||
---
|
||||
.../tests/System.Text.Json.Tests/JsonDocumentTests.cs | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonDocumentTests.cs b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonDocumentTests.cs
|
||||
index 45590069c094f..cc3d827ca729f 100644
|
||||
--- a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonDocumentTests.cs
|
||||
+++ b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonDocumentTests.cs
|
||||
@@ -3611,7 +3611,7 @@ public static void NameEquals_Empty_Throws()
|
||||
out Utf8JsonReader reader,
|
||||
ReadOnlyMemory<byte> data,
|
||||
int segmentCount,
|
||||
- in JsonReaderState state,
|
||||
+ scoped in JsonReaderState state,
|
||||
bool isFinalBlock = false)
|
||||
{
|
||||
if (segmentCount == 0)
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
From e5fa6b10f5e4bcb14e3930e4eeae7181765529ee Mon Sep 17 00:00:00 2001
|
||||
From: Chris Rummel <crummel@microsoft.com>
|
||||
Date: Thu, 21 Oct 2021 16:29:32 -0500
|
||||
Subject: [PATCH] Also build for netstandard2.0 to support NuGet.
|
||||
|
||||
Backport: https://github.com/dotnet/source-build/issues/2557.
|
||||
---
|
||||
.../Microsoft.Web.XmlTransform.csproj | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/Microsoft.Web.XmlTransform/Microsoft.Web.XmlTransform.csproj b/src/Microsoft.Web.XmlTransform/Microsoft.Web.XmlTransform.csproj
|
||||
index 7cb81d1..f272d7f 100644
|
||||
--- a/src/Microsoft.Web.XmlTransform/Microsoft.Web.XmlTransform.csproj
|
||||
+++ b/src/Microsoft.Web.XmlTransform/Microsoft.Web.XmlTransform.csproj
|
||||
@@ -3,7 +3,7 @@
|
||||
<Import Project="$(RepositoryEngineeringDir)\Package.props" />
|
||||
|
||||
<PropertyGroup>
|
||||
- <TargetFrameworks>netstandard2.1</TargetFrameworks>
|
||||
+ <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
<IsPackable>true</IsPackable>
|
||||
<IsShipping>false</IsShipping>
|
||||
--
|
||||
2.31.1
|
||||
|
||||
Loading…
Reference in a new issue