diff --git a/eng/Baseline.props b/eng/Baseline.props
index d70e21d4e4b..be4e42c4d90 100644
--- a/eng/Baseline.props
+++ b/eng/Baseline.props
@@ -2,166 +2,175 @@
$(MSBuildAllProjects);$(MSBuildThisFileFullPath)
- 2.1.6
+ 2.2.0
- 2.1.2
+ 2.2.0
-
+
- 2.1.2
+ 2.2.0
-
-
-
+
+
+
- 2.1.2
+ 2.2.0
-
-
+
+
- 2.1.2
+ 2.2.0
-
-
-
+
+
+
+
+
+
+ 2.2.0
+
+
+
+
+
- 2.1.1
+ 2.2.0
-
+
- 2.1.1
+ 2.2.0
-
-
+
+
- 2.1.1
+ 2.2.0
-
+
- 2.1.1
+ 2.2.0
-
+
- 2.1.1
+ 2.2.0
-
+
- 2.1.1
+ 2.2.0
-
-
+
+
- 2.1.1
+ 2.2.0
-
-
+
+
- 2.1.1
+ 2.2.0
-
-
+
+
- 2.1.1
+ 2.2.0
-
-
+
+
- 2.1.1
+ 2.2.0
-
+
- 2.1.1
+ 2.2.0
-
-
+
+
- 2.1.1
+ 2.2.0
-
+
- 2.1.1
+ 2.2.0
- 2.1.1
+ 2.2.0
-
+
- 2.1.1
+ 2.2.0
-
+
-
+
-
+
- 2.1.0
+ 2.2.0
@@ -174,180 +183,190 @@
- 2.1.1
+ 2.2.0
-
+
- 2.1.1
+ 2.2.0
-
+
- 2.1.1
+ 2.2.0
-
+
- 2.1.1
+ 2.2.0
-
-
+
+
- 2.1.1
+ 2.2.0
- 2.1.1
+ 2.2.0
- 2.1.1
+ 2.2.0
-
-
-
-
-
+
+
+
+
+
- 2.1.1
+ 2.2.0
-
-
+
+
- 2.1.1
+ 2.2.0
-
-
-
+
+
+
- 2.1.1
+ 2.2.0
-
+
- 2.1.1
+ 2.2.0
-
+
-
+
- 2.1.1
+ 2.2.0
-
+
- 2.1.1
+ 2.2.0
-
-
-
-
+
+
+
+
-
+
-
-
-
-
+
+
+
+
-
+
- 2.1.1
+ 2.2.0
-
+
- 2.1.1
+ 2.2.0
-
-
-
-
+
+
+
+
- 2.1.6
+ 2.2.0
- 2.1.1
+ 2.2.0
-
-
-
-
+
+
+
+
+
+
+
+ 2.2.0
+
+
+
+
+
- 2.1.1
+ 2.2.0
-
-
+
+
+
- 2.1.6
+ 2.2.0
-
+
- 2.1.1
+ 2.2.0
-
-
+
+
\ No newline at end of file
diff --git a/eng/Dependencies.props b/eng/Dependencies.props
index b9dca1fbdb9..bf5b9328388 100644
--- a/eng/Dependencies.props
+++ b/eng/Dependencies.props
@@ -1,4 +1,4 @@
-
+
$(MSBuildAllProjects);$(MSBuildThisFileFullPath)
@@ -7,11 +7,11 @@
4.2.1
2.2.0-preview2-20181105.3
- 2.2.0-rtm-27105-02
+ 2.2.0
4.5.0
2.0.3
4.5.0
- 4.6.0-rtm-27105-02
+ 4.6.0
4.5.0
4.5.0
4.5.2
diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props
index 9fc0361d899..2f1bb65513f 100644
--- a/eng/PatchConfig.props
+++ b/eng/PatchConfig.props
@@ -1,15 +1,8 @@
-
+
-
-
- Microsoft.Extensions.ObjectPool;
- Microsoft.Extensions.Primitives;
-
-
-
diff --git a/eng/Sources.props b/eng/Sources.props
index 28a7e2f81cc..7f8dd19d180 100644
--- a/eng/Sources.props
+++ b/eng/Sources.props
@@ -3,6 +3,13 @@
$(DotNetRestoreSources)
+
+
+
+ $(RestoreSources);
+ https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-2/20181110-02/final/index.json
+
+
$(RestoreSources);
https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets
index f1b4b44ee5a..7d00f094a23 100644
--- a/eng/targets/ResolveReferences.targets
+++ b/eng/targets/ResolveReferences.targets
@@ -82,6 +82,18 @@
+
+ <_PrivatePackageReferenceWithVersion Include="@(Reference->WithMetadataValue('PrivateAssets', 'All'))">
+ %(LatestPackageReference.Identity)
+ %(LatestPackageReference.Version)
+
+
+ <_PrivatePackageReferenceWithVersion Remove="@(_PrivatePackageReferenceWithVersion)" Condition="'%(Id)' != '%(Identity)' " />
+
+
+
+
+
<_BaselinePackageReferenceWithVersion Remove="@(_BaselinePackageReferenceWithVersion)" />
<_LatestPackageReferenceWithVersion Remove="@(_LatestPackageReferenceWithVersion)" />
diff --git a/eng/tools/BaselineGenerator/Program.cs b/eng/tools/BaselineGenerator/Program.cs
index 73c22bcdecb..358a68f3356 100644
--- a/eng/tools/BaselineGenerator/Program.cs
+++ b/eng/tools/BaselineGenerator/Program.cs
@@ -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 ", "The NuGet v2 source of the package to fetch", CommandOptionType.SingleValue);
_output = Option("-o|--output ", "The generated file output path", CommandOptionType.SingleValue);
+ _feedv3 = Option("--v3", "Sources is nuget v3", CommandOptionType.NoValue);
Invoke = () => Run().GetAwaiter().GetResult();
}
@@ -78,11 +80,15 @@ private async Task Run()
if (!File.Exists(nupkgPath))
{
- var url = $"{source}/{id}/{version}";
+ var url = _feedv3.HasValue()
+ ? $"{source}/{id.ToLowerInvariant()}/{version}/{id.ToLowerInvariant()}.{version}.nupkg"
+ : $"{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);
}
}
diff --git a/eng/tools/BaselineGenerator/baseline.xml b/eng/tools/BaselineGenerator/baseline.xml
index 1d493d5380c..8b96a71672d 100644
--- a/eng/tools/BaselineGenerator/baseline.xml
+++ b/eng/tools/BaselineGenerator/baseline.xml
@@ -1,42 +1,44 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/TestingUtils/Microsoft.AspNetCore.Analyzer.Testing/src/Microsoft.AspNetCore.Analyzer.Testing.csproj b/src/TestingUtils/Microsoft.AspNetCore.Analyzer.Testing/src/Microsoft.AspNetCore.Analyzer.Testing.csproj
index 0930dc8f96a..15259c0539d 100644
--- a/src/TestingUtils/Microsoft.AspNetCore.Analyzer.Testing/src/Microsoft.AspNetCore.Analyzer.Testing.csproj
+++ b/src/TestingUtils/Microsoft.AspNetCore.Analyzer.Testing/src/Microsoft.AspNetCore.Analyzer.Testing.csproj
@@ -5,6 +5,8 @@
netstandard2.0
$(PackageTags);testing
false
+
+ true
diff --git a/src/TestingUtils/Microsoft.AspNetCore.Testing/src/Microsoft.AspNetCore.Testing.csproj b/src/TestingUtils/Microsoft.AspNetCore.Testing/src/Microsoft.AspNetCore.Testing.csproj
index d9d9008dd2b..64e0b3c4e1d 100644
--- a/src/TestingUtils/Microsoft.AspNetCore.Testing/src/Microsoft.AspNetCore.Testing.csproj
+++ b/src/TestingUtils/Microsoft.AspNetCore.Testing/src/Microsoft.AspNetCore.Testing.csproj
@@ -8,6 +8,8 @@
aspnetcore
false
true
+
+ true
diff --git a/version.props b/version.props
index a2511a63fb5..c2a13f14f2d 100644
--- a/version.props
+++ b/version.props
@@ -2,14 +2,12 @@
2
2
- 0
- rtm
-
+ 1
+ servicing
$(BUILD_BUILDNUMBER)
t000
$(MajorVersion).$(MinorVersion).$(PatchVersion)
$(PreReleaseLabel)-$(BuildNumber)
- $(PreReleaseBrandingLabel) Build $(BuildNumber)
0.1.$(PatchVersion)
@@ -20,10 +18,6 @@
true
false
-
- $(VersionPrefix)
- $(PackageBrandingVersion) $(BrandingVersionSuffix.Trim())
-
$(VersionPrefix)
$(VersionPrefix)-$(VersionSuffix)
@@ -45,7 +39,6 @@
-