Skip to content

Prepare repo to build 2.2.1 #493

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

Merged
merged 1 commit into from
Nov 14, 2018
Merged

Prepare repo to build 2.2.1 #493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
249 changes: 134 additions & 115 deletions eng/Baseline.props
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions eng/Dependencies.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project>
<Project>
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>
Expand All @@ -7,11 +7,11 @@
<PropertyGroup Label="Package Versions: Auto">
<FSharpCorePackageVersion>4.2.1</FSharpCorePackageVersion>
<InternalAspNetCoreSdkPackageVersion>2.2.0-preview2-20181105.3</InternalAspNetCoreSdkPackageVersion>
<MicrosoftNETCoreAppPackageVersion>2.2.0-rtm-27105-02</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreAppPackageVersion>2.2.0</MicrosoftNETCoreAppPackageVersion>
<MicrosoftWin32RegistryPackageVersion>4.5.0</MicrosoftWin32RegistryPackageVersion>
<NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
<SystemComponentModelAnnotationsPackageVersion>4.5.0</SystemComponentModelAnnotationsPackageVersion>
<SystemDataSqlClientPackageVersion>4.6.0-rtm-27105-02</SystemDataSqlClientPackageVersion>
<SystemDataSqlClientPackageVersion>4.6.0</SystemDataSqlClientPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>4.5.0</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemDiagnosticsEventLogPackageVersion>4.5.0</SystemDiagnosticsEventLogPackageVersion>
<SystemIOPipelinesPackageVersion>4.5.2</SystemIOPipelinesPackageVersion>
Expand Down
9 changes: 1 addition & 8 deletions eng/PatchConfig.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
<Project>

<PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.7' ">
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.1' ">
<PackagesInPatch>
</PackagesInPatch>
</PropertyGroup>

<PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.6' ">
<PackagesInPatch>
Microsoft.Extensions.ObjectPool;
Microsoft.Extensions.Primitives;
</PackagesInPatch>
</PropertyGroup>

</Project>
7 changes: 7 additions & 0 deletions eng/Sources.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@

<PropertyGroup Label="RestoreSources">
<RestoreSources>$(DotNetRestoreSources)</RestoreSources>

<!-- This feed contains the 2.2.0 RTM runtime. This can be removed after it is released to nuget.org. -->
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we add a post-release activity to clean up things like this?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this is necessary. The dotnet-core blob and myget feeds contain the 2.2.0 packages

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I'll open a bug on aspnetcore-internal to track this.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The dotnet-core blob and myget feeds contain the 2.2.0 packages

Cool, i'll remove this feed now. Didn't see this comment before I merged.

<RestoreSources>
$(RestoreSources);
https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-2/20181110-02/final/index.json
</RestoreSources>

<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' ">
$(RestoreSources);
https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
Expand Down
12 changes: 12 additions & 0 deletions eng/targets/ResolveReferences.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,18 @@
<PackageReference Include="@(_BaselinePackageReferenceWithVersion)" IsImplicitlyDefined="true" />
<Reference Remove="@(_BaselinePackageReferenceWithVersion)" />

<!-- For PrivateAssets=All references, fallback to LatestPackageReferences. -->
<_PrivatePackageReferenceWithVersion Include="@(Reference->WithMetadataValue('PrivateAssets', 'All'))">
<Id>%(LatestPackageReference.Identity)</Id>
<Version>%(LatestPackageReference.Version)</Version>
</_PrivatePackageReferenceWithVersion>

<_PrivatePackageReferenceWithVersion Remove="@(_PrivatePackageReferenceWithVersion)" Condition="'%(Id)' != '%(Identity)' " />

<!-- Remove reference items that have been resolved to a LatestPackageReference item. -->
<PackageReference Include="@(_PrivatePackageReferenceWithVersion)" IsImplicitlyDefined="true" />
<Reference Remove="@(_PrivatePackageReferenceWithVersion)" />

<!-- Free up memory for unnecessary items -->
<_BaselinePackageReferenceWithVersion Remove="@(_BaselinePackageReferenceWithVersion)" />
<_LatestPackageReferenceWithVersion Remove="@(_LatestPackageReferenceWithVersion)" />
Expand Down
12 changes: 9 additions & 3 deletions eng/tools/BaselineGenerator/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,13 @@ static void Main(string[] args)

private readonly CommandOption _source;
private readonly CommandOption _output;
private readonly CommandOption _feedv3;

public Program()
{
_source = Option("-s|--source <SOURCE>", "The NuGet v2 source of the package to fetch", CommandOptionType.SingleValue);
_output = Option("-o|--output <OUT>", "The generated file output path", CommandOptionType.SingleValue);
_feedv3 = Option("--v3", "Sources is nuget v3", CommandOptionType.NoValue);

Invoke = () => Run().GetAwaiter().GetResult();
}
Expand Down Expand Up @@ -78,11 +80,15 @@ private async Task<int> Run()

if (!File.Exists(nupkgPath))
{
var url = $"{source}/{id}/{version}";
var url = _feedv3.HasValue()
? $"{source}/{id.ToLowerInvariant()}/{version}/{id.ToLowerInvariant()}.{version}.nupkg"
Copy link

@muratg muratg Nov 14, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:/ I'm sure this will bite us elsewhere too. (nuget casing issues)

: $"{source}/{id}/{version}";
Console.WriteLine($"Downloading {url}");

var response = await client.GetStreamAsync(url);

using (var file = File.Create(nupkgPath))
{
Console.WriteLine($"Downloading {url}");
var response = await client.GetStreamAsync(url);
await response.CopyToAsync(file);
}
}
Expand Down
84 changes: 43 additions & 41 deletions eng/tools/BaselineGenerator/baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,44 @@
<Baseline Version="2.1.6">
<Package Id="Microsoft.Extensions.Caching.Abstractions" Version="2.1.2" />
<Package Id="Microsoft.Extensions.Caching.Memory" Version="2.1.2" />
<Package Id="Microsoft.Extensions.Caching.Redis" Version="2.1.2" />
<Package Id="Microsoft.Extensions.Caching.SqlServer" Version="2.1.2" />
<Package Id="Microsoft.Extensions.Configuration.Abstractions" Version="2.1.1" />
<Package Id="Microsoft.Extensions.Configuration.AzureKeyVault" Version="2.1.1" />
<Package Id="Microsoft.Extensions.Configuration.Binder" Version="2.1.1" />
<Package Id="Microsoft.Extensions.Configuration.CommandLine" Version="2.1.1" />
<Package Id="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.1.1" />
<Package Id="Microsoft.Extensions.Configuration.FileExtensions" Version="2.1.1" />
<Package Id="Microsoft.Extensions.Configuration.Ini" Version="2.1.1" />
<Package Id="Microsoft.Extensions.Configuration.Json" Version="2.1.1" />
<Package Id="Microsoft.Extensions.Configuration.KeyPerFile" Version="2.1.1" />
<Package Id="Microsoft.Extensions.Configuration.UserSecrets" Version="2.1.1" />
<Package Id="Microsoft.Extensions.Configuration.Xml" Version="2.1.1" />
<Package Id="Microsoft.Extensions.Configuration" Version="2.1.1" />
<Package Id="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.1" />
<Package Id="Microsoft.Extensions.DependencyInjection.Specification.Tests" Version="2.1.1" />
<Package Id="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
<Package Id="Microsoft.Extensions.DiagnosticAdapter" Version="2.1.0" />
<Package Id="Microsoft.Extensions.FileProviders.Abstractions" Version="2.1.1" />
<Package Id="Microsoft.Extensions.FileProviders.Composite" Version="2.1.1" />
<Package Id="Microsoft.Extensions.FileProviders.Embedded" Version="2.1.1" />
<Package Id="Microsoft.Extensions.FileProviders.Physical" Version="2.1.1" />
<Package Id="Microsoft.Extensions.FileSystemGlobbing" Version="2.1.1" />
<Package Id="Microsoft.Extensions.Logging.Abstractions" Version="2.1.1" />
<Package Id="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.1" />
<Package Id="Microsoft.Extensions.Logging.Configuration" Version="2.1.1" />
<Package Id="Microsoft.Extensions.Logging.Console" Version="2.1.1" />
<Package Id="Microsoft.Extensions.Logging.Debug" Version="2.1.1" />
<Package Id="Microsoft.Extensions.Logging.EventLog" Version="2.1.1" />
<Package Id="Microsoft.Extensions.Logging.EventSource" Version="2.1.1" />
<Package Id="Microsoft.Extensions.Logging.Testing" Version="2.1.1" />
<Package Id="Microsoft.Extensions.Logging.TraceSource" Version="2.1.1" />
<Package Id="Microsoft.Extensions.Logging" Version="2.1.1" />
<Package Id="Microsoft.Extensions.ObjectPool" Version="2.1.6" />
<Package Id="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" />
<Package Id="Microsoft.Extensions.Options" Version="2.1.1" />
<Package Id="Microsoft.Extensions.Primitives" Version="2.1.6" />
<Package Id="Microsoft.Extensions.WebEncoders" Version="2.1.1" />
<Baseline Version="2.2.0">
<Package Id="Microsoft.Extensions.Caching.Abstractions" Version="2.2.0" />
<Package Id="Microsoft.Extensions.Caching.Memory" Version="2.2.0" />
<Package Id="Microsoft.Extensions.Caching.Redis" Version="2.2.0" />
<Package Id="Microsoft.Extensions.Caching.SqlServer" Version="2.2.0" />
<Package Id="Microsoft.Extensions.Caching.StackExchangeRedis" Version="2.2.0" />
<Package Id="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
<Package Id="Microsoft.Extensions.Configuration.AzureKeyVault" Version="2.2.0" />
<Package Id="Microsoft.Extensions.Configuration.Binder" Version="2.2.0" />
<Package Id="Microsoft.Extensions.Configuration.CommandLine" Version="2.2.0" />
<Package Id="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.2.0" />
<Package Id="Microsoft.Extensions.Configuration.FileExtensions" Version="2.2.0" />
<Package Id="Microsoft.Extensions.Configuration.Ini" Version="2.2.0" />
<Package Id="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
<Package Id="Microsoft.Extensions.Configuration.KeyPerFile" Version="2.2.0" />
<Package Id="Microsoft.Extensions.Configuration.UserSecrets" Version="2.2.0" />
<Package Id="Microsoft.Extensions.Configuration.Xml" Version="2.2.0" />
<Package Id="Microsoft.Extensions.Configuration" Version="2.2.0" />
<Package Id="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.2.0" />
<Package Id="Microsoft.Extensions.DependencyInjection.Specification.Tests" Version="2.2.0" />
<Package Id="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
<Package Id="Microsoft.Extensions.DiagnosticAdapter" Version="2.2.0" />
<Package Id="Microsoft.Extensions.FileProviders.Abstractions" Version="2.2.0" />
<Package Id="Microsoft.Extensions.FileProviders.Composite" Version="2.2.0" />
<Package Id="Microsoft.Extensions.FileProviders.Embedded" Version="2.2.0" />
<Package Id="Microsoft.Extensions.FileProviders.Physical" Version="2.2.0" />
<Package Id="Microsoft.Extensions.FileSystemGlobbing" Version="2.2.0" />
<Package Id="Microsoft.Extensions.Logging.Abstractions" Version="2.2.0" />
<Package Id="Microsoft.Extensions.Logging.AzureAppServices" Version="2.2.0" />
<Package Id="Microsoft.Extensions.Logging.Configuration" Version="2.2.0" />
<Package Id="Microsoft.Extensions.Logging.Console" Version="2.2.0" />
<Package Id="Microsoft.Extensions.Logging.Debug" Version="2.2.0" />
<Package Id="Microsoft.Extensions.Logging.EventLog" Version="2.2.0" />
<Package Id="Microsoft.Extensions.Logging.EventSource" Version="2.2.0" />
<Package Id="Microsoft.Extensions.Logging.Testing" Version="2.2.0" />
<Package Id="Microsoft.Extensions.Logging.TraceSource" Version="2.2.0" />
<Package Id="Microsoft.Extensions.Logging" Version="2.2.0" />
<Package Id="Microsoft.Extensions.ObjectPool" Version="2.2.0" />
<Package Id="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
<Package Id="Microsoft.Extensions.Options.DataAnnotations" Version="2.2.0" />
<Package Id="Microsoft.Extensions.Options" Version="2.2.0" />
<Package Id="Microsoft.Extensions.Primitives" Version="2.2.0" />
<Package Id="Microsoft.Extensions.WebEncoders" Version="2.2.0" />
</Baseline>
2 changes: 2 additions & 0 deletions ...ls/Microsoft.AspNetCore.Analyzer.Testing/src/Microsoft.AspNetCore.Analyzer.Testing.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
<TargetFramework>netstandard2.0</TargetFramework>
<PackageTags>$(PackageTags);testing</PackageTags>
<EnableApiCheck>false</EnableApiCheck>
<!-- This package is internal, so we don't generate a package baseline. Always build against the latest dependencies. -->
<UseLatestPackageReferences>true</UseLatestPackageReferences>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 2 additions & 0 deletions src/TestingUtils/Microsoft.AspNetCore.Testing/src/Microsoft.AspNetCore.Testing.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
<PackageTags>aspnetcore</PackageTags>
<EnableApiCheck>false</EnableApiCheck>
<IsPackable>true</IsPackable>
<!-- This package is internal, so we don't generate a package baseline. Always build against the latest dependencies. -->
<UseLatestPackageReferences>true</UseLatestPackageReferences>
</PropertyGroup>

<ItemGroup>
Expand Down
11 changes: 2 additions & 9 deletions version.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@
<PropertyGroup>
<MajorVersion>2</MajorVersion>
<MinorVersion>2</MinorVersion>
<PatchVersion>0</PatchVersion>
<PreReleaseLabel>rtm</PreReleaseLabel>
<PreReleaseBrandingLabel></PreReleaseBrandingLabel>
<PatchVersion>1</PatchVersion>
<PreReleaseLabel>servicing</PreReleaseLabel>
<BuildNumber Condition="'$(BuildNumber)' == ''">$(BUILD_BUILDNUMBER)</BuildNumber>
<BuildNumber Condition="'$(BuildNumber)' == ''">t000</BuildNumber>
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
<VersionSuffix>$(PreReleaseLabel)-$(BuildNumber)</VersionSuffix>
<BrandingVersionSuffix>$(PreReleaseBrandingLabel) Build $(BuildNumber)</BrandingVersionSuffix>

<ExperimentalVersionPrefix>0.1.$(PatchVersion)</ExperimentalVersionPrefix>

Expand All @@ -20,10 +18,6 @@
<IncludePreReleaseLabelInPackageVersion>true</IncludePreReleaseLabelInPackageVersion>
<IncludePreReleaseLabelInPackageVersion Condition=" '$(IsFinalBuild)' == 'true' AND ('$(PreReleaseLabel)' == 'servicing' OR '$(PreReleaseLabel)' == 'rtm')">false</IncludePreReleaseLabelInPackageVersion>

<!-- The 'human friendly' version to display in installers. In pre-release builds, this might be "2.0.7 Preview 2 Build 12356". In final builds, it should be "2.0.7" -->
<PackageBrandingVersion>$(VersionPrefix)</PackageBrandingVersion>
<PackageBrandingVersion Condition=" '$(IncludePreReleaseLabelInPackageVersion)' == 'true' ">$(PackageBrandingVersion) $(BrandingVersionSuffix.Trim())</PackageBrandingVersion>

<!-- The version in files -->
<PackageVersion>$(VersionPrefix)</PackageVersion>
<PackageVersion Condition=" '$(IncludePreReleaseLabelInPackageVersion)' == 'true' ">$(VersionPrefix)-$(VersionSuffix)</PackageVersion>
Expand All @@ -45,7 +39,6 @@
<Target Name="InspectVersionNumbers">
<Message Importance="High" Text="InformationalVersion = '$(InformationalVersion)'" />
<Message Importance="High" Text="PackageVersion = '$(PackageVersion)'" />
<Message Importance="High" Text="PackageBrandingVersion = '$(PackageBrandingVersion)'" />
</Target>

</Project>