这是indexloc提供的服务,不要输入任何密码
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
4 changes: 1 addition & 3 deletions Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
<PackageReference Update="FSharp.Compiler.Service" Version="28.0.0" />
</ItemGroup>

<Target Name="_InitializeAssemblyVersion">
<!-- don't let Arcade override assembly versions -->
</Target>
<Import Project="eng\targets\Versions.targets" Condition="'$(UseStableVersion)' == 'true'" />

</Project>
9 changes: 9 additions & 0 deletions MLS.Agent/Directory.Build.Props
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<Project>

<PropertyGroup>
<UseStableVersion>true</UseStableVersion>
</PropertyGroup>

<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />

</Project>
27 changes: 27 additions & 0 deletions eng/AfterSolutionBuild.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<Project>

<!--

This file is a terrible hack.


The `dotnet-try.*.nupkg` package is never rebuilt to have a stable version because that's handled manually. The fix
is to not allow it to be picked up by the repack targets by temporarily renaming it before the
`PackageReleasePackages` target and restoring it's name after.
-->

<ItemGroup>
<DotNetTryPackages Include="$(ArtifactsShippingPackagesDir)\dotnet-try.*.nupkg" />
</ItemGroup>

<!-- Appends the extension `.renamed` to the dotnet-try package to force the glob `*.nupkg` to not pick it up. -->
<Target Name="RenameDotNetTryOutputPackage" BeforeTargets="PackageReleasePackages">
<Move SourceFiles="%(DotNetTryPackages.FullPath)" DestinationFiles="%(DotNetTryPackages.FullPath).renamed" />
</Target>

<!-- Removes the `.renamed` extension from the dotnet-try package. -->
<Target Name="RestoreDotNetTryOutputPackage" AfterTargets="PackageReleasePackages">
<Move SourceFiles="%(DotNetTryPackages.FullPath).renamed" DestinationFiles="%(DotNetTryPackages.FullPath)" />
</Target>

</Project>
11 changes: 8 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,16 @@
<!-- opt-out properties -->
<UsingToolSourceLink>false</UsingToolSourceLink>
<!-- opt-in properties -->
<UsingToolNuGetRepack>true</UsingToolNuGetRepack>
<UsingToolSymbolUploader>true</UsingToolSymbolUploader>
<TestRunnerAdditionalArguments>-parallel none</TestRunnerAdditionalArguments>
</PropertyGroup>
<PropertyGroup>
<MajorVersion>1</MajorVersion>
<MinorVersion>0</MinorVersion>
<AutoGenerateAssemblyVersion>false</AutoGenerateAssemblyVersion>
<DotNetFinalVersionKind>release</DotNetFinalVersionKind>
<PatchVersion>0</PatchVersion>
<PreReleaseVersionLabel>beta</PreReleaseVersionLabel>
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
</PropertyGroup>
<PropertyGroup>
<!-- package settings -->
Expand All @@ -20,7 +22,10 @@
<PublishRepositoryUrl>false</PublishRepositoryUrl>
<RepositoryUrl>https://github.com/dotnet/try</RepositoryUrl>
</PropertyGroup>
<PropertyGroup>
<PropertyGroup Condition="'$(UseStableVersion)' == 'true'">
<AutoGenerateAssemblyVersion>false</AutoGenerateAssemblyVersion>
<DotNetFinalVersionKind>release</DotNetFinalVersionKind>
<PreReleaseVersionLabel></PreReleaseVersionLabel>
<!--
Mimic the build number calculation from here:
https://github.com/dotnet/arcade/blob/ce8e852e418ca52d28e562f9697fbb926d0b0bb1/src/Microsoft.DotNet.Arcade.Sdk/tools/Version.BeforeCommonTargets.targets#L24-L36
Expand Down
7 changes: 7 additions & 0 deletions eng/targets/Versions.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<Project>

<Target Name="_InitializeAssemblyVersion">
<!-- don't let Arcade override assembly versions -->
</Target>

</Project>