Skip to content

Commit ca55b39

Browse files
marafmaraf
committed
Merge remote-tracking branch 'origin/main' into maraf/KnownWasmSdkPack
2 parents ea5656d + b9b37c3 commit ca55b39

File tree

11 files changed

+203
-245
lines changed

11 files changed

+203
-245
lines changed

‎eng/Version.Details.xml

Lines changed: 81 additions & 81 deletions
Large diffs are not rendered by default.

‎eng/Versions.props

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,19 @@
3333
</PropertyGroup>
3434
<PropertyGroup>
3535
<!-- Dependency from https://github.com/dotnet/arcade -->
36-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23174.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
36+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23177.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
3737
</PropertyGroup>
3838
<PropertyGroup>
3939
<!-- Dependency from https://github.com/dotnet/arcade-services -->
4040
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.23128.1</MicrosoftDotNetDarcLibVersion>
4141
</PropertyGroup>
4242
<PropertyGroup>
4343
<!-- Dependency from https://github.com/dotnet/winforms -->
44-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>8.0.0-preview.4.23172.4</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
44+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>8.0.0-preview.4.23177.3</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
4545
</PropertyGroup>
4646
<PropertyGroup>
4747
<!-- Dependency from https://github.com/dotnet/wpf -->
48-
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>8.0.0-preview.4.23177.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
48+
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>8.0.0-preview.4.23178.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
4949
</PropertyGroup>
5050
<PropertyGroup>
5151
<!-- Dependency from https://github.com/dotnet/test-templates -->
@@ -54,33 +54,33 @@
5454
<MicrosoftDotNetTestProjectTemplates30PackageVersion>1.0.2-beta4.22406.1</MicrosoftDotNetTestProjectTemplates30PackageVersion>
5555
<!-- Supported versions -->
5656
<MicrosoftDotNetTestProjectTemplates31PackageVersion>1.1.0-rc.22558.1</MicrosoftDotNetTestProjectTemplates31PackageVersion>
57-
<MicrosoftDotNetTestProjectTemplates50PackageVersion>1.1.0-rc.23174.1</MicrosoftDotNetTestProjectTemplates50PackageVersion>
58-
<MicrosoftDotNetTestProjectTemplates60PackageVersion>1.1.0-rc.23174.1</MicrosoftDotNetTestProjectTemplates60PackageVersion>
59-
<MicrosoftDotNetTestProjectTemplates70PackageVersion>1.1.0-rc.23174.1</MicrosoftDotNetTestProjectTemplates70PackageVersion>
60-
<MicrosoftDotNetTestProjectTemplates80PackageVersion>1.1.0-rc.23174.1</MicrosoftDotNetTestProjectTemplates80PackageVersion>
57+
<MicrosoftDotNetTestProjectTemplates50PackageVersion>1.1.0-rc.23204.1</MicrosoftDotNetTestProjectTemplates50PackageVersion>
58+
<MicrosoftDotNetTestProjectTemplates60PackageVersion>1.1.0-rc.23204.1</MicrosoftDotNetTestProjectTemplates60PackageVersion>
59+
<MicrosoftDotNetTestProjectTemplates70PackageVersion>1.1.0-rc.23204.1</MicrosoftDotNetTestProjectTemplates70PackageVersion>
60+
<MicrosoftDotNetTestProjectTemplates80PackageVersion>1.1.0-rc.23204.1</MicrosoftDotNetTestProjectTemplates80PackageVersion>
6161
</PropertyGroup>
6262
<PropertyGroup>
6363
<!-- NUnit3.DotNetNew.Template versions do not 'flow in' -->
6464
<NUnit3DotNetNewTemplatePackageVersion>1.8.1</NUnit3DotNetNewTemplatePackageVersion>
6565
</PropertyGroup>
6666
<PropertyGroup>
6767
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
68-
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>8.0.0-preview.4.23177.14</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
69-
<MicrosoftAspNetCoreAppRefPackageVersion>8.0.0-preview.4.23177.14</MicrosoftAspNetCoreAppRefPackageVersion>
70-
<MicrosoftAspNetCoreAppRefInternalPackageVersion>8.0.0-preview.4.23177.14</MicrosoftAspNetCoreAppRefInternalPackageVersion>
71-
<VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.4.23177.14</VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>
72-
<dotnetdevcertsPackageVersion>8.0.0-preview.4.23177.14</dotnetdevcertsPackageVersion>
73-
<dotnetuserjwtsPackageVersion>8.0.0-preview.4.23177.14</dotnetuserjwtsPackageVersion>
74-
<dotnetusersecretsPackageVersion>8.0.0-preview.4.23177.14</dotnetusersecretsPackageVersion>
68+
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>8.0.0-preview.4.23203.12</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
69+
<MicrosoftAspNetCoreAppRefPackageVersion>8.0.0-preview.4.23203.12</MicrosoftAspNetCoreAppRefPackageVersion>
70+
<MicrosoftAspNetCoreAppRefInternalPackageVersion>8.0.0-preview.4.23203.12</MicrosoftAspNetCoreAppRefInternalPackageVersion>
71+
<VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.4.23203.12</VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>
72+
<dotnetdevcertsPackageVersion>8.0.0-preview.4.23203.12</dotnetdevcertsPackageVersion>
73+
<dotnetuserjwtsPackageVersion>8.0.0-preview.4.23203.12</dotnetuserjwtsPackageVersion>
74+
<dotnetusersecretsPackageVersion>8.0.0-preview.4.23203.12</dotnetusersecretsPackageVersion>
7575
</PropertyGroup>
7676
<PropertyGroup>
7777
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
7878
</PropertyGroup>
7979
<PropertyGroup>
8080
<!-- Dependencies from https://github.com/dotnet/sdk -->
81-
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.100-preview.4.23178.2</MicrosoftDotNetCommonItemTemplatesPackageVersion>
82-
<MicrosoftNETSdkPackageVersion>8.0.100-preview.4.23178.2</MicrosoftNETSdkPackageVersion>
83-
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.100-preview.4.23178.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
81+
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.100-preview.4.23203.10</MicrosoftDotNetCommonItemTemplatesPackageVersion>
82+
<MicrosoftNETSdkPackageVersion>8.0.100-preview.4.23203.10</MicrosoftNETSdkPackageVersion>
83+
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.100-preview.4.23203.10</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
8484
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
8585
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
8686
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@@ -91,24 +91,24 @@
9191
</PropertyGroup>
9292
<PropertyGroup>
9393
<!-- Dependencies from https://github.com/dotnet/corefx -->
94-
<MicrosoftNETCorePlatformsPackageVersion>8.0.0-preview.4.23177.1</MicrosoftNETCorePlatformsPackageVersion>
94+
<MicrosoftNETCorePlatformsPackageVersion>8.0.0-preview.4.23181.2</MicrosoftNETCorePlatformsPackageVersion>
9595
</PropertyGroup>
9696
<PropertyGroup>
9797
<!-- Dependencies from https://github.com/dotnet/core-setup -->
98-
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.4.23177.1</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
99-
<VSRedistCommonNetCoreTargetingPackx6480PackageVersion>8.0.0-preview.4.23177.1</VSRedistCommonNetCoreTargetingPackx6480PackageVersion>
100-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-preview.4.23177.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
101-
<MicrosoftNETCoreAppHostwinx64PackageVersion>8.0.0-preview.4.23177.1</MicrosoftNETCoreAppHostwinx64PackageVersion>
102-
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.4.23177.1</MicrosoftNETCoreAppRefPackageVersion>
103-
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-preview.4.23177.1</MicrosoftNETCoreDotNetHostResolverPackageVersion>
98+
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.4.23181.2</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
99+
<VSRedistCommonNetCoreTargetingPackx6480PackageVersion>8.0.0-preview.4.23181.2</VSRedistCommonNetCoreTargetingPackx6480PackageVersion>
100+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-preview.4.23181.2</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
101+
<MicrosoftNETCoreAppHostwinx64PackageVersion>8.0.0-preview.4.23181.2</MicrosoftNETCoreAppHostwinx64PackageVersion>
102+
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.4.23181.2</MicrosoftNETCoreAppRefPackageVersion>
103+
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-preview.4.23181.2</MicrosoftNETCoreDotNetHostResolverPackageVersion>
104104
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
105105
</PropertyGroup>
106106
<PropertyGroup>
107107
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
108-
<VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>8.0.0-preview.4.23177.1</VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>
109-
<VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>8.0.0-preview.4.23177.1</VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>
110-
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>8.0.0-preview.4.23177.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
111-
<MicrosoftWindowsDesktopAppRefPackageVersion>8.0.0-preview.4.23177.1</MicrosoftWindowsDesktopAppRefPackageVersion>
108+
<VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>8.0.0-preview.4.23178.3</VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>
109+
<VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>8.0.0-preview.4.23178.3</VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>
110+
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>8.0.0-preview.4.23178.3</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
111+
<MicrosoftWindowsDesktopAppRefPackageVersion>8.0.0-preview.4.23178.3</MicrosoftWindowsDesktopAppRefPackageVersion>
112112
</PropertyGroup>
113113
<PropertyGroup>
114114
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->

