Skip to content

Commit 8767a5a

Browse files
safesparrowsafesparrow
authored
Merge branch 'main' into otel
2 parents 336b120 + 4ad5615 commit 8767a5a

File tree

69 files changed

+1144
-159
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+1144
-159
lines changed

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @dotnet/fsharp-team-msft

‎Build.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
@echo off
2-
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\build.ps1""" -build -restore %*"
2+
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\build.ps1""" -build -restore %*"

‎azure-pipelines.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ stages:
118118
steps:
119119
- checkout: self
120120
clean: true
121+
- template: /eng/restore-internal-tools.yml
121122
- script: eng\CIBuild.cmd
122123
-configuration $(_BuildConfig)
123124
-prepareMachine
@@ -138,6 +139,7 @@ stages:
138139
/p:OfficialBuildId=$(BUILD.BUILDNUMBER)
139140
/p:PublishToSymbolServer=true
140141
/p:VisualStudioDropName=$(VisualStudioDropName)
142+
/p:GenerateSbom=true
141143
- script: .\tests\EndToEndBuildTests\EndToEndBuildTests.cmd -c $(_BuildConfig)
142144
displayName: End to end build tests
143145
- task: PublishTestResults@2

‎eng/Build.ps1‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ param (
4545
[switch]$deployExtensions,
4646
[switch]$prepareMachine,
4747
[switch]$useGlobalNuGetCache = $true,
48+
[switch]$dontUseGlobalNuGetCache = $false,
4849
[switch]$warnAsError = $true,
4950
[switch][Alias('test')]$testDesktop,
5051
[switch]$testCoreClr,
@@ -113,7 +114,7 @@ function Print-Usage() {
113114
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
114115
Write-Host " -procdump Monitor test runs with procdump"
115116
Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build"
116-
Write-Host " -useGlobalNuGetCache Use global NuGet cache."
117+
Write-Host " -dontUseGlobalNuGetCache Do not use the global NuGet cache"
117118
Write-Host " -noVisualStudio Only build fsc and fsi as .NET Core applications. No Visual Studio required. '-configuration', '-verbosity', '-norestore', '-rebuild' are supported."
118119
Write-Host " -sourceBuild Simulate building for source-build."
119120
Write-Host " -skipbuild Skip building product"
@@ -131,6 +132,10 @@ function Process-Arguments() {
131132
exit 0
132133
}
133134

135+
if ($dontUseGlobalNugetCache -or $ci) {
136+
$script:useGlobalNugetCache = $False
137+
}
138+
134139
$script:nodeReuse = $False;
135140

136141
if ($testAll) {

‎eng/RestoreInternal.cmd‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
@echo off
2+
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0\common\build.ps1""" -build -restore %*"

‎eng/Version.Details.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
</Dependency>
99
</ProductDependencies>
1010
<ToolsetDependencies>
11-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22513.2">
11+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22520.1">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>32f13f8a8af8085ca09fbf93513ac848582c4a41</Sha>
13+
<Sha>7e27c0ab0fc92ec636c26442fd1663dc5714aa4b</Sha>
1414
<SourceBuild RepoName="arcade" ManagedOnly="true" />
1515
</Dependency>
16-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22513.2">
16+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22520.1">
1717
<Uri>https://github.com/dotnet/arcade</Uri>
18-
<Sha>32f13f8a8af8085ca09fbf93513ac848582c4a41</Sha>
18+
<Sha>7e27c0ab0fc92ec636c26442fd1663dc5714aa4b</Sha>
1919
</Dependency>
2020
</ToolsetDependencies>
2121
</Dependencies>

‎eng/common/cross/arm/tizen-fetch.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ if [ ! -d $TMPDIR ]; then
5151
mkdir -p $TMPDIR
5252
fi
5353

54-
TIZEN_URL=http://download.tizen.org/snapshots/tizen
54+
TIZEN_URL=http://download.tizen.org/snapshots/TIZEN/Tizen
5555
BUILD_XML=build.xml
5656
REPOMD_XML=repomd.xml
5757
PRIMARY_XML=primary.xml
@@ -155,7 +155,7 @@ fetch_tizen_pkgs()
155155
}
156156

157157
Inform "Initialize arm base"
158-
fetch_tizen_pkgs_init standard base
158+
fetch_tizen_pkgs_init standard Tizen-Base
159159
Inform "fetch common packages"
160160
fetch_tizen_pkgs armv7hl gcc gcc-devel-static glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils
161161
Inform "fetch coreclr packages"
@@ -164,7 +164,7 @@ Inform "fetch corefx packages"
164164
fetch_tizen_pkgs armv7hl libcom_err libcom_err-devel zlib zlib-devel libopenssl11 libopenssl1.1-devel krb5 krb5-devel
165165

166166
Inform "Initialize standard unified"
167-
fetch_tizen_pkgs_init standard unified
167+
fetch_tizen_pkgs_init standard Tizen-Unified
168168
Inform "fetch corefx packages"
169169
fetch_tizen_pkgs armv7hl gssdp gssdp-devel tizen-release
170170

‎eng/common/cross/arm64/tizen-fetch.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ if [ ! -d $TMPDIR ]; then
5151
mkdir -p $TMPDIR
5252
fi
5353

54-
TIZEN_URL=http://download.tizen.org/snapshots/tizen/
54+
TIZEN_URL=http://download.tizen.org/snapshots/TIZEN/Tizen
5555
BUILD_XML=build.xml
5656
REPOMD_XML=repomd.xml
5757
PRIMARY_XML=primary.xml
@@ -154,8 +154,8 @@ fetch_tizen_pkgs()
154154
done
155155
}
156156

157-
Inform "Initialize arm base"
158-
fetch_tizen_pkgs_init standard base
157+
Inform "Initialize arm64 base"
158+
fetch_tizen_pkgs_init standard Tizen-Base
159159
Inform "fetch common packages"
160160
fetch_tizen_pkgs aarch64 gcc glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils
161161
Inform "fetch coreclr packages"
@@ -164,7 +164,7 @@ Inform "fetch corefx packages"
164164
fetch_tizen_pkgs aarch64 libcom_err libcom_err-devel zlib zlib-devel libopenssl11 libopenssl1.1-devel krb5 krb5-devel
165165

166166
Inform "Initialize standard unified"
167-
fetch_tizen_pkgs_init standard unified
167+
fetch_tizen_pkgs_init standard Tizen-Unified
168168
Inform "fetch corefx packages"
169169
fetch_tizen_pkgs aarch64 gssdp gssdp-devel tizen-release
170170

‎eng/common/cross/armel/tizen-fetch.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ if [ ! -d $TMPDIR ]; then
5151
mkdir -p $TMPDIR
5252
fi
5353

54-
TIZEN_URL=http://download.tizen.org/snapshots/tizen
54+
TIZEN_URL=http://download.tizen.org/snapshots/TIZEN/Tizen
5555
BUILD_XML=build.xml
5656
REPOMD_XML=repomd.xml
5757
PRIMARY_XML=primary.xml
@@ -154,8 +154,8 @@ fetch_tizen_pkgs()
154154
done
155155
}
156156

157-
Inform "Initialize arm base"
158-
fetch_tizen_pkgs_init standard base
157+
Inform "Initialize armel base"
158+
fetch_tizen_pkgs_init standard Tizen-Base
159159
Inform "fetch common packages"
160160
fetch_tizen_pkgs armv7l gcc gcc-devel-static glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils
161161
Inform "fetch coreclr packages"
@@ -164,7 +164,7 @@ Inform "fetch corefx packages"
164164
fetch_tizen_pkgs armv7l libcom_err libcom_err-devel zlib zlib-devel libopenssl11 libopenssl1.1-devel krb5 krb5-devel
165165

166166
Inform "Initialize standard unified"
167-
fetch_tizen_pkgs_init standard unified
167+
fetch_tizen_pkgs_init standard Tizen-Unified
168168
Inform "fetch corefx packages"
169169
fetch_tizen_pkgs armv7l gssdp gssdp-devel tizen-release
170170

‎eng/common/cross/armel/tizen/tizen-dotnet.ks‎

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

0 commit comments

Comments
 (0)