Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
897f260
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 2, 2023
ab5b618
Update dependencies from https://github.com/dotnet/sdk build 20230901.35
dotnet-maestro[bot] Sep 2, 2023
c87b098
Update dependencies from https://github.com/dotnet/sdk build 20230903.19
dotnet-maestro[bot] Sep 4, 2023
30fc141
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Sep 4, 2023
877998f
Update dependencies from https://github.com/dotnet/icu build 20230904.1
dotnet-maestro[bot] Sep 5, 2023
4afedab
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Sep 5, 2023
ec56ae2
Update dependencies from https://github.com/dotnet/cecil build 202309…
dotnet-maestro[bot] Sep 5, 2023
cb5320a
Update dependencies from https://github.com/dotnet/sdk build 20230904.3
dotnet-maestro[bot] Sep 5, 2023
3cc2bcf
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Sep 5, 2023
aabfced
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 6, 2023
d499798
Update dependencies from https://github.com/dotnet/icu build 20230904.1
dotnet-maestro[bot] Sep 6, 2023
d7a2f5e
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Sep 6, 2023
8d5edf3
Update dependencies from https://github.com/dotnet/emsdk build 202309…
dotnet-maestro[bot] Sep 6, 2023
2d8502f
Update dependencies from https://github.com/dotnet/hotreload-utils bu…
dotnet-maestro[bot] Sep 6, 2023
55a1813
Update dependencies from https://github.com/dotnet/cecil build 202309…
dotnet-maestro[bot] Sep 6, 2023
aeb9e4f
Update dependencies from https://github.com/dotnet/sdk build 20230905.28
dotnet-maestro[bot] Sep 6, 2023
0d9aef4
Dependency coherency updates
dotnet-maestro[bot] Sep 6, 2023
a79435e
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 7, 2023
7315321
Update dependencies from https://github.com/dotnet/icu build 20230904.1
dotnet-maestro[bot] Sep 7, 2023
9afc4d8
Update dependencies from https://github.com/dotnet/runtime-assets bui…
dotnet-maestro[bot] Sep 7, 2023
23a907d
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Sep 7, 2023
b47de8c
Update dependencies from https://github.com/dotnet/emsdk build 202309…
dotnet-maestro[bot] Sep 7, 2023
29387f7
Update dependencies from https://github.com/dotnet/hotreload-utils bu…
dotnet-maestro[bot] Sep 7, 2023
472096e
Update dependencies from https://github.com/dotnet/cecil build 202309…
dotnet-maestro[bot] Sep 7, 2023
8889cad
Update dependencies from https://github.com/dotnet/sdk build 20230907.1
dotnet-maestro[bot] Sep 7, 2023
0b6b51b
Dependency coherency updates
dotnet-maestro[bot] Sep 7, 2023
15e0367
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 8, 2023
4ccbae8
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Sep 8, 2023
6e5b94d
Update dependencies from https://github.com/dotnet/runtime-assets bui…
dotnet-maestro[bot] Sep 8, 2023
69cdef5
Update dependencies from https://github.com/dotnet/icu build 20230904.1
dotnet-maestro[bot] Sep 8, 2023
e0fdf2b
Update dependencies from https://github.com/dotnet/emsdk build 202309…
dotnet-maestro[bot] Sep 8, 2023
35da50a
Update dependencies from https://github.com/dotnet/hotreload-utils bu…
dotnet-maestro[bot] Sep 8, 2023
5a37df4
Update dependencies from https://github.com/dotnet/cecil build 202309…
dotnet-maestro[bot] Sep 8, 2023
63944f4
Update dependencies from https://github.com/dotnet/sdk build 20230908.1
dotnet-maestro[bot] Sep 8, 2023
5d17b74
Dependency coherency updates
dotnet-maestro[bot] Sep 8, 2023
3641d59
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 9, 2023
a063412
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Sep 9, 2023
79c0bd8
Update dependencies from https://github.com/dotnet/runtime-assets bui…
dotnet-maestro[bot] Sep 9, 2023
6792e75
Update dependencies from https://github.com/dotnet/icu build 20230904.1
dotnet-maestro[bot] Sep 9, 2023
879b49a
Update dependencies from https://github.com/dotnet/emsdk build 202309…
dotnet-maestro[bot] Sep 9, 2023
10fcdf8
Update dependencies from https://github.com/dotnet/hotreload-utils bu…
dotnet-maestro[bot] Sep 9, 2023
a1675af
Update dependencies from https://github.com/dotnet/cecil build 202309…
dotnet-maestro[bot] Sep 9, 2023
6a3eb47
Update dependencies from https://github.com/dotnet/sdk build 20230908.16
dotnet-maestro[bot] Sep 9, 2023
bec9f9b
Dependency coherency updates
dotnet-maestro[bot] Sep 9, 2023
166a409
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 10, 2023
400dca5
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Sep 10, 2023
7b1c49c
Update dependencies from https://github.com/dotnet/runtime-assets bui…
dotnet-maestro[bot] Sep 10, 2023
aa13bff
Update dependencies from https://github.com/dotnet/icu build 20230904.1
dotnet-maestro[bot] Sep 10, 2023
9bce3b5
Update dependencies from https://github.com/dotnet/emsdk build 202309…
dotnet-maestro[bot] Sep 10, 2023
1bb8def
Update dependencies from https://github.com/dotnet/hotreload-utils bu…
dotnet-maestro[bot] Sep 10, 2023
114c877
Update dependencies from https://github.com/dotnet/cecil build 202309…
dotnet-maestro[bot] Sep 10, 2023
200f60d
Update dependencies from https://github.com/dotnet/sdk build 20230909.1
dotnet-maestro[bot] Sep 10, 2023
e82ddef
Dependency coherency updates
dotnet-maestro[bot] Sep 10, 2023
e0de150
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 11, 2023
db1800c
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Sep 11, 2023
284db24
Update dependencies from https://github.com/dotnet/runtime-assets bui…
dotnet-maestro[bot] Sep 11, 2023
1e66e99
Update dependencies from https://github.com/dotnet/icu build 20230904.1
dotnet-maestro[bot] Sep 11, 2023
ecd71bf
Update dependencies from https://github.com/dotnet/emsdk build 202309…
dotnet-maestro[bot] Sep 11, 2023
fbbe326
Update dependencies from https://github.com/dotnet/hotreload-utils bu…
dotnet-maestro[bot] Sep 11, 2023
cea26bd
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Sep 11, 2023
4680191
Update dependencies from https://github.com/dotnet/cecil build 202309…
dotnet-maestro[bot] Sep 11, 2023
304d76c
Update dependencies from https://github.com/dotnet/source-build-refer…
dotnet-maestro[bot] Sep 11, 2023
f493046
Update dependencies from https://github.com/dotnet/sdk build 20230910.9
dotnet-maestro[bot] Sep 11, 2023
d8a8441
Dependency coherency updates
dotnet-maestro[bot] Sep 11, 2023
901bc50
Make installer tests use System.Text.Json from framework only if vers…
elinor-fung Sep 11, 2023
b11ca7a
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 12, 2023
d5b9fa1
Update dependencies from https://github.com/dotnet/icu build 20230904.1
dotnet-maestro[bot] Sep 12, 2023
f064b19
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Sep 12, 2023
0bb9d92
Update dependencies from https://github.com/dotnet/runtime-assets bui…
dotnet-maestro[bot] Sep 12, 2023
f5d9239
Update dependencies from https://github.com/dotnet/emsdk build 202309…
dotnet-maestro[bot] Sep 12, 2023
18f51c1
Update dependencies from https://github.com/dotnet/hotreload-utils bu…
dotnet-maestro[bot] Sep 12, 2023
09e34c2
Update dependencies from https://github.com/dotnet/cecil build 202309…
dotnet-maestro[bot] Sep 12, 2023
eb0788f
Update dependencies from https://github.com/dotnet/sdk build 20230912.5
dotnet-maestro[bot] Sep 12, 2023
727e4cb
Dependency coherency updates
dotnet-maestro[bot] Sep 12, 2023
4d4e513
Fix missing RID graph from the core frameworks deps.json
vitek-karas Sep 13, 2023
8ef717c
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 13, 2023
9e0c0e2
Update dependencies from https://github.com/dotnet/icu build 20230904.1
dotnet-maestro[bot] Sep 13, 2023
fa13e78
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Sep 13, 2023
d8ad1b9
Update dependencies from https://github.com/dotnet/runtime-assets bui…
dotnet-maestro[bot] Sep 13, 2023
591ab17
Update dependencies from https://github.com/dotnet/emsdk build 202309…
dotnet-maestro[bot] Sep 13, 2023
c475502
Update dependencies from https://github.com/dotnet/hotreload-utils bu…
dotnet-maestro[bot] Sep 13, 2023
5861189
Update dependencies from https://github.com/dotnet/cecil build 202309…
dotnet-maestro[bot] Sep 13, 2023
720d81f
Update dependencies from https://github.com/dotnet/sdk build 20230913.7
dotnet-maestro[bot] Sep 13, 2023
d059105
Dependency coherency updates
dotnet-maestro[bot] Sep 13, 2023
e6389c6
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 14, 2023
b98a600
Update dependencies from https://github.com/dotnet/icu build 20230904.1
dotnet-maestro[bot] Sep 14, 2023
5001256
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Sep 14, 2023
c4c574f
Update dependencies from https://github.com/dotnet/runtime-assets bui…
dotnet-maestro[bot] Sep 14, 2023
52010a9
Update dependencies from https://github.com/dotnet/emsdk build 202309…
dotnet-maestro[bot] Sep 14, 2023
a0dcbe4
Update dependencies from https://github.com/dotnet/hotreload-utils bu…
dotnet-maestro[bot] Sep 14, 2023
8dd4bb1
Update dependencies from https://github.com/dotnet/cecil build 202309…
dotnet-maestro[bot] Sep 14, 2023
dbc0cd8
Update dependencies from https://github.com/dotnet/sdk build 20230914.2
dotnet-maestro[bot] Sep 14, 2023
f5294de
Dependency coherency updates
dotnet-maestro[bot] Sep 14, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "8.0.0-prerelease.23431.1",
"version": "8.0.0-prerelease.23456.2",
"commands": [
"xharness"
]
Expand Down
316 changes: 158 additions & 158 deletions eng/Version.Details.xml

