Skip to content

[main] Update dependencies from dotnet/arcade dotnet/xharness dotnet/msquic dotnet/emsdk #67436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 19 commits into from
Closed

[main] Update dependencies from dotnet/arcade dotnet/xharness dotnet/msquic dotnet/emsdk #67436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
081bb4e
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Apr 1, 2022
bbb54ba
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Apr 1, 2022
ccd828f
Update dependencies from https://github.com/dotnet/msquic build 20220…
dotnet-maestro[bot] Apr 1, 2022
cd17f2d
Update dependencies from https://github.com/dotnet/emsdk build 202204…
dotnet-maestro[bot] Apr 1, 2022
bec50ed
Bump tools version to .NET 7
hoyosjs Apr 2, 2022
8a961be
Move non-netfx tasks to 7.0
hoyosjs Apr 2, 2022
b4a931f
Merge remote-tracking branch 'upstream/main' into darc-main-e8f262cb-…
agocke Apr 3, 2022
9f29dac
Also change the TFM for the tasks
agocke Apr 4, 2022
be679a2
Merge branch 'darc-main-e8f262cb-ba2a-48ad-af27-9f469127294b' of gith…
agocke Apr 4, 2022
fbcdfb9
Also update wasm
agocke Apr 4, 2022
4f78ef5
Update AssemblyStripper.csproj
agocke Apr 4, 2022
f11f9a4
Fix build for net7.0
radical Apr 5, 2022
91f871d
Update src/tasks/MonoTargetsTasks/ILStrip/AssemblyStripper/AssemblySt…
jkotas Apr 5, 2022
60ead9b
Populate target framework versions for tasks, and generated nugets based
radical Apr 5, 2022
6fe6d9b
Version substitution for MonoTargets nuget
radical Apr 5, 2022
07d50d3
Version substitution for MonoAOTCompiler nuget
radical Apr 5, 2022
848c39b
sendhelixhelp.proj: Ensure that DotNetCliVersion gets overridden, as
radical Apr 5, 2022
d4d81e3
Merge remote-tracking branch 'origin/main' into darc-main-e8f262cb-ba…
radical Apr 5, 2022
c5e4535
Merge branch 'main' into darc-main-e8f262cb-ba2a-48ad-af27-9f469127294b
lewing Apr 7, 2022
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
8 changes: 7 additions & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<NetCoreAppCurrent>net$(NetCoreAppCurrentVersion)</NetCoreAppCurrent>
<NetCoreAppMinimum>net6.0</NetCoreAppMinimum>

<NetCoreAppToolCurrentVersion>6.0</NetCoreAppToolCurrentVersion>
<NetCoreAppToolCurrentVersion>7.0</NetCoreAppToolCurrentVersion>
<NetCoreAppToolCurrent>net$(NetCoreAppToolCurrentVersion)</NetCoreAppToolCurrent>
<NetCoreAppCurrentToolTargetFrameworkMoniker>$(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppToolCurrentVersion)</NetCoreAppCurrentToolTargetFrameworkMoniker>

Expand All @@ -68,6 +68,12 @@
<NetFrameworkToolCurrent>net472</NetFrameworkToolCurrent>
<!-- Don't build for NETFramework during source-build. -->
<NetFrameworkToolCurrent Condition="'$(DotNetBuildFromSource)' == 'true'" />

<TargetFrameworkForNETFrameworkTasks>$(NetFrameworkToolCurrent)</TargetFrameworkForNETFrameworkTasks>
<!-- Don't build for NETFramework during source-build. -->
<TargetFrameworkForNETFrameworkTasks Condition="'$(DotNetBuildFromSource)' == 'true'" />

<TargetFrameworkForNETCoreTasks>$(NetCoreAppToolCurrent)</TargetFrameworkForNETCoreTasks>
</PropertyGroup>

<PropertyGroup>
Expand Down
84 changes: 42 additions & 42 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<Uri>https://github.com/dotnet/icu</Uri>
<Sha>50877d02014f8d6540a3c056feb34bf912c92141</Sha>
</Dependency>
<Dependency Name="System.Net.MsQuic.Transport" Version="7.0.0-alpha.1.22173.2">
<Dependency Name="System.Net.MsQuic.Transport" Version="7.0.0-alpha.1.22181.2">
<Uri>https://github.com/dotnet/msquic</Uri>
<Sha>03def3e4f051aa09f9642a6a839a0c806682536e</Sha>
<Sha>417bdeac3988ec59ee7f6c045ae03d2193bcdab0</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-preview.4.22178.1">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-preview.4.22201.2">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>ac46fa88e66788611803e55bb856bd9b508183c9</Sha>
<Sha>eb809c8854de4d1bdf227a55550af01a1bb38e4b</Sha>
</Dependency>
<Dependency Name="System.ServiceModel.Primitives" Version="4.9.0-rc2.21473.1">
<Uri>https://github.com/dotnet/wcf</Uri>
Expand Down Expand Up @@ -54,77 +54,77 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22179.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22181.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1527dc867ccb652def4c0f57fbd2ebbed3a94019</Sha>
<Sha>e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22179.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22181.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1527dc867ccb652def4c0f57fbd2ebbed3a94019</Sha>
<Sha>e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22179.1">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22181.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1527dc867ccb652def4c0f57fbd2ebbed3a94019</Sha>
<Sha>e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22179.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22181.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1527dc867ccb652def4c0f57fbd2ebbed3a94019</Sha>
<Sha>e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22179.1">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22181.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1527dc867ccb652def4c0f57fbd2ebbed3a94019</Sha>
<Sha>e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22179.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22181.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1527dc867ccb652def4c0f57fbd2ebbed3a94019</Sha>
<Sha>e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22179.1">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22181.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1527dc867ccb652def4c0f57fbd2ebbed3a94019</Sha>
<Sha>e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22179.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22181.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1527dc867ccb652def4c0f57fbd2ebbed3a94019</Sha>
<Sha>e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22179.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22181.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1527dc867ccb652def4c0f57fbd2ebbed3a94019</Sha>
<Sha>e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22179.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22181.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1527dc867ccb652def4c0f57fbd2ebbed3a94019</Sha>
<Sha>e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22179.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22181.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1527dc867ccb652def4c0f57fbd2ebbed3a94019</Sha>
<Sha>e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22179.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22181.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1527dc867ccb652def4c0f57fbd2ebbed3a94019</Sha>
<Sha>e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22179.1">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22181.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1527dc867ccb652def4c0f57fbd2ebbed3a94019</Sha>
<Sha>e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22179.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22181.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1527dc867ccb652def4c0f57fbd2ebbed3a94019</Sha>
<Sha>e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22179.1">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22181.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1527dc867ccb652def4c0f57fbd2ebbed3a94019</Sha>
<Sha>e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22179.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22181.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1527dc867ccb652def4c0f57fbd2ebbed3a94019</Sha>
<Sha>e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22179.1">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22181.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1527dc867ccb652def4c0f57fbd2ebbed3a94019</Sha>
<Sha>e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22179.1">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22181.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1527dc867ccb652def4c0f57fbd2ebbed3a94019</Sha>
<Sha>e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
<Uri>https://github.com/microsoft/vstest</Uri>
Expand Down Expand Up @@ -250,9 +250,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>f9a28aefa80424a69f3ce16e845c4e01e5d8c17e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22179.1">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22181.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1527dc867ccb652def4c0f57fbd2ebbed3a94019</Sha>
<Sha>e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22121.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
36 changes: 18 additions & 18 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,22 +53,22 @@
<!-- SDK dependencies -->
<MicrosoftDotNetCompatibilityVersion>2.0.0-alpha.1.21525.11</MicrosoftDotNetCompatibilityVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22179.1</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22179.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22179.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.22179.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22179.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22179.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22179.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22179.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22179.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22179.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22179.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22179.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22179.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22179.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22179.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22179.1</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22181.2</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22181.2</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22181.2</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.22181.2</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22181.2</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22181.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22181.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22181.2</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22181.2</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22181.2</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22181.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22181.2</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22181.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22181.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22181.2</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22181.2</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down Expand Up @@ -181,7 +181,7 @@
<!-- ICU -->
<MicrosoftNETCoreRuntimeICUTransportVersion>7.0.0-preview.4.22178.2</MicrosoftNETCoreRuntimeICUTransportVersion>
<!-- MsQuic -->
<SystemNetMsQuicTransportVersion>7.0.0-alpha.1.22173.2</SystemNetMsQuicTransportVersion>
<SystemNetMsQuicTransportVersion>7.0.0-alpha.1.22181.2</SystemNetMsQuicTransportVersion>
<!-- Mono LLVM -->
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22178.2</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22178.2</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
Expand All @@ -192,7 +192,7 @@
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22178.2</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22178.2</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<!-- emscripten / Node -->
<MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-preview.4.22178.1</MicrosoftNETWorkloadEmscriptenManifest70100Version>
<MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-preview.4.22201.2</MicrosoftNETWorkloadEmscriptenManifest70100Version>
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenManifest70100Version)</MicrosoftNETRuntimeEmscriptenVersion>
<!-- workloads -->
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>
Expand Down
10 changes: 5 additions & 5 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"sdk": {
"version": "6.0.100",
"version": "7.0.100-preview.2.22153.17",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
"dotnet": "6.0.100"
"dotnet": "7.0.100-preview.2.22153.17"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22179.1",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22179.1",
"Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22179.1",
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22181.2",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22181.2",
"Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22181.2",
"Microsoft.Build.NoTargets": "3.3.0",
"Microsoft.Build.Traversal": "3.1.6",
"Microsoft.NET.Sdk.IL": "7.0.0-preview.3.22171.1"
Expand Down
10 changes: 5 additions & 5 deletions src/libraries/sendtohelixhelp.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,11 +143,6 @@
<DotNetCliPackageType>sdk</DotNetCliPackageType>
</PropertyGroup>

<PropertyGroup Condition="'$(UseDotNetCliVersionFromGlobalJson)' == 'true'">
<GlobalJsonContent>$([System.IO.File]::ReadAllText('$(RepoRoot)global.json'))</GlobalJsonContent>
<DotNetCliVersion>$([System.Text.RegularExpressions.Regex]::Match($(GlobalJsonContent), '(%3F&lt;="dotnet": ").*(%3F=")'))</DotNetCliVersion>
</PropertyGroup>

<ItemGroup>
<HelixProperties Condition="'$(RuntimeFlavor)' != ''" Include="runtimeFlavor" Value="$(RuntimeFlavor)" />
<HelixProperties Condition="'$(Scenario)' != ''" Include="scenario" Value="$(Scenario)" />
Expand All @@ -156,6 +151,11 @@
<!-- Ensure that all HelixPreCommand items are ready before this -->
<Target Name="BuildHelixCommand">

<PropertyGroup Condition="'$(UseDotNetCliVersionFromGlobalJson)' == 'true'">
<GlobalJsonContent>$([System.IO.File]::ReadAllText('$(RepoRoot)global.json'))</GlobalJsonContent>
<DotNetCliVersion>$([System.Text.RegularExpressions.Regex]::Match($(GlobalJsonContent), '(%3F&lt;="dotnet": ").*(%3F=")'))</DotNetCliVersion>
</PropertyGroup>

<PropertyGroup>
<HelixPreCommands>@(HelixPreCommand)</HelixPreCommands>
<HelixCommandPrefix Condition="'$(WindowsShell)' == 'true' and @(HelixCommandPrefixItem->Count()) > 0" >$(HelixCommandPrefix) @(HelixCommandPrefixItem -> 'set &quot;%(Identity)&quot;', ' &amp; ')</HelixCommandPrefix>
Expand Down
21 changes: 20 additions & 1 deletion ...osoft.NET.Runtime.MonoAOTCompiler.Task/Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,28 @@
<ItemGroup>
<ProjectReference Include="$(RepoTasksDir)AotCompilerTask\MonoAOTCompiler.csproj" />

<PackageFile Include="Sdk\Sdk.props" TargetPath="Sdk" />
<PackageFile Include="build\$(MSBuildProjectName).props" TargetPath="build" />
</ItemGroup>

<Target Name="_PrepareForPack" BeforeTargets="GetPackageFiles">
<PropertyGroup>
<SdkPropsPath>$(IntermediateOutputPath)Sdk.props</SdkPropsPath>
</PropertyGroup>

<ItemGroup>
<_ReplacementValue Include="TargetFrameworkForNETCoreTasks" Value="$(TargetFrameworkForNETCoreTasks)" />
<_ReplacementValue Include="TargetFrameworkForNETFrameworkTasks" Value="$(TargetFrameworkForNETFrameworkTasks)" />
</ItemGroup>

<GenerateFileFromTemplate
TemplateFile="Sdk/Sdk.props.in"
Properties="@(_ReplacementValue)"
OutputPath="$(SdkPropsPath)" />

<ItemGroup>
<PackageFile Include="$(SdkPropsPath)" TargetPath="Sdk" />
</ItemGroup>
</Target>

<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
</Project>
7 changes: 0 additions & 7 deletions src/mono/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Sdk/Sdk.props
View file
Open in desktop

This file was deleted.

7 changes: 7 additions & 0 deletions src/mono/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Sdk/Sdk.props.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<Project>
<PropertyGroup>
<MonoAOTCompilerTasksAssemblyPath Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tasks\${TargetFrameworkForNETCoreTasks}\MonoAOTCompiler.dll</MonoAOTCompilerTasksAssemblyPath>
<MonoAOTCompilerTasksAssemblyPath Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tasks\${TargetFrameworkForNETFrameworkTasks}\MonoAOTCompiler.dll</MonoAOTCompilerTasksAssemblyPath>
</PropertyGroup>
<UsingTask TaskName="MonoAOTCompiler" AssemblyFile="$(MonoAOTCompilerTasksAssemblyPath)" />
</Project>
Loading