Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit ba1ad20

Browse files
pavelsavarapavelsavara
committed
Merge branch 'main' into pr-wasm-emscripten-bump-3.1.56
2 parents b2655bf + 2d0dff4 commit ba1ad20

File tree

365 files changed

+14346
-3342
lines changed

Some content is hidden

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

365 files changed

+14346
-3342
lines changed

‎docs/project/dogfooding.md‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dotnet new nugetconfig
1414

1515
Next, add the package source to NuGet.Config with the [dotnet nuget add source](https://learn.microsoft.com/dotnet/core/tools/dotnet-nuget-add-source) command:
1616
```
17-
dotnet nuget add source -n dotnet8 https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet8/nuget/v3/index.json
17+
dotnet nuget add source -n dotnet9 https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet9/nuget/v3/index.json
1818
```
1919

2020
Then, you will be able to add the latest prerelease version of the desired package to your project.
@@ -31,7 +31,7 @@ To use daily builds of the entire runtime, follow the steps given in the rest of
3131
If you're using private Azure DevOps feeds for your projects, you might need to add the preview feed through the Azure-specific feed URI format, which is `azure-feed://organization/optionalProject/feed@view`. In this case, you can add the .NET development package feed as follows:
3232

3333
```
34-
azure-feed://dnceng/public/dotnet8@Local
34+
azure-feed://dnceng/public/dotnet9@Local
3535
```
3636

3737
## Install prerequisites
@@ -40,19 +40,19 @@ azure-feed://dnceng/public/dotnet8@Local
4040

4141
2. If you are using a local copy of the dotnet CLI, take care that when you type `dotnet` you do not inadvertently pick up a different copy that you may have in your path. On Windows, for example, if you use a Command Prompt, a global copy may be in the path, so use the fully qualified path to your local `dotnet` (e.g. `C:\dotnet\dotnet.exe`). If you receive an error "error NETSDK1045: The current .NET SDK does not support targeting .NET 9.0." then you may be executing an older `dotnet`.
4242

43-
After setting up dotnet you can verify you are using the dogfooding version by executing `dotnet --info`. Here is an example output at the time of writing:
43+
After setting up dotnet you can verify you are using the current preview version by executing `dotnet --info`. Here is an example output:
4444
```
4545
>dotnet --info
4646
.NET SDK:
47-
Version: 9.0.100-preview.5.22226.4
47+
Version: 9.0.100-preview.1.23456.7
4848
Commit: fc127ac5a4
4949
5050
Runtime Environment:
5151
OS Name: Windows
5252
OS Version: 10.0.22616
5353
OS Platform: Windows
5454
RID: win10-x64
55-
Base Path: C:\Program Files\dotnet\sdk\9.0.100-preview.5.22226.4\
55+
Base Path: C:\Program Files\dotnet\sdk\9.0.100-preview.1.23456.7\
5656
5757
global.json file:
5858
Not found
@@ -63,10 +63,10 @@ Host:
6363
Commit: 47d9c43ab1
6464
6565
.NET SDKs installed:
66-
9.0.100-preview.5.22226.4 [C:\Program Files\dotnet\sdk]
66+
9.0.100-preview.1.23456.7 [C:\Program Files\dotnet\sdk]
6767
6868
.NET runtimes installed:
69-
Microsoft.NETCore.App 9.0.0-preview.5.22224.3 [C:\Program Files\dotnet\shared\Microsoft.NETCore.App]
69+
Microsoft.NETCore.App 9.0.0-preview.1.23456.7 [C:\Program Files\dotnet\shared\Microsoft.NETCore.App]
7070
7171
Download .NET:
7272
https://aka.ms/dotnet-download
@@ -79,7 +79,7 @@ Learn about .NET Runtimes and SDKs:
7979
3. Our daily builds are uploaded to development feed, not NuGet - so ensure the development feed is in your nuget configuration in case you need other packages that aren't included in the download. For example, on Windows you could edit `%userprofile%\appdata\roaming\nuget\nuget.config` or on Linux edit `~/.nuget/NuGet/NuGet.Config` to add these lines:
8080
```xml
8181
<packageSources>
82-
<add key="dotnet8" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet8/nuget/v3/index.json" />
82+
<add key="dotnet9" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet9/nuget/v3/index.json" />
8383
...
8484
</packageSources>
8585
```
@@ -150,7 +150,7 @@ make it self-contained by adding a RuntimeIdentifier (RID).
150150
<!-- Ensure that the target framework is correct e.g. 'net9.0' -->
151151
<TargetFramework>net9.0</TargetFramework>
152152
<!-- modify build in this line with version reported by `dotnet --info` as above under ".NET runtimes installed" -> Microsoft.NETCore.App -->
153-
<!-- moreover, this can be any valid Microsoft.NETCore.App package version from https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json -->
153+
<!-- moreover, this can be any valid Microsoft.NETCore.App package version from https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json -->
154154
<RuntimeFrameworkVersion>9.0.0-preview.5.22224.3</RuntimeFrameworkVersion>
155155
<RuntimeIdentifier>win-x64</RuntimeIdentifier> <!-- RID to make it self-contained -->
156156
</PropertyGroup>
@@ -165,8 +165,8 @@ $ bin\Debug\net9.0\win-x64\publish\App.exe
165165
### Daily builds table
166166

167167
<!--
168-
To update this table, run 'build.sh/cmd RegenerateDownloadTable'. See
169-
'tools-local/regenerate-readme-table.proj' to add or remove rows or columns,
168+
To update this table, run 'build.sh/cmd -s RegenerateDownloadTable'. See
169+
'eng/regenerate-download-table.csproj' to add or remove rows or columns,
170170
and add links below to fill out the table's contents.
171171
-->
172172
<!-- BEGIN generated table -->

‎docs/workflow/testing/using-dev-shipping-packages.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ This config file will require a handful of modifications to work as we need it t
8181

8282
<!-- Any packages that might be required, but not present in your build, will have to be taken from the latest NuGet feed. -->
8383
<!-- More info on: https://github.com/dotnet/sdk#installing-the-sdk -->
84-
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
84+
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
8585

8686
<!-- Set this path to where your Shipping Artifacts are located. Note that we are assuming a 'Debug' build in this example. -->
8787
<add key="local runtime" value="Path/To/Runtime/artifacts/packages/Debug/Shipping" />

‎docs/workflow/testing/using-your-build-with-installed-sdk.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ dotnet publish --self-contained
8888
<!--To inherit the global NuGet package sources remove the <clear/> line below -->
8989
<clear />
9090
<add key="nuget" value="https://api.nuget.org/v3/index.json" />
91-
<add key="dotnet8" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet8/nuget/v3/index.json" />
91+
<add key="dotnet9" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet9/nuget/v3/index.json" />
9292
</packageSources>
9393
</configuration>
9494
```

‎eng/liveILLink.targets‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,11 @@
3030

3131
<ItemGroup Condition="'$(_RequiresLiveILLink)' == 'true'">
3232
<!-- The assembly shouldn't be referenced, nor promoted to a package dependency, nor copied to the output directory. -->
33-
<!-- ILLink.Tasks is architecture independent, so TargetArch and TargetOS should not be specified -->
3433
<ProjectReference Include="$(_ILLinkTasksSourceDir)ILLink.Tasks.csproj"
3534
ReferenceOutputAssembly="false"
3635
PrivateAssets="all"
3736
Private="false"
38-
SetConfiguration="Configuration=$(ToolsConfiguration)"
39-
GlobalPropertiesToRemove="TargetArchitecture;TargetOS" >
37+
SetConfiguration="Configuration=$(ToolsConfiguration)">
4038
<!-- Keep TFMs in sync with ILLink.Tasks.csproj -->
4139
<SetTargetFramework Condition="'$(MSBuildRuntimeType)' == 'Core'">TargetFramework=$(NetCoreAppToolCurrent)</SetTargetFramework>
4240
<SetTargetFramework Condition="'$(MSBuildRuntimeType)' != 'Core'">TargetFramework=$(NetFrameworkToolCurrent)</SetTargetFramework>

‎eng/pipelines/common/templates/runtimes/run-test-job.yml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -615,15 +615,19 @@ jobs:
615615
condition: always()
616616

617617
# Ensure the Python azure-storage-blob package is installed before doing the upload.
618-
- script: $(PipScript) install --upgrade pip && $(PipScript) install azure.storage.blob==12.5.0 --force-reinstall
619-
displayName: Upgrade Pip to latest and install azure-storage-blob Python package
618+
- script: $(PipScript) install --upgrade pip && $(PipScript) install azure.storage.blob==12.5.0 --force-reinstall && $(PipScript) install azure.identity==1.16.1 --force-reinstall
619+
displayName: Upgrade Pip to latest and install azure-storage-blob and azure-identity Python packages
620620
condition: always()
621621

622-
- script: $(PythonScript) $(Build.SourcesDirectory)/src/coreclr/scripts/superpmi.py upload -log_level DEBUG -arch $(archType) -build_type $(buildConfig) -mch_files $(MergedMchFileLocation)$(CollectionName).$(CollectionType).$(MchFileTag).mch -core_root $(Build.SourcesDirectory)/artifacts/bin/coreclr/$(osGroup).x64.$(buildConfigUpper)
622+
- task: AzureCLI@2
623623
displayName: 'Upload SuperPMI $(CollectionName)-$(CollectionType) collection to Azure Storage'
624+
inputs:
625+
azureSubscription: 'superpmi-collect-rw'
626+
scriptType: 'pscore'
627+
scriptLocation: 'inlineScript'
628+
inlineScript: |
629+
$(PythonScript) $(Build.SourcesDirectory)/src/coreclr/scripts/superpmi.py upload -log_level DEBUG -arch $(archType) -build_type $(buildConfig) -mch_files $(MergedMchFileLocation)$(CollectionName).$(CollectionType).$(MchFileTag).mch -core_root $(Build.SourcesDirectory)/artifacts/bin/coreclr/$(osGroup).x64.$(buildConfigUpper)
624630
condition: always()
625-
env:
626-
CLRJIT_AZ_KEY: $(clrjit_key1) # secret key stored as variable in pipeline
627631

628632
- task: CopyFiles@2
629633
displayName: Copying superpmi.log of all partitions

‎eng/pipelines/coreclr/templates/run-superpmi-collect-job.yml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -177,13 +177,17 @@ jobs:
177177
onlyAddExtraIndex: false
178178

179179
# Ensure the Python azure-storage-blob package is installed before doing the upload.
180-
- script: $(PipScript) install --upgrade pip && $(PipScript) install azure.storage.blob==12.5.0 --force-reinstall
181-
displayName: Upgrade Pip to latest and install azure-storage-blob Python package
180+
- script: $(PipScript) install --upgrade pip && $(PipScript) install azure.storage.blob==12.5.0 --force-reinstall && $(PipScript) install azure.identity==1.16.1 --force-reinstall
181+
displayName: Upgrade Pip to latest and install azure-storage-blob and azure-identity Python packages
182182

183-
- script: $(PythonScript) $(Build.SourcesDirectory)/src/coreclr/scripts/superpmi.py upload -log_level DEBUG -arch $(archType) -build_type $(buildConfig) -mch_files $(MergedMchFileLocation)$(CollectionName).$(CollectionType).$(MchFileTag).mch -core_root $(Build.SourcesDirectory)/artifacts/bin/coreclr/$(osGroup).x64.$(buildConfigUpper)
183+
- task: AzureCLI@2
184184
displayName: ${{ format('Upload SuperPMI {0}-{1} collection to Azure Storage', parameters.collectionName, parameters.collectionType) }}
185-
env:
186-
CLRJIT_AZ_KEY: $(clrjit_key1) # secret key stored as variable in pipeline
185+
inputs:
186+
azureSubscription: 'superpmi-collect-rw'
187+
scriptType: 'pscore'
188+
scriptLocation: 'inlineScript'
189+
inlineScript: |
190+
$(PythonScript) $(Build.SourcesDirectory)/src/coreclr/scripts/superpmi.py upload -log_level DEBUG -arch $(archType) -build_type $(buildConfig) -mch_files $(MergedMchFileLocation)$(CollectionName).$(CollectionType).$(MchFileTag).mch -core_root $(Build.SourcesDirectory)/artifacts/bin/coreclr/$(osGroup).x64.$(buildConfigUpper)
187191
188192
# Always upload the available logs for diagnostics
189193
- task: CopyFiles@2

‎eng/pipelines/coreclr/templates/upload-jits-steps.yml‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,14 @@ steps:
1010
displayName: Enable python venv
1111

1212
# Ensure the Python azure-storage-blob package is installed before doing the upload.
13-
- script: $(PipScript) install --upgrade pip && $(PipScript) install azure.storage.blob==12.5.0 --force-reinstall
14-
displayName: Upgrade Pip to latest and install azure-storage-blob Python package
13+
- script: $(PipScript) install --upgrade pip && $(PipScript) install azure.storage.blob==12.5.0 --force-reinstall && $(PipScript) install azure.identity==1.16.1 --force-reinstall
14+
displayName: Upgrade Pip to latest and install azure-storage-blob and azure-identity Python packages
1515

16-
- script: $(PythonScript) $(Build.SourcesDirectory)/src/coreclr/scripts/jitrollingbuild.py upload -build_type $(_BuildConfig) -arch $(archType) -host_os $(osGroup) -git_hash $(Build.SourceVersion) --use_latest_jit_change
17-
displayName: Upload JIT to Azure Storage
18-
env:
19-
CLRJIT_AZ_KEY: $(clrjit_key1) # secret key stored as variable in pipeline
16+
- task: AzureCLI@2
17+
displayName: 'Upload JIT to Azure Storage'
18+
inputs:
19+
azureSubscription: 'superpmi-collect-rw'
20+
scriptType: 'pscore'
21+
scriptLocation: 'inlineScript'
22+
inlineScript: |
23+
$(PythonScript) $(Build.SourcesDirectory)/src/coreclr/scripts/jitrollingbuild.py upload -build_type $(_BuildConfig) -arch $(archType) -host_os $(osGroup) -git_hash $(Build.SourceVersion) --use_latest_jit_change

‎eng/pipelines/libraries/superpmi-postprocess-step.yml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,19 @@ steps:
6666
condition: always()
6767

6868
# Ensure the Python azure-storage-blob package is installed before doing the upload.
69-
- script: ${{ parameters.PipScript }} install --upgrade pip && ${{ parameters.PipScript }} install azure.storage.blob==12.5.0 --force-reinstall
70-
displayName: Upgrade Pip to latest and install azure-storage-blob Python package
69+
- script: ${{ parameters.PipScript }} install --upgrade pip && ${{ parameters.PipScript }} install azure.storage.blob==12.5.0 --force-reinstall && ${{ parameters.PipScript }} install azure.identity==1.16.1 --force-reinstall
70+
displayName: Upgrade Pip to latest and install azure-storage-blob and azure-identity Python packages
7171
condition: always()
7272

73-
- script: ${{ parameters.PythonScript }} $(Build.SourcesDirectory)/src/coreclr/scripts/superpmi.py upload -log_level DEBUG -arch ${{ parameters.archType }} -build_type ${{ parameters.buildConfig }} -mch_files ${{ parameters.MergedMchFileLocation }}${{ parameters.SuperPmiCollectionName }}.${{ parameters.SuperPmiCollectionType }}.${{ parameters.osGroup }}.${{ parameters.archType }}.${{ parameters.buildConfig }}.mch -core_root $(Build.SourcesDirectory)/artifacts/bin/coreclr/${{ parameters.osGroup }}.x64.${{ parameters.buildConfigUpper }}
73+
- task: AzureCLI@2
7474
displayName: 'Upload SuperPMI ${{ parameters.SuperPmiCollectionName }}-${{ parameters.SuperPmiCollectionType }} collection to Azure Storage'
75+
inputs:
76+
azureSubscription: 'superpmi-collect-rw'
77+
scriptType: 'pscore'
78+
scriptLocation: 'inlineScript'
79+
inlineScript: |
80+
${{ parameters.PythonScript }} $(Build.SourcesDirectory)/src/coreclr/scripts/superpmi.py upload -log_level DEBUG -arch ${{ parameters.archType }} -build_type ${{ parameters.buildConfig }} -mch_files ${{ parameters.MergedMchFileLocation }}${{ parameters.SuperPmiCollectionName }}.${{ parameters.SuperPmiCollectionType }}.${{ parameters.osGroup }}.${{ parameters.archType }}.${{ parameters.buildConfig }}.mch -core_root $(Build.SourcesDirectory)/artifacts/bin/coreclr/${{ parameters.osGroup }}.x64.${{ parameters.buildConfigUpper }}
7581
condition: always()
76-
env:
77-
CLRJIT_AZ_KEY: $(clrjit_key1) # secret key stored as variable in pipeline
7882

7983
- task: CopyFiles@2
8084
displayName: Copying superpmi.log of all partitions

‎eng/regenerate-download-table.proj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</PropertyGroup>
1515

1616
<ItemGroup>
17-
<Branch Include="Main" Abbr="8.0.X" />
17+
<Branch Include="Main" Abbr="9.0.X" />
1818

1919
<Platform Include="Windows (x64)" Abbr="win-x64" />
2020
<Platform Include="Windows (x86)" Abbr="win-x86" />
@@ -28,8 +28,8 @@
2828
<Platform Include="Linux-musl (arm)" Abbr="linux-musl-arm" />
2929
<Platform Include="Linux-musl (arm64)" Abbr="linux-musl-arm64" />
3030
<Platform Include="Dpkg Based Systems (x64)" Abbr="deb" />
31-
<Platform Include="CentOS 7 (x64)" Abbr="centos-7" />
32-
<Platform Include="RHEL 7.2 (x64)" Abbr="rhel7" />
31+
<Platform Include="CentOS 9 (x64)" Abbr="centos-9" />
32+
<Platform Include="RHEL 8 (x64)" Abbr="rhel8" />
3333
<Platform Include="Fedora 27 (x64)" Abbr="fedora-27" />
3434
<Platform Include="SLES 12 (x64)" Abbr="sles-12" />
3535
<Platform Include="OpenSUSE 42 (x64)" Abbr="OpenSUSE-42" />

‎eng/testing/tests.browser.targets‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -173,16 +173,6 @@
173173
<WasmGenerateRunV8Script>true</WasmGenerateRunV8Script>
174174

175175
<WasmNativeDebugSymbols Condition="'$(DebuggerSupport)' == 'true' and '$(WasmNativeDebugSymbols)' == ''">true</WasmNativeDebugSymbols>
176-
<!--
177-
Do this *after* importing BrowserWasmApp.targets. tests.wasm.targets sets this to `reset-to-zero` to indicate
178-
that we want to force this value to zero.
179-
180-
BrowserWasmApp.targets *overrides* `WasmDebugLevel` when `DebuggerSupport=true`, but for the library tests
181-
we explicitly want to:
182-
1. build with DebuggerSupport=true so the debugger attributes are preserved by the linker;
183-
2. *debugging* is disabled at run time so the interpreter optimizations don't get disabled.
184-
-->
185-
<WasmDebugLevel Condition="'$(WasmDebugLevel)' == 'reset-to-zero'">0</WasmDebugLevel>
186176
</PropertyGroup>
187177

188178
<ItemGroup Condition="'$(IncludeSatelliteAssembliesInVFS)' == 'true' and '$(BuildAOTTestsOnHelix)' != 'true'">

0 commit comments

Comments
 (0)