Large diffs are not rendered by default.

148 changes: 74 additions & 74 deletions eng/Versions.props

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
"dotnet": "8.0.100-rc.1.23415.11"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23431.2",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23431.2",
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23431.2",
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23463.1",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23463.1",
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23463.1",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.23426.3"
"Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.23460.2"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<SymbolsArchiveName>dotnet-runtime-symbols</SymbolsArchiveName>
<VSInsertionShortComponentName>NetCore.SharedFramework</VSInsertionShortComponentName>
<UseTemplatedPlatformManifest>true</UseTemplatedPlatformManifest>
<UseRidGraph>true</UseRidGraph>
</PropertyGroup>

<PropertyGroup>
Expand Down
6 changes: 4 additions & 2 deletions src/installer/tests/Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,11 @@
<Target Name="RemoveOOBPackageReference" AfterTargets="ResolvePackageAssets">

<!-- Tests have some dependencies that use the System.Text.Json package (HostModel, DependencyModel),
but the tests should just use the framework on which they are run. Explicitly remove the item. -->
but the tests should just use the framework on which they are run if possible Explicitly remove
the item if the target framework version for the test matches the referenced package version. -->
<ItemGroup>
<RuntimeCopyLocalItems Remove="@(RuntimeCopyLocalItems)" Condition="'%(NuGetPackageId)' == 'System.Text.Json'" />
<RuntimeCopyLocalItems Remove="@(RuntimeCopyLocalItems)"
Condition="'%(NuGetPackageId)' == 'System.Text.Json' and $(SystemTextJsonVersion.StartsWith('$(_TargetFrameworkVersionWithoutV)'))" />
</ItemGroup>
</Target>

Expand Down