‎eng/pipelines/templates/jobs/vmr-build.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,8 @@ jobs:
106106
- ${{ if parameters.buildFromArchive }}:
107107
- script: |
108108
set -ex
109-
"${{ parameters.vmrPath }}/eng/pack-sources.sh" -o "$(Build.StagingDirectory)/dotnet-sources.tar.gz"
110-
tar -xf dotnet-sources.tar.gz
111-
mv "dotnet-$(Build.SourceVersion)" "$(sourcesPath)"
109+
cp -r "${{ parameters.vmrPath }}" "$(sourcesPath)"
110+
rm -rf "$(sourcesPath)/.git"
112111
displayName: Export VMR sources
113112
workingDirectory: $(Build.StagingDirectory)
114113
@@ -127,7 +126,9 @@ jobs:
127126
- ${{ if ne(parameters.reuseBuildArtifactsFrom, '') }}:
128127
- download: current
129128
artifact: ${{ parameters.reuseBuildArtifactsFrom }}_${{ parameters.architecture }}_Artifacts
130-
patterns: '*.tar.gz'
129+
patterns: |
130+
**/Private.SourceBuilt.Artifacts.*.tar.gz
131+
**/dotnet-sdk-*.tar.gz
131132
displayName: Download Previous Build
132133

133134
- task: CopyFiles@2
@@ -182,7 +183,12 @@ jobs:
182183
echo "##vso[task.setvariable variable=additionalBuildArgs]--with-sdk /vmr/.dotnet"
183184
fi
184185
185-
docker run --rm -v "$(sourcesPath):/vmr" -w /vmr ${{ parameters.container }} ./prep.sh ${customPrepArgs}
186+
if [[ '${{ parameters.buildFromArchive }}' == 'True' ]]; then
187+
customPrepArgs="$customPrepArgs --source-repository https://github.com/dotnet/dotnet"
188+
customPrepArgs="$customPrepArgs --source-version $(git -C "${{ parameters.vmrPath }}" rev-parse HEAD)"
189+
fi
190+
191+
docker run --rm -v "$(sourcesPath):/vmr" -w /vmr ${{ parameters.container }} ./prep.sh $customPrepArgs
186192
displayName: Prep the Build
187193
188194
- script: |
@@ -207,7 +213,7 @@ jobs:
207213
customBuildArgs="$customBuildArgs --poison"
208214
fi
209215
210-
docker run --rm -v "$(sourcesPath):/vmr" -w /vmr ${customRunArgs} ${{ parameters.container }} ./build.sh --clean-while-building $(additionalBuildArgs) ${customBuildArgs}
216+
docker run --rm -v "$(sourcesPath):/vmr" -w /vmr $customRunArgs ${{ parameters.container }} ./build.sh --clean-while-building $(additionalBuildArgs) $customBuildArgs
211217
displayName: Build
212218
213219
- script: |

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"cmake": "3.21.0"
1212
},
1313
"msbuild-sdks": {
14-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23174.1",
15-
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23174.1"
14+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23177.4",
15+
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23177.4"
1616
}
1717
}

‎src/SourceBuild/content/.devcontainer/init.sh

100644100755
File mode changed.

‎src/SourceBuild/content/.devcontainer/synchronize-vmr.sh

100644100755
File mode changed.

‎src/SourceBuild/content/build.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,11 @@ if [ -f "${packagesArchiveDir}archiveArtifacts.txt" ]; then
113113
fi
114114
fi
115115

116+
if [ ! -d "$SCRIPT_ROOT/.git" ]; then
117+
echo "ERROR: $SCRIPT_ROOT is not a git repository. Please run prep.sh add initialize Source Link metadata."
118+
exit 1
119+
fi
120+
116121
if [ -d "$CUSTOM_SDK_DIR" ]; then
117122
export SDK_VERSION=$("$CUSTOM_SDK_DIR/dotnet" --version)
118123
export CLI_ROOT="$CUSTOM_SDK_DIR"

‎src/SourceBuild/content/eng/pack-sources.sh

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

0 commit comments

Comments
 (0)