diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 9394fd31e..b8aebb8b0 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.23578.2", + "version": "1.1.0-beta.23621.3", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 62557d883..d34e02c84 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,42 +5,42 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - 24d29943d978beb39cabb14d63a9954d61826e97 + 8663076a95e5b989687dad0f5002ea2c72432a4e - + https://github.com/dotnet/windowsdesktop - 24d29943d978beb39cabb14d63a9954d61826e97 + 8663076a95e5b989687dad0f5002ea2c72432a4e - + https://github.com/dotnet/windowsdesktop - 24d29943d978beb39cabb14d63a9954d61826e97 + 8663076a95e5b989687dad0f5002ea2c72432a4e - + https://github.com/dotnet/windowsdesktop - 24d29943d978beb39cabb14d63a9954d61826e97 + 8663076a95e5b989687dad0f5002ea2c72432a4e - + https://github.com/dotnet/runtime - 99cfd79e7c8e8d42bc2c55f6662d64c74cbe8428 + 8121f82d7d46118eef03a99eecbde64d8021cec7 - + https://github.com/dotnet/runtime - 99cfd79e7c8e8d42bc2c55f6662d64c74cbe8428 + 8121f82d7d46118eef03a99eecbde64d8021cec7 - + https://github.com/dotnet/runtime - 99cfd79e7c8e8d42bc2c55f6662d64c74cbe8428 + 8121f82d7d46118eef03a99eecbde64d8021cec7 - + https://github.com/dotnet/runtime - 99cfd79e7c8e8d42bc2c55f6662d64c74cbe8428 + 8121f82d7d46118eef03a99eecbde64d8021cec7 - + https://github.com/dotnet/runtime - 99cfd79e7c8e8d42bc2c55f6662d64c74cbe8428 + 8121f82d7d46118eef03a99eecbde64d8021cec7 @@ -48,55 +48,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 99cfd79e7c8e8d42bc2c55f6662d64c74cbe8428 + 8121f82d7d46118eef03a99eecbde64d8021cec7 - + https://github.com/dotnet/aspnetcore - 5088789413c6364dccd0f36b3eddc89c4606c42f + 4b7810723c27d47cc982055c6615cccf664e2980 - + https://github.com/dotnet/aspnetcore - 5088789413c6364dccd0f36b3eddc89c4606c42f + 4b7810723c27d47cc982055c6615cccf664e2980 - + https://github.com/dotnet/aspnetcore - 5088789413c6364dccd0f36b3eddc89c4606c42f + 4b7810723c27d47cc982055c6615cccf664e2980 - + https://github.com/dotnet/aspnetcore - 5088789413c6364dccd0f36b3eddc89c4606c42f + 4b7810723c27d47cc982055c6615cccf664e2980 - + https://github.com/dotnet/aspnetcore - 5088789413c6364dccd0f36b3eddc89c4606c42f + 4b7810723c27d47cc982055c6615cccf664e2980 - + https://github.com/dotnet/aspnetcore - 5088789413c6364dccd0f36b3eddc89c4606c42f + 4b7810723c27d47cc982055c6615cccf664e2980 - + https://github.com/dotnet/aspnetcore - 5088789413c6364dccd0f36b3eddc89c4606c42f + 4b7810723c27d47cc982055c6615cccf664e2980 - + https://github.com/dotnet/sdk - af41d3d39a69c7a17b6a3ae22259056100f23f6d + 76a69c35c0218803b3b341761879e6ff9ed82760 - + https://github.com/dotnet/sdk - af41d3d39a69c7a17b6a3ae22259056100f23f6d + 76a69c35c0218803b3b341761879e6ff9ed82760 - + https://github.com/dotnet/sdk - af41d3d39a69c7a17b6a3ae22259056100f23f6d + 76a69c35c0218803b3b341761879e6ff9ed82760 - + https://github.com/dotnet/sdk - af41d3d39a69c7a17b6a3ae22259056100f23f6d + 76a69c35c0218803b3b341761879e6ff9ed82760 https://github.com/dotnet/test-templates @@ -124,54 +124,54 @@ ec54b2c1553db0a544ef0e8595be2318fc12e08d - + https://github.com/dotnet/winforms - e1393ed208a58a6a2f864ac5ae9cd8ae965d236c + 6ab0ff669b846809efac9a24ceb568a3afde5fb4 - + https://github.com/dotnet/wpf - 8e3e1a550c591a7732df79f075716b88af692b43 + 322a1a7312613bf0ac357adc94ca9efb14409b1e - + https://github.com/dotnet/fsharp - 2aefcec87bf9e73a712c0c3f5b49c23358b034e8 + 0c489541068f311e23b582410c1df3ff86f1d526 - + https://github.com/dotnet/fsharp - 2aefcec87bf9e73a712c0c3f5b49c23358b034e8 + 0c489541068f311e23b582410c1df3ff86f1d526 - + https://github.com/microsoft/vstest - dc8fe3865011cef3a0891f5f55c1fc5c7f401066 + f33b3e4ec550c48607057bf051574c048d3ef7b6 - + https://github.com/dotnet/runtime - 99cfd79e7c8e8d42bc2c55f6662d64c74cbe8428 + 8121f82d7d46118eef03a99eecbde64d8021cec7 - + https://github.com/dotnet/roslyn - 462e180642875c0540ae1379e60425f635ec4f78 + 072cbffda581a3bf26dac3bc5feb9fdcb0f5ff13 - + https://github.com/dotnet/msbuild - f97064d3b83485628dec0769659e786b55f6835a + b59f07e4312eb6e3e33e59241453606c81992738 - + https://github.com/nuget/nuget.client - e8b43e6602749844de42f9f37e07fa9aa1fb108c + 0adf7ac2d046bbc6d7e8db29ff82b3b2f8fc5f14 https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 487a0a43dbe6e83f07b200b7523447222bb2137b + 13ad0749b943e56246a8c40aea3e58648dfa0996 @@ -179,15 +179,15 @@ 48e42f59d64d84b404e904996a9ed61f2a17a569 - + https://github.com/dotnet/deployment-tools - 0d6c22d227b318fb253c967e1ac041b8e68e7e7d + fdef0932d9953ee12367c8dac9ef638b573d4f42 - + https://github.com/dotnet/deployment-tools - 0d6c22d227b318fb253c967e1ac041b8e68e7e7d + fdef0932d9953ee12367c8dac9ef638b573d4f42 @@ -195,9 +195,9 @@ bc555088c6b4862ad0b93fbc245ef0628e661256 - + https://github.com/dotnet/symreader - 2c8079e2e8e78c0cd11ac75a32014756136ecdb9 + aa31e333b952f53910dc6bd08d80596eaaf89360 @@ -211,38 +211,38 @@ - + https://github.com/dotnet/arcade - 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d + a1e4795fcba619bba3534700b660ad6d2e3ce859 - + https://github.com/dotnet/arcade - 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d + a1e4795fcba619bba3534700b660ad6d2e3ce859 - + https://github.com/dotnet/arcade - 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d + a1e4795fcba619bba3534700b660ad6d2e3ce859 - + https://github.com/dotnet/arcade-services - 5263b603d90991a0c200aca8b8892c3d7cfe4751 + 702f946f89ace6197fdca2ac309d32187c4bc1bd - + https://github.com/dotnet/arcade-services - 5263b603d90991a0c200aca8b8892c3d7cfe4751 + 702f946f89ace6197fdca2ac309d32187c4bc1bd - + https://github.com/dotnet/arcade - 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d + a1e4795fcba619bba3534700b660ad6d2e3ce859 https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - a9a44d16c43525b354da1808ab73c514b3b05e7d + 2a008ae4f42c0db384db5a4864752b2ff52d720b diff --git a/eng/Versions.props b/eng/Versions.props index 4ae3963b4..b3a1d53ab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,19 +40,19 @@ - 9.0.0-beta.23614.6 + 9.0.0-beta.23621.2 - 1.1.0-beta.23578.2 + 1.1.0-beta.23621.3 - 9.0.0-alpha.1.23605.3 + 9.0.0-alpha.1.23627.2 - 9.0.0-alpha.1.23606.2 + 9.0.0-alpha.1.23627.1 @@ -73,50 +73,50 @@ - 9.0.0-alpha.1.23614.6 - 9.0.0-alpha.1.23614.6 - 9.0.0-alpha.1.23614.6 - 9.0.0-alpha.1.23614.6 - 9.0.0-alpha.1.23614.6 - 9.0.0-alpha.1.23614.6 - 9.0.0-alpha.1.23614.6 + 9.0.0-alpha.1.23620.2 + 9.0.0-alpha.1.23620.2 + 9.0.0-alpha.1.23620.2 + 9.0.0-alpha.1.23620.2 + 9.0.0-alpha.1.23620.2 + 9.0.0-alpha.1.23620.2 + 9.0.0-alpha.1.23620.2 0.2.0 - 9.0.100-alpha.1.23615.3 - 9.0.100-alpha.1.23615.3 - 9.0.100-alpha.1.23615.3 + 9.0.100-alpha.1.23628.5 + 9.0.100-alpha.1.23628.5 + 9.0.100-alpha.1.23628.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23614.9 + 4.9.0-3.23627.3 - 9.0.0-alpha.1.23614.10 + 9.0.0-alpha.1.23627.5 - 9.0.0-alpha.1.23614.10 - 9.0.0-alpha.1.23614.10 - 9.0.0-alpha.1.23614.10 - 9.0.0-alpha.1.23614.10 - 9.0.0-alpha.1.23614.10 + 9.0.0-alpha.1.23627.5 + 9.0.0-alpha.1.23627.5 + 9.0.0-alpha.1.23627.5 + 9.0.0-alpha.1.23627.5 + 9.0.0-alpha.1.23627.5 8.0.0-rc.1.23414.4 2.1.0 - 9.0.0-alpha.1.23613.1 - 9.0.0-alpha.1.23613.1 - 9.0.0-alpha.1.23613.1 - 9.0.0-alpha.1.23613.1 + 9.0.0-alpha.1.23628.1 + 9.0.0-alpha.1.23628.1 + 9.0.0-alpha.1.23628.1 + 9.0.0-alpha.1.23628.1 @@ -128,11 +128,11 @@ - 6.9.0-preview.1.54 + 6.9.0-preview.1.69 - 2.0.0-preview.1.23601.1 + 2.0.0-preview.1.23612.2 @@ -246,7 +246,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.9.0-preview-23612-01 + 17.9.0-release-23619-01 8.0.0-alpha.1.22557.12 9.0.0-preview.23613.1 @@ -262,7 +262,7 @@ 13.3.8825-net8-rc1 16.4.8825-net8-rc1 - 9.0.0-alpha.1.23613.1 + 9.0.0-alpha.1.23617.2 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) diff --git a/eng/common/build.cmd b/eng/common/build.cmd new file mode 100644 index 000000000..99daf368a --- /dev/null +++ b/eng/common/build.cmd @@ -0,0 +1,3 @@ +@echo off +powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0build.ps1""" %*" +exit /b %ErrorLevel% diff --git a/eng/common/sdl/trim-assets-version.ps1 b/eng/common/sdl/trim-assets-version.ps1 index 1f3c531b2..0daa2a9e9 100644 --- a/eng/common/sdl/trim-assets-version.ps1 +++ b/eng/common/sdl/trim-assets-version.ps1 @@ -61,8 +61,6 @@ try { ExitWithExitCode 1 } - # Remove the ROLL FORWARD env var with a future Arcade.Sdk update in Arcade. - $env:DOTNET_ROLL_FORWARD = "Major" Exec-BlockVerbosely { & "$dotnet" $CliToolName trim-assets-version ` --assets-path $InputPath ` diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 0b0153135..01c0dd995 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -136,7 +136,7 @@ jobs: condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}: - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - ${{ if and(ne(parameters.artifacts.download, 'false'), ne(parameters.artifacts.download, '')) }}: - task: DownloadPipelineArtifact@2 diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 3b25fd979..d9c5b4aaf 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -72,7 +72,7 @@ jobs: condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Publish Build Assets diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 4ef7bd271..d7bf5c6e3 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -18,7 +18,7 @@ variables: - name: SymbolToolVersion value: 1.0.1 - name: BinlogToolVersion - value: 1.0.8 + value: 1.0.9 - name: runCodesignValidationInjection value: false diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index d64236b28..bbc010fe7 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -169,7 +169,7 @@ stages: # This is necessary whenever we want to publish/restore to an AzDO private feed # Since sdk-task.ps1 tries to restore packages we need to do this authentication here # otherwise it'll complain about accessing a private feed. - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 displayName: 'Authenticate to AzDO Feeds' # Signing validation will optionally work with the buildmanifest file which is downloaded from @@ -267,7 +267,7 @@ stages: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Publish Using Darc diff --git a/eng/common/templates/steps/publish-logs.yml b/eng/common/templates/steps/publish-logs.yml index dadf1c464..835e52751 100644 --- a/eng/common/templates/steps/publish-logs.yml +++ b/eng/common/templates/steps/publish-logs.yml @@ -3,7 +3,7 @@ parameters: JobLabel: '' CustomSensitiveDataList: '' # A default - in case value from eng/common/templates/post-build/common-variables.yml is not passed - BinlogToolVersion: '1.0.8' + BinlogToolVersion: '1.0.9' steps: - task: Powershell@2 diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index 85e5cd726..50129e61e 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -210,7 +210,13 @@ jobs: echo "##vso[task.setvariable variable=additionalBuildArgs]--with-sdk /vmr/.dotnet" fi - docker run --rm -v "$(sourcesPath):/vmr" -w /vmr ${{ parameters.container }} ./prep.sh $customPrepArgs + # Only use Docker stuff on Linux + if [[ -n "${{ parameters.container }}" ]]; then + docker run --rm -v "$(sourcesPath):/vmr" -w /vmr ${{ parameters.container }} ./prep.sh $customPrepArgs + else + cd $(sourcesPath) + ./prep.sh $customPrepArgs + fi displayName: Prep the Build - script: | @@ -218,7 +224,7 @@ jobs: df -h # Allows Arcade to have access to the commit for the build - customRunArgs="-e BUILD_SOURCEVERSION" + customEnvVars="BUILD_SOURCEVERSION=$BUILD_SOURCEVERSION" customBuildArgs= if [[ '${{ parameters.runOnline }}' == 'True' ]]; then customBuildArgs='--online' @@ -239,23 +245,40 @@ jobs: customBuildArgs="$customBuildArgs --use-mono-runtime" fi - if [[ ! -z '${{ parameters.crossRootFs }}' || ! -z '${{ parameters.targetRid }}' ]]; then + if [[ -n "${{ parameters.container }}" ]]; then + useDocker=true + fi + + if [[ ! -z '${{ parameters.targetRid }}' ]]; then extraBuildProperties="--" + if [[ '${{ parameters.useMonoRuntime }}' == 'True' ]]; then + customEnvVars="$customEnvVars CROSSCOMPILE=1" + fi + extraBuildProperties="$extraBuildProperties /p:PortableBuild=true /p:DotNetBuildVertical=true /p:CrossBuild=true" fi if [[ ! -z '${{ parameters.crossRootFs }}' ]]; then - customRunArgs="$customRunArgs -e ROOTFS_DIR=${{ parameters.crossRootFs}}" - extraBuildProperties="$extraBuildProperties /p:PortableBuild=true /p:DotNetBuildVertical=true /p:CrossBuild=true" - if [[ '${{ parameters.useMonoRuntime }}' == 'True' ]]; then - customRunArgs="$customRunArgs -e CROSSCOMPILE=1" - fi + customEnvVars="$customEnvVars ROOTFS_DIR=${{ parameters.crossRootFs}}" fi if [[ ! -z '${{ parameters.targetRid }}' ]]; then extraBuildProperties="$extraBuildProperties /p:OverrideTargetRid=${{ parameters.targetRid }}" fi - docker run --rm -v "$(sourcesPath):/vmr" -w /vmr $customRunArgs ${{ parameters.container }} ./build.sh --clean-while-building $(additionalBuildArgs) $customBuildArgs $extraBuildProperties + # Only use Docker stuff on Linux + if [[ "$useDocker" == "true" ]]; then + for envVar in $customEnvVars; do + customEnvVarsWithDockerSyntax="$customEnvVarsWithDockerSyntax -e $envVar" + done + docker run --rm -v "$(sourcesPath):/vmr" -w /vmr $customEnvVarsWithDockerSyntax ${{ parameters.container }} ./build.sh --clean-while-building $(additionalBuildArgs) $customBuildArgs $extraBuildProperties + else + for envVar in $customEnvVars; do + customEnvVarsWithBashSyntax="$customEnvVarsWithBashSyntax export $envVar;" + done + cd $(sourcesPath) + eval $customEnvVarsWithBashSyntax + ./build.sh --clean-while-building $(additionalBuildArgs) $customBuildArgs $extraBuildProperties + fi displayName: Build # Don't run tests if overriding RID, we don't support that for now diff --git a/eng/pipelines/templates/stages/vmr-cross-build.yml b/eng/pipelines/templates/stages/vmr-cross-build.yml index 7a27282cb..1b5657b8c 100644 --- a/eng/pipelines/templates/stages/vmr-cross-build.yml +++ b/eng/pipelines/templates/stages/vmr-cross-build.yml @@ -34,6 +34,10 @@ parameters: name: NetCore-Public-XL demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + # Mac + poolMac: + vmImage: 'macos-12' + stages: - stage: VMR_PoC_Build displayName: VMR PoC-Build @@ -106,6 +110,42 @@ stages: crossRootFs: '/crossrootfs/arm64' # 📝 targetRid: 'linux-arm64' # 📝 + - 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: OSXCrossX64_Online_MsftSdk + isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} + vmrBranch: ${{ variables.VmrBranch }} + architecture: x64 + pool: + vmImage: ${{ parameters.poolMac.vmImage }} + container: '' + buildFromArchive: false # 🚫 + enablePoison: false # 🚫 + excludeOmniSharpTests: true # ✅ + runOnline: true # ✅ + useMonoRuntime: true # ✅ + withPreviousSDK: false # 🚫 + targetRid: 'osx-x64' # 📝 + + - 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: OSXCrossArm64_Online_MsftSdk + isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} + vmrBranch: ${{ variables.VmrBranch }} + architecture: arm64 + pool: + vmImage: ${{ parameters.poolMac.vmImage }} + container: '' + buildFromArchive: false # 🚫 + enablePoison: false # 🚫 + excludeOmniSharpTests: true # ✅ + runOnline: true # ✅ + useMonoRuntime: true # ✅ + withPreviousSDK: false # 🚫 + targetRid: 'osx-arm64' # 📝 + - template: ../jobs/vmr-build.yml parameters: # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline diff --git a/eng/pipelines/templates/steps/vmr-pull-updates.yml b/eng/pipelines/templates/steps/vmr-pull-updates.yml index 3d2fdf3cd..dfa2ded71 100644 --- a/eng/pipelines/templates/steps/vmr-pull-updates.yml +++ b/eng/pipelines/templates/steps/vmr-pull-updates.yml @@ -58,7 +58,7 @@ steps: --repository "installer:${{ parameters.targetRef }}" --recursive --remote "installer:$(pwd)" - --readme-template $(Agent.BuildDirectory)/installer/src/VirtualMonoRepo/README.template.md + --component-template $(Agent.BuildDirectory)/installer/src/VirtualMonoRepo/Component.template.md --tpn-template $(Agent.BuildDirectory)/installer/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt --debug || diff --git a/eng/vmr-sync.sh b/eng/vmr-sync.sh index 0e0a5b275..bd453f87c 100755 --- a/eng/vmr-sync.sh +++ b/eng/vmr-sync.sh @@ -33,10 +33,10 @@ ### --debug ### Optional. Turns on the most verbose logging for the VMR tooling ### -### --readme-template -### Optional. Template for VMRs README.md used for regenerating the file to list the newest versions of +### --component-template +### Optional. Template for VMRs Component.md used for regenerating the file to list the newest versions of ### components. -### Defaults to src/VirtualMonoRepo/README.template.md +### Defaults to src/VirtualMonoRepo/Component.template.md ### ### --recursive ### Optional. Recursively synchronize all the source build dependencies (declared in Version.Details.xml) @@ -94,7 +94,8 @@ function highlight () { echo "${COLOR_CYAN}$FAILURE_PREFIX${1//${COLOR_RESET}/${COLOR_CYAN}}${COLOR_CLEAR}" } -installer_dir=$(realpath "$scriptroot/../") +# realpath is not available in macOS 12, try horrible-but-portable workaround +installer_dir=$(cd "$scriptroot/../"; pwd -P) tmp_dir='' vmr_dir='' @@ -103,7 +104,7 @@ repository='' additional_remotes='' recursive=false verbosity=verbose -readme_template="$installer_dir/src/VirtualMonoRepo/README.template.md" +readme_template="$installer_dir/src/VirtualMonoRepo/Component.template.md" tpn_template="$installer_dir/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt" azdev_pat='' @@ -138,8 +139,8 @@ while [[ $# -gt 0 ]]; do additional_remotes="$additional_remotes $2" shift ;; - --readme-template) - readme_template=$2 + --component-template) + component_template=$2 shift ;; --tpn-template) @@ -238,7 +239,8 @@ set -e highlight 'Installing .NET, preparing the tooling..' source "$scriptroot/common/tools.sh" InitializeDotNetCli true -dotnet=$(realpath "$scriptroot/../.dotnet/dotnet") +dotnetDir=$( cd $scriptroot/../.dotnet/; pwd -P ) +dotnet=$dotnetDir/dotnet "$dotnet" tool restore highlight "Starting the synchronization of '$repository'.." @@ -266,7 +268,7 @@ fi --$verbosity \ $recursive_arg \ $additional_remotes \ - --readme-template "$readme_template" \ + --component-template "$component_template" \ --tpn-template "$tpn_template" \ --discard-patches \ "$repository" diff --git a/global.json b/global.json index 88ad3b49e..875330ea6 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "9.0.100-alpha.1.23613.1", + "dotnet": "9.0.100-alpha.1.23615.4", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23614.6", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23614.6" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23621.2", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23621.2" } } diff --git a/src/SourceBuild/content/Directory.Build.props b/src/SourceBuild/content/Directory.Build.props index 2efe17577..9d05322e9 100644 --- a/src/SourceBuild/content/Directory.Build.props +++ b/src/SourceBuild/content/Directory.Build.props @@ -8,8 +8,6 @@ - - net9.0 netstandard2.0 diff --git a/src/VirtualMonoRepo/README.template.md b/src/SourceBuild/content/README.md similarity index 99% rename from src/VirtualMonoRepo/README.template.md rename to src/SourceBuild/content/README.md index 7bc080a3c..a1d3d73d6 100644 --- a/src/VirtualMonoRepo/README.template.md +++ b/src/SourceBuild/content/README.md @@ -160,11 +160,7 @@ To enable full offline source-building of the VMR, we have no other choice than ### Detailed list - - -> Auto-generated list of components will go here - - +The full list of components synchronized into the VMR is [here (Components.md)](./Components.md). The repository also contains a [JSON manifest](https://github.com/dotnet/dotnet/blob/main/src/source-manifest.json) listing all components in a machine-readable format. diff --git a/src/SourceBuild/content/build.sh b/src/SourceBuild/content/build.sh index a1224e436..c56c5085d 100755 --- a/src/SourceBuild/content/build.sh +++ b/src/SourceBuild/content/build.sh @@ -259,7 +259,12 @@ if [ "$alternateTarget" == "true" ]; then export NUGET_PACKAGES=$NUGET_PACKAGES/smoke-tests "$CLI_ROOT/dotnet" msbuild "$SCRIPT_ROOT/build.proj" -bl:"$SCRIPT_ROOT/artifacts/log/Debug/BuildTests_$LogDateStamp.binlog" -flp:"LogFile=$SCRIPT_ROOT/artifacts/logs/BuildTests_$LogDateStamp.log" -clp:v=m ${MSBUILD_ARGUMENTS[@]} "$@" else - "$CLI_ROOT/dotnet" msbuild "$SCRIPT_ROOT/eng/tools/init-build.proj" -bl:"$SCRIPT_ROOT/artifacts/log/Debug/BuildXPlatTasks_$LogDateStamp.binlog" -flp:LogFile="$SCRIPT_ROOT/artifacts/logs/BuildXPlatTasks_$LogDateStamp.log" -t:PrepareOfflineLocalTools ${MSBUILD_ARGUMENTS[@]} "$@" + # BuildXPlatTasks uses NetCurrent but that is not set since Arcade isn't used here. + # Bootstrap NetCurrent by deriving it from the installed .NET CLI version. + netCurrent="$($CLI_ROOT/dotnet --version | while IFS='.' read major minor _; do echo "net$major.$minor"; done)" + + "$CLI_ROOT/dotnet" msbuild "$SCRIPT_ROOT/eng/tools/init-build.proj" -p:NetCurrent=$netCurrent -bl:"$SCRIPT_ROOT/artifacts/log/Debug/BuildXPlatTasks_$LogDateStamp.binlog" -flp:LogFile="$SCRIPT_ROOT/artifacts/logs/BuildXPlatTasks_$LogDateStamp.log" -t:PrepareOfflineLocalTools ${MSBUILD_ARGUMENTS[@]} "$@" + # kill off the MSBuild server so that on future invocations we pick up our custom SDK Resolver "$CLI_ROOT/dotnet" build-server shutdown diff --git a/src/SourceBuild/content/prep.sh b/src/SourceBuild/content/prep.sh index 678cb8a6f..90c6a8ecf 100755 --- a/src/SourceBuild/content/prep.sh +++ b/src/SourceBuild/content/prep.sh @@ -174,6 +174,7 @@ function BootstrapArtifacts { # Check for the version of dotnet to install if [ "$installDotnet" == true ]; then echo " Installing dotnet..." + use_installed_dotnet_cli=false (source ./eng/common/tools.sh && InitializeDotNetCli true) # TODO: Remove once runtime dependency is gone (https://github.com/dotnet/runtime/issues/93666) diff --git a/src/SourceBuild/content/repo-projects/sdk.proj b/src/SourceBuild/content/repo-projects/sdk.proj index a77e3f092..e1e865d7b 100644 --- a/src/SourceBuild/content/repo-projects/sdk.proj +++ b/src/SourceBuild/content/repo-projects/sdk.proj @@ -6,6 +6,11 @@ $(BuildCommandArgs) $(FlagParameterPrefix)nodereuse $(ArcadeFalseBoolBuildArg) $(BuildCommandArgs) /p:PackageProjectUrl=https://github.com/dotnet/sdk + $(TargetRid) + osx-$(Platform) + freebsd-$(Platform) + win-$(Platform) + <_platformIndex>$(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-')) <_baseOS>$(NETCoreSdkPortableRuntimeIdentifier.Substring(0, $(_platformIndex))) @@ -13,7 +18,7 @@ <_targetPortableArch>$(Platform) <_targetPortableArch Condition="'$(OverrideTargetArch)' != ''">$(OverrideTargetArch) $(BuildCommandArgs) /p:PortableRid=$(_baseOS)-$(_targetPortableArch) - $(BuildCommandArgs) /p:TargetRid=$(TargetRid) + $(BuildCommandArgs) /p:TargetRid=$(OverrideTargetRid) $(BuildCommandArgs) /p:NativeAotSupported=false diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt index 3000c80e8..6cf694f75 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt @@ -45,7 +45,6 @@ sb,./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/*? # missing workload manifests - https://github.com/dotnet/source-build/issues/3242 msft,./sdk-manifests/x.y.z/microsoft.net.sdk.android/* -msft,./sdk-manifests/x.y.z/microsoft.net.sdk.aspire/* msft,./sdk-manifests/x.y.z/microsoft.net.sdk.ios/* msft,./sdk-manifests/x.y.z/microsoft.net.sdk.maccatalyst/* msft,./sdk-manifests/x.y.z/microsoft.net.sdk.macos/* diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff index 434883537..4c2d7775b 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff @@ -44,14 +44,6 @@ index ------------ ./packs/Microsoft.NETCore.App.Ref/ ./packs/Microsoft.NETCore.App.Ref/x.y.z/ ./packs/Microsoft.NETCore.App.Ref/x.y.z/analyzers/ -@@ ------------ @@ - ./packs/NETStandard.Library.Ref/x.y.z/ref/netstandard2.1/System.Xml.XPath.XDocument.dll - ./sdk-manifests/ - ./sdk-manifests/x.y.z/ --./sdk-manifests/x.y.z/ - ./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/ - ./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/x.y.z/ - ./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/x.y.z/WorkloadManifest.json @@ ------------ @@ ./sdk/x.y.z/.version ./sdk/x.y.z/AppHostTemplate/ diff --git a/src/SourceBuild/patches/format/0001-Explicitly-set-TFM-to-net9.0.patch b/src/SourceBuild/patches/format/0001-Explicitly-set-TFM-to-net9.0.patch deleted file mode 100644 index ac34d9338..000000000 --- a/src/SourceBuild/patches/format/0001-Explicitly-set-TFM-to-net9.0.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Matt Thalman -Date: Wed, 18 Oct 2023 12:50:21 -0500 -Subject: [PATCH] Explicitly set TFM to net9.0 - -Backport: https://github.com/dotnet/source-build/issues/3663 ---- - perf/dotnet-format.Performance.csproj | 2 +- - src/dotnet-format.csproj | 2 +- - tests/dotnet-format.UnitTests.csproj | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/perf/dotnet-format.Performance.csproj b/perf/dotnet-format.Performance.csproj -index 677b7b9a..3e1387d1 100644 ---- a/perf/dotnet-format.Performance.csproj -+++ b/perf/dotnet-format.Performance.csproj -@@ -1,7 +1,7 @@ -  - - -- $(NetCurrent) -+ net9.0 - Exe - true - Release -diff --git a/src/dotnet-format.csproj b/src/dotnet-format.csproj -index 5549fb71..8a77d03f 100644 ---- a/src/dotnet-format.csproj -+++ b/src/dotnet-format.csproj -@@ -1,7 +1,7 @@ -  - - -- $(NetCurrent) -+ net9.0 - Exe - Microsoft.CodeAnalysis.Tools - true -diff --git a/tests/dotnet-format.UnitTests.csproj b/tests/dotnet-format.UnitTests.csproj -index c4311a1a..5b1bcfb9 100644 ---- a/tests/dotnet-format.UnitTests.csproj -+++ b/tests/dotnet-format.UnitTests.csproj -@@ -1,7 +1,7 @@ -  - - -- $(NetCurrent) -+ net9.0 - Microsoft.CodeAnalysis.Tools.Tests - - diff --git a/src/SourceBuild/patches/nuget-client/0001-Shorten-source-build-inner-clone-paths-5543.patch b/src/SourceBuild/patches/nuget-client/0001-Shorten-source-build-inner-clone-paths-5543.patch deleted file mode 100644 index 340c374c1..000000000 --- a/src/SourceBuild/patches/nuget-client/0001-Shorten-source-build-inner-clone-paths-5543.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> -Date: Fri, 15 Dec 2023 10:01:14 -0800 -Subject: [PATCH] Shorten source-build inner clone paths (#5543) - -Backport: https://github.com/NuGet/NuGet.Client/pull/5543 ---- - eng/pipelines/templates/Source_Build.yml | 2 +- - eng/source-build/build.sh | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/eng/pipelines/templates/Source_Build.yml b/eng/pipelines/templates/Source_Build.yml -index 7163c617e..842904c4f 100644 ---- a/eng/pipelines/templates/Source_Build.yml -+++ b/eng/pipelines/templates/Source_Build.yml -@@ -12,7 +12,7 @@ steps: - condition: "or(failed(), eq(variables['System.debug'], 'true'))" - continueOnError: true - inputs: -- PathToPublish: "artifacts/source-build/self/log/source-build.binlog" -+ PathToPublish: "artifacts/sb/log/source-build.binlog" - ArtifactName: "Source-build log" - ArtifactType: Container - -diff --git a/eng/source-build/build.sh b/eng/source-build/build.sh -index 292b0fff8..cdf226b06 100755 ---- a/eng/source-build/build.sh -+++ b/eng/source-build/build.sh -@@ -85,7 +85,7 @@ ReadGlobalVersion Microsoft.DotNet.Arcade.Sdk - export ARCADE_VERSION=$_ReadGlobalVersion - - if [ -z "$DotNetBuildFromSourceFlavor" ] || [ "$DotNetBuildFromSourceFlavor" != "Product" ]; then -- export NUGET_PACKAGES=$scriptroot/../../artifacts/source-build/self/package-cache/ -+ export NUGET_PACKAGES=$scriptroot/../../artifacts/sb/package-cache/ - fi - --"$DOTNET" msbuild "$scriptroot/source-build.proj" /p:Configuration=$configuration /p:DotNetBuildFromSource=true /p:ArcadeBuildFromSource=true "/p:RepoRoot=$scriptroot/../../" "/bl:$scriptroot/../../artifacts/source-build/self/log/source-build.binlog" $args -+"$DOTNET" msbuild "$scriptroot/source-build.proj" /p:Configuration=$configuration /p:DotNetBuildFromSource=true /p:ArcadeBuildFromSource=true "/p:RepoRoot=$scriptroot/../../" "/bl:$scriptroot/../../artifacts/sb/log/source-build.binlog" $args diff --git a/src/SourceBuild/patches/razor/0001-Explicitly-set-net9.0-TFM.patch b/src/SourceBuild/patches/razor/0001-Explicitly-set-net9.0-TFM.patch deleted file mode 100644 index 295561075..000000000 --- a/src/SourceBuild/patches/razor/0001-Explicitly-set-net9.0-TFM.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Matt Thalman -Date: Wed, 18 Oct 2023 10:58:11 -0500 -Subject: [PATCH] Explicitly set net9.0 TFM - -Backport: https://github.com/dotnet/source-build/issues/3663 ---- - Directory.Build.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Directory.Build.props b/Directory.Build.props -index bf6754f23..d76f449be 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -66,7 +66,7 @@ - --> - - -- $(NetCurrent) -+ net9.0 - $(DefaultNetCoreTargetFramework) - - diff --git a/src/SourceBuild/patches/source-build-reference-packages/0001-Explicitly-target-net9.0-for-NoOp-proj.patch b/src/SourceBuild/patches/source-build-reference-packages/0001-Explicitly-target-net9.0-for-NoOp-proj.patch deleted file mode 100644 index 6438c7678..000000000 --- a/src/SourceBuild/patches/source-build-reference-packages/0001-Explicitly-target-net9.0-for-NoOp-proj.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Matt Thalman -Date: Tue, 7 Nov 2023 12:40:49 -0600 -Subject: [PATCH] Explicitly target net9.0 for NoOp proj - -https://github.com/dotnet/source-build/issues/3663 ---- - eng/NoOp.csproj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eng/NoOp.csproj b/eng/NoOp.csproj -index 659aa00a..3ecefd43 100644 ---- a/eng/NoOp.csproj -+++ b/eng/NoOp.csproj -@@ -5,7 +5,7 @@ - - - -- $(NetCurrent) -+ net9.0 - - - diff --git a/src/SourceBuild/patches/templating/0001-Set-NETCoreTargetFramework-to-net9.0.patch b/src/SourceBuild/patches/templating/0001-Set-NETCoreTargetFramework-to-net9.0.patch deleted file mode 100644 index f0d6531ee..000000000 --- a/src/SourceBuild/patches/templating/0001-Set-NETCoreTargetFramework-to-net9.0.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Matt Thalman -Date: Tue, 12 Dec 2023 10:49:01 -0600 -Subject: [PATCH] Set NETCoreTargetFramework to net9.0 - -Backport: https://github.com/dotnet/source-build/issues/3663 ---- - Directory.Build.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Directory.Build.props b/Directory.Build.props -index 6370d08a9..7292506cd 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -5,7 +5,7 @@ - - - preview -- net8.0 -+ net9.0 - netstandard2.0 - net48 - Microsoft .NET Core diff --git a/src/SourceBuild/patches/vstest/0001-Explicitly-use-net9.0-TFM.patch b/src/SourceBuild/patches/vstest/0001-Explicitly-use-net9.0-TFM.patch deleted file mode 100644 index 78ebca72a..000000000 --- a/src/SourceBuild/patches/vstest/0001-Explicitly-use-net9.0-TFM.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Matt Thalman -Date: Thu, 19 Oct 2023 08:29:45 -0500 -Subject: [PATCH] Explicitly use net9.0 TFM - -Backport: https://github.com/dotnet/source-build/issues/3663 ---- - Directory.Build.targets | 2 +- - .../Microsoft.TestPlatform.Build.csproj | 2 +- - .../Microsoft.TestPlatform.CLI.csproj | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Directory.Build.targets b/Directory.Build.targets -index b720568b..617ca4fc 100644 ---- a/Directory.Build.targets -+++ b/Directory.Build.targets -@@ -6,7 +6,7 @@ - - - -- $(NetCurrent) -+ net9.0 - - $(NetCurrent) - -diff --git a/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj -index a93852ce..945b1ac2 100644 ---- a/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj -+++ b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj -@@ -12,7 +12,7 @@ - - - -- $(NetCurrent) -+ net9.0 - - - -diff --git a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj -index b8f6849b..b56b993c 100644 ---- a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj -+++ b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj -@@ -31,7 +31,7 @@ - - - -- -+ - - - diff --git a/src/SourceBuild/patches/xdt/0001-Allow-override-of-build-tool-framework-version.patch b/src/SourceBuild/patches/xdt/0001-Allow-override-of-build-tool-framework-version.patch deleted file mode 100644 index 4a351587d..000000000 --- a/src/SourceBuild/patches/xdt/0001-Allow-override-of-build-tool-framework-version.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nikola Milosavljevic -Date: Mon, 30 Oct 2023 22:52:31 +0000 -Subject: [PATCH] Allow override of build tool framework version - -Backport: https://github.com/dotnet/aspnetcore/issues/51753 ---- - eng/common/tools.sh | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/eng/common/tools.sh b/eng/common/tools.sh -index 17f0a36..343490c 100755 ---- a/eng/common/tools.sh -+++ b/eng/common/tools.sh -@@ -312,7 +312,12 @@ function InitializeBuildTool { - # return values - _InitializeBuildTool="$_InitializeDotNetCli/dotnet" - _InitializeBuildToolCommand="msbuild" -- _InitializeBuildToolFramework="netcoreapp3.1" -+ # use override if it exists - commonly set by source-build -+ if [[ -z "${_OverrideArcadeInitializeBuildToolFramework}" ]]; then -+ _InitializeBuildToolFramework="netcoreapp3.1" -+ else -+ _InitializeBuildToolFramework="${_OverrideArcadeInitializeBuildToolFramework}" -+ fi - } - - # Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116 diff --git a/src/VirtualMonoRepo/Component.template.md b/src/VirtualMonoRepo/Component.template.md new file mode 100644 index 000000000..27b0f7893 --- /dev/null +++ b/src/VirtualMonoRepo/Component.template.md @@ -0,0 +1,15 @@ +# List of components + +To enable full offline source-building of the VMR, we have no other choice than to synchronize all the necessary code into the VMR. This also includes any code referenced via git submodules. More details on why and how this is done can be found here: +- [Strategy for managing external source dependencies](src/arcade/Documentation/UnifiedBuild/VMR-Strategy-For-External-Source.md) +- [Source Synchronization Process](src/arcade/Documentation/UnifiedBuild/VMR-Design-And-Operation.md#source-synchronization-process) + +## Detailed list + + + +> Auto-generated list of components will go here + + + +The repository also contains a [JSON manifest](https://github.com/dotnet/dotnet/blob/main/src/source-manifest.json) listing all components in a machine-readable format. diff --git a/src/VirtualMonoRepo/InitializeVMR.proj b/src/VirtualMonoRepo/InitializeVMR.proj index 09ab72b1c..e3d98fc3c 100644 --- a/src/VirtualMonoRepo/InitializeVMR.proj +++ b/src/VirtualMonoRepo/InitializeVMR.proj @@ -58,7 +58,7 @@ VmrPath="$(VmrDir)" TmpPath="$(TmpDir)" InstallerPath="$(RepoRoot)" - ReadmeTemplatePath="$(MSBuildThisFileDirectory)/README.template.md" + ComponentTemplatePath="$(MSBuildThisFileDirectory)/Component.template.md" TpnTemplatePath="$(MSBuildThisFileDirectory)/THIRD-PARTY-NOTICES.template.txt" SourceMappingsPath="$(MSBuildThisFileDirectory)/source-mappings.json" /> diff --git a/src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs b/src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs index 2a8c1d726..5ab294231 100644 --- a/src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs +++ b/src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs @@ -42,7 +42,7 @@ public class VirtualMonoRepo_Initialize : Build.Utilities.Task, ICancelableTask public string InstallerPath { get; set; } - public string ReadmeTemplatePath { get; set; } + public string ComponentTemplatePath { get; set; } public string TpnTemplatePath { get; set; } @@ -72,7 +72,7 @@ public class VirtualMonoRepo_Initialize : Build.Utilities.Task, ICancelableTask Recursive, new NativePath(SourceMappingsPath), additionalRemotes, - ReadmeTemplatePath, + ComponentTemplatePath, TpnTemplatePath, generateCodeowners: false, discardPatches: true,