dotnet
/
msbuild
зеркало из https://github.com/dotnet/msbuild.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Update to RC1 (#9249) 

* Update to RC1

* Copy RID graph to bootstrap

This enables UseRidGraph=true builds, like many of our projects.
This commit is contained in:
Rainer Sigwald 2023-09-26 08:09:38 -05:00 коммит произвёл GitHub
Родитель 914c3e8674
Коммит c9f3f0ddc2
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
10 изменённых файлов: 16 добавлений и 70 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
eng/BootStrapMSBuild.targets
Просмотреть файл

@ -229,6 +229,9 @@
<Copy SourceFiles="@(NuGetSdkResolverManifest)"
DestinationFolder="$(BootstrapDestination)SdkResolvers\Microsoft.Build.NuGetSdkResolver" />
<Copy SourceFiles="$(RuntimeIdentifierGraphPath)"
DestinationFolder="$(BootstrapDestination)" />
<Copy SourceFiles="@(InstalledSdks)"
DestinationFiles="@(InstalledSdks -> '$(BootstrapDestination)Sdks\%(RecursiveDir)%(Filename)%(Extension)')" />

26
global.json
Просмотреть файл

@ -1,15 +1,15 @@
{
"sdk": {
"allowPrerelease": true
"sdk": {
"allowPrerelease": true
},
"tools": {
"dotnet": "8.0.100-rc.1.23463.5",
"vs": {
"version": "17.7.0"
},
"tools": {
"dotnet": "8.0.100-preview.7.23376.3",
"vs": {
"version": "17.6.0"
},
"xcopy-msbuild": "17.6.0-2"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23425.2"
}
}
"xcopy-msbuild": "17.7.2"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23425.2"
}
}

5
src/Build/CompatibilitySuppressions.xml
Просмотреть файл

@ -1,9 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<!-- For updating target framework from net 7.0 to net 8.0 in MSBuild 17.8 suppress baseline package validation error PKV006 on net 7.0 -->
<Suppression>
<DiagnosticId>PKV006</DiagnosticId>
<Target>net7.0</Target>
</Suppression>
</Suppressions>

5
src/Build/Microsoft.Build.csproj
Просмотреть файл

@ -26,11 +26,6 @@
<NoWarn>$(NoWarn);NU5104</NoWarn>
</PropertyGroup>
<PropertyGroup>
<ApiCompatPreserveUnnecessarySuppressions>true</ApiCompatPreserveUnnecessarySuppressions>
<ApiCompatPermitUnnecessarySuppressions>true</ApiCompatPermitUnnecessarySuppressions>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Framework\Microsoft.Build.Framework.csproj" />
<ProjectReference Include="..\StringTools\StringTools.csproj" />

5
src/Framework/CompatibilitySuppressions.xml
Просмотреть файл

@ -54,9 +54,4 @@
<DiagnosticId>PKV004</DiagnosticId>
<Target>Xamarin.XboxOne,Version=v0.0</Target>
</Suppression>
<!-- For updating target framework from net 7.0 to net 8.0 in MSBuild 17.8 suppress baseline package validation error PKV006 on net 7.0 -->
<Suppression>
<DiagnosticId>PKV006</DiagnosticId>
<Target>net7.0</Target>
</Suppression>
</Suppressions>

5
src/Framework/Microsoft.Build.Framework.csproj
Просмотреть файл

@ -27,11 +27,6 @@
<PackageReference Include="Microsoft.Win32.Registry" />
</ItemGroup>
<PropertyGroup>
<ApiCompatPreserveUnnecessarySuppressions>true</ApiCompatPreserveUnnecessarySuppressions>
<ApiCompatPermitUnnecessarySuppressions>true</ApiCompatPermitUnnecessarySuppressions>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\Shared\Constants.cs">
<Link>Shared\Constants.cs</Link>

14
src/Tasks/CompatibilitySuppressions.xml
Просмотреть файл

@ -12,15 +12,6 @@
<Right>ref/net472/Microsoft.Build.Tasks.Core.dll</Right>
</Suppression>
<!-- We don't have the net7 reference assemblies handy to pass in to compare against the net8 ones -->
<Suppression>
<DiagnosticId>CP1002</DiagnosticId>
<Target>System.Security.Cryptography, Version=7.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</Target>
<Left>ref/net7.0/Microsoft.Build.Tasks.Core.dll</Left>
<Right>ref/netstandard2.0/Microsoft.Build.Tasks.Core.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<!-- PKV004 for netstandard2.0-supporting TFs that we do not have runtime assemblies for.
This is intentional, because you can only use MSBuild in the context of a .NET SDK
(on net7.0, as of MSBuild 17.4) or in the context of Visual Studio (net472), but we
@ -74,9 +65,4 @@
<DiagnosticId>PKV004</DiagnosticId>
<Target>Xamarin.XboxOne,Version=v0.0</Target>
</Suppression>
<!-- For updating target framework from net 7.0 to net 8.0 in MSBuild 17.8 suppress baseline package validation error PKV006 on net 7.0 -->
<Suppression>
<DiagnosticId>PKV006</DiagnosticId>
<Target>net7.0</Target>
</Suppression>
</Suppressions>

5
src/Tasks/Microsoft.Build.Tasks.csproj
Просмотреть файл

@ -19,11 +19,6 @@
<EnablePackageValidation>true</EnablePackageValidation>
</PropertyGroup>
<PropertyGroup>
<ApiCompatPreserveUnnecessarySuppressions>true</ApiCompatPreserveUnnecessarySuppressions>
<ApiCompatPermitUnnecessarySuppressions>true</ApiCompatPermitUnnecessarySuppressions>
</PropertyGroup>
<ItemGroup>
<EmbeddedResource Include="system.design\system.design.txt">
<Type>Resx</Type>

13
src/Utilities/CompatibilitySuppressions.xml
Просмотреть файл

@ -1,14 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<!-- We don't have the net7 reference assemblies handy to pass in to compare against the net8 ones -->
<Suppression>
<DiagnosticId>CP1002</DiagnosticId>
<Target>System.Runtime, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</Target>
<Left>ref/net7.0/Microsoft.Build.Utilities.Core.dll</Left>
<Right>ref/netstandard2.0/Microsoft.Build.Utilities.Core.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<!-- PKV004 for netstandard2.0-supporting TFs that we do not have runtime assemblies for.
This is intentional, because you can only use MSBuild in the context of a .NET SDK
(on net7.0, as of MSBuild 17.4) or in the context of Visual Studio (net472), but we
@ -62,9 +54,4 @@
<DiagnosticId>PKV004</DiagnosticId>
<Target>Xamarin.XboxOne,Version=v0.0</Target>
</Suppression>
<!-- For updating target framework from net 7.0 to net 8.0 in MSBuild 17.8 suppress baseline package validation error PKV006 on net 7.0 -->
<Suppression>
<DiagnosticId>PKV006</DiagnosticId>
<Target>net7.0</Target>
</Suppression>
</Suppressions>

5
src/Utilities/Microsoft.Build.Utilities.csproj
Просмотреть файл

@ -18,11 +18,6 @@
<EnablePackageValidation>true</EnablePackageValidation>
</PropertyGroup>
<PropertyGroup>
<ApiCompatPreserveUnnecessarySuppressions>true</ApiCompatPreserveUnnecessarySuppressions>
<ApiCompatPermitUnnecessarySuppressions>true</ApiCompatPermitUnnecessarySuppressions>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Framework\Microsoft.Build.Framework.csproj" />
<ProjectReference Include="..\StringTools\StringTools.csproj" />