Merge branch 'release/8.0.3xx' of https://github.com/dotnet/installer into merge/release/8.0.1xx-to-release/8.0.3xx
This commit is contained in:
Jason Zhai
commit
33f52fa4f8
39 changed files with 606 additions and 1963 deletions
|
|
@ -3,7 +3,7 @@
|
|||
"isRoot": true,
|
||||
"tools": {
|
||||
"microsoft.dotnet.darc": {
|
||||
"version": "1.1.0-beta.23621.3",
|
||||
"version": "1.1.0-beta.24306.1",
|
||||
"commands": [
|
||||
"darc"
|
||||
]
|
||||
|
|
|
|||
15
.vsts-ci.yml
15
.vsts-ci.yml
|
|
@ -31,7 +31,7 @@ variables:
|
|||
value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
|
||||
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
|
||||
/p:dotnetbuilds-internal-container-read-token-base64=$(dotnetbuilds-internal-container-read-token-base64)
|
||||
- template: /eng/common/templates/variables/pool-providers.yml
|
||||
- template: /eng/common/templates-official/variables/pool-providers.yml
|
||||
# Set the MicroBuild plugin installation directory to the agent temp directory to avoid SDL tool scanning.
|
||||
- name: MicroBuildOutputFolderOverride
|
||||
value: $(Agent.TempDirectory)
|
||||
|
|
@ -56,7 +56,7 @@ extends:
|
|||
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
|
||||
centosStream8:
|
||||
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8
|
||||
debian11:
|
||||
debian11Amd64:
|
||||
image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64
|
||||
fedora40:
|
||||
image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-40
|
||||
|
|
@ -71,13 +71,6 @@ extends:
|
|||
name: $(DncEngInternalBuildPool)
|
||||
image: 1es-windows-2022
|
||||
os: windows
|
||||
${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
|
||||
componentgovernance:
|
||||
ignoreDirectories: artifacts, .packages
|
||||
# Temporary to workaround MicroBuild issues.
|
||||
credscan:
|
||||
enabled: false
|
||||
justificationForDisabling: 'CredScan is failing on the MicroBuild signing plugin. "MicroBuild/Plugins/nuget.config" has changing content and thus cannot be baselined.'
|
||||
stages:
|
||||
- stage: Build
|
||||
jobs:
|
||||
|
|
@ -99,7 +92,7 @@ extends:
|
|||
targetPath: $(Build.SourcesDirectory)\eng\buildConfiguration
|
||||
artifactName: buildConfiguration
|
||||
|
||||
# PR-only jobs
|
||||
# PR-only jobs
|
||||
- ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
|
||||
# Windows
|
||||
- template: eng/build.yml@self
|
||||
|
|
@ -142,7 +135,7 @@ extends:
|
|||
parameters:
|
||||
agentOs: Linux
|
||||
jobName: Build_Debian_11_Debug_x64
|
||||
container: debian11
|
||||
container: debian11Amd64
|
||||
buildConfiguration: Debug
|
||||
buildArchitecture: x64
|
||||
additionalBuildParameters: '/p:BuildSdkDeb=true'
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
# Pipeline: https://dev.azure.com/dnceng-public/public/_build?definitionId=20
|
||||
|
||||
trigger:
|
||||
batch: true
|
||||
branches:
|
||||
|
|
@ -78,8 +80,8 @@ stages:
|
|||
- template: eng/build-pr.yml
|
||||
parameters:
|
||||
agentOs: Linux
|
||||
jobName: Build_Fedora_36_Debug_x64
|
||||
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36'
|
||||
jobName: Build_Fedora_39_Debug_x64
|
||||
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39'
|
||||
buildConfiguration: Debug
|
||||
buildArchitecture: x64
|
||||
linuxPortable: true
|
||||
|
|
|
|||
66
NuGet.config
66
NuGet.config
|
|
@ -6,13 +6,6 @@
|
|||
<packageSources>
|
||||
<clear />
|
||||
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
|
||||
<!-- Begin: Package sources from dotnet-emsdk -->
|
||||
<add key="darc-pub-dotnet-emsdk-a64772f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a64772f5/nuget/v3/index.json" />
|
||||
<add key="darc-pub-dotnet-emsdk-a64772f-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a64772f5-5/nuget/v3/index.json" />
|
||||
<add key="darc-pub-dotnet-emsdk-a64772f-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a64772f5-3/nuget/v3/index.json" />
|
||||
<add key="darc-pub-dotnet-emsdk-a64772f-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a64772f5-2/nuget/v3/index.json" />
|
||||
<add key="darc-pub-dotnet-emsdk-a64772f-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a64772f5-1/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-emsdk -->
|
||||
<!-- Begin: Package sources from dotnet-aspnetcore -->
|
||||
<add key="darc-int-dotnet-aspnetcore-2f1db20" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-2f1db204/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-aspnetcore-2f1db20-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-2f1db204-5/nuget/v3/index.json" />
|
||||
|
|
@ -20,8 +13,23 @@
|
|||
<add key="darc-int-dotnet-aspnetcore-2f1db20-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-2f1db204-2/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-aspnetcore-2f1db20-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-2f1db204-1/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-aspnetcore -->
|
||||
<!-- Begin: Package sources from dotnet-emsdk -->
|
||||
<add key="darc-pub-dotnet-emsdk-a64772f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a64772f5/nuget/v3/index.json" />
|
||||
<add key="darc-pub-dotnet-emsdk-a64772f-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a64772f5-5/nuget/v3/index.json" />
|
||||
<add key="darc-pub-dotnet-emsdk-a64772f-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a64772f5-3/nuget/v3/index.json" />
|
||||
<add key="darc-pub-dotnet-emsdk-a64772f-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a64772f5-2/nuget/v3/index.json" />
|
||||
<add key="darc-pub-dotnet-emsdk-a64772f-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a64772f5-1/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-emsdk -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-28ae95b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-28ae95bc/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-28ae95b-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-28ae95bc-5/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-28ae95b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-28ae95bc-3/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-28ae95b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-28ae95bc-2/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-28ae95b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-28ae95bc-1/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-emsdk -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<!-- End: Package sources from dotnet-windowsdesktop -->
|
||||
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
|
||||
<add key="darc-pub-DotNet-msbuild-Trusted-b5265ef" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-b5265ef3/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from DotNet-msbuild-Trusted -->
|
||||
<!-- Begin: Package sources from dotnet-runtime -->
|
||||
<add key="darc-int-dotnet-runtime-2aade6b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be/nuget/v3/index.json" />
|
||||
|
|
@ -31,19 +39,17 @@
|
|||
<add key="darc-int-dotnet-runtime-2aade6b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-1/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
<!-- Begin: Package sources from dotnet-sdk -->
|
||||
<add key="darc-int-dotnet-sdk-289435f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-289435f5/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-sdk-289435f-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-289435f5-5/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-sdk-289435f-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-289435f5-3/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-sdk-289435f-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-289435f5-2/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-sdk-289435f-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-289435f5-1/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-sdk-3ecaf32" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-3ecaf320/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-sdk-3ecaf32-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-3ecaf320-7/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-sdk-3ecaf32-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-3ecaf320-6/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-sdk-3ecaf32-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-3ecaf320-5/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-sdk-3ecaf32-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-3ecaf320-4/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-sdk-3ecaf32-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-3ecaf320-3/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-sdk-3ecaf32-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-3ecaf320-2/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-sdk-3ecaf32-11" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-3ecaf320-11/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-sdk-3ecaf32-10" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-3ecaf320-10/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-sdk-3ecaf32-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-3ecaf320-1/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-sdk -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-28ae95b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-28ae95bc/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-28ae95b-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-28ae95bc-5/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-28ae95b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-28ae95bc-3/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-28ae95b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-28ae95bc-2/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-28ae95b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-28ae95bc-1/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-windowsdesktop -->
|
||||
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
|
||||
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
|
||||
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
|
||||
|
|
@ -57,7 +63,6 @@
|
|||
<add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
|
||||
<add key="dotnet-libraries-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries-transport/nuget/v3/index.json" />
|
||||
<add key="msbuild-prerelease-with-release-version" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-8ffc3fe3/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-tools-internal" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v3/index.json" />
|
||||
</packageSources>
|
||||
<disabledPackageSources>
|
||||
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
|
||||
|
|
@ -75,11 +80,16 @@
|
|||
<add key="darc-int-dotnet-runtime-2aade6b-5" value="true" />
|
||||
<add key="darc-int-dotnet-runtime-2aade6b" value="true" />
|
||||
<!-- Begin: Package sources from dotnet-sdk -->
|
||||
<add key="darc-int-dotnet-sdk-289435f-1" value="true" />
|
||||
<add key="darc-int-dotnet-sdk-289435f-2" value="true" />
|
||||
<add key="darc-int-dotnet-sdk-289435f-3" value="true" />
|
||||
<add key="darc-int-dotnet-sdk-289435f-5" value="true" />
|
||||
<add key="darc-int-dotnet-sdk-289435f" value="true" />
|
||||
<add key="darc-int-dotnet-sdk-3ecaf32-1" value="true" />
|
||||
<add key="darc-int-dotnet-sdk-3ecaf32-10" value="true" />
|
||||
<add key="darc-int-dotnet-sdk-3ecaf32-11" value="true" />
|
||||
<add key="darc-int-dotnet-sdk-3ecaf32-2" value="true" />
|
||||
<add key="darc-int-dotnet-sdk-3ecaf32-3" value="true" />
|
||||
<add key="darc-int-dotnet-sdk-3ecaf32-4" value="true" />
|
||||
<add key="darc-int-dotnet-sdk-3ecaf32-5" value="true" />
|
||||
<add key="darc-int-dotnet-sdk-3ecaf32-6" value="true" />
|
||||
<add key="darc-int-dotnet-sdk-3ecaf32-7" value="true" />
|
||||
<add key="darc-int-dotnet-sdk-3ecaf32" value="true" />
|
||||
<!-- End: Package sources from dotnet-sdk -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-28ae95b-1" value="true" />
|
||||
|
|
@ -87,9 +97,11 @@
|
|||
<add key="darc-int-dotnet-windowsdesktop-28ae95b-3" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-28ae95b-5" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-28ae95b" value="true" />
|
||||
<!-- Begin: Package sources from dotnet-sdk -->
|
||||
<!-- End: Package sources from dotnet-sdk -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<!-- End: Package sources from dotnet-windowsdesktop -->
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
|
||||
<add key="darc-int-dotnet-tools-internal" value="true" />
|
||||
</disabledPackageSources>
|
||||
</configuration>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,13 @@
|
|||
-->
|
||||
<UsagePattern IdentityGlob="NuGet.*/*" />
|
||||
|
||||
<!-- These MSBuild packages are allowed for installer repo build. The live version will be flowed in for the VMR build. -->
|
||||
<UsagePattern IdentityGlob="Microsoft.Build*/17.10.4" />
|
||||
<UsagePattern IdentityGlob="Microsoft.NET.StringTools/17.10.4" />
|
||||
|
||||
<!-- These are coming in via runtime but the source-build infra isn't able to automatically pick up the right intermediate. -->
|
||||
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/*8.0.*" />
|
||||
|
||||
<UsagePattern IdentityGlob="System.Threading.Tasks.Dataflow/*8.0.0*" />
|
||||
</IgnorePatterns>
|
||||
</UsageData>
|
||||
|
|
|
|||
|
|
@ -85,22 +85,22 @@
|
|||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
||||
<Sha>2f1db20456007c9515068a35a65afdf99af70bc6</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.107">
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.303">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>289435f5c45053c7599cf237fefc8391d1eb7f0b</Sha>
|
||||
<Sha>3ecaf32089ff44b59b6cfc518baf20be49886604</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.107-servicing.24317.5">
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.303-servicing.24317.6">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>289435f5c45053c7599cf237fefc8391d1eb7f0b</Sha>
|
||||
<Sha>3ecaf32089ff44b59b6cfc518baf20be49886604</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.107-servicing.24317.5">
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.303-servicing.24317.6">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>289435f5c45053c7599cf237fefc8391d1eb7f0b</Sha>
|
||||
<Sha>3ecaf32089ff44b59b6cfc518baf20be49886604</Sha>
|
||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.107-servicing.24317.5">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.303-servicing.24317.6">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>289435f5c45053c7599cf237fefc8391d1eb7f0b</Sha>
|
||||
<Sha>3ecaf32089ff44b59b6cfc518baf20be49886604</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
|
||||
<Uri>https://github.com/dotnet/test-templates</Uri>
|
||||
|
|
@ -110,18 +110,18 @@
|
|||
<Uri>https://github.com/dotnet/test-templates</Uri>
|
||||
<Sha>1e5f3603af2277910aad946736ee23283e7f3e16</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.6.0" Version="1.1.0-rc.23410.2">
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.6.0" Version="1.1.0-rc.24059.1">
|
||||
<Uri>https://github.com/dotnet/test-templates</Uri>
|
||||
<Sha>1e5f3603af2277910aad946736ee23283e7f3e16</Sha>
|
||||
<Sha>7d2f2719628e6744f3172a2d48e0d1f600b360c0</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.7.0" Version="1.1.0-rc.23410.2">
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.7.0" Version="1.1.0-rc.24059.1">
|
||||
<Uri>https://github.com/dotnet/test-templates</Uri>
|
||||
<Sha>1e5f3603af2277910aad946736ee23283e7f3e16</Sha>
|
||||
<Sha>7d2f2719628e6744f3172a2d48e0d1f600b360c0</Sha>
|
||||
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.8.0" Version="1.1.0-rc.23410.2">
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.8.0" Version="1.1.0-rc.24059.1">
|
||||
<Uri>https://github.com/dotnet/test-templates</Uri>
|
||||
<Sha>1e5f3603af2277910aad946736ee23283e7f3e16</Sha>
|
||||
<Sha>7d2f2719628e6744f3172a2d48e0d1f600b360c0</Sha>
|
||||
</Dependency>
|
||||
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
|
||||
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.7-servicing.24313.8" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
|
|
@ -132,41 +132,36 @@
|
|||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
|
||||
<Sha>43bb8cc831c2658e1117415019264bfe6f644f94</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.102-beta.24081.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.301-beta.24271.6" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
<Sha>fc5e9eda234e2b69aa479f4f83faddc31fdd4da7</Sha>
|
||||
<Sha>80c165644db640d0f309affe0daa281c7e17b939</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="8.0.102-beta.24081.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="8.0.301-beta.24271.6" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
<Sha>fc5e9eda234e2b69aa479f4f83faddc31fdd4da7</Sha>
|
||||
<Sha>80c165644db640d0f309affe0daa281c7e17b939</Sha>
|
||||
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.8.0-release-23615-02" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.10.0-release-24272-11" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/microsoft/vstest</Uri>
|
||||
<Sha>aa59400b11e1aeee2e8af48928dbd48748a8bef9</Sha>
|
||||
<Sha>83d73f783bf54c336d1eab04a53d554f8a6c0b19</Sha>
|
||||
<SourceBuild RepoName="vstest" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>2aade6beb02ea367fd97c4070a4198802fe61c03</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.8.0-7.24225.6" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/roslyn</Uri>
|
||||
<Sha>de75b3c77d41c21562fc2e9dbcc26b2268c80b26</Sha>
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.10.0-3.24314.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn</Uri>
|
||||
<Sha>259e82e9f20dd3dd3ec961f352ddcf9bc29072ea</Sha>
|
||||
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Build" Version="17.8.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.Build" Version="17.10.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/msbuild</Uri>
|
||||
<Sha>b5265ef370a651f8c3458110b804e5cbf869eeb5</Sha>
|
||||
<Sha>10fbfbf2eeb0597fdc1f600d87d38c7f57317bdc</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.5-preview-24055-02">
|
||||
<Uri>https://github.com/dotnet/msbuild</Uri>
|
||||
<Sha>b5265ef370a651f8c3458110b804e5cbf869eeb5</Sha>
|
||||
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="NuGet.Build.Tasks" Version="6.8.1-rc.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted</Uri>
|
||||
<Sha>550277e0616e549446f03fda35d3e23dff75dc01</Sha>
|
||||
<Dependency Name="NuGet.Build.Tasks" Version="6.10.0-preview.2.97" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/nuget/nuget.client</Uri>
|
||||
<Sha>fb50d1a45ed10b39b5f335bc3a4bdcaea9b951cf</Sha>
|
||||
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">
|
||||
|
|
@ -177,16 +172,16 @@
|
|||
<Uri>https://github.com/dotnet/emsdk</Uri>
|
||||
<Sha>a64772f521c578bc9925578b1384d3a08a02d31d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk.Aspire.Manifest-8.0.100" Version="8.0.0-preview.1.23557.2">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspire</Uri>
|
||||
<Sha>48e42f59d64d84b404e904996a9ed61f2a17a569</Sha>
|
||||
<SourceBuild RepoName="aspire" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="8.0.7-servicing.24313.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/emsdk</Uri>
|
||||
<Sha>a64772f521c578bc9925578b1384d3a08a02d31d</Sha>
|
||||
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk.Aspire.Manifest-8.0.100" Version="8.0.0-preview.1.23557.2">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspire</Uri>
|
||||
<Sha>48e42f59d64d84b404e904996a9ed61f2a17a569</Sha>
|
||||
<SourceBuild RepoName="aspire" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-preview.1.23463.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/deployment-tools</Uri>
|
||||
<Sha>5957c5c5f85f17c145e7fab4ece37ad6aafcded9</Sha>
|
||||
|
|
@ -219,26 +214,26 @@
|
|||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24367.1">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24376.1">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>fa3d544b066661522f1ec5d5e8cfd461a29b0f8a</Sha>
|
||||
<Sha>1e2be7464703499cf98e20536fb4da4218c8fce1</Sha>
|
||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.24367.1">
|
||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.24376.1">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>fa3d544b066661522f1ec5d5e8cfd461a29b0f8a</Sha>
|
||||
<Sha>1e2be7464703499cf98e20536fb4da4218c8fce1</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24367.1">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24376.1">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>fa3d544b066661522f1ec5d5e8cfd461a29b0f8a</Sha>
|
||||
<Sha>1e2be7464703499cf98e20536fb4da4218c8fce1</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23578.2">
|
||||
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24306.1">
|
||||
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
||||
<Sha>5263b603d90991a0c200aca8b8892c3d7cfe4751</Sha>
|
||||
<Sha>b65fa14c7799a84e7fc2384bf821720d8ab1873b</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.23578.2">
|
||||
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.24306.1">
|
||||
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
||||
<Sha>5263b603d90991a0c200aca8b8892c3d7cfe4751</Sha>
|
||||
<Sha>b65fa14c7799a84e7fc2384bf821720d8ab1873b</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-alpha.1.22557.12">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@
|
|||
<PropertyGroup>
|
||||
<VersionMajor>8</VersionMajor>
|
||||
<VersionMinor>0</VersionMinor>
|
||||
<VersionSDKMinor>1</VersionSDKMinor>
|
||||
<VersionFeature>09</VersionFeature>
|
||||
<VersionSDKMinor>3</VersionSDKMinor>
|
||||
<VersionFeature>05</VersionFeature>
|
||||
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
|
||||
<MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
|
||||
<CliProductBandVersion>$(MajorMinorVersion).$(VersionSDKMinor)</CliProductBandVersion>
|
||||
|
|
@ -16,21 +16,20 @@
|
|||
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
|
||||
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
|
||||
<!-- Calculate prerelease label -->
|
||||
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' != 'true'">rtm</PreReleaseVersionLabel>
|
||||
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' != 'true'">preview</PreReleaseVersionLabel>
|
||||
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' == 'true' and '$(VersionFeature)' == '00'">rtm</PreReleaseVersionLabel>
|
||||
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' == 'true' and '$(VersionFeature)' != '00'">servicing</PreReleaseVersionLabel>
|
||||
<PreReleaseVersionIteration Condition="'$(StabilizePackageVersion)' != 'true'">
|
||||
</PreReleaseVersionIteration>
|
||||
<PreReleaseVersionIteration Condition="'$(StabilizePackageVersion)' != 'true'">0</PreReleaseVersionIteration>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<VersionFeature21>30</VersionFeature21>
|
||||
<VersionFeature31>32</VersionFeature31>
|
||||
<VersionFeature50>17</VersionFeature50>
|
||||
<VersionFeature60>$([MSBuild]::Add($(VersionFeature), 25))</VersionFeature60>
|
||||
<VersionFeature60>$([MSBuild]::Add($(VersionFeature), 29))</VersionFeature60>
|
||||
<VersionFeature70>20</VersionFeature70>
|
||||
<!-- Should be kept in sync with VersionFeature70. It should match the version of Microsoft.NET.ILLink.Tasks
|
||||
referenced by the same 7.0 SDK that references the 7.0.VersionFeature70 runtime pack. -->
|
||||
<_NET70ILLinkPackVersion>7.0.100-1.23211.1</_NET70ILLinkPackVersion>
|
||||
<_NET70ILLinkPackVersion>7.0.100-1.23401.1</_NET70ILLinkPackVersion>
|
||||
</PropertyGroup>
|
||||
<!-- Restore feeds -->
|
||||
<PropertyGroup Label="Restore feeds">
|
||||
|
|
@ -40,11 +39,11 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.24367.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.24376.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/arcade-services -->
|
||||
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.23621.3</MicrosoftDotNetDarcLibVersion>
|
||||
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.24306.1</MicrosoftDotNetDarcLibVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||
|
|
@ -55,9 +54,10 @@
|
|||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>8.0.7-servicing.24313.7</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/test-templates -->
|
||||
<!-- Supported versions -->
|
||||
<MicrosoftDotNetTestProjectTemplates60PackageVersion>1.1.0-rc.23410.2</MicrosoftDotNetTestProjectTemplates60PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates80PackageVersion>1.1.0-rc.23410.2</MicrosoftDotNetTestProjectTemplates80PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates60PackageVersion>1.1.0-rc.24059.1</MicrosoftDotNetTestProjectTemplates60PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates80PackageVersion>1.1.0-rc.24059.1</MicrosoftDotNetTestProjectTemplates80PackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- NUnit3.DotNetNew.Template versions do not 'flow in' -->
|
||||
|
|
@ -78,16 +78,16 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.107</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>8.0.107-servicing.24317.5</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.107-servicing.24317.5</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.303</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>8.0.303-servicing.24317.6</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.303-servicing.24317.6</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/roslyn -->
|
||||
<MicrosoftNetCompilersToolsetPackageVersion>4.8.0-7.24225.6</MicrosoftNetCompilersToolsetPackageVersion>
|
||||
<MicrosoftNetCompilersToolsetPackageVersion>4.10.0-3.24314.14</MicrosoftNetCompilersToolsetPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/corefx -->
|
||||
|
|
@ -122,11 +122,11 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/NuGet/NuGet.Client -->
|
||||
<NuGetBuildTasksPackageVersion>6.8.1-rc.2</NuGetBuildTasksPackageVersion>
|
||||
<NuGetBuildTasksPackageVersion>6.10.0-preview.2.97</NuGetBuildTasksPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/msbuild -->
|
||||
<MicrosoftBuildPackageVersion>17.8.5</MicrosoftBuildPackageVersion>
|
||||
<MicrosoftBuildPackageVersion>17.10.4</MicrosoftBuildPackageVersion>
|
||||
</PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/deployment-tools -->
|
||||
<PropertyGroup>
|
||||
|
|
@ -151,7 +151,7 @@
|
|||
<SubtractOneFromTemplateVersions Condition="$([MSBuild]::Subtract($(VersionFeature), $(MicrosoftNETSdkPatchVersion))) >= 2">true</SubtractOneFromTemplateVersions>
|
||||
<SubtractOneFromTemplateVersions Condition="$(VersionFeature) >= 1 AND ! $(MicrosoftNETSdkPackageVersion.Contains('rtm')) AND ! $(MicrosoftNETSdkPackageVersion.Contains('servicing'))">true</SubtractOneFromTemplateVersions>
|
||||
<AspNetCoreTemplateFeature60>$([MSBuild]::Subtract($(VersionFeature60), 1))</AspNetCoreTemplateFeature60>
|
||||
<AspNetCoreTemplateFeature60 Condition="$(MicrosoftNETSdkPackageVersion.Contains('preview'))">$(VersionFeature60)</AspNetCoreTemplateFeature60>
|
||||
<AspNetCoreTemplateFeature60 Condition="$(MicrosoftNETSdkPackageVersion.Contains('preview')) AND $(VersionFeature) < 1">$(VersionFeature60)</AspNetCoreTemplateFeature60>
|
||||
<AspNetCoreTemplateFeature60 Condition="'$(SubtractOneFromTemplateVersions)' == 'true'">$([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1))</AspNetCoreTemplateFeature60>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
|
|
@ -189,7 +189,7 @@
|
|||
<PropertyGroup>
|
||||
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
|
||||
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
|
||||
<MicrosoftNETTestSdkVersion>17.8.0-release-23615-02</MicrosoftNETTestSdkVersion>
|
||||
<MicrosoftNETTestSdkVersion>17.10.0-release-24272-11</MicrosoftNETTestSdkVersion>
|
||||
<MicrosoftExtensionsLoggingConsoleVersion>8.0.0-alpha.1.22557.12</MicrosoftExtensionsLoggingConsoleVersion>
|
||||
</PropertyGroup>
|
||||
<!-- Workload manifest package versions -->
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
parameters:
|
||||
# Agent OS identifier and used as job name
|
||||
# Agent OS identifier and used as job name
|
||||
- name: agentOs
|
||||
type: string
|
||||
|
||||
# Job name
|
||||
# Job name
|
||||
- name: jobName
|
||||
type: string
|
||||
|
||||
|
|
@ -12,7 +12,7 @@ parameters:
|
|||
type: string
|
||||
default: ''
|
||||
|
||||
# Job timeout
|
||||
# Job timeout
|
||||
- name: timeoutInMinutes
|
||||
type: number
|
||||
default: 180
|
||||
|
|
@ -77,16 +77,16 @@ jobs:
|
|||
${{ if not(parameters.pgoInstrument) }}:
|
||||
name: ${{ parameters.agentOs }}_${{ parameters.jobName }}
|
||||
|
||||
# Set up the pool/machine info to be used based on the Agent OS
|
||||
## Set up the pool/machine info to be used based on the Agent OS
|
||||
${{ if eq(parameters.agentOs, 'Windows_NT') }}:
|
||||
enableMicrobuild: true
|
||||
pool:
|
||||
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||
name: $(DncEngPublicBuildPool)
|
||||
demands: ImageOverride -equals windows.vs2019.amd64.open
|
||||
demands: ImageOverride -equals windows.vs2022.amd64.open
|
||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||
name: $(DncEngInternalBuildPool)
|
||||
demands: ImageOverride -equals windows.vs2019.amd64
|
||||
demands: ImageOverride -equals windows.vs2022.amd64
|
||||
${{ if eq(parameters.agentOs, 'Linux') }}:
|
||||
pool:
|
||||
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||
|
|
@ -111,8 +111,8 @@ jobs:
|
|||
workspace:
|
||||
clean: all
|
||||
|
||||
# Test parameters
|
||||
variables:
|
||||
# Test variables
|
||||
- ${{ if eq(parameters.agentOs, 'Windows_NT') }}:
|
||||
- _PackArg: '-pack'
|
||||
- ${{ if parameters.runTests }}:
|
||||
|
|
@ -246,8 +246,8 @@ jobs:
|
|||
inputs:
|
||||
SourceFolder: '$(installerRoot)/artifacts'
|
||||
Contents: |
|
||||
log/${{ parameters.buildConfiguration }}/**/*
|
||||
TestResults/${{ parameters.buildConfiguration }}/**/*
|
||||
log/${{ parameters.buildConfiguration }}/**/*
|
||||
TestResults/${{ parameters.buildConfiguration }}/**/*
|
||||
TargetFolder: '$(Build.ArtifactStagingDirectory)'
|
||||
continueOnError: true
|
||||
condition: always()
|
||||
|
|
|
|||
|
|
@ -83,11 +83,11 @@ jobs:
|
|||
pool:
|
||||
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||
name: $(DncEngPublicBuildPool)
|
||||
image: 1es-windows-2019-open
|
||||
image: 1es-windows-2022-open
|
||||
os: windows
|
||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||
name: $(DncEngInternalBuildPool)
|
||||
image: 1es-windows-2019
|
||||
image: 1es-windows-2022
|
||||
os: windows
|
||||
${{ if eq(parameters.agentOs, 'Linux') }}:
|
||||
pool:
|
||||
|
|
@ -97,7 +97,7 @@ jobs:
|
|||
os: linux
|
||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||
name: $(DncEngInternalBuildPool)
|
||||
image: 1es-ubuntu-2004
|
||||
image: 1es-ubuntu-2204
|
||||
os: linux
|
||||
container: ${{ parameters.container }}
|
||||
${{ if eq(parameters.agentOs, 'Darwin') }}:
|
||||
|
|
|
|||
|
|
@ -149,7 +149,7 @@ jobs:
|
|||
scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
|
||||
arguments: -BuildId $(BARBuildId)
|
||||
-PublishingInfraVersion 3
|
||||
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
|
||||
-AzdoToken '$(System.AccessToken)'
|
||||
-WaitPublishingFinish true
|
||||
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
|
||||
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
|
||||
|
|
|
|||
|
|
@ -281,7 +281,7 @@ stages:
|
|||
scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
|
||||
arguments: -BuildId $(BARBuildId)
|
||||
-PublishingInfraVersion ${{ parameters.publishingInfraVersion }}
|
||||
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
|
||||
-AzdoToken '$(System.AccessToken)'
|
||||
-WaitPublishingFinish true
|
||||
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
|
||||
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
|
||||
|
|
|
|||
|
|
@ -145,7 +145,7 @@ jobs:
|
|||
scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
|
||||
arguments: -BuildId $(BARBuildId)
|
||||
-PublishingInfraVersion 3
|
||||
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
|
||||
-AzdoToken '$(System.AccessToken)'
|
||||
-WaitPublishingFinish true
|
||||
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
|
||||
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
|
||||
|
|
|
|||
|
|
@ -277,7 +277,7 @@ stages:
|
|||
scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
|
||||
arguments: -BuildId $(BARBuildId)
|
||||
-PublishingInfraVersion ${{ parameters.publishingInfraVersion }}
|
||||
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
|
||||
-AzdoToken '$(System.AccessToken)'
|
||||
-WaitPublishingFinish true
|
||||
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
|
||||
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
|
||||
|
|
|
|||
|
|
@ -72,10 +72,7 @@ jobs:
|
|||
condition: succeededOrFailed()
|
||||
dependsOn: ${{ parameters.reuseBuildArtifactsFrom }}_${{ parameters.architecture }}
|
||||
variables:
|
||||
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||
- template: /eng/common/templates/variables/pool-providers.yml
|
||||
- ${{ else }}:
|
||||
- template: /eng/common/templates-official/variables/pool-providers.yml
|
||||
- template: /eng/common/templates/variables/pool-providers.yml
|
||||
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||
- group: AzureDevOps-Artifact-Feeds-Pats
|
||||
- ${{ if and(not(parameters.isBuiltFromVmr), eq(variables['System.TeamProject'], 'internal'), not(startswith(parameters.vmrBranch, 'internal/release/')), not(eq(variables['Build.Reason'], 'PullRequest'))) }}:
|
||||
|
|
@ -95,21 +92,8 @@ jobs:
|
|||
- name: sourcesPath
|
||||
value: ${{ parameters.vmrPath }}
|
||||
|
||||
templateContext:
|
||||
outputs:
|
||||
- output: pipelineArtifact
|
||||
displayName: 'Publish BuildLogs'
|
||||
condition: succeededOrFailed()
|
||||
targetPath: '$(Build.StagingDirectory)/BuildLogs'
|
||||
artifactName: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt)
|
||||
- output: pipelineArtifact
|
||||
displayName: 'Publish Artifacts'
|
||||
condition: succeededOrFailed()
|
||||
targetPath: $(Build.ArtifactStagingDirectory)/publishing
|
||||
artifactName: $(Agent.JobName)_Artifacts
|
||||
|
||||
steps:
|
||||
- template: ../steps/vmr-prepare.yml@self
|
||||
- template: ../steps/vmr-prepare.yml
|
||||
parameters:
|
||||
${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
|
||||
vmrBranch: $(System.PullRequest.TargetBranch)
|
||||
|
|
@ -120,7 +104,7 @@ jobs:
|
|||
|
||||
# Synchronize new content in the VMR during PRs (we expect this to come
|
||||
- ${{ if and(not(parameters.isBuiltFromVmr), eq(variables['Build.Reason'], 'PullRequest')) }}:
|
||||
- template: ../steps/vmr-pull-updates.yml@self
|
||||
- template: ../steps/vmr-pull-updates.yml
|
||||
parameters:
|
||||
vmrPath: ${{ parameters.vmrPath }}
|
||||
vmrBranch: ${{ parameters.vmrBranch }}
|
||||
|
|
@ -308,3 +292,9 @@ jobs:
|
|||
mergeTestResults: true
|
||||
publishRunAttachments: true
|
||||
testRunTitle: SourceBuild_SmokeTests_$(Agent.JobName)
|
||||
|
||||
- publish: $(Build.ArtifactStagingDirectory)/publishing
|
||||
artifact: $(Agent.JobName)_Artifacts
|
||||
displayName: Publish Artifacts
|
||||
condition: succeededOrFailed()
|
||||
continueOnError: true
|
||||
|
|
|
|||
|
|
@ -19,13 +19,10 @@ parameters:
|
|||
|
||||
jobs:
|
||||
- job: Synchronize_VMR
|
||||
displayName: Synchronize VMR's ${{ parameters.vmrBranch }}
|
||||
displayName: Synchronize dotnet/dotnet
|
||||
timeoutInMinutes: 120
|
||||
variables:
|
||||
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||
- template: /eng/common/templates/variables/pool-providers.yml
|
||||
- ${{ else }}:
|
||||
- template: /eng/common/templates-official/variables/pool-providers.yml
|
||||
- template: /eng/common/templates/variables/pool-providers.yml
|
||||
- name: vmrPath
|
||||
value: $(Agent.BuildDirectory)/vmr
|
||||
- ${{ if not(parameters.noPush) }}:
|
||||
|
|
@ -43,12 +40,10 @@ jobs:
|
|||
pool:
|
||||
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||
name: $(DncEngPublicBuildPool)
|
||||
image: 1es-ubuntu-2004-open
|
||||
os: linux
|
||||
${{ else }}:
|
||||
demands: ImageOverride -equals Build.Ubuntu.2004.Amd64.Open
|
||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||
name: $(DncEngInternalBuildPool)
|
||||
demands: ImageOverride -equals 1es-ubuntu-2004
|
||||
os: linux
|
||||
demands: ImageOverride -equals Build.Ubuntu.2004.Amd64
|
||||
|
||||
steps:
|
||||
- template: ../steps/vmr-prepare.yml
|
||||
|
|
@ -62,6 +57,7 @@ jobs:
|
|||
vmrBranch: ${{ parameters.vmrBranch }}
|
||||
targetRef: ${{ parameters.targetRef }}
|
||||
|
||||
|
||||
- ${{ if and(not(parameters.noPush), not(in(variables['Build.Reason'], 'PullRequest')), eq(variables['System.TeamProject'], 'internal')) }}:
|
||||
# Push main and release branches to the public VMR
|
||||
- ${{ if or(eq(parameters.vmrBranch, 'main'), startsWith(parameters.vmrBranch, 'release/')) }}:
|
||||
|
|
|
|||
|
|
@ -2,40 +2,29 @@
|
|||
### If run in a PR, new changes are applied to a local copy of the VMR, then it is source-built and tested
|
||||
|
||||
parameters:
|
||||
- name: dependsOn
|
||||
type: object
|
||||
default: []
|
||||
- name: condition
|
||||
type: string
|
||||
default: always()
|
||||
dependsOn: []
|
||||
condition: always()
|
||||
|
||||
# Branch of the VMR to use (to push to for internal builds)
|
||||
- name: vmrBranch
|
||||
type: string
|
||||
default: $(Build.SourceBranch)
|
||||
vmrBranch: $(Build.SourceBranch)
|
||||
|
||||
# True when build is running from dotnet/dotnet directly
|
||||
- name: isBuiltFromVmr
|
||||
type: boolean
|
||||
default: false
|
||||
isBuiltFromVmr:
|
||||
|
||||
# These are not expected to be passed it but rather just object variables reused below
|
||||
- name: pool_Linux
|
||||
type: object
|
||||
default:
|
||||
name: $(defaultPoolName)
|
||||
image: $(poolImage_Linux)
|
||||
demands: ImageOverride -equals $(poolImage_Linux)
|
||||
os: linux
|
||||
# Internal builds
|
||||
poolInternalAmd64:
|
||||
name: NetCore1ESPool-Svc-Internal
|
||||
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
|
||||
poolInternalAmd64PR:
|
||||
name: NetCore1ESPool-Internal-XL
|
||||
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
|
||||
poolInternalArm64:
|
||||
name: Docker-Linux-Arm-Internal
|
||||
|
||||
- name: pool_LinuxArm64
|
||||
type: object
|
||||
default:
|
||||
name: $(poolName_LinuxArm64)
|
||||
image: $(poolImage_LinuxArm64)
|
||||
demands: ImageOverride -equals $(poolImage_LinuxArm64)
|
||||
hostArchitecture: Arm64
|
||||
os: linux
|
||||
# Public builds / PRs
|
||||
poolPublicAmd64:
|
||||
name: NetCore-Public-XL
|
||||
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
|
||||
|
||||
stages:
|
||||
- stage: VMR_Source_Build
|
||||
|
|
@ -43,7 +32,23 @@ stages:
|
|||
dependsOn: ${{ parameters.dependsOn }}
|
||||
condition: ${{ parameters.condition }}
|
||||
variables:
|
||||
- template: ../variables/vmr-build.yml@self
|
||||
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||
- name: defaultPoolName
|
||||
value: ${{ parameters.poolPublicAmd64.name }}
|
||||
- name: defaultPoolDemands
|
||||
value: ${{ parameters.poolPublicAmd64.demands }}
|
||||
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||
- ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
|
||||
- name: defaultPoolName
|
||||
value: ${{ parameters.poolInternalAmd64PR.name }}
|
||||
- name: defaultPoolDemands
|
||||
value: ${{ parameters.poolInternalAmd64PR.demands }}
|
||||
- ${{ else }}:
|
||||
- name: defaultPoolName
|
||||
value: ${{ parameters.poolInternalAmd64.name }}
|
||||
- name: defaultPoolDemands
|
||||
value: ${{ parameters.poolInternalAmd64.demands }}
|
||||
|
||||
- ${{ if ne(parameters.vmrBranch, '') }}:
|
||||
- name: VmrBranch
|
||||
value: ${{ parameters.vmrBranch }}
|
||||
|
|
@ -55,14 +60,16 @@ stages:
|
|||
|
||||
# PR and CI legs ------------------------------------
|
||||
|
||||
- template: ../jobs/vmr-build.yml@self
|
||||
- template: ../jobs/vmr-build.yml
|
||||
parameters:
|
||||
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
|
||||
buildName: ${{ format('{0}_Online_MsftSdk', variables.centOSStreamName) }}
|
||||
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
|
||||
vmrBranch: ${{ variables.VmrBranch }}
|
||||
architecture: x64
|
||||
pool: ${{ parameters.pool_Linux }}
|
||||
pool:
|
||||
name: ${{ variables.defaultPoolName }}
|
||||
demands: ${{ variables.defaultPoolDemands }}
|
||||
container: ${{ variables.centOSStreamContainer }}
|
||||
buildFromArchive: false # 🚫
|
||||
enablePoison: false # 🚫
|
||||
|
|
@ -71,14 +78,16 @@ stages:
|
|||
useMonoRuntime: false # 🚫
|
||||
withPreviousSDK: false # 🚫
|
||||
|
||||
- template: ../jobs/vmr-build.yml@self
|
||||
- template: ../jobs/vmr-build.yml
|
||||
parameters:
|
||||
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
|
||||
buildName: ${{ format('{0}_Offline_MsftSdk', variables.centOSStreamName) }}
|
||||
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
|
||||
vmrBranch: ${{ variables.VmrBranch }}
|
||||
architecture: x64
|
||||
pool: ${{ parameters.pool_Linux }}
|
||||
pool:
|
||||
name: ${{ variables.defaultPoolName }}
|
||||
demands: ${{ variables.defaultPoolDemands }}
|
||||
container: ${{ variables.centOSStreamContainer }}
|
||||
buildFromArchive: true # ✅
|
||||
enablePoison: false # 🚫
|
||||
|
|
@ -91,32 +100,16 @@ stages:
|
|||
|
||||
# CI - Stage 1 x64 legs ------------------------------------
|
||||
|
||||
# This AlmaLinux leg is intended to build with the min supported glibc version
|
||||
- template: ../jobs/vmr-build.yml
|
||||
parameters:
|
||||
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
|
||||
buildName: ${{ format('{0}_Offline_MsftSdk', variables.almaLinuxName) }}
|
||||
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
|
||||
vmrBranch: ${{ variables.VmrBranch }}
|
||||
architecture: x64
|
||||
pool: ${{ parameters.pool_Linux }}
|
||||
container: ${{ variables.almaLinuxContainer }}
|
||||
extraProperties: /p:TargetRID=${{ variables.almaLinuxX64Rid }}
|
||||
buildFromArchive: false # 🚫
|
||||
enablePoison: false # 🚫
|
||||
excludeOmniSharpTests: true # ✅
|
||||
runOnline: false # 🚫
|
||||
useMonoRuntime: false # 🚫
|
||||
withPreviousSDK: false # 🚫
|
||||
|
||||
- template: ../jobs/vmr-build.yml@self
|
||||
parameters:
|
||||
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
|
||||
buildName: ${{ format('{0}_Offline_MsftSdk', variables.alpineName) }}
|
||||
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
|
||||
vmrBranch: ${{ variables.VmrBranch }}
|
||||
architecture: x64
|
||||
pool: ${{ parameters.pool_Linux }}
|
||||
pool:
|
||||
name: ${{ variables.defaultPoolName }}
|
||||
demands: ${{ variables.defaultPoolDemands }}
|
||||
container: ${{ variables.alpineContainer }}
|
||||
buildFromArchive: false # ✅
|
||||
enablePoison: false # 🚫
|
||||
|
|
@ -125,14 +118,16 @@ stages:
|
|||
useMonoRuntime: false # 🚫
|
||||
withPreviousSDK: false # 🚫
|
||||
|
||||
- template: ../jobs/vmr-build.yml@self
|
||||
- template: ../jobs/vmr-build.yml
|
||||
parameters:
|
||||
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
|
||||
buildName: ${{ format('{0}_Online_PreviousSourceBuiltSdk', variables.centOSStreamName) }}
|
||||
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
|
||||
vmrBranch: ${{ variables.VmrBranch }}
|
||||
architecture: x64
|
||||
pool: ${{ parameters.pool_Linux }}
|
||||
pool:
|
||||
name: ${{ variables.defaultPoolName }}
|
||||
demands: ${{ variables.defaultPoolDemands }}
|
||||
container: ${{ variables.centOSStreamContainer }}
|
||||
buildFromArchive: false # 🚫
|
||||
enablePoison: false # 🚫
|
||||
|
|
@ -141,14 +136,16 @@ stages:
|
|||
useMonoRuntime: false # 🚫
|
||||
withPreviousSDK: true # ✅
|
||||
|
||||
- template: ../jobs/vmr-build.yml@self
|
||||
- template: ../jobs/vmr-build.yml
|
||||
parameters:
|
||||
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
|
||||
buildName: ${{ format('{0}_Offline_PreviousSourceBuiltSdk', variables.centOSStreamName) }}
|
||||
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
|
||||
vmrBranch: ${{ variables.VmrBranch }}
|
||||
architecture: x64
|
||||
pool: ${{ parameters.pool_Linux }}
|
||||
pool:
|
||||
name: ${{ variables.defaultPoolName }}
|
||||
demands: ${{ variables.defaultPoolDemands }}
|
||||
container: ${{ variables.centOSStreamContainer }}
|
||||
buildFromArchive: false # 🚫
|
||||
enablePoison: false # 🚫
|
||||
|
|
@ -157,14 +154,16 @@ stages:
|
|||
useMonoRuntime: false # 🚫
|
||||
withPreviousSDK: true # ✅
|
||||
|
||||
- template: ../jobs/vmr-build.yml@self
|
||||
- template: ../jobs/vmr-build.yml
|
||||
parameters:
|
||||
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
|
||||
buildName: ${{ format('{0}_Mono_Offline_MsftSdk', variables.centOSStreamName) }}
|
||||
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
|
||||
vmrBranch: ${{ variables.VmrBranch }}
|
||||
architecture: x64
|
||||
pool: ${{ parameters.pool_Linux }}
|
||||
pool:
|
||||
name: ${{ variables.defaultPoolName }}
|
||||
demands: ${{ variables.defaultPoolDemands }}
|
||||
container: ${{ variables.centOSStreamContainer }}
|
||||
buildFromArchive: true # ✅
|
||||
enablePoison: false # 🚫
|
||||
|
|
@ -173,14 +172,16 @@ stages:
|
|||
useMonoRuntime: true # ✅
|
||||
withPreviousSDK: false # 🚫
|
||||
|
||||
- template: ../jobs/vmr-build.yml@self
|
||||
- template: ../jobs/vmr-build.yml
|
||||
parameters:
|
||||
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
|
||||
buildName: ${{ format('{0}_Offline_MsftSdk', variables.fedoraName) }}
|
||||
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
|
||||
vmrBranch: ${{ variables.VmrBranch }}
|
||||
architecture: x64
|
||||
pool: ${{ parameters.pool_Linux }}
|
||||
pool:
|
||||
name: ${{ variables.defaultPoolName }}
|
||||
demands: ${{ variables.defaultPoolDemands }}
|
||||
container: ${{ variables.fedoraContainer }}
|
||||
buildFromArchive: true # ✅
|
||||
enablePoison: true # ✅
|
||||
|
|
@ -189,14 +190,16 @@ stages:
|
|||
useMonoRuntime: false # 🚫
|
||||
withPreviousSDK: false # 🚫
|
||||
|
||||
- template: ../jobs/vmr-build.yml@self
|
||||
- template: ../jobs/vmr-build.yml
|
||||
parameters:
|
||||
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
|
||||
buildName: ${{ format('{0}_Offline_MsftSdk', variables.ubuntuName) }}
|
||||
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
|
||||
vmrBranch: ${{ variables.VmrBranch }}
|
||||
architecture: x64
|
||||
pool: ${{ parameters.pool_Linux }}
|
||||
pool:
|
||||
name: ${{ variables.defaultPoolName }}
|
||||
demands: ${{ variables.defaultPoolDemands }}
|
||||
container: ${{ variables.ubuntuContainer }}
|
||||
buildFromArchive: false # 🚫
|
||||
enablePoison: false # 🚫
|
||||
|
|
@ -207,14 +210,14 @@ stages:
|
|||
|
||||
# CI - Stage 1 arm64 Legs ------------------------------------
|
||||
|
||||
- template: ../jobs/vmr-build.yml@self
|
||||
- template: ../jobs/vmr-build.yml
|
||||
parameters:
|
||||
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
|
||||
buildName: ${{ format('{0}Arm64_Offline_MsftSdk', variables.ubuntuName) }}
|
||||
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
|
||||
vmrBranch: ${{ variables.VmrBranch }}
|
||||
architecture: arm64
|
||||
pool: ${{ parameters.pool_LinuxArm64 }}
|
||||
pool: ${{ parameters.poolInternalArm64 }}
|
||||
container: ${{ variables.ubuntuArmContainer }}
|
||||
buildFromArchive: false # 🚫
|
||||
enablePoison: false # 🚫
|
||||
|
|
@ -225,14 +228,16 @@ stages:
|
|||
|
||||
# CI - Stage 2 x64 Legs ------------------------------------
|
||||
|
||||
- template: ../jobs/vmr-build.yml@self
|
||||
- template: ../jobs/vmr-build.yml
|
||||
parameters:
|
||||
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
|
||||
buildName: ${{ format('{0}_Online_CurrentSourceBuiltSdk', variables.centOSStreamName) }}
|
||||
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
|
||||
vmrBranch: ${{ variables.VmrBranch }}
|
||||
architecture: x64
|
||||
pool: ${{ parameters.pool_Linux }}
|
||||
pool:
|
||||
name: ${{ variables.defaultPoolName }}
|
||||
demands: ${{ variables.defaultPoolDemands }}
|
||||
container: ${{ variables.centOSStreamContainer }}
|
||||
buildFromArchive: false # 🚫
|
||||
enablePoison: false # 🚫
|
||||
|
|
@ -242,14 +247,16 @@ stages:
|
|||
withPreviousSDK: false # 🚫
|
||||
reuseBuildArtifactsFrom: ${{ format('{0}_Online_MsftSdk', variables.centOSStreamName) }}
|
||||
|
||||
- template: ../jobs/vmr-build.yml@self
|
||||
- template: ../jobs/vmr-build.yml
|
||||
parameters:
|
||||
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
|
||||
buildName: ${{ format('{0}_Offline_CurrentSourceBuiltSdk', variables.fedoraName) }}
|
||||
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
|
||||
vmrBranch: ${{ variables.VmrBranch }}
|
||||
architecture: x64
|
||||
pool: ${{ parameters.pool_Linux }}
|
||||
pool:
|
||||
name: ${{ variables.defaultPoolName }}
|
||||
demands: ${{ variables.defaultPoolDemands }}
|
||||
container: ${{ variables.fedoraContainer }}
|
||||
buildFromArchive: false # 🚫
|
||||
enablePoison: false # 🚫
|
||||
|
|
|
|||
|
|
@ -35,26 +35,3 @@ variables:
|
|||
value: ubuntu.22.04-x64
|
||||
- name: ubuntuArm64Rid
|
||||
value: ubuntu.22.04-arm64
|
||||
|
||||
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||
- name: defaultPoolName
|
||||
value: NetCore-Public-XL
|
||||
- name: poolImage_Linux
|
||||
value: 1es-ubuntu-2004-open
|
||||
- name: poolImage_LinuxArm64
|
||||
value: Mariner-2-Docker-ARM64
|
||||
- name: poolName_LinuxArm64
|
||||
value: Docker-Linux-Arm-Public
|
||||
- ${{ else }}:
|
||||
- ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
|
||||
- name: defaultPoolName
|
||||
value: NetCore1ESPool-Internal-XL
|
||||
- ${{ else }}:
|
||||
- name: defaultPoolName
|
||||
value: $(DncEngInternalBuildPool)
|
||||
- name: poolImage_Linux
|
||||
value: 1es-ubuntu-2204
|
||||
- name: poolImage_LinuxArm64
|
||||
value: Mariner-2-Docker-ARM64
|
||||
- name: poolName_LinuxArm64
|
||||
value: Docker-Linux-Arm-Internal
|
||||
|
|
|
|||
|
|
@ -1,56 +0,0 @@
|
|||
# This is the non-1ES PR pipeline source-building the VMR used in installer PRs
|
||||
# https://dev.azure.com/dnceng-public/public/_build?definitionId=233
|
||||
|
||||
trigger: none
|
||||
pr:
|
||||
branches:
|
||||
include:
|
||||
- main
|
||||
- release/*
|
||||
|
||||
parameters:
|
||||
- name: vmrBranch
|
||||
displayName: dotnet/dotnet branch to push to
|
||||
type: string
|
||||
default: ' '
|
||||
|
||||
- name: disableVmrBuild
|
||||
displayName: Skip source-building the VMR
|
||||
type: boolean
|
||||
default: false
|
||||
|
||||
variables:
|
||||
- ${{ if ne(parameters.vmrBranch, ' ') }}:
|
||||
- name: VmrBranch
|
||||
value: ${{ replace(parameters.vmrBranch, ' ', '') }}
|
||||
- ${{ else }}:
|
||||
- name: VmrBranch
|
||||
value: release/8.0.1xx
|
||||
|
||||
resources:
|
||||
repositories:
|
||||
- repository: vmr
|
||||
type: github
|
||||
name: dotnet/dotnet
|
||||
endpoint: dotnet
|
||||
ref: $(VmrBranch)
|
||||
|
||||
stages:
|
||||
# You can temporarily disable the VMR Build stage by setting the disableVmrBuild variable
|
||||
- ${{ if not(parameters.disableVmrBuild) }}:
|
||||
- template: templates/stages/vmr-build.yml
|
||||
parameters:
|
||||
vmrBranch: ${{ variables.VmrBranch }}
|
||||
isBuiltFromVmr: false
|
||||
|
||||
# In case the VMR Build stage is temporarily disabled, the VMR synchronization step is run to validate
|
||||
# that the PR can be merged and later synchronized into the VMR without problems.
|
||||
- ${{ else }}:
|
||||
- stage: Synchronize_VMR
|
||||
displayName: Synchronize VMR
|
||||
dependsOn: []
|
||||
jobs:
|
||||
- template: templates/jobs/vmr-synchronization.yml
|
||||
parameters:
|
||||
vmrBranch: ${{ variables.VmrBranch }}
|
||||
noPush: true
|
||||
|
|
@ -4,6 +4,10 @@ pr:
|
|||
include:
|
||||
- main
|
||||
- release/*
|
||||
exclude:
|
||||
- release/*.0.2xx
|
||||
- release/*.0.3xx
|
||||
- release/*.0.4xx
|
||||
|
||||
parameters:
|
||||
- name: vmrBranch
|
||||
|
|
|
|||
|
|
@ -17,11 +17,6 @@ resources:
|
|||
name: dotnet-dotnet
|
||||
ref: $(Build.SourceBranch)
|
||||
|
||||
- repository: 1ESPipelineTemplates
|
||||
type: git
|
||||
name: 1ESPipelineTemplates/1ESPipelineTemplates
|
||||
ref: refs/tags/release
|
||||
|
||||
parameters:
|
||||
- name: vmrBranch
|
||||
displayName: dotnet-dotnet branch to push to
|
||||
|
|
@ -29,8 +24,6 @@ parameters:
|
|||
default: ' '
|
||||
|
||||
variables:
|
||||
- template: /eng/common/templates-official/variables/pool-providers.yml@self
|
||||
|
||||
- ${{ if ne(parameters.vmrBranch, ' ') }}:
|
||||
- name: VmrBranch
|
||||
value: ${{ replace(parameters.vmrBranch, ' ', '') }}
|
||||
|
|
@ -38,27 +31,7 @@ variables:
|
|||
- name: VmrBranch
|
||||
value: ${{ replace(replace(variables['Build.SourceBranch'], 'refs/heads/', ''), 'refs/pull/', '') }}
|
||||
|
||||
extends:
|
||||
template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
|
||||
parameters:
|
||||
sdl:
|
||||
sourceAnalysisPool:
|
||||
name: $(DncEngInternalBuildPool)
|
||||
image: 1es-windows-2022
|
||||
os: windows
|
||||
|
||||
sourceRepositoriesToScan:
|
||||
exclude:
|
||||
- repository: vmr
|
||||
|
||||
componentgovernance:
|
||||
sourceScanPath: $(Agent.BuildDirectory)/vmr
|
||||
ignoreDirectories: $(Agent.BuildDirectory)/vmr/src
|
||||
|
||||
stages:
|
||||
- stage: VMRSynchronization
|
||||
displayName: VMR Synchronization
|
||||
jobs:
|
||||
- template: /eng/pipelines/templates/jobs/vmr-synchronization.yml@self
|
||||
parameters:
|
||||
vmrBranch: ${{ variables.VmrBranch }}
|
||||
jobs:
|
||||
- template: templates/jobs/vmr-synchronization.yml
|
||||
parameters:
|
||||
vmrBranch: ${{ variables.VmrBranch }}
|
||||
|
|
@ -19,11 +19,6 @@ resources:
|
|||
endpoint: dotnet
|
||||
ref: $(Build.SourceBranch)
|
||||
|
||||
- repository: 1ESPipelineTemplates
|
||||
type: git
|
||||
name: 1ESPipelineTemplates/1ESPipelineTemplates
|
||||
ref: refs/tags/release
|
||||
|
||||
parameters:
|
||||
- name: vmrBranch
|
||||
displayName: dotnet/dotnet branch to push to
|
||||
|
|
@ -31,8 +26,6 @@ parameters:
|
|||
default: ' '
|
||||
|
||||
variables:
|
||||
- template: /eng/common/templates-official/variables/pool-providers.yml@self
|
||||
|
||||
- ${{ if ne(parameters.vmrBranch, ' ') }}:
|
||||
- name: VmrBranch
|
||||
value: ${{ replace(parameters.vmrBranch, ' ', '') }}
|
||||
|
|
@ -40,27 +33,9 @@ variables:
|
|||
- name: VmrBranch
|
||||
value: ${{ replace(replace(variables['Build.SourceBranch'], 'refs/heads/', ''), 'refs/pull/', '') }}
|
||||
|
||||
extends:
|
||||
template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
|
||||
parameters:
|
||||
sdl:
|
||||
sourceAnalysisPool:
|
||||
name: $(DncEngInternalBuildPool)
|
||||
image: 1es-windows-2022
|
||||
os: windows
|
||||
jobs:
|
||||
- template: /eng/pipelines/templates/jobs/vmr-synchronization.yml
|
||||
parameters:
|
||||
vmrBranch: ${{ variables.VmrBranch }}
|
||||
|
||||
sourceRepositoriesToScan:
|
||||
exclude:
|
||||
- repository: vmr
|
||||
|
||||
componentgovernance:
|
||||
sourceScanPath: $(Agent.BuildDirectory)/vmr
|
||||
ignoreDirectories: $(Agent.BuildDirectory)/vmr/src
|
||||
|
||||
stages:
|
||||
- stage: VMRSynchronization
|
||||
displayName: VMR Synchronization
|
||||
jobs:
|
||||
- template: /eng/pipelines/templates/jobs/vmr-synchronization.yml@self
|
||||
parameters:
|
||||
vmrBranch: ${{ variables.VmrBranch }}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
"cmake": "3.21.0"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24367.1",
|
||||
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24367.1"
|
||||
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24376.1",
|
||||
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24376.1"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -7,6 +7,13 @@ trigger:
|
|||
- main
|
||||
- release/*
|
||||
- internal/release/*
|
||||
exclude:
|
||||
- release/*.0.2xx
|
||||
- release/*.0.3xx
|
||||
- release/*.0.4xx
|
||||
- internal/release/*.0.2xx
|
||||
- internal/release/*.0.3xx
|
||||
- internal/release/*.0.4xx
|
||||
|
||||
pr:
|
||||
branches:
|
||||
|
|
@ -15,31 +22,10 @@ pr:
|
|||
- release/*
|
||||
- internal/release/*
|
||||
|
||||
resources:
|
||||
repositories:
|
||||
- repository: 1ESPipelineTemplates
|
||||
type: git
|
||||
name: 1ESPipelineTemplates/1ESPipelineTemplates
|
||||
ref: refs/tags/release
|
||||
stages:
|
||||
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
|
||||
- template: templates/stages/vmr-scan.yml
|
||||
|
||||
extends:
|
||||
template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
|
||||
- template: /src/installer/eng/pipelines/templates/stages/vmr-build.yml
|
||||
parameters:
|
||||
sdl:
|
||||
sourceAnalysisPool:
|
||||
name: NetCore1ESPool-Internal
|
||||
image: 1es-windows-2022
|
||||
os: windows
|
||||
|
||||
baseline:
|
||||
baselineFile: $(Build.SourcesDirectory)\.config\guardian\.gdnbaselines
|
||||
|
||||
customBuildTags:
|
||||
- ES365AIMigrationTooling
|
||||
|
||||
stages:
|
||||
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
|
||||
- template: /eng/pipelines/templates/stages/vmr-scan.yml@self
|
||||
- template: /src/installer/eng/pipelines/templates/stages/vmr-build.yml@self
|
||||
parameters:
|
||||
isBuiltFromVmr: true
|
||||
isBuiltFromVmr: true
|
||||
|
|
|
|||
|
|
@ -1,18 +0,0 @@
|
|||
# This is the non-1ES PR pipeline for dotnet/dotnet
|
||||
# https://dev.azure.com/dnceng-public/public/_build?definitionId=240
|
||||
|
||||
trigger: none
|
||||
pr:
|
||||
branches:
|
||||
include:
|
||||
- main
|
||||
- release/*
|
||||
- internal/release/*
|
||||
|
||||
stages:
|
||||
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
|
||||
- template: templates/stages/vmr-scan.yml
|
||||
|
||||
- template: /src/installer/eng/pipelines/templates/stages/vmr-build.yml
|
||||
parameters:
|
||||
isBuiltFromVmr: true
|
||||
|
|
@ -3,22 +3,17 @@ stages:
|
|||
displayName: Tag & Scan
|
||||
dependsOn: []
|
||||
variables:
|
||||
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||
- template: /eng/common/templates/variables/pool-providers.yml
|
||||
- ${{ else }}:
|
||||
- template: /eng/common/templates-official/variables/pool-providers.yml
|
||||
- template: /eng/common/templates/variables/pool-providers.yml
|
||||
jobs:
|
||||
- job: Tag_n_Scan
|
||||
displayName: Tag & Scan
|
||||
pool:
|
||||
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||
name: $(DncEngPublicBuildPool)
|
||||
image: 1es-ubuntu-2004-open
|
||||
os: linux
|
||||
demands: ImageOverride -equals Build.Ubuntu.2004.Amd64.Open
|
||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||
name: $(DncEngInternalBuildPool)
|
||||
image: 1es-ubuntu-2004
|
||||
os: linux
|
||||
demands: ImageOverride -equals Build.Ubuntu.2004.Amd64
|
||||
|
||||
steps:
|
||||
- checkout: self
|
||||
|
|
|
|||
|
|
@ -1,4 +1,7 @@
|
|||
using System;
|
||||
// Copyright (c) .NET Foundation and contributors. All rights reserved.
|
||||
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
|
|
|
|||
|
|
@ -24,7 +24,8 @@ namespace Microsoft.DotNet.Cli.Build
|
|||
|
||||
AddFolder(sb,
|
||||
@"MSBuildSdkResolver",
|
||||
@"MSBuild\Current\Bin\SdkResolvers\Microsoft.DotNet.MSBuildSdkResolver");
|
||||
@"MSBuild\Current\Bin\SdkResolvers\Microsoft.DotNet.MSBuildSdkResolver",
|
||||
ngenAssemblies: true);
|
||||
|
||||
AddFolder(sb,
|
||||
@"msbuildExtensions",
|
||||
|
|
@ -39,7 +40,7 @@ namespace Microsoft.DotNet.Cli.Build
|
|||
return true;
|
||||
}
|
||||
|
||||
private void AddFolder(StringBuilder sb, string relativeSourcePath, string swrInstallDir)
|
||||
private void AddFolder(StringBuilder sb, string relativeSourcePath, string swrInstallDir, bool ngenAssemblies = false)
|
||||
{
|
||||
string sourceFolder = Path.Combine(MSBuildExtensionsLayoutDirectory, relativeSourcePath);
|
||||
var files = Directory.GetFiles(sourceFolder)
|
||||
|
|
@ -55,7 +56,14 @@ namespace Microsoft.DotNet.Cli.Build
|
|||
{
|
||||
sb.Append(@" file source=""$(PkgVS_Redist_Common_Net_Core_SDK_MSBuildExtensions)\");
|
||||
sb.Append(Path.Combine(relativeSourcePath, Path.GetFileName(file)));
|
||||
sb.AppendLine("\"");
|
||||
sb.Append('"');
|
||||
|
||||
if (ngenAssemblies && file.EndsWith(".dll", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
sb.Append(@" vs.file.ngenApplications=""[installDir]\Common7\IDE\vsn.exe""");
|
||||
}
|
||||
|
||||
sb.AppendLine();
|
||||
}
|
||||
|
||||
sb.AppendLine();
|
||||
|
|
@ -67,6 +75,7 @@ namespace Microsoft.DotNet.Cli.Build
|
|||
string newRelativeSourcePath = Path.Combine(relativeSourcePath, subfolderName);
|
||||
string newSwrInstallDir = Path.Combine(swrInstallDir, subfolderName);
|
||||
|
||||
// Don't propagate ngenAssemblies to subdirectories.
|
||||
AddFolder(sb, newRelativeSourcePath, newSwrInstallDir);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,7 @@
|
|||
using System;
|
||||
// Copyright (c) .NET Foundation and contributors. All rights reserved.
|
||||
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,7 @@
|
|||
using System;
|
||||
// Copyright (c) .NET Foundation and contributors. All rights reserved.
|
||||
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,7 @@
|
|||
using System;
|
||||
// Copyright (c) .NET Foundation and contributors. All rights reserved.
|
||||
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
|
|
|
|||
|
|
@ -19,27 +19,28 @@
|
|||
Properties="ArtifactsDir=$(ArtifactsDir)tasks\"/>
|
||||
</Target>
|
||||
|
||||
<UsingTask TaskName="AddMetadataIsPE" AssemblyFile="$(CoreSdkTaskDll)"/>
|
||||
<UsingTask TaskName="BuildFPMToolPreReqs" AssemblyFile="$(CoreSdkTaskDll)"/>
|
||||
<UsingTask TaskName="CalculateTemplateVersions" AssemblyFile="$(CoreSdkTaskDll)" />
|
||||
<UsingTask TaskName="Chmod" AssemblyFile="$(CoreSdkTaskDll)" />
|
||||
<UsingTask TaskName="CollatePackageDownloads" AssemblyFile="$(CoreSdkTaskDll)"/>
|
||||
<UsingTask TaskName="Crossgen" AssemblyFile="$(CoreSdkTaskDll)"/>
|
||||
<UsingTask TaskName="DotNetDebTool" AssemblyFile="$(CoreSdkTaskDll)" />
|
||||
<UsingTask TaskName="DownloadFile" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" />
|
||||
<UsingTask TaskName="ExtractArchiveToDirectory" AssemblyFile="$(CoreSdkTaskDll)" />
|
||||
<UsingTask TaskName="ZipFileCreateFromDirectory" AssemblyFile="$(CoreSdkTaskDll)" />
|
||||
<UsingTask TaskName="ZipFileExtractToDirectory" AssemblyFile="$(CoreSdkTaskDll)" />
|
||||
<UsingTask TaskName="TarGzFileCreateFromDirectory" AssemblyFile="$(CoreSdkTaskDll)" />
|
||||
<UsingTask TaskName="GenerateMsiVersionFromFullVersion" AssemblyFile="$(CoreSdkTaskDll)" />
|
||||
<UsingTask TaskName="ReplaceFileContents" AssemblyFile="$(CoreSdkTaskDll)" />
|
||||
<UsingTask TaskName="UpdateRuntimeConfig" AssemblyFile="$(CoreSdkTaskDll)" />
|
||||
<UsingTask TaskName="Chmod" AssemblyFile="$(CoreSdkTaskDll)" />
|
||||
<UsingTask TaskName="DotNetDebTool" AssemblyFile="$(CoreSdkTaskDll)" />
|
||||
<UsingTask TaskName="BuildFPMToolPreReqs" AssemblyFile="$(CoreSdkTaskDll)"/>
|
||||
<UsingTask TaskName="GenerateDefaultRuntimeFrameworkVersion" AssemblyFile="$(CoreSdkTaskDll)"/>
|
||||
<UsingTask TaskName="AddMetadataIsPE" AssemblyFile="$(CoreSdkTaskDll)"/>
|
||||
<UsingTask TaskName="Crossgen" AssemblyFile="$(CoreSdkTaskDll)"/>
|
||||
<UsingTask TaskName="GetRuntimePackRids" AssemblyFile="$(CoreSdkTaskDll)"/>
|
||||
<UsingTask TaskName="GenerateMSBuildExtensionsSWR" AssemblyFile="$(CoreSdkTaskDll)"/>
|
||||
<UsingTask TaskName="GetLinuxNativeInstallerDependencyVersions" AssemblyFile="$(CoreSdkTaskDll)"/>
|
||||
<UsingTask TaskName="CollatePackageDownloads" AssemblyFile="$(CoreSdkTaskDll)"/>
|
||||
<UsingTask TaskName="GenerateMsiVersionFromFullVersion" AssemblyFile="$(CoreSdkTaskDll)" />
|
||||
<UsingTask TaskName="GenerateSdkRuntimeIdentifierChain" AssemblyFile="$(CoreSdkTaskDll)"/>
|
||||
<UsingTask TaskName="GetDependencyInfo" AssemblyFile="$(CoreSdkTaskDll)"/>
|
||||
<UsingTask TaskName="GetLinuxNativeInstallerDependencyVersions" AssemblyFile="$(CoreSdkTaskDll)"/>
|
||||
<UsingTask TaskName="GetRuntimePackRids" AssemblyFile="$(CoreSdkTaskDll)"/>
|
||||
<UsingTask TaskName="ReplaceDuplicateFilesWithHardLinks" AssemblyFile="$(CoreSdkTaskDll)"/>
|
||||
<UsingTask TaskName="ReplaceFileContents" AssemblyFile="$(CoreSdkTaskDll)" />
|
||||
<UsingTask TaskName="ReplaceFilesWithSymbolicLinks" AssemblyFile="$(CoreSdkTaskDll)"/>
|
||||
<UsingTask TaskName="TarGzFileCreateFromDirectory" AssemblyFile="$(CoreSdkTaskDll)" />
|
||||
<UsingTask TaskName="UpdateRuntimeConfig" AssemblyFile="$(CoreSdkTaskDll)" />
|
||||
<UsingTask TaskName="ZipFileCreateFromDirectory" AssemblyFile="$(CoreSdkTaskDll)" />
|
||||
<UsingTask TaskName="ZipFileExtractToDirectory" AssemblyFile="$(CoreSdkTaskDll)" />
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -106,5 +106,21 @@
|
|||
<Copy SourceFiles="@(ManifestContent)"
|
||||
DestinationFolder="$(RedistLayoutPath)sdk-manifests/%(DestinationPath)"/>
|
||||
|
||||
<PropertyGroup>
|
||||
<WorkloadSetVersion Condition="'$(DotNetFinalVersionKind)' == 'release'">$(VersionPrefix)-baseline$(_BuildNumberLabels)</WorkloadSetVersion>
|
||||
<WorkloadSetVersion Condition="'$(DotNetFinalVersionKind)' != 'release'">$(Version)</WorkloadSetVersion>
|
||||
<RealFormattedManifestPaths>$(RedistLayoutPath)sdk-manifests\$(NetFeatureBand)\workloadsets\$(WorkloadSetVersion)</RealFormattedManifestPaths>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<FormattedBaselineManifest Include="{" />
|
||||
<FormattedBaselineManifest Include=""%(BundledManifests.Identity)": "%(BundledManifests.Version)/%(BundledManifests.FeatureBand)","/>
|
||||
<FormattedBaselineManifest Include="}" />
|
||||
</ItemGroup>
|
||||
|
||||
<WriteLinestoFile File="$(RealFormattedManifestPaths)\baseline.workloadset.json" Lines="@(FormattedBaselineManifest)" />
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
<Target Name="GenerateBundledVersions"
|
||||
Condition="'$(PgoInstrument)' != 'true'"
|
||||
DependsOnTargets="GenerateBundledVersionsProps;GenerateBundledCliToolsProps" >
|
||||
DependsOnTargets="GenerateBundledVersionsProps;GenerateBundledCliToolsProps;GenerateBundledMSBuildProps" >
|
||||
|
||||
<WriteLinesToFile
|
||||
File="$(ArtifactsShippingPackagesDir)productVersion.txt"
|
||||
|
|
@ -1206,6 +1206,54 @@ Copyright (c) .NET Foundation. All rights reserved.
|
|||
Overwrite="true" />
|
||||
</Target>
|
||||
|
||||
<Target Name="GenerateBundledMSBuildProps" DependsOnTargets="SetupBundledComponents">
|
||||
<PropertyGroup>
|
||||
<MinimumMSBuildVersionFile>$(RedistLayoutPath)sdk/$(Version)/minimumMSBuildVersion</MinimumMSBuildVersionFile>
|
||||
<BundledMSBuildPropsFileName>Microsoft.NETCoreSdk.BundledMSBuildInformation.props</BundledMSBuildPropsFileName>
|
||||
<BundledMSBuildVersion>$(MSBuildVersion)</BundledMSBuildVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<Error Text="No MSBuild version file found under '$(RedistLayoutPath)sdk/$(Version)'" Condition="!Exists('$(MinimumMSBuildVersionFile)')" />
|
||||
|
||||
<ReadLinesFromFile File="$(MinimumMSBuildVersionFile)">
|
||||
<Output TaskParameter="Lines" PropertyName="MinimumMSBuildVersion"/>
|
||||
</ReadLinesFromFile>
|
||||
|
||||
<PropertyGroup>
|
||||
<_BundledMSBuildVersionMajorMinor>$([System.Version]::Parse('$(BundledMSBuildVersion)').ToString(2))</_BundledMSBuildVersionMajorMinor>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<BundledMSBuildPropsFileContent>
|
||||
<![CDATA[
|
||||
<!--
|
||||
***********************************************************************************************
|
||||
$(BundledMSBuildPropsFileName)
|
||||
|
||||
WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
|
||||
created a backup copy. Incorrect changes to this file will make it
|
||||
impossible to load or build your projects from the command-line or the IDE.
|
||||
|
||||
Copyright (c) .NET Foundation. All rights reserved.
|
||||
***********************************************************************************************
|
||||
-->
|
||||
<Project>
|
||||
<PropertyGroup>
|
||||
<MinimumMSBuildVersion>$(MinimumMSBuildVersion)</MinimumMSBuildVersion>
|
||||
<BundledMSBuildVersion>$(BundledMSBuildVersion)</BundledMSBuildVersion>
|
||||
<_MSBuildVersionMajorMinor>%24([System.Version]::Parse('%24(MSBuildVersion)').ToString(2))</_MSBuildVersionMajorMinor>
|
||||
<_IsDisjointMSBuildVersion>%24([MSBuild]::VersionGreaterThan('%24(_MSBuildVersionMajorMinor)', '$(_BundledMSBuildVersionMajorMinor)'))</_IsDisjointMSBuildVersion>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
]]>
|
||||
</BundledMSBuildPropsFileContent>
|
||||
</PropertyGroup>
|
||||
|
||||
<WriteLinesToFile File="$(SdkOutputDirectory)$(BundledMSBuildPropsFileName)"
|
||||
Lines="$(BundledMSBuildPropsFileContent)"
|
||||
Overwrite="true" />
|
||||
</Target>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageDownload Include="Microsoft.NETCore.Platforms" Version="[$(MicrosoftNETCorePlatformsPackageVersion)]" />
|
||||
</ItemGroup>
|
||||
|
|
|
|||
|
|
@ -27,14 +27,17 @@ namespace EndToEnd.Tests
|
|||
{
|
||||
foreach (var manifestDir in manifestVersionDir.EnumerateDirectories())
|
||||
{
|
||||
var manifestId = manifestDir.Name;
|
||||
var manifestId = manifestVersionDir.Name;
|
||||
|
||||
string manifestFile = manifestDir.GetFile("WorkloadManifest.json").FullName;
|
||||
|
||||
File.Exists(manifestFile).Should().BeTrue();
|
||||
using var fileStream = new FileStream(manifestFile, FileMode.Open, FileAccess.Read);
|
||||
Action readManifest = () => WorkloadManifestReader.ReadWorkloadManifest(manifestId, fileStream, manifestFile);
|
||||
readManifest.Should().NotThrow("manifestId:" + manifestId + " manifestFile:" + manifestFile + "is invalid");
|
||||
if (!string.Equals(manifestId, "workloadsets"))
|
||||
{
|
||||
new FileInfo(manifestFile).Exists.Should().BeTrue();
|
||||
using var fileStream = new FileStream(manifestFile, FileMode.Open, FileAccess.Read);
|
||||
Action readManifest = () => WorkloadManifestReader.ReadWorkloadManifest(manifestId, fileStream, manifestFile);
|
||||
readManifest.Should().NotThrow("manifestId:" + manifestId + " manifestFile:" + manifestFile + "is invalid");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<Project>
|
||||
<Project>
|
||||
|
||||
<PropertyGroup>
|
||||
<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
|
||||
|
|
@ -215,6 +215,10 @@
|
|||
<TestArgs>$(TestArgs) -testList SdkIntegrationTests</TestArgs>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="$(StabilizePackageVersion) == 'true'">
|
||||
<!-- Add list of tests to skip in stable SDKS -->
|
||||
<TestArgs>$(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipStableSDK.xml"</TestArgs>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="('$(OS)' == 'Windows_NT') And ('$(Architecture)' == 'x86')">
|
||||
<!-- Add list of tests to skip on x86 -->
|
||||
|
|
|
|||
|
|
@ -45,10 +45,6 @@
|
|||
</TestList>
|
||||
|
||||
<SkippedTests>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAHelloWorldProject.It_publishes_portable_apps_to_the_publish_folder_and_the_app_should_run"
|
||||
Skip="true"
|
||||
Issue="https://github.com/dotnet/sdk/pull/3574"
|
||||
Reason="Test update needed (in PR)"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishASingleFileApp.It_runs_single_file_apps"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
|
|
@ -61,201 +57,13 @@
|
|||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Test doesn't work with newer RIDs"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_keeps_symbols_by_default"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_links_simple_app_without_analysis_warnings_and_it_runs"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_does_not_include_leftover_artifacts_on_second_run"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_respects_warning_level_independently"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_runs_incrementally"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_symbols_option_can_override_defaults_from_debugger_support"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_removes_symbols_when_debugger_support_is_disabled"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_displays_informational_warning"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.PrepareForILLink_can_set_IsTrimmable"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_accepts_option_to_remove_symbols"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_defaults_keep_nonframework"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_accepts_root_descriptor"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_respects_global_TrimMode"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_only_runs_when_switch_is_enabled"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_error_on_nonboolean_optimization_flag"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishASingleFileApp.It_generates_a_single_file_including_pdbs"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.PrepareForILLink_can_set_TrimMode"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_accepts_option_to_enable_analysis_warnings"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_error_on_portable_app"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_can_treat_warnings_not_as_errors"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.TrimmingOptions_are_defaulted_correctly_on_trimmed_apps"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_errors_fail_the_build"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_can_treat_warnings_as_errors"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_roots_IntermediateAssembly"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_can_treat_warnings_as_errors_independently"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_accepts_option_to_disable_analysis_warnings"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_can_ignore_warnings"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_respects_analysis_level"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_accepts_option_to_enable_analysis_warnings_without_PublishTrimmed"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_displays_informational_warning_when_trim_analysis_warnings_are_suppressed_on_net6plus"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_old_defaults_keep_nonframework"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_dont_display_time_awareness_message_on_incremental_build"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_IsTrimmable_metadata_can_override_attribute"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_respects_IsTrimmable_attribute"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_displays_informational_warning_up_to_net5_by_default"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_dont_display_informational_warning_by_default_on_net6plus"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_analysis_warnings_are_enabled_by_default"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_TrimMode_applies_to_IsTrimmable_assemblies"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Build.Tests.AppHostTests.It_builds_a_runnable_apphost_by_default"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishASingleFileApp.It_can_include_ni_pdbs_in_single_file"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Build.Tests.GivenWeWantToRequireWindowsForDesktopApps.WindowsFormsAppCanBuildOnNonWindows"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_verify_analysis_warnings_framework_assemblies"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_verify_analysis_warnings_hello_world_app_trim_mode_link"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_verify_analysis_warnings_hello_world_app_trim_mode_copyused"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishASingleFileApp.It_generates_publishing_single_file_with_win7"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_net7_defaults_trim_nonframework"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.IsTrimmable_warns_when_expected_for_not_correctly_multitargeted_libraries"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishASingleFileApp.EnableSingleFile_warns_when_expected_for_not_correctly_multitargeted_libraries"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_can_use_latest_with_unsupported_target_framework"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Requires props file not in installer repo"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAHelloWorldProject.It_publishes_portable_apps_to_the_publish_folder_and_the_app_should_run"
|
||||
Skip="true"
|
||||
Issue="https://github.com/dotnet/sdk/pull/3574"
|
||||
Reason="Requires the 1.1 runtime, renenable when removed"/>
|
||||
</SkippedTests>
|
||||
</Tests>
|
||||
|
|
|
|||
|
|
@ -6,5 +6,13 @@
|
|||
<Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildASelfContainedApp.It_builds_a_runnable_output"
|
||||
Skip="true"
|
||||
Reason=".NET Core 1.1 fails to publish on distributions with unsupported RIDs."/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_links_simple_app_without_analysis_warnings_and_it_runs"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Fails on 3.1 on linux for missing ICU package"/>
|
||||
<Method Name="Microsoft.NET.Build.Tests.AppHostTests.It_builds_a_runnable_apphost_by_default"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Fails on 3.1 on linux for missing ICU package"/>
|
||||
</SkippedTests>
|
||||
</Tests>
|
||||
|
|
|
|||
212
test/SdkTests/TestsToSkipStableSDK.xml
Normal file
212
test/SdkTests/TestsToSkipStableSDK.xml
Normal file
|
|
@ -0,0 +1,212 @@
|
|||
<Tests>
|
||||
<SkippedTests>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_keeps_symbols_by_default"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_does_not_include_leftover_artifacts_on_second_run"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_respects_warning_level_independently"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_runs_incrementally"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_symbols_option_can_override_defaults_from_debugger_support"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_removes_symbols_when_debugger_support_is_disabled"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_displays_informational_warning"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.PrepareForILLink_can_set_IsTrimmable"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_accepts_option_to_remove_symbols"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_defaults_keep_nonframework"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_accepts_root_descriptor"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_respects_global_TrimMode"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_only_runs_when_switch_is_enabled"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_error_on_nonboolean_optimization_flag"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishASingleFileApp.It_generates_a_single_file_including_pdbs"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.PrepareForILLink_can_set_TrimMode"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_accepts_option_to_enable_analysis_warnings"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_error_on_portable_app"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_can_treat_warnings_not_as_errors"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.TrimmingOptions_are_defaulted_correctly_on_trimmed_apps"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_errors_fail_the_build"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_can_treat_warnings_as_errors"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_roots_IntermediateAssembly"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_can_treat_warnings_as_errors_independently"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_accepts_option_to_disable_analysis_warnings"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_can_ignore_warnings"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_respects_analysis_level"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_accepts_option_to_enable_analysis_warnings_without_PublishTrimmed"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_displays_informational_warning_when_trim_analysis_warnings_are_suppressed_on_net6plus"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_old_defaults_keep_nonframework"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_dont_display_time_awareness_message_on_incremental_build"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_IsTrimmable_metadata_can_override_attribute"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_respects_IsTrimmable_attribute"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_displays_informational_warning_up_to_net5_by_default"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_dont_display_informational_warning_by_default_on_net6plus"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_analysis_warnings_are_enabled_by_default"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_TrimMode_applies_to_IsTrimmable_assemblies"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishASingleFileApp.It_can_include_ni_pdbs_in_single_file"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Build.Tests.GivenWeWantToRequireWindowsForDesktopApps.WindowsFormsAppCanBuildOnNonWindows"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_verify_analysis_warnings_framework_assemblies"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_verify_analysis_warnings_hello_world_app_trim_mode_link"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_verify_analysis_warnings_hello_world_app_trim_mode_copyused"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishASingleFileApp.It_generates_publishing_single_file_with_win7"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_net7_defaults_trim_nonframework"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.IsTrimmable_warns_when_expected_for_not_correctly_multitargeted_libraries"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishASingleFileApp.EnableSingleFile_warns_when_expected_for_not_correctly_multitargeted_libraries"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAFrameworkDependentApp.It_publishes_with_or_without_apphost"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_links_simple_app_without_analysis_warnings_and_it_runs"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildANetCoreApp.It_runs_the_app_from_the_output_folder"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildANetCoreApp.It_runs_a_rid_specific_app_with_conflicts_from_the_output_folder"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildANetCoreApp.It_runs_the_app_with_conflicts_from_the_output_folder"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
<Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildANetCoreApp.It_runs_a_rid_specific_app_from_the_output_folder"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
|
||||
</SkippedTests>
|
||||
</Tests>
|
||||
Loading…
Reference in a new issue