Merge branch 'main' into shortstack
This commit is contained in:
Jo Shields
GitHub
commit
68bdaffc07
12 changed files with 197 additions and 34 deletions
|
|
@ -201,18 +201,18 @@
|
|||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24081.4">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24102.4">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>438a8e2488313fb3aa1b24a741a85c2669ee7e0d</Sha>
|
||||
<Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
|
||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24081.4">
|
||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24102.4">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>438a8e2488313fb3aa1b24a741a85c2669ee7e0d</Sha>
|
||||
<Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24081.4">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24102.4">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>438a8e2488313fb3aa1b24a741a85c2669ee7e0d</Sha>
|
||||
<Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24076.2">
|
||||
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
||||
|
|
@ -222,9 +222,9 @@
|
|||
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
||||
<Sha>e9cac5ab2b545c66de5414b330d2187286d17194</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24081.4">
|
||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24102.4">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>438a8e2488313fb3aa1b24a741a85c2669ee7e0d</Sha>
|
||||
<Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-alpha.1.23612.13">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24081.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24102.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/arcade-services -->
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
"cmake": "3.21.0"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24081.4",
|
||||
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24081.4"
|
||||
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24102.4",
|
||||
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24102.4"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,17 +12,17 @@ using System.Linq;
|
|||
namespace Microsoft.DotNet.SourceBuild.Tasks
|
||||
{
|
||||
/// <summary>
|
||||
/// Extends the SDK to handle "SOURCE_BUILD_SDK_*" override environment variables. Each override
|
||||
/// Extends the SDK to handle "SOURCE_BUILT_SDK_*" override environment variables. Each override
|
||||
/// should provide a set of 3 environment variables:
|
||||
///
|
||||
/// SOURCE_BUILD_SDK_ID_EXAMPLE=Your.Sdk.Example
|
||||
/// SOURCE_BUILT_SDK_ID_EXAMPLE=Your.Sdk.Example
|
||||
/// ID of the SDK nuget package to override.
|
||||
///
|
||||
/// SOURCE_BUILD_SDK_DIR_EXAMPLE=/git/repo/bin/extracted/Your.Sdk.Example/
|
||||
/// SOURCE_BUILT_SDK_DIR_EXAMPLE=/git/repo/bin/extracted/Your.Sdk.Example/
|
||||
/// Directory where the sdk/Sdk.props and/or sdk/Sdk.targets files are located. This should be
|
||||
/// the directory where the override SDK package is extracted.
|
||||
///
|
||||
/// SOURCE_BUILD_SDK_VERSION_EXAMPLE=1.0.0-source-built
|
||||
/// SOURCE_BUILT_SDK_VERSION_EXAMPLE=1.0.0-source-built
|
||||
/// (Optional) Version of the SDK package to use. This is informational.
|
||||
/// </summary>
|
||||
public class SourceBuiltSdkResolver : SdkResolver
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.Build.NoTargets": "3.7.0",
|
||||
"Microsoft.Build.Traversal": "3.4.0",
|
||||
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24075.2"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,12 +28,23 @@
|
|||
<NuGetConfigFile Condition="'$(NuGetConfigFile)' == '' and Exists('$(ProjectDirectory)NuGet.config')">$(ProjectDirectory)NuGet.config</NuGetConfigFile>
|
||||
<NuGetConfigFile Condition="'$(NuGetConfigFile)' == '' and Exists('$(ProjectDirectory)NuGet.Config')">$(ProjectDirectory)NuGet.Config</NuGetConfigFile>
|
||||
|
||||
<OriginalNuGetConfigFile>$(NuGetConfigFile)</OriginalNuGetConfigFile>
|
||||
<!-- Update nuget.config property to point to modified file that will be created/updated during build. -->
|
||||
<NuGetConfigFile Condition="'$(OriginalNuGetConfigFile)' != ''">$(BaseIntermediateOutputPath)$([System.IO.Path]::GetFileName('$(OriginalNuGetConfigFile)'))</NuGetConfigFile>
|
||||
|
||||
<SourceBuiltSdksDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'source-built-sdks'))</SourceBuiltSdksDir>
|
||||
|
||||
<!-- Set the bootstrap version to the VMR's version if empty. (no bootstrap set). -->
|
||||
<ArcadeBootstrapVersion>$([MSBuild]::ValueOrDefault('$(ARCADE_BOOTSTRAP_VERSION)', '$(ArcadeSdkVersion)'))</ArcadeBootstrapVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
|
||||
<!-- Get Microsoft.Build.NoTargets and Microsoft.Build.Traversal versions from VMR's global.json -->
|
||||
<VMRGlobalJsonContents>$([System.IO.File]::ReadAllText($(RepoRoot)global.json))</VMRGlobalJsonContents>
|
||||
<NoTargetsSdkVersion>$([System.Text.RegularExpressions.Regex]::Match($(VMRGlobalJsonContents), '"Microsoft.Build.NoTargets": "([^"]*)"').Groups.get_Item(1))</NoTargetsSdkVersion>
|
||||
<TraversalSdkVersion>$([System.Text.RegularExpressions.Regex]::Match($(VMRGlobalJsonContents), '"Microsoft.Build.Traversal": "([^"]*)"').Groups.get_Item(1))</TraversalSdkVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(BuildOS)' == 'windows'">
|
||||
<FlagParameterPrefix>-</FlagParameterPrefix>
|
||||
<ArcadeFalseBoolBuildArg>0</ArcadeFalseBoolBuildArg>
|
||||
|
|
@ -60,6 +71,7 @@
|
|||
<BuildArgs>$(BuildArgs) /p:DotNetBuildOrchestrator=true</BuildArgs>
|
||||
<BuildArgs Condition="'$(CrossBuild)' == 'true'">$(BuildArgs) /p:CrossBuild=true</BuildArgs>
|
||||
<BuildArgs Condition="'$(DotNetBuildSkipTests)' == 'true'">$(BuildArgs) /p:DotNetBuildSkipTests=true</BuildArgs>
|
||||
<BuildArgs Condition="'$(NuGetConfigFile)' != ''">$(BuildArgs) /p:RestoreConfigFile=$(NuGetConfigFile)</BuildArgs>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
|
||||
|
|
@ -133,6 +145,9 @@
|
|||
|
||||
<!-- Need to be passed in as an env var so that custom Exec tasks in the repo's SourceBuild.props receive this setting. -->
|
||||
<EnvironmentVariables Include="DotNetPackageVersionPropsPath=$(PackageVersionPropsPath)" />
|
||||
|
||||
<!-- Needed for miscellanous projects in various repos - see https://github.com/dotnet/source-build/issues/4081-->
|
||||
<EnvironmentVariables Include="RestoreConfigFile=$(NuGetConfigFile)" Condition="'$(NuGetConfigFile)' != ''" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
@ -170,6 +185,21 @@
|
|||
|
||||
<ArcadeSharedFrameworkSdkOverride Include="Microsoft.DotNet.SharedFramework.Sdk" Group="ARCADE_SHARED_FX_SDK" Version="$(arcadeOutputPackageVersion)" />
|
||||
<WindowsDesktopSdkOverride Include="Microsoft.Net.Sdk.WindowsDesktop" Group="WINDOWS_DESKTOP" Location="$(ToolsDir)EmptySdk" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
|
||||
|
||||
<!--
|
||||
Add Microsoft.Build.NoTargets and Microsoft.Build.Traversal SDK overrides, for all repos,
|
||||
except source-build-reference-packages repo, that builds these packages and utility projects.
|
||||
|
||||
We need to override all SDK packages that are used by repos, to prevent NuGet SDK Resolver from trying to
|
||||
restore these packages from online feeds. In offline build we only want to use local source-build feeds.
|
||||
Therefore, we create a copy of repo's NuGet.config file, modify it, and pass it into repo build using
|
||||
RestoreConfigFile property. MSBuild uses NuGetSdkResolver to restore missing SDKs, which doesn't honor
|
||||
RestoreConfigFile property and uses NuGet.config file from repo's root which has online feeds.
|
||||
-->
|
||||
<NoTargetsSdkOverride Include="Microsoft.Build.NoTargets" Group="NOTARGETS" Version="$(NoTargetsSdkVersion)" />
|
||||
<TraversalSdkOverride Include="Microsoft.Build.Traversal" Group="TRAVERSAL" Version="$(TraversalSdkVersion)" />
|
||||
<SourceBuiltSdkOverride Include="@(NoTargetsSdkOverride)" Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(RepositoryName)' != 'source-build-reference-packages' and '$(IsUtilityProject)' != 'true'" />
|
||||
<SourceBuiltSdkOverride Include="@(TraversalSdkOverride)" Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(RepositoryName)' != 'source-build-reference-packages' and '$(IsUtilityProject)' != 'true'" />
|
||||
</ItemGroup>
|
||||
|
||||
<!-- CLI internal version is statically set by us to a version that will never show up in the wild.
|
||||
|
|
|
|||
|
|
@ -55,9 +55,23 @@
|
|||
<UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="WritePackageUsageData" />
|
||||
<UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="WriteUsageReports" />
|
||||
|
||||
<!-- Update NuGet feeds in the repo -->
|
||||
<Target Name="CopyNuGetConfig"
|
||||
Condition="'$(NuGetConfigFile)' != ''"
|
||||
Inputs="$(MSBuildProjectFullPath);$(OriginalNuGetConfigFile)"
|
||||
Outputs="$(NuGetConfigFile)">
|
||||
|
||||
<MakeDir Directories="$([System.IO.Path]::GetDirectoryName('$(NuGetConfigFile)'))" />
|
||||
|
||||
<Copy
|
||||
SourceFiles="$(OriginalNuGetConfigFile)"
|
||||
DestinationFiles="$(NuGetConfigFile)">
|
||||
<Output TaskParameter="CopiedFiles" ItemName="FileWrites" />
|
||||
</Copy>
|
||||
</Target>
|
||||
|
||||
<Target Name="UpdateNuGetConfig"
|
||||
Condition="'$(NuGetConfigFile)' != '' or '@(NuGetConfigFiles)' != ''"
|
||||
DependsOnTargets="CopyNuGetConfig"
|
||||
Condition="'$(NuGetConfigFile)' != ''"
|
||||
Inputs="$(MSBuildProjectFullPath)"
|
||||
Outputs="$(BaseIntermediateOutputPath)UpdateNuGetConfig.complete">
|
||||
<PropertyGroup>
|
||||
|
|
@ -90,49 +104,44 @@
|
|||
<NetSdkSupportingFeed>https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json</NetSdkSupportingFeed>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- Update the detected or manually specified NuGetConfigFile, but also allow multiple. -->
|
||||
<ItemGroup>
|
||||
<NuGetConfigFiles Include="$(NuGetConfigFile)" />
|
||||
</ItemGroup>
|
||||
|
||||
<RemoveInternetSourcesFromNuGetConfig
|
||||
NuGetConfigFile="%(NuGetConfigFiles.Identity)"
|
||||
NuGetConfigFile="$(NuGetConfigFile)"
|
||||
BuildWithOnlineFeeds="$(DotNetBuildWithOnlineFeeds)"
|
||||
KeepFeedPrefixes="@(KeepFeedPrefixes)"
|
||||
Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
|
||||
|
||||
<AddSourceToNuGetConfig NuGetConfigFile="%(NuGetConfigFiles.Identity)"
|
||||
<AddSourceToNuGetConfig NuGetConfigFile="$(NuGetConfigFile)"
|
||||
SourceName="$(PrebuiltNuGetSourceName)"
|
||||
SourcePath="$(PrebuiltPackagesPath)"
|
||||
Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
|
||||
|
||||
<AddSourceToNuGetConfig NuGetConfigFile="%(NuGetConfigFiles.Identity)"
|
||||
<AddSourceToNuGetConfig NuGetConfigFile="$(NuGetConfigFile)"
|
||||
SourceName="$(PreviouslySourceBuiltNuGetSourceName)"
|
||||
SourcePath="$(PrebuiltSourceBuiltPackagesPath)"
|
||||
Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
|
||||
|
||||
<AddSourceToNuGetConfig NuGetConfigFile="%(NuGetConfigFiles.Identity)"
|
||||
<AddSourceToNuGetConfig NuGetConfigFile="$(NuGetConfigFile)"
|
||||
SourceName="$(ReferencePackagesNuGetSourceName)"
|
||||
SourcePath="$(ReferencePackagesDir)"
|
||||
Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
|
||||
|
||||
<AddSourceToNuGetConfig NuGetConfigFile="%(NuGetConfigFiles.Identity)"
|
||||
<AddSourceToNuGetConfig NuGetConfigFile="$(NuGetConfigFile)"
|
||||
SourceName="$(SourceBuiltNuGetSourceName)"
|
||||
SourcePath="$(SourceBuiltPackagesPath)" />
|
||||
|
||||
<AddSourceToNuGetConfig NuGetConfigFile="%(NuGetConfigFiles.Identity)"
|
||||
<AddSourceToNuGetConfig NuGetConfigFile="$(NuGetConfigFile)"
|
||||
SourceName="$(ExtraSourcesNuGetSourceName)"
|
||||
SourcePath="$(ExtraRestoreSourcePath)"
|
||||
Condition="'$(ExtraRestoreSourcePath)' != ''" />
|
||||
|
||||
<!-- See root Directory.Build.props for value. -->
|
||||
<AddSourceToNuGetConfig NuGetConfigFile="%(NuGetConfigFiles.Identity)"
|
||||
<AddSourceToNuGetConfig NuGetConfigFile="$(NuGetConfigFile)"
|
||||
SourceName="$(NetSdkSupportingFeedName)"
|
||||
SourcePath="$(NetSdkSupportingFeed)"
|
||||
Condition="'$(AddNetSdkSupportingFeed)' == 'true'" />
|
||||
|
||||
<UpdateNuGetConfigPackageSourcesMappings
|
||||
NuGetConfigFile="%(NuGetConfigFiles.Identity)"
|
||||
NuGetConfigFile="$(NuGetConfigFile)"
|
||||
BuildWithOnlineFeeds="$(DotNetBuildWithOnlineFeeds)"
|
||||
SourceBuildSources="$(SourceBuildSources)" />
|
||||
|
||||
|
|
@ -572,16 +581,21 @@
|
|||
Condition="'@(BuiltSdkPackageOverride)' != ''"
|
||||
Inputs="$(MSBuildProjectFullPath)"
|
||||
Outputs="$(BaseIntermediateOutputPath)ExtractToolPackage.complete">
|
||||
<PropertyGroup>
|
||||
<_ToolPackagesRoot Condition="'$(RepositoryName)' != 'source-build-reference-packages'">$(SourceBuiltPackagesPath)</_ToolPackagesRoot>
|
||||
<_ToolPackagesRoot Condition="'$(RepositoryName)' == 'source-build-reference-packages'">$(ReferencePackagesDir)</_ToolPackagesRoot>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<_ToolPackage
|
||||
Condition="'%(BuiltSdkPackageOverride.Version)' == ''"
|
||||
Include="$(SourceBuiltPackagesPath)%(BuiltSdkPackageOverride.Identity)*.nupkg"
|
||||
Exclude="$(SourceBuiltPackagesPath)%(BuiltSdkPackageOverride.Identity)*.symbols.nupkg"
|
||||
Include="$(_ToolPackagesRoot)%(BuiltSdkPackageOverride.Identity)*.nupkg"
|
||||
Exclude="$(_ToolPackagesRoot)%(BuiltSdkPackageOverride.Identity)*.symbols.nupkg"
|
||||
Id="%(BuiltSdkPackageOverride.Identity)" />
|
||||
<_ToolPackage
|
||||
Condition="'%(BuiltSdkPackageOverride.Version)' != ''"
|
||||
Include="$(SourceBuiltPackagesPath)%(BuiltSdkPackageOverride.Identity).%(BuiltSdkPackageOverride.Version).nupkg"
|
||||
Exclude="$(SourceBuiltPackagesPath)%(BuiltSdkPackageOverride.Identity).%(BuiltSdkPackageOverride.Version).symbols.nupkg"
|
||||
Include="$(_ToolPackagesRoot)%(BuiltSdkPackageOverride.Identity).%(BuiltSdkPackageOverride.Version).nupkg"
|
||||
Exclude="$(_ToolPackagesRoot)%(BuiltSdkPackageOverride.Identity).%(BuiltSdkPackageOverride.Version).symbols.nupkg"
|
||||
Id="%(BuiltSdkPackageOverride.Identity)" />
|
||||
</ItemGroup>
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,13 @@
|
|||
<BuildArgs>$(BuildArgs) /p:LocalNuGetPackageCacheDirectory=$(LocalNuGetPackageCacheDirectory)</BuildArgs>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<BuiltSdkPackageOverride Include="@(NoTargetsSdkOverride)" />
|
||||
<BuiltSdkPackageOverride Include="@(TraversalSdkOverride)" />
|
||||
</ItemGroup>
|
||||
|
||||
<Target Name="AddLocalNuGetPackageCacheDirectory"
|
||||
AfterTargets="CopyNuGetConfig"
|
||||
BeforeTargets="UpdateNuGetConfig">
|
||||
<MakeDir Condition="'$(LocalNuGetPackageCacheDirectory)' != ''"
|
||||
Directories="$(LocalNuGetPackageCacheDirectory)" />
|
||||
|
|
|
|||
|
|
@ -0,0 +1,22 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Nikola Milosavljevic <nikolam@microsoft.com>
|
||||
Date: Wed, 31 Jan 2024 16:40:03 +0000
|
||||
Subject: [PATCH] Enable use of RestoreConfigFile property in source-build
|
||||
|
||||
Backport: https://github.com/dotnet/aspnetcore/pull/53738
|
||||
---
|
||||
eng/SourceBuild.props | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
|
||||
index 991a0e2e51..e637eb0143 100644
|
||||
--- a/eng/SourceBuild.props
|
||||
+++ b/eng/SourceBuild.props
|
||||
@@ -40,6 +40,7 @@
|
||||
<_AdditionalRepoTaskBuildArgs />
|
||||
<_AdditionalRepoTaskBuildArgs Condition="'$(DotNetRuntimeSourceFeed)' != ''" >$(_AdditionalRepoTaskBuildArgs) --runtimesourcefeed $(DotNetRuntimeSourceFeed)</_AdditionalRepoTaskBuildArgs>
|
||||
<_AdditionalRepoTaskBuildArgs Condition="'$(DotNetRuntimeSourceFeedKey)' != ''" >$(_AdditionalRepoTaskBuildArgs) --runtimesourcefeedkey $(DotNetRuntimeSourceFeedKey)</_AdditionalRepoTaskBuildArgs>
|
||||
+ <_AdditionalRepoTaskBuildArgs Condition="'$(RestoreConfigFile)' != ''" >$(_AdditionalRepoTaskBuildArgs) /p:RestoreConfigFile=$(RestoreConfigFile)</_AdditionalRepoTaskBuildArgs>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Nikola Milosavljevic <nikolam@microsoft.com>
|
||||
Date: Thu, 1 Feb 2024 20:38:17 +0000
|
||||
Subject: [PATCH] Add missing SDK dependency to global.json
|
||||
|
||||
Backport: https://github.com/dotnet/razor/pull/9886
|
||||
---
|
||||
global.json | 3 ++-
|
||||
.../Microsoft.NET.Sdk.Razor.SourceGenerators.Transport.csproj | 2 +-
|
||||
2 files changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/global.json b/global.json
|
||||
index ada577e39..c3c7a902c 100644
|
||||
--- a/global.json
|
||||
+++ b/global.json
|
||||
@@ -21,6 +21,7 @@
|
||||
"rollForward": "latestPatch"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
- "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24075.5"
|
||||
+ "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24075.5",
|
||||
+ "Microsoft.Build.NoTargets": "2.0.1"
|
||||
}
|
||||
}
|
||||
diff --git a/src/Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.Transport/Microsoft.NET.Sdk.Razor.SourceGenerators.Transport.csproj b/src/Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.Transport/Microsoft.NET.Sdk.Razor.SourceGenerators.Transport.csproj
|
||||
index b1f652079..91885d077 100644
|
||||
--- a/src/Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.Transport/Microsoft.NET.Sdk.Razor.SourceGenerators.Transport.csproj
|
||||
+++ b/src/Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.Transport/Microsoft.NET.Sdk.Razor.SourceGenerators.Transport.csproj
|
||||
@@ -1,4 +1,4 @@
|
||||
-<Project Sdk="Microsoft.Build.NoTargets/2.0.1">
|
||||
+<Project Sdk="Microsoft.Build.NoTargets">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Nikola Milosavljevic <nikolam@microsoft.com>
|
||||
Date: Wed, 31 Jan 2024 16:48:26 +0000
|
||||
Subject: [PATCH] Enable use of RestoreConfigFile property in source-build
|
||||
|
||||
Backport: https://github.com/dotnet/runtime/pull/97778
|
||||
---
|
||||
eng/SourceBuild.props | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
|
||||
index 3b544528694..dee4316dbbf 100644
|
||||
--- a/eng/SourceBuild.props
|
||||
+++ b/eng/SourceBuild.props
|
||||
@@ -51,6 +51,7 @@
|
||||
<InnerBuildArgs Condition="'$(OfficialBuildId)' != ''">$(InnerBuildArgs) /p:OfficialBuildId=$(OfficialBuildId)</InnerBuildArgs>
|
||||
<InnerBuildArgs Condition="'$(ContinuousIntegrationBuild)' != ''">$(InnerBuildArgs) /p:ContinuousIntegrationBuild=$(ContinuousIntegrationBuild)</InnerBuildArgs>
|
||||
<InnerBuildArgs Condition="'$(PortableBuild)' != ''">$(InnerBuildArgs) /p:PortableBuild=$(PortableBuild)</InnerBuildArgs>
|
||||
+ <InnerBuildArgs Condition="'$(RestoreConfigFile)' != ''">$(InnerBuildArgs) /p:RestoreConfigFile=$(RestoreConfigFile)</InnerBuildArgs>
|
||||
</PropertyGroup>
|
||||
</Target>
|
||||
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Nikola Milosavljevic <nikolam@microsoft.com>
|
||||
Date: Thu, 1 Feb 2024 20:49:37 +0000
|
||||
Subject: [PATCH] Add missing SDK dependency to global.json
|
||||
|
||||
Backport: https://github.com/dotnet/sdk/pull/38426
|
||||
---
|
||||
global.json | 3 ++-
|
||||
src/Containers/packaging/package.csproj | 2 +-
|
||||
2 files changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/global.json b/global.json
|
||||
index a294ff1e80..d79e46c295 100644
|
||||
--- a/global.json
|
||||
+++ b/global.json
|
||||
@@ -15,6 +15,7 @@
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24076.5",
|
||||
- "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24076.5"
|
||||
+ "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24076.5",
|
||||
+ "Microsoft.Build.NoTargets": "3.7.0"
|
||||
}
|
||||
}
|
||||
diff --git a/src/Containers/packaging/package.csproj b/src/Containers/packaging/package.csproj
|
||||
index 590b15e874..a3a40db735 100644
|
||||
--- a/src/Containers/packaging/package.csproj
|
||||
+++ b/src/Containers/packaging/package.csproj
|
||||
@@ -1,4 +1,4 @@
|
||||
-<Project Sdk="Microsoft.Build.NoTargets/3.7.0">
|
||||
+<Project Sdk="Microsoft.Build.NoTargets">
|
||||
<PropertyGroup>
|
||||
<TargetFramework>$(SdkTargetFramework)</TargetFramework>
|
||||
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
||||
Loading…
Reference in a new issue