mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #13036 from dotnet/marcpopMSFT-merge601xx

Browse source 
Update 6.0.2xx to current 6.0.102 changes
This commit is contained in:
Marc Paine 2022-01-18 09:39:40 -08:00 • committed by GitHub
commit 41ae4ef8f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 145 additions and 259 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
NuGet.config
View file

@ -32,5 +32,14 @@
<!-- Temporary feed for Xamarin workload manifest -->
<add key="xamarin" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/xamarin-impl/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources />
<disabledPackageSources>
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<!-- 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.-->
</disabledPackageSources>
</configuration>

7
README.md
View file

@ -58,9 +58,10 @@ This repo also contains code to help you build the entire .NET product end-to-en
# Build status
|All legs|
|:------:|
|[![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/286)](https://dev.azure.com/dnceng/internal/_build?definitionId=286)|
Visibility|All legs|
|:------|:------|
|Public|[![Status](https://dev.azure.com/dnceng/public/_apis/build/status/176)](https://dev.azure.com/dnceng/public/_build?definitionId=176)|
|Microsoft Internal|[![Status](https://dev.azure.com/dnceng/internal/_apis/build/status/286)](https://dev.azure.com/dnceng/internal/_build?definitionId=286)|
Installers and Binaries
-----------------------

26
src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml
View file

@ -12,7 +12,11 @@ jobs:
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
variables:
_BuildConfig: Release
- name: _BuildConfig
value: Release
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- group: DotNet-Source-Build-All-Orgs-Source-Access
workspace:
clean: all
@ -50,10 +54,26 @@ jobs:
$officialBuildArgs \
$internalRuntimeDownloadArgs \
/p:DotNetPublishUsingPipelines=true \
/p:ArcadeBuildTarball=true
/p:ArcadeBuildTarball=true \
/p:AzDoPat=$(dn-bot-all-orgs-build-rw-code-rw)
displayName: Create Tarball
- template: /src/SourceBuild/Arcade/eng/common/templates/steps/source-build-publish-logs.yml
- task: CopyFiles@2
displayName: Prepare BuildLogs staging directory
inputs:
Contents: |
**/*.log
**/*.binlog
TargetFolder: '$(Build.StagingDirectory)/BuildLogs'
CleanTargetFolder: true
continueOnError: true
condition: succeededOrFailed()
- publish: '$(Build.StagingDirectory)/BuildLogs'
artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt)
displayName: Publish BuildLogs
continueOnError: true
condition: succeededOrFailed()
- ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
# Check if the tarball should be built now so the result can be used in the build tarball job condition.

41
src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml
View file

@ -12,7 +12,11 @@ parameters:
# The following parameters aren't expected to be passed in rather they are used for encapsulation
# -----------------------------------------------------------------------------------------------
centOS7Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-source-build-20210714125450-5d87b80
centOS8Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-8-source-build-20211118190102-9355e7b
debian9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch-20211001171226-047508b
fedora33Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2
ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-20210924170306-047508b
poolInternal:
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
@ -33,17 +37,38 @@ jobs:
${{ parameters.poolInternal }}
strategy:
matrix:
Fedora33-Online:
CentOS7-Online:
_BootstrapPrep: true
_BuildArch: x64
_Container: ${{ parameters.fedora33Container }}
_Container: ${{ parameters.centOS7Container }}
_ExcludeOmniSharpTests: true
_RunOnline: true
# Offline builds have prebuilts: https://github.com/dotnet/fsharp/issues/12499
${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
CentOS7-Offline:
_BootstrapPrep: true
_BuildArch: x64
_Container: ${{ parameters.centOS7Container }}
_ExcludeOmniSharpTests: true
_RunOnline: false
CentOS8-Offline:
_BootstrapPrep: true
_BuildArch: x64
_Container: ${{ parameters.centOS8Container }}
_ExcludeOmniSharpTests: false
_RunOnline: false
Fedora33-Offline:
_BootstrapPrep: false
_BuildArch: x64
_Container: ${{ parameters.fedora33Container }}
_ExcludeOmniSharpTests: false
_RunOnline: false
timeoutInMinutes: 240
Ubuntu1804-Offline:
_BootstrapPrep: true
_BuildArch: x64
_Container: ${{ parameters.ubuntu1804Container }}
_ExcludeOmniSharpTests: false
_RunOnline: false
timeoutInMinutes: 300
workspace:
clean: all
@ -54,10 +79,16 @@ jobs:
parameters:
buildArch: $(_BuildArch)
container: $(_Container)
excludeOmniSharpTests: $(_ExcludeOmniSharpTests)
prepScript: |
set -x
docker run --rm -v ${{ parameters.tarballDir }}:/tarball -w /tarball $(_Container) ./prep.sh
customPrepArgs=
if [ '$(_BootstrapPrep)' = 'true' ]; then
customPrepArgs='--bootstrap'
fi
docker run --rm -v ${{ parameters.tarballDir }}:/tarball -w /tarball $(_Container) ./prep.sh ${customPrepArgs}
runOnline: $(_RunOnline)
tarballDir: ${{ parameters.tarballDir }}
tarballResourceId: ${{ parameters.tarballResourceId }}

31
src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml
View file

@ -10,6 +10,9 @@ parameters:
# Container image to build within
container: null
# Skip running the OmniSharp smoke-tests
excludeOmniSharpTests: false
# Script logic to prep the tarball for building
prepScript: null
@ -63,12 +66,32 @@ steps:
- script: |
set -x
docker run --rm -v ${{ parameters.tarballDir }}:/tarball -w /tarball ${{ parameters.container }} ./build.sh --run-smoke-test ${{ parameters.additionalBuildArgs }}
docker run --rm -v ${{ parameters.tarballDir }}:/tarball -w /tarball -e excludeOmniSharpTests=${{ parameters.excludeOmniSharpTests}} ${{ parameters.container }} ./build.sh --run-smoke-test ${{ parameters.additionalBuildArgs }}
displayName: Run Tests
- template: /src/SourceBuild/Arcade/eng/common/templates/steps/source-build-publish-logs.yml
parameters:
sourceFolder: ${{ parameters.tarballDir }}
# Don't use CopyFiles@2 as it encounters permissions issues because it indexes all files in the source directory graph.
- script: |
set -x
targetFolder=$(Build.StagingDirectory)/BuildLogs/
mkdir -p ${targetFolder}
cd "${{ parameters.tarballDir }}"
find artifacts/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \;
find artifacts/ -type f -name "*.log" -exec cp {} --parents -t ${targetFolder} \;
find artifacts/prebuilt-report/ -exec cp {} --parents -t ${targetFolder} \;
find src/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \;
find src/ -type f -name "*.log" -exec cp {} --parents -t ${targetFolder} \;
find testing-smoke/logs -exec cp {} --parents -t ${targetFolder} \;
displayName: Prepare BuildLogs staging directory
continueOnError: true
condition: succeededOrFailed()
- publish: '$(Build.StagingDirectory)/BuildLogs'
artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt)
displayName: Publish BuildLogs
continueOnError: true
condition: succeededOrFailed()
- publish: '${{ parameters.tarballDir }}/artifacts/${{ parameters.buildArch}}/Release/'
artifact: $(Agent.JobName)_Artifacts

25
src/SourceBuild/Arcade/eng/common/templates/steps/source-build-publish-logs.yml
View file

@ -1,25 +0,0 @@
# Gathers and publishes the build logs for a source-build
parameters:
# Folder to scan for source-build logs from
sourceFolder: $(Build.SourcesDirectory)
steps:
- task: CopyFiles@2
displayName: Prepare BuildLogs staging directory
inputs:
SourceFolder: '${{ parameters.sourceFolder }}'
Contents: |
**/*.log
**/*.binlog
artifacts/prebuilt-report/*
TargetFolder: '$(Build.StagingDirectory)/BuildLogs'
CleanTargetFolder: true
continueOnError: true
condition: succeededOrFailed()
- publish: '$(Build.StagingDirectory)/BuildLogs'
artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt)
displayName: Publish BuildLogs
continueOnError: true
condition: succeededOrFailed()

1
src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets
View file

@ -124,6 +124,7 @@
<TarballRepoSourceEngDir>$(TarballSourceDir)$(SourceDir)eng/</TarballRepoSourceEngDir>
<TarballVersionDetailsFile>$(TarballRepoSourceEngDir)Version.Details.xml</TarballVersionDetailsFile>
<CloneParam Condition=" '$(CloneVerbosity)' == 'quiet' ">-q</CloneParam>
<RepoUri Condition=" '$(AzDoPat)' != '' ">$(RepoUri.Replace('https://dev.azure.com', 'https://dn-bot:$(AzDoPat)@dev.azure.com'))</RepoUri>
</PropertyGroup>
<!-- Perform a local clone of the root repo, it's faster and doesn't require the RepoSha to be a tree. -->

13
src/SourceBuild/tarball/content/build.sh
View file

@ -156,11 +156,12 @@ export DOTNET_CLI_TELEMETRY_OPTOUT=1
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
export NUGET_PACKAGES=$restoredPackagesDir/
if [ "$alternateTarget" == "true" ]; then
"$CLI_ROOT/dotnet" $CLI_ROOT/sdk/$SDK_VERSION/MSBuild.dll "$SCRIPT_ROOT/build.proj" /bl:source-build-test.binlog /clp:v=m ${MSBUILD_ARGUMENTS[@]} "$@"
else
LogDateStamp=$(date +"%m%d%H%M%S")
$CLI_ROOT/dotnet $CLI_ROOT/sdk/$SDK_VERSION/MSBuild.dll /bl:$SCRIPT_ROOT/artifacts/log/Debug/BuildXPlatTasks_$LogDateStamp.binlog $SCRIPT_ROOT/tools-local/init-build.proj /t:PrepareOfflineLocalTools ${MSBUILD_ARGUMENTS[@]} "$@"
LogDateStamp=$(date +"%m%d%H%M%S")
$CLI_ROOT/dotnet $CLI_ROOT/sdk/$SDK_VERSION/MSBuild.dll /bl:$SCRIPT_ROOT/artifacts/log/Debug/Build_$LogDateStamp.binlog $SCRIPT_ROOT/build.proj ${MSBUILD_ARGUMENTS[@]} "$@"
if [ "$alternateTarget" == "true" ]; then
"$CLI_ROOT/dotnet" $CLI_ROOT/sdk/$SDK_VERSION/MSBuild.dll "$SCRIPT_ROOT/build.proj" /bl:$SCRIPT_ROOT/artifacts/log/Debug/BuildTests_$LogDateStamp.binlog /fileLoggerParameters:LogFile=$SCRIPT_ROOT/artifacts/logs/BuildTests_$LogDateStamp.log /clp:v=m ${MSBUILD_ARGUMENTS[@]} "$@"
else
$CLI_ROOT/dotnet $CLI_ROOT/sdk/$SDK_VERSION/MSBuild.dll /bl:$SCRIPT_ROOT/artifacts/log/Debug/BuildXPlatTasks_$LogDateStamp.binlog /fileLoggerParameters:LogFile=$SCRIPT_ROOT/artifacts/logs/BuildXPlatTasks_$LogDateStamp.log $SCRIPT_ROOT/tools-local/init-build.proj /t:PrepareOfflineLocalTools ${MSBUILD_ARGUMENTS[@]} "$@"
$CLI_ROOT/dotnet $CLI_ROOT/sdk/$SDK_VERSION/MSBuild.dll /bl:$SCRIPT_ROOT/artifacts/log/Debug/Build_$LogDateStamp.binlog /fileLoggerParameters:LogFile=$SCRIPT_ROOT/artifacts/logs/Build_$LogDateStamp.log $SCRIPT_ROOT/build.proj ${MSBUILD_ARGUMENTS[@]} "$@"
fi

10
src/SourceBuild/tarball/content/eng/Versions.props
View file

@ -1,15 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- SDK/Runtime Version Information -->
<PropertyGroup>
<MajorVersion>6</MajorVersion>
<MinorVersion>0</MinorVersion>
<RuntimePatchVersion>0-preview.6</RuntimePatchVersion>
<SdkPatchVersion>100-preview.6</SdkPatchVersion>
<RuntimeProductVersion>$(MajorVersion).$(MinorVersion).$(RuntimePatchVersion)</RuntimeProductVersion>
<AspNetCoreProductVersion>$(MajorVersion).$(MinorVersion).$(RuntimePatchVersion)</AspNetCoreProductVersion>
<SdkProductVersion>$(MajorVersion).$(MinorVersion).$(SdkPatchVersion)</SdkProductVersion>
</PropertyGroup>
<!-- Repo Version Information -->
<PropertyGroup>
<VersionPrefix>0.1.0</VersionPrefix>

2
src/SourceBuild/tarball/content/prep.sh
View file

@ -118,7 +118,7 @@ if [ "$buildBootstrap" == "true" ]; then
fi
# Run restore on project to initiate download of bootstrap packages
$DOTNET_SDK_PATH/dotnet restore $workingDir/buildBootstrapPreviouslySB.csproj /bl /p:ArchiveDir="$SCRIPT_ROOT/packages/archive/"
$DOTNET_SDK_PATH/dotnet restore $workingDir/buildBootstrapPreviouslySB.csproj /bl:artifacts/prep/bootstrap.binlog /fileLoggerParameters:LogFile=artifacts/prep/bootstrap.log /p:ArchiveDir="$SCRIPT_ROOT/packages/archive/"
# Remove working directory
rm -rf $workingDir

2
src/SourceBuild/tarball/content/repos/Directory.Build.targets
View file

@ -758,7 +758,7 @@
<ItemGroup>
<!-- This file is a resource tracked by Git, not generated by restore. Ignore false positive. -->
<IgnoredProjectAssetsJsonFiles Include="$(SubmoduleDirectory)nuget.client*/test/NuGet.Core.Tests/NuGet.Build.Tasks.Pack.Test/compiler/resources/project.assets.json"/>
<IgnoredProjectAssetsJsonFiles Include="$(SubmoduleDirectory)*nuget-client*/**/test/NuGet.Core.Tests/NuGet.Build.Tasks.Pack.Test/compiler/resources/project.assets.json"/>
</ItemGroup>
<WritePackageUsageData

19
src/SourceBuild/tarball/content/repos/aspnetcore.proj
View file

@ -53,24 +53,5 @@
<UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="ReplaceRegexInFiles" />
<Target Name="FixAspNetCoreVersion"
BeforeTargets="RepoBuild">
<ItemGroup>
<MinifiedJavascriptFile Include="$(ProjectDirectory)**\blazor.server.js" />
</ItemGroup>
<!--
Patch the version embedded in minified js files. Because they are
minified files, git patch doesn't work too well and produces unreadable
binary patches.
-->
<ReplaceRegexInFiles
InputFiles="@(MinifiedJavascriptFile)"
OldTextRegex=",l=&quot;5\.0\.\d+&quot;}]\);"
NewText=",l=&quot;$(AspNetCoreProductVersion)&quot;}]);" />
</Target>
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
</Project>

22
src/SourceBuild/tarball/content/smoke-test.sh
View file

@ -52,10 +52,13 @@ excludeWebNoHttpsTests=false
excludeWebHttpsTests=false
excludeLocalTests=false
excludeOnlineTests=false
excludeOmniSharpTests=${excludeOmniSharpTests:-false}
devCertsVersion="$DEV_CERTS_VERSION_DEFAULT"
testingDir="$SCRIPT_ROOT/testing-smoke"
cliDir="$testingDir/builtCli"
logFile="$testingDir/smoke-test.log"
logsDir="$testingDir/logs"
logFile="$logsDir/smoke-test.log"
omnisharpLogFile="$logsDir/omnisharp.log"
restoredPackagesDir="$testingDir/packages"
testingHome="$testingDir/home"
archiveRestoredPackages=false
@ -79,6 +82,7 @@ function usage() {
echo " --excludeWebHttpsTests don't run web project tests with https using dotnet-dev-certs"
echo " --excludeLocalTests exclude tests that use local sources for nuget packages"
echo " --excludeOnlineTests exclude test that use online sources for nuget packages"
echo " --excludeOmniSharpTests don't run the OmniSharp tests"
echo " --devCertsVersion <version> use dotnet-dev-certs <version> instead of default $DEV_CERTS_VERSION_DEFAULT"
echo " --prodConBlobFeedUrl <url> override the prodcon blob feed specified in ProdConFeed.txt, removing it if empty"
echo " --archiveRestoredPackages capture all restored packages to $archivedPackagesDir"
@ -137,6 +141,9 @@ while :; do
--excludeonlinetests)
excludeOnlineTests=true
;;
--excludeomnisharptests)
excludeOmniSharpTests=true
;;
--devcertsversion)
shift
devCertsVersion="$1"
@ -206,7 +213,7 @@ function doCommand() {
binlogHttpsPart="https"
fi
binlogPrefix="$testingDir/${projectDir}_${binlogOnlinePart}_${binlogHttpsPart}_"
binlogPrefix="$logsDir/${projectDir}_${binlogOnlinePart}_${binlogHttpsPart}_"
binlog="${binlogPrefix}$1.binlog"
echo " running $1" | tee -a "$logFile"
@ -619,7 +626,7 @@ function runOmniSharpTests() {
"${dotnetCmd}" new $project
popd
./omnisharp/run -s "$(readlink -f hello-$project)" > omnisharp.log &
./omnisharp/run -s "$(readlink -f hello-$project)" > "$omnisharpLogFile" &
sleep 5
@ -632,9 +639,9 @@ function runOmniSharpTests() {
kill "$(pgrep -f "$(pwd)")"
cat omnisharp.log
cat "$omnisharpLogFile"
if grep ERROR omnisharp.log; then
if grep ERROR "$omnisharpLogFile"; then
echo "test failed"
exit 1
else
@ -702,6 +709,7 @@ if [ -e "$testingDir" ]; then
fi
mkdir -p "$testingDir"
mkdir -p "$logsDir"
cd "$testingDir"
# Create blank Directory.Build files to avoid traversing to source-build infra.
@ -769,6 +777,8 @@ fi
runXmlDocTests
runOmniSharpTests
if [ "$excludeOmniSharpTests" == "false" ]; then
runOmniSharpTests
fi
echo "ALL TESTS PASSED!"

168
src/SourceBuild/tarball/content/tools-local/prebuilt-baseline.xml
View file

@ -1,168 +0,0 @@
<UsageData>
<CreatedByRid>fedora.33-x64</CreatedByRid>
<ProjectDirectories>
<Dir>src/arcade.a3377cccde8639089f99107e2ba5df2c8cbe6394/</Dir>
<Dir>src/aspnetcore./</Dir>
<Dir>src/clicommandlineparser.3198bf5660cad3dab85f5475bf1fda9688146e3f/</Dir>
<Dir>src/command-line-api.5e855e911de7c56fe28400c4500e888fe2a3da8e/</Dir>
<Dir>src/diagnostics.6f48c2ae749c29b687af0353e6c2a9590d7e3d22/</Dir>
<Dir>src/fsharp./</Dir>
<Dir>src/installer.c6ec4363003b18d8e587620baa36205b80ee3074/</Dir>
<Dir>src/known-good-tests./</Dir>
<Dir>src/known-good./</Dir>
<Dir>src/linker.f2588193553431636b9853b0f87209fa395a72c5/</Dir>
<Dir>src/msbuild./</Dir>
<Dir>src/nuget.client./</Dir>
<Dir>src/package-source-build/</Dir>
<Dir>src/roslyn-analyzers./</Dir>
<Dir>src/roslyn./</Dir>
<Dir>src/runtime./</Dir>
<Dir>src/runtime./</Dir>
<Dir>src/sdk./</Dir>
<Dir>src/source-build-reference-packages.36fb56afdf0ee2fb2e0833bdef98dfde12a0837b/</Dir>
<Dir>src/source-build.3fb25b8db3bec654e37e71a5b2b7fde14444bc2f/</Dir>
<Dir>src/sourcelink.4b584dbc392bb1aad49c2eb1ab84d8b489b6dccc/</Dir>
<Dir>src/symreader.1968a003d845d119a9d38ac4daaeea22897f7daf/</Dir>
<Dir>src/templating.3bc0d90f3e450f3e4ebda128081d091fb42968e3/</Dir>
<Dir>src/test-templates.6898c1c70c2d14e9725ddab6e1ebe8084c4d7e27/</Dir>
<Dir>src/vstest./</Dir>
<Dir>src/xdt.6a46e7c886cdf499ba3433f665ab417be814135e/</Dir>
<Dir>src/xliff-tasks.71c811561ad4dcf46825a5077fbcc668ab74754f/</Dir>
<Dir>Tools/</Dir>
<Dir>tools-local/tasks/</Dir>
<Dir>artifacts/obj/</Dir>
<Dir></Dir>
</ProjectDirectories>
<Usages>
<Usage Id="Microsoft.AspNetCore.App.Ref" Version="3.1.10" />
<Usage Id="Microsoft.AspNetCore.App.Ref" Version="5.0.0" />
<Usage Id="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
<Usage Id="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0-preview.3.21164.3" />
<Usage Id="Microsoft.Build" Version="16.7.0" IsDirectDependency="true" />
<Usage Id="Microsoft.Build.Framework" Version="16.7.0" />
<Usage Id="Microsoft.Build.Framework" Version="17.0.0-preview-21267-01" IsDirectDependency="true" />
<Usage Id="Microsoft.Build.Tasks.Core" Version="16.7.0" IsDirectDependency="true" />
<Usage Id="Microsoft.Build.Utilities.Core" Version="16.7.0" />
<Usage Id="Microsoft.Build.Utilities.Core" Version="17.0.0-preview-21267-01" IsDirectDependency="true" />
<Usage Id="Microsoft.CodeAnalysis.Analyzers" Version="2.6.1" />
<Usage Id="Microsoft.CodeAnalysis.Analyzers" Version="3.3.2" />
<Usage Id="Microsoft.CodeAnalysis.Common" Version="2.9.0" />
<Usage Id="Microsoft.CodeAnalysis.Common" Version="3.10.0-2.final" />
<Usage Id="Microsoft.CodeAnalysis.CSharp" Version="2.9.0" IsDirectDependency="true" />
<Usage Id="Microsoft.CodeAnalysis.CSharp" Version="3.10.0-2.final" />
<Usage Id="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="3.10.0-2.final" IsDirectDependency="true" />
<Usage Id="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.10.0-2.final" IsDirectDependency="true" />
<Usage Id="Microsoft.CodeAnalysis.Workspaces.Common" Version="3.10.0-2.final" />
<Usage Id="Microsoft.CodeCoverage" Version="16.7.1" />
<Usage Id="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21319.2" IsDirectDependency="true" />
<Usage Id="Microsoft.Extensions.Configuration" Version="2.1.1" />
<Usage Id="Microsoft.Extensions.Configuration" Version="6.0.0-preview.3.21164.3" />
<Usage Id="Microsoft.Extensions.Configuration.Abstractions" Version="2.1.1" />
<Usage Id="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0-preview.3.21164.3" />
<Usage Id="Microsoft.Extensions.Configuration.Binder" Version="2.1.1" />
<Usage Id="Microsoft.Extensions.Configuration.Binder" Version="6.0.0-preview.3.21164.3" />
<Usage Id="Microsoft.Extensions.DependencyInjection" Version="2.1.1" IsDirectDependency="true" />
<Usage Id="Microsoft.Extensions.DependencyInjection" Version="6.0.0-preview.3.21164.3" />
<Usage Id="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.1" />
<Usage Id="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0-preview.3.21164.3" />
<Usage Id="Microsoft.Extensions.Logging" Version="2.1.1" IsDirectDependency="true" />
<Usage Id="Microsoft.Extensions.Logging" Version="6.0.0-preview.3.21164.3" IsDirectDependency="true" />
<Usage Id="Microsoft.Extensions.Logging.Abstractions" Version="2.1.1" />
<Usage Id="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0-preview.3.21164.3" IsDirectDependency="true" />
<Usage Id="Microsoft.Extensions.Logging.Configuration" Version="6.0.0-preview.3.21164.3" />
<Usage Id="Microsoft.Extensions.Logging.Console" Version="6.0.0-preview.3.21164.3" IsDirectDependency="true" />
<Usage Id="Microsoft.Extensions.Options" Version="2.1.1" />
<Usage Id="Microsoft.Extensions.Options" Version="6.0.0-preview.3.21164.3" />
<Usage Id="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0-preview.3.21164.3" />
<Usage Id="Microsoft.Extensions.Primitives" Version="2.1.1" />
<Usage Id="Microsoft.Extensions.Primitives" Version="6.0.0-preview.3.21164.3" />
<Usage Id="Microsoft.Net.Compilers.Toolset" Version="3.10.0-4.21310.5" IsDirectDependency="true" IsAutoReferenced="true" />
<Usage Id="Microsoft.NET.Sdk.WorkloadManifestReader" Version="6.0.100-preview.5.21254.11" IsDirectDependency="true" />
<Usage Id="Microsoft.NET.StringTools" Version="1.0.0-preview-21267-01" />
<Usage Id="Microsoft.NET.Test.Sdk" Version="16.7.1" IsDirectDependency="true" IsAutoReferenced="true" />
<Usage Id="Microsoft.NETCore.App.Host.linux-x64" Version="5.0.5" />
<Usage Id="Microsoft.NETCore.App.Ref" Version="5.0.0" />
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.0" />
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0" />
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.0" />
<Usage Id="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" IsDirectDependency="true" IsAutoReferenced="true" />
<Usage Id="Microsoft.NETFramework.ReferenceAssemblies.net20" Version="1.0.0" />
<Usage Id="Microsoft.NETFramework.ReferenceAssemblies.net40" Version="1.0.0" />
<Usage Id="Microsoft.NETFramework.ReferenceAssemblies.net472" Version="1.0.0-preview.1" IsDirectDependency="true" />
<Usage Id="Microsoft.NETFramework.ReferenceAssemblies.net472" Version="1.0.0" />
<Usage Id="Microsoft.TestPlatform.ObjectModel" Version="16.7.1" />
<Usage Id="Microsoft.TestPlatform.TestHost" Version="16.7.1" />
<Usage Id="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="1.16.30" />
<Usage Id="Microsoft.Win32.SystemEvents" Version="4.7.0" />
<Usage Id="Mono.Cecil" Version="0.11.3" />
<Usage Id="NETStandard.Library" Version="1.6.0" />
<Usage Id="NETStandard.Library" Version="1.6.1" />
<Usage Id="Newtonsoft.Json" Version="13.0.1" />
<Usage Id="NuGet.Commands" Version="5.6.0-preview.2.6489+5433d816f748d4ad78b75fc320397d8117f57771" />
<Usage Id="NuGet.Common" Version="5.6.0-preview.2.6489+5433d816f748d4ad78b75fc320397d8117f57771" />
<Usage Id="NuGet.Common" Version="5.8.1+b257acfcdd76b32d4cddd549c177d99e800f4d83" />
<Usage Id="NuGet.Configuration" Version="5.6.0-preview.2.6489+5433d816f748d4ad78b75fc320397d8117f57771" />
<Usage Id="NuGet.Configuration" Version="5.8.1+b257acfcdd76b32d4cddd549c177d99e800f4d83" />
<Usage Id="NuGet.Credentials" Version="5.6.0-preview.2.6489+5433d816f748d4ad78b75fc320397d8117f57771" />
<Usage Id="NuGet.Credentials" Version="5.8.1+b257acfcdd76b32d4cddd549c177d99e800f4d83" />
<Usage Id="NuGet.DependencyResolver.Core" Version="5.6.0-preview.2.6489+5433d816f748d4ad78b75fc320397d8117f57771" />
<Usage Id="NuGet.Frameworks" Version="5.0.0+42a8779499c1d1ed2488c2e6b9e2ee6ff6107766" />
<Usage Id="NuGet.Frameworks" Version="5.6.0-preview.2.6489+5433d816f748d4ad78b75fc320397d8117f57771" />
<Usage Id="NuGet.Frameworks" Version="5.8.1+b257acfcdd76b32d4cddd549c177d99e800f4d83" />
<Usage Id="NuGet.LibraryModel" Version="5.6.0-preview.2.6489+5433d816f748d4ad78b75fc320397d8117f57771" />
<Usage Id="NuGet.Packaging" Version="5.6.0-preview.2.6489+5433d816f748d4ad78b75fc320397d8117f57771" />
<Usage Id="NuGet.Packaging" Version="5.8.1+b257acfcdd76b32d4cddd549c177d99e800f4d83" />
<Usage Id="NuGet.Packaging.Core" Version="5.6.0-preview.2.6489+5433d816f748d4ad78b75fc320397d8117f57771" />
<Usage Id="NuGet.ProjectModel" Version="5.6.0-preview.2.6489+5433d816f748d4ad78b75fc320397d8117f57771" />
<Usage Id="NuGet.Protocol" Version="5.6.0-preview.2.6489+5433d816f748d4ad78b75fc320397d8117f57771" />
<Usage Id="NuGet.Protocol" Version="5.8.1+b257acfcdd76b32d4cddd549c177d99e800f4d83" />
<Usage Id="NuGet.Versioning" Version="5.6.0-preview.2.6489+5433d816f748d4ad78b75fc320397d8117f57771" />
<Usage Id="NuGet.Versioning" Version="5.8.1+b257acfcdd76b32d4cddd549c177d99e800f4d83" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.ILAsm" Version="5.0.0-preview.4.20202.18" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.ILDAsm" Version="5.0.0-preview.4.20202.18" Rid="linux-x64" />
<Usage Id="runtime.native.System" Version="4.0.0" />
<Usage Id="runtime.native.System" Version="4.3.0" />
<Usage Id="runtime.native.System.IO.Compression" Version="4.3.0" />
<Usage Id="System.Collections.Immutable" Version="5.0.0" />
<Usage Id="System.Composition" Version="1.0.31" />
<Usage Id="System.Composition.AttributedModel" Version="1.0.31" />
<Usage Id="System.Composition.Convention" Version="1.0.31" />
<Usage Id="System.Composition.Hosting" Version="1.0.31" />
<Usage Id="System.Composition.Runtime" Version="1.0.31" />
<Usage Id="System.Composition.TypedParts" Version="1.0.31" />
<Usage Id="System.Configuration.ConfigurationManager" Version="4.7.0" />
<Usage Id="System.Diagnostics.DiagnosticSource" Version="6.0.0-preview.3.21164.3" />
<Usage Id="System.Drawing.Common" Version="4.7.0" />
<Usage Id="System.Formats.Asn1" Version="5.0.0" />
<Usage Id="System.IO.Pipelines" Version="5.0.1" />
<Usage Id="System.Memory" Version="4.5.0" IsDirectDependency="true" />
<Usage Id="System.Reflection.Metadata" Version="5.0.0" />
<Usage Id="System.Resources.Extensions" Version="4.6.0" />
<Usage Id="System.Runtime.CompilerServices.Unsafe" Version="4.5.0" IsDirectDependency="true" />
<Usage Id="System.Runtime.CompilerServices.Unsafe" Version="4.5.1" />
<Usage Id="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
<Usage Id="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-preview.3.21164.3" />
<Usage Id="System.Security.Cryptography.Cng" Version="4.4.0" IsDirectDependency="true" />
<Usage Id="System.Security.Cryptography.Cng" Version="5.0.0" />
<Usage Id="System.Security.Cryptography.Pkcs" Version="5.0.0" />
<Usage Id="System.Security.Cryptography.ProtectedData" Version="4.4.0" />
<Usage Id="System.Security.Cryptography.ProtectedData" Version="4.7.0" />
<Usage Id="System.Text.Encodings.Web" Version="4.7.1" />
<Usage Id="System.Text.Encodings.Web" Version="6.0.0-preview.3.21164.3" />
<Usage Id="System.Text.Json" Version="4.7.2" IsDirectDependency="true" />
<Usage Id="System.Text.Json" Version="6.0.0-preview.3.21164.3" />
<Usage Id="System.Threading.Tasks.Dataflow" Version="4.5.24" IsDirectDependency="true" />
<Usage Id="System.ValueTuple" Version="4.3.0" />
<Usage Id="System.Windows.Extensions" Version="4.7.0" />
<Usage Id="WiX" Version="3.11.2" />
<Usage Id="xunit" Version="2.4.1" IsDirectDependency="true" IsAutoReferenced="true" />
<Usage Id="xunit.abstractions" Version="2.0.3" />
<Usage Id="xunit.analyzers" Version="0.10.0" />
<Usage Id="xunit.assert" Version="2.4.1" />
<Usage Id="xunit.core" Version="2.4.1" />
<Usage Id="xunit.extensibility.core" Version="2.4.1" />
<Usage Id="xunit.extensibility.execution" Version="2.4.1" />
<Usage Id="xunit.runner.console" Version="2.4.1" IsDirectDependency="true" IsAutoReferenced="true" />
<Usage Id="xunit.runner.visualstudio" Version="2.4.3" IsDirectDependency="true" IsAutoReferenced="true" />
</Usages>
</UsageData>

18
src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/ValidateUsageAgainstBaseline.cs
View file

@ -17,9 +17,6 @@ namespace Microsoft.DotNet.SourceBuild.Tasks.UsageReport
[Required]
public string DataFile { get; set; }
[Required]
public string BaselineDataFile { get; set; }
[Required]
public string OutputBaselineFile { get; set; }
@ -28,14 +25,25 @@ namespace Microsoft.DotNet.SourceBuild.Tasks.UsageReport
public bool AllowTestProjectUsage { get; set; }
public string BaselineDataFile { get; set; }
public override bool Execute()
{
var used = UsageData.Parse(XElement.Parse(File.ReadAllText(DataFile)));
var baseline = UsageData.Parse(XElement.Parse(File.ReadAllText(BaselineDataFile)));
IEnumerable<Usage> baselineUsages;
if (File.Exists(BaselineDataFile))
{
baselineUsages = UsageData.Parse(XElement.Parse(File.ReadAllText(BaselineDataFile))).Usages;
}
else
{
baselineUsages = Enumerable.Empty<Usage>();
}
Comparison<PackageIdentity> diff = Compare(
used.Usages.Select(u => u.GetIdentityWithoutRid()).Distinct(),
baseline.Usages.Select(u => u.GetIdentityWithoutRid()).Distinct());
baselineUsages.Select(u => u.GetIdentityWithoutRid()).Distinct());
var report = new XElement("BaselineComparison");

6
src/redist/targets/BundledManifests.targets
View file

@ -51,7 +51,11 @@
</PropertyGroup>
<ItemGroup>
<SignCheckWorkloadManifestMsiInputFiles Include="@(BundledManifests->'%(RestoredMsiPathInNupkg)')" />
<BundledManifestsToValidateSigning Include="@(BundledManifests)"
Exclude="Microsoft.NET.Workload.Mono.ToolChain;
Microsoft.NET.Workload.Emscripten" />
<SignCheckWorkloadManifestMsiInputFiles Include="@(BundledManifestsToValidateSigning->'%(RestoredMsiPathInNupkg)')" />
</ItemGroup>
<Exec Command="$(SignCheckExe) ^

2
src/redist/targets/GenerateMSIs.targets
View file

@ -164,7 +164,7 @@
'$(SdkMSIInstallerFile)' ^
'$(WixRoot)' ^
'$(ToolsetBrandName)' ^
'$(VersionPrefix)' ^
'$(CliProductBandVersion)00' ^
'$(MsiVersion)' ^
'$(SDKBundleVersion)' ^
'$(Version)' ^