Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet-arcade dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26407.6</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26407.6</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetXliffTasksPackageVersion>11.0.0-beta.26407.6</MicrosoftDotNetXliffTasksPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26407.8</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26407.8</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetXliffTasksPackageVersion>11.0.0-beta.26407.8</MicrosoftDotNetXliffTasksPackageVersion>
<!-- dotnet-dotnet dependencies -->
<MicrosoftBclAsyncInterfacesPackageVersion>10.0.10</MicrosoftBclAsyncInterfacesPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>10.0.10</MicrosoftExtensionsConfigurationPackageVersion>
Expand Down
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,13 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26407.6">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26407.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>41232a67a0c1a77d425a6bef59ded8a81a2fdf3c</Sha>
<Sha>212960245c74330fbfb71776563638061e35446c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.26407.6">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.26407.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>41232a67a0c1a77d425a6bef59ded8a81a2fdf3c</Sha>
<Sha>212960245c74330fbfb71776563638061e35446c</Sha>
</Dependency>
<Dependency Name="Microsoft.DiaSymReader" Version="2.2.10">
<Uri>https://github.com/dotnet/symreader</Uri>
Expand All @@ -131,9 +131,9 @@
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>3d32d464e2949f054086fbb5346e4beea0c6df56</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26407.6">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26407.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>41232a67a0c1a77d425a6bef59ded8a81a2fdf3c</Sha>
<Sha>212960245c74330fbfb71776563638061e35446c</Sha>
</Dependency>
<!-- Entries below are necessary for source-build. This allows the packages to be retrieved from previously-source-built
artifacts and flow in as dependencies of the packages produced by roslyn. -->
Expand Down
6 changes: 1 addition & 5 deletions eng/targets/GeneratePkgDef.targets
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,6 @@
Note: We use None items since we do not want them to be included in VSIX and we want them to be displayed in Solution Explorer
(if we used Content items they would get included in the VSIX by VSSDK by default).
-->

<!-- TODO: Remove UsingTasks when upgrading to Arcade 11: https://github.com/dotnet/roslyn/issues/83095 -->
<UsingTask TaskName="Microsoft.DotNet.Build.Tasks.VisualStudio.GetPkgDefAssemblyDependencyGuid" AssemblyFile="$(ArcadeVisualStudioBuildTasksAssembly)" Condition="$(ArcadeSdkVersion.StartsWith('10'))" />
<UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.GetAssemblyFullName" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Condition="$(ArcadeSdkVersion.StartsWith('10'))" />

<Target Name="_SetGeneratePkgDefInputsOutputs">
<PropertyGroup>
Expand Down Expand Up @@ -311,4 +307,4 @@
<FileWrites Include="$(_GeneratePkgDefOutputFile)" />
</ItemGroup>
</Target>
</Project>
</Project>
4 changes: 0 additions & 4 deletions eng/targets/Imports.targets
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,6 @@
DestinationFolder="$(OutDir)" />
</Target>

<!-- TODO: Remove UsingTasks when upgrading to Arcade 11: https://github.com/dotnet/roslyn/issues/83095 -->
<UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.CompareVersions" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Condition="$(ArcadeSdkVersion.StartsWith('10'))" />
<UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.SingleError" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Condition="$(ArcadeSdkVersion.StartsWith('10'))" />

<Target Name="_CheckRequiredMSBuildVersion" BeforeTargets="BeforeBuild" Condition="'$(DotNetBuildSourceOnly)' != 'true'">
<CompareVersions Left="$(MSBuildVersion)" Right="$(MinimumMSBuildVersion)">
<Output TaskParameter="Result" PropertyName="_VersionComparisonResult"/>
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"xcopy-msbuild": "18.0.0"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26407.6",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26407.6",
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26407.8",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26407.8",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.Build.NoTargets": "3.7.0"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@
<!--
Workaround for https://github.com/dotnet/roslyn/issues/17864.
-->
<!-- TODO: Remove UsingTask when upgrading to Arcade 11: https://github.com/dotnet/roslyn/issues/83095 -->
<UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.SetCorFlags" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Condition="$(ArcadeSdkVersion.StartsWith('10'))" />

<Target Name="_Generate32BitCsc"
AfterTargets="Build"
Inputs="$(ArtifactsBinDir)csc\$(Configuration)\net472\csc.exe"
Expand Down
12 changes: 0 additions & 12 deletions src/Setup/DevDivInsertionFiles/DevDivInsertionFiles.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,6 @@
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
<Project Sdk="Microsoft.NET.Sdk">

<!-- TODO: Remove _NuGetRepackAssembly property when upgrading to Arcade 11: https://github.com/dotnet/roslyn/issues/83095 -->
<PropertyGroup>
<_NuGetRepackAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(NuGetPackageRoot)microsoft.dotnet.nugetrepack.tasks\$(MicrosoftDotnetNuGetRepackTasksVersion)\tools\net472\Microsoft.DotNet.NuGetRepack.Tasks.dll</_NuGetRepackAssembly>
<_NuGetRepackAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(NuGetPackageRoot)microsoft.dotnet.nugetrepack.tasks\$(MicrosoftDotnetNuGetRepackTasksVersion)\tools\netcoreapp2.1\Microsoft.DotNet.NuGetRepack.Tasks.dll</_NuGetRepackAssembly>
</PropertyGroup>

<!-- TODO: Remove UsingTasks when upgrading to Arcade 11: https://github.com/dotnet/roslyn/issues/83095 -->
<UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.GetAssemblyFullName" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Condition="$(ArcadeSdkVersion.StartsWith('10'))" />
<UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.GroupItemsBy" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Condition="$(ArcadeSdkVersion.StartsWith('10'))" />
<UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.Unsign" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Condition="$(ArcadeSdkVersion.StartsWith('10'))" />
<UsingTask TaskName="Microsoft.DotNet.Tools.ReplacePackageParts" AssemblyFile="$(_NuGetRepackAssembly)" />

<UsingTask TaskName="Microsoft.NET.Build.Tasks.JoinItems" AssemblyFile="$(MicrosoftNETBuildTasksAssembly)" />

<PropertyGroup>
Expand Down
Loading