Skip to content

Commit

Permalink
Merge pull request #1883 from StephenBonikowsky/UpdateToOfficialPrevi…
Browse files Browse the repository at this point in the history
…ew1PkgDependencies

Updating to official preview1 dependency builds.
  • Loading branch information
StephenBonikowsky authored May 3, 2017
2 parents 5681627 + 3fc55d2 commit 5b04dd9
Show file tree
Hide file tree
Showing 16 changed files with 55 additions and 55 deletions.
8 changes: 4 additions & 4 deletions dependencies.props
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- Source of truth for dependency tooling: the commit hash of the dotnet/versions master branch as of the last auto-upgrade. -->
<PropertyGroup>
<CoreFxCurrentRef>65e6186cee146b0dbe65dcfab0055c6c5c635cbd</CoreFxCurrentRef>
<CoreClrCurrentRef>65e6186cee146b0dbe65dcfab0055c6c5c635cbd</CoreClrCurrentRef>
<CoreFxCurrentRef>37a403b8d4534caa5f359d4d3ec4d02f9b6077a4</CoreFxCurrentRef>
<CoreClrCurrentRef>c2ec9626f15debe0348f0b125654f6eb1c56aaba</CoreClrCurrentRef>
<WCFCurrentRef>c9a03fe0c3309508cb509a4ffdd6dc8b79ed525e</WCFCurrentRef>
</PropertyGroup>

<!-- Auto-upgraded properties for each build info dependency. -->
<PropertyGroup>
<CoreFxExpectedPrerelease>preview1-25228-02</CoreFxExpectedPrerelease>
<StandardExpectedPrerelease>preview1-25228-01</StandardExpectedPrerelease>
<CoreFxExpectedPrerelease>preview1-25302-01</CoreFxExpectedPrerelease>
<StandardExpectedPrerelease>preview1-25301-01</StandardExpectedPrerelease>
</PropertyGroup>

<!-- Full package version strings that are used in other parts of the build. -->
Expand Down
2 changes: 1 addition & 1 deletion pkg/baseline/baseline.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<CoreFxBaseLinePackageName>Microsoft.Private.PackageBaseline</CoreFxBaseLinePackageName>
<CoreFxBaseLinePackageVersion>2.0.0-preview1-25228-01</CoreFxBaseLinePackageVersion>
<CoreFxBaseLinePackageVersion>2.0.0-preview1-25302-01</CoreFxBaseLinePackageVersion>
<!-- NuGet doesn't currently write out the versionless props/targets for this, so manually pull it in from packages folder -->
<CoreFxBaseLinePackageProps Condition="'$(CoreFxBaseLinePackageProps)' == ''">$(PackagesDir)$(CoreFxBaseLinePackageName)/$(CoreFxBaseLinePackageVersion)/build/$(CoreFxBaseLinePackageName).props</CoreFxBaseLinePackageProps>

Expand Down
2 changes: 1 addition & 1 deletion pkg/baseline/project.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"dependencies": {
"Microsoft.Private.PackageBaseline": "2.0.0-preview1-25228-01",
"Microsoft.Private.PackageBaseline": "2.0.0-preview1-25302-01",
"System.ServiceModel.Duplex": "4.3.0",
"System.ServiceModel.Http": "4.3.0",
"System.ServiceModel.NetTcp": "4.3.0",
Expand Down
26 changes: 13 additions & 13 deletions src/Common/test-runtime/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
"coveralls.io": "1.4",
"OpenCover": "4.6.519",
"ReportGenerator": "2.4.3",
"Microsoft.NETCore.TestHost": "2.0.0-preview1-25228-01",
"NETStandard.Library": "2.0.0-preview1-25228-01",
"Microsoft.NETCore.TestHost": "2.0.0-preview1-25301-02",
"NETStandard.Library": "2.0.0-preview1-25301-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04",
"xunit.console.netcore": "1.0.3-prerelease-00925-01",
"Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04",
"System.Reflection.DispatchProxy": "4.4.0-preview1-25228-02",
"System.Reflection.DispatchProxy": "4.4.0-preview1-25302-01",
"System.ServiceModel.Duplex": "4.4.0-preview1-25302-01",
"System.ServiceModel.Http": "4.4.0-preview1-25302-01",
"System.ServiceModel.NetTcp": "4.4.0-preview1-25302-01",
Expand All @@ -25,8 +25,8 @@
"coveralls.io": "1.4",
"OpenCover": "4.6.519",
"ReportGenerator": "2.4.3",
"Microsoft.NETCore.TestHost": "2.0.0-preview1-25228-01",
"Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25228-01",
"Microsoft.NETCore.TestHost": "2.0.0-preview1-25301-02",
"Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25301-02",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04",
"xunit.console.netcore": "1.0.3-prerelease-00925-01",
"Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04",
Expand All @@ -40,7 +40,7 @@
"System.Net.Http": "4.4.0-preview1-25218-03",
"System.Net.WebHeaderCollection": "4.4.0-beta-24911-02",
"System.Net.WebSockets.Client": "4.4.0-beta-24911-02",
"System.Reflection.DispatchProxy": "4.4.0-preview1-25228-02",
"System.Reflection.DispatchProxy": "4.4.0-preview1-25302-01",
"System.Reflection.Extensions": "4.4.0-beta-24911-02",
"System.ServiceModel.Duplex": "4.4.0-preview1-25302-01",
"System.ServiceModel.Http": "4.4.0-preview1-25302-01",
Expand All @@ -60,8 +60,8 @@
"coveralls.io": "1.4",
"OpenCover": "4.6.519",
"ReportGenerator": "2.4.3",
"Microsoft.NETCore.TestHost": "2.0.0-preview1-25228-01",
"Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25228-01",
"Microsoft.NETCore.TestHost": "2.0.0-preview1-25301-02",
"Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25301-02",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04",
"xunit.console.netcore": "1.0.3-prerelease-00925-01",
"Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04",
Expand All @@ -75,7 +75,7 @@
"System.Net.Http": "4.4.0-preview1-25218-03",
"System.Net.WebHeaderCollection": "4.4.0-beta-24911-02",
"System.Net.WebSockets.Client": "4.4.0-beta-24911-02",
"System.Reflection.DispatchProxy": "4.4.0-preview1-25228-02",
"System.Reflection.DispatchProxy": "4.4.0-preview1-25302-01",
"System.Reflection.Extensions": "4.4.0-beta-24911-02",
"System.ServiceModel.Duplex": "4.4.0-preview1-25302-01",
"System.ServiceModel.Http": "4.4.0-preview1-25302-01",
Expand All @@ -94,7 +94,7 @@
"coveralls.io": "1.4",
"OpenCover": "4.6.519",
"ReportGenerator": "2.4.3",
"Microsoft.NETCore.TestHost": "2.0.0-preview1-25228-01",
"Microsoft.NETCore.TestHost": "2.0.0-preview1-25301-02",
"Microsoft.NETCore.App": "2.0.0-preview1-002101-00",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04",
"xunit.console.netcore": "1.0.3-prerelease-00925-01",
Expand Down Expand Up @@ -1026,8 +1026,8 @@
"coveralls.io": "1.4",
"OpenCover": "4.6.519",
"ReportGenerator": "2.4.3",
"Microsoft.NETCore.TestHost": "2.0.0-preview1-25228-01",
"Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25228-01",
"Microsoft.NETCore.TestHost": "2.0.0-preview1-25301-02",
"Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25301-02",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04",
"xunit.console.netcore": "1.0.3-prerelease-00925-01",
"Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04",
Expand All @@ -1040,7 +1040,7 @@
"System.Net.Http": "4.4.0-preview1-25218-03",
"System.Net.WebHeaderCollection": "4.4.0-beta-24911-02",
"System.Net.WebSockets.Client": "4.4.0-beta-24911-02",
"System.Reflection.DispatchProxy": "4.4.0-preview1-25228-02",
"System.Reflection.DispatchProxy": "4.4.0-preview1-25302-01",
"System.Reflection.Extensions": "4.4.0-beta-24911-02",
"System.ServiceModel.Duplex": "4.4.0-preview1-25302-01",
"System.ServiceModel.Http": "4.4.0-preview1-25302-01",
Expand Down
6 changes: 3 additions & 3 deletions src/System.Private.ServiceModel/src/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"frameworks": {
"netstandard2.0": {
"dependencies": {
"NETStandard.Library": "2.0.0-preview1-25228-01",
"System.Security.Principal.Windows": "4.4.0-preview1-25228-02",
"System.Reflection.DispatchProxy": "4.4.0-preview1-25228-02",
"NETStandard.Library": "2.0.0-preview1-25301-01",
"System.Security.Principal.Windows": "4.4.0-preview1-25302-01",
"System.Reflection.DispatchProxy": "4.4.0-preview1-25302-01",
"System.Runtime.InteropServices.RuntimeInformation": "4.4.0-preview1-25218-03"
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/System.Private.ServiceModel/src/windows/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"frameworks": {
"netstandard2.0": {
"dependencies": {
"NETStandard.Library": "2.0.0-preview1-25228-01",
"System.Security.Principal.Windows": "4.4.0-preview1-25228-02",
"System.Reflection.DispatchProxy": "4.4.0-preview1-25228-02",
"NETStandard.Library": "2.0.0-preview1-25301-01",
"System.Security.Principal.Windows": "4.4.0-preview1-25302-01",
"System.Reflection.DispatchProxy": "4.4.0-preview1-25302-01",
"System.Runtime.InteropServices.RuntimeInformation": "4.4.0-preview1-25218-03"
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/System.ServiceModel.Duplex/ref/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"frameworks": {
"netstandard2.0": {
"dependencies": {
"NETStandard.Library": "2.0.0-preview1-25228-01",
"System.Security.Principal.Windows": "4.4.0-preview1-25228-02",
"NETStandard.Library": "2.0.0-preview1-25301-01",
"System.Security.Principal.Windows": "4.4.0-preview1-25302-01",
"System.ServiceModel.Primitives": "4.4.0-preview1-25302-01",
"System.Reflection.DispatchProxy": "4.4.0-preview1-25228-02",
"System.Reflection.DispatchProxy": "4.4.0-preview1-25302-01",
"System.Runtime.InteropServices.RuntimeInformation": "4.4.0-preview1-25218-03"
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/System.ServiceModel.Duplex/src/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"frameworks": {
"netstandard2.0": {
"dependencies": {
"NETStandard.Library": "2.0.0-preview1-25228-01",
"System.Security.Principal.Windows": "4.4.0-preview1-25228-02",
"System.Reflection.DispatchProxy": "4.4.0-preview1-25228-02",
"NETStandard.Library": "2.0.0-preview1-25301-01",
"System.Security.Principal.Windows": "4.4.0-preview1-25302-01",
"System.Reflection.DispatchProxy": "4.4.0-preview1-25302-01",
"System.Runtime.InteropServices.RuntimeInformation": "4.4.0-preview1-25218-03"
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/System.ServiceModel.Http/ref/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"frameworks": {
"netstandard2.0": {
"dependencies": {
"NETStandard.Library": "2.0.0-preview1-25228-01",
"System.Security.Principal.Windows": "4.4.0-preview1-25228-02",
"NETStandard.Library": "2.0.0-preview1-25301-01",
"System.Security.Principal.Windows": "4.4.0-preview1-25302-01",
"System.ServiceModel.Primitives": "4.4.0-preview1-25302-01",
"System.Reflection.DispatchProxy": "4.4.0-preview1-25228-02",
"System.Reflection.DispatchProxy": "4.4.0-preview1-25302-01",
"System.Runtime.InteropServices.RuntimeInformation": "4.4.0-preview1-25218-03"
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/System.ServiceModel.Http/src/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"frameworks": {
"netstandard2.0": {
"dependencies": {
"NETStandard.Library": "2.0.0-preview1-25228-01",
"System.Security.Principal.Windows": "4.4.0-preview1-25228-02",
"System.Reflection.DispatchProxy": "4.4.0-preview1-25228-02",
"NETStandard.Library": "2.0.0-preview1-25301-01",
"System.Security.Principal.Windows": "4.4.0-preview1-25302-01",
"System.Reflection.DispatchProxy": "4.4.0-preview1-25302-01",
"System.Runtime.InteropServices.RuntimeInformation": "4.4.0-preview1-25218-03"
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/System.ServiceModel.NetTcp/ref/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"frameworks": {
"netstandard2.0": {
"dependencies": {
"NETStandard.Library": "2.0.0-preview1-25228-01",
"System.Security.Principal.Windows": "4.4.0-preview1-25228-02",
"NETStandard.Library": "2.0.0-preview1-25301-01",
"System.Security.Principal.Windows": "4.4.0-preview1-25302-01",
"System.ServiceModel.Primitives": "4.4.0-preview1-25302-01",
"System.Reflection.DispatchProxy": "4.4.0-preview1-25228-02",
"System.Reflection.DispatchProxy": "4.4.0-preview1-25302-01",
"System.Runtime.InteropServices.RuntimeInformation": "4.4.0-preview1-25218-03"
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/System.ServiceModel.NetTcp/src/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"frameworks": {
"netstandard2.0": {
"dependencies": {
"NETStandard.Library": "2.0.0-preview1-25228-01",
"System.Security.Principal.Windows": "4.4.0-preview1-25228-02",
"System.Reflection.DispatchProxy": "4.4.0-preview1-25228-02",
"NETStandard.Library": "2.0.0-preview1-25301-01",
"System.Security.Principal.Windows": "4.4.0-preview1-25302-01",
"System.Reflection.DispatchProxy": "4.4.0-preview1-25302-01",
"System.Runtime.InteropServices.RuntimeInformation": "4.4.0-preview1-25218-03"
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/System.ServiceModel.Primitives/ref/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"frameworks": {
"netstandard2.0": {
"dependencies": {
"NETStandard.Library": "2.0.0-preview1-25228-01",
"System.Security.Principal.Windows": "4.4.0-preview1-25228-02",
"System.Reflection.DispatchProxy": "4.4.0-preview1-25228-02",
"NETStandard.Library": "2.0.0-preview1-25301-01",
"System.Security.Principal.Windows": "4.4.0-preview1-25302-01",
"System.Reflection.DispatchProxy": "4.4.0-preview1-25302-01",
"System.Runtime.InteropServices.RuntimeInformation": "4.4.0-preview1-25218-03"
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/System.ServiceModel.Primitives/src/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"frameworks": {
"netstandard2.0": {
"dependencies": {
"NETStandard.Library": "2.0.0-preview1-25228-01",
"System.Security.Principal.Windows": "4.4.0-preview1-25228-02",
"System.Reflection.DispatchProxy": "4.4.0-preview1-25228-02",
"NETStandard.Library": "2.0.0-preview1-25301-01",
"System.Security.Principal.Windows": "4.4.0-preview1-25302-01",
"System.Reflection.DispatchProxy": "4.4.0-preview1-25302-01",
"System.Runtime.InteropServices.RuntimeInformation": "4.4.0-preview1-25218-03"
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/System.ServiceModel.Security/ref/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"frameworks": {
"netstandard2.0": {
"dependencies": {
"NETStandard.Library": "2.0.0-preview1-25228-01",
"System.Security.Principal.Windows": "4.4.0-preview1-25228-02",
"NETStandard.Library": "2.0.0-preview1-25301-01",
"System.Security.Principal.Windows": "4.4.0-preview1-25302-01",
"System.ServiceModel.Primitives": "4.4.0-preview1-25302-01",
"System.Reflection.DispatchProxy": "4.4.0-preview1-25228-02",
"System.Reflection.DispatchProxy": "4.4.0-preview1-25302-01",
"System.Runtime.InteropServices.RuntimeInformation": "4.4.0-preview1-25218-03"
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/System.ServiceModel.Security/src/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"frameworks": {
"netstandard2.0": {
"dependencies": {
"NETStandard.Library": "2.0.0-preview1-25228-01",
"System.Security.Principal.Windows": "4.4.0-preview1-25228-02",
"System.Reflection.DispatchProxy": "4.4.0-preview1-25228-02",
"NETStandard.Library": "2.0.0-preview1-25301-01",
"System.Security.Principal.Windows": "4.4.0-preview1-25302-01",
"System.Reflection.DispatchProxy": "4.4.0-preview1-25302-01",
"System.Runtime.InteropServices.RuntimeInformation": "4.4.0-preview1-25218-03"
}
}
Expand Down

0 comments on commit 5b04dd9

Please sign in to comment.