Skip to content

Commit 57875d9

Browse files
StephenBonikowskyStephenBonikowsky
committed
Updating NetStandard version for 2.0.0 release.
1 parent 71d7060 commit 57875d9

File tree

16 files changed

+62
-54
lines changed

16 files changed

+62
-54
lines changed

‎dependencies.props‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<!-- Source of truth for dependency tooling: the commit hash of the dotnet/versions master branch as of the last auto-upgrade. -->
33
<PropertyGroup>
4-
<CoreFxCurrentRef>368eeab3bf02cc55086e170d500cfbb15c974acc</CoreFxCurrentRef>
5-
<CoreClrCurrentRef>f4e6d7f7e3c10cbd87d5d9e0fcee32e9aa19f6d1</CoreClrCurrentRef>
4+
<CoreFxCurrentRef>534770cbd98c4083de4d93b809f2e0968f0f856a</CoreFxCurrentRef>
65
<WCFCurrentRef>c9a03fe0c3309508cb509a4ffdd6dc8b79ed525e</WCFCurrentRef>
6+
<StandardCurrentRef>8f8313cbe4b0f4d89c4d0835e08e3e340a18eec0</StandardCurrentRef>
77
</PropertyGroup>
88

99
<!-- Auto-upgraded properties for each build info dependency. -->
1010
<PropertyGroup>
11-
<CoreFxExpectedPrerelease>preview2-25309-01</CoreFxExpectedPrerelease>
12-
<StandardExpectedPrerelease>preview2-25309-01</StandardExpectedPrerelease>
11+
<CoreFxExpectedPrerelease>preview2-25405-01</CoreFxExpectedPrerelease>
12+
<NETStandardPackageVersion>2.0.0-preview2-25401-01</NETStandardPackageVersion>
13+
<NETStandardPackageId>NETStandard.Library</NETStandardPackageId>
1314
</PropertyGroup>
1415

1516
<!-- Full package version strings that are used in other parts of the build. -->
1617
<PropertyGroup>
1718
<AppXRunnerVersion>1.0.3-prerelease-00921-01</AppXRunnerVersion>
19+
<MicrosoftNETCoreAppPackageVersion>2.0.0-preview2-25407-01</MicrosoftNETCoreAppPackageVersion>
1820
</PropertyGroup>
1921

2022
<!-- Package dependency verification/auto-upgrade configuration. -->
@@ -31,14 +33,14 @@
3133
<CurrentRef>$(WCFCurrentRef)</CurrentRef>
3234
</RemoteDependencyBuildInfo>
3335
<RemoteDependencyBuildInfo Include="CoreFx">
34-
<BuildInfoPath>$(BaseDotNetBuildInfo)corefx/$(DependencyBranch)</BuildInfoPath>
36+
<BuildInfoPath>$(BaseDotNetBuildInfo)corefx/$(CoreDependencyBranch)</BuildInfoPath>
3537
<CurrentRef>$(CoreFxCurrentRef)</CurrentRef>
3638
<!-- manually pick up a new baseline in order to get package dependencies updated -->
37-
<DisabledPackages>Microsoft.Private.PackageBaseline;NETStandard.Library</DisabledPackages>
39+
<DisabledPackages>Microsoft.Private.PackageBaseline</DisabledPackages>
3840
</RemoteDependencyBuildInfo>
39-
<RemoteDependencyBuildInfo Include="CoreClr">
40-
<BuildInfoPath>$(BaseDotNetBuildInfo)coreclr/$(DependencyBranch)</BuildInfoPath>
41-
<CurrentRef>$(CoreClrCurrentRef)</CurrentRef>
41+
<RemoteDependencyBuildInfo Include="Standard">
42+
<BuildInfoPath>$(BaseDotNetBuildInfo)standard/$(CoreDependencyBranch)</BuildInfoPath>
43+
<CurrentRef>$(StandardCurrentRef)</CurrentRef>
4244
</RemoteDependencyBuildInfo>
4345

4446
<DependencyBuildInfo Include="@(RemoteDependencyBuildInfo)">
@@ -50,6 +52,11 @@
5052
<ElementName>CoreFxExpectedPrerelease</ElementName>
5153
<BuildInfoName>CoreFx</BuildInfoName>
5254
</XmlUpdateStep>
55+
<XmlUpdateStep Include="Standard">
56+
<Path>$(MSBuildThisFileFullPath)</Path>
57+
<ElementName>NETStandardPackageVersion</ElementName>
58+
<PackageId>$(NETStandardPackageId)</PackageId>
59+
</XmlUpdateStep>
5360
</ItemGroup>
5461

5562
<!-- Set up dependencies on packages that aren't found in a BuildInfo. -->
@@ -75,9 +82,10 @@
7582
<StaticDependency Include="Microsoft.TargetingPack.Private.NETNative">
7683
<Version>1.1.0-beta-24607-01</Version>
7784
</StaticDependency>
85+
7886
<DependencyBuildInfo Include="NETStandard.Library">
7987
<PackageId>NETStandard.Library</PackageId>
80-
<Version>2.0.0-$(StandardExpectedPrerelease)</Version>
88+
<Version>$(NETStandardPackageVersion)</Version>
8189
</DependencyBuildInfo>
8290

8391
<DependencyBuildInfo Include="@(StaticDependency)">

‎dir.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,6 @@
116116

117117
<!-- This import is needed because we're still using project.json to restore packages.
118118
Once we switch to MSBuild it will automatically handle target imports from the packages themselves. -->
119-
<Import Condition="'$(TargetGroup)'=='netstandard2.0' and Exists('$(PackagesDir)NETStandard.Library\2.0.0-$(StandardExpectedPrerelease)\build\netstandard2.0\NETStandard.Library.targets')"
120-
Project="$(PackagesDir)NETStandard.Library\2.0.0-$(StandardExpectedPrerelease)\build\netstandard2.0\NETStandard.Library.targets" />
119+
<Import Condition="'$(TargetGroup)'=='netstandard2.0' and Exists('$(PackagesDir)NETStandard.Library\$(NETStandardPackageVersion)\build\netstandard2.0\NETStandard.Library.targets')"
120+
Project="$(PackagesDir)NETStandard.Library\$(NETStandardPackageVersion)\build\netstandard2.0\NETStandard.Library.targets" />
121121
</Project>

‎src/Common/test-runtime/project.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
"OpenCover": "4.6.519",
88
"ReportGenerator": "2.4.3",
99
"Microsoft.NETCore.TestHost": "2.0.0-preview2-25304-01",
10-
"NETStandard.Library": "2.0.0-preview2-25309-01",
10+
"NETStandard.Library": "2.0.0-preview2-25401-01",
1111
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04",
1212
"xunit.console.netcore": "1.0.3-prerelease-00925-01",
1313
"Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04",
14-
"System.Reflection.DispatchProxy": "4.4.0-preview2-25309-01",
15-
"System.Net.Http.WinHttpHandler": "4.4.0-preview2-25309-01",
14+
"System.Reflection.DispatchProxy": "4.4.0-preview2-25405-01",
15+
"System.Net.Http.WinHttpHandler": "4.4.0-preview2-25405-01",
1616
"System.ServiceModel.Duplex": "4.4.0-preview1-25302-01",
1717
"System.ServiceModel.Http": "4.4.0-preview1-25302-01",
1818
"System.ServiceModel.NetTcp": "4.4.0-preview1-25302-01",
@@ -30,7 +30,7 @@
3030
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04",
3131
"xunit.console.netcore": "1.0.3-prerelease-00925-01",
3232
"Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04",
33-
"System.Net.Http.WinHttpHandler": "4.4.0-preview2-25309-01",
33+
"System.Net.Http.WinHttpHandler": "4.4.0-preview2-25405-01",
3434
"System.ServiceModel.Duplex": "4.4.0-preview1-25302-01",
3535
"System.ServiceModel.Http": "4.4.0-preview1-25302-01",
3636
"System.ServiceModel.NetTcp": "4.4.0-preview1-25302-01",

‎src/System.Private.ServiceModel/src/System.Private.ServiceModel.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
</ItemGroup>
6666
<ItemGroup Condition="'$(TargetGroup)' == 'netstandard2.0'">
6767
<!-- Copy ref to output to enable APICompat for the facades that directly reference this project -->
68-
<Content Include="$(PackagesDir)NETStandard.Library\2.0.0-$(StandardExpectedPrerelease)\build\netstandard2.0\ref\netstandard.dll">
68+
<Content Include="$(PackagesDir)NETStandard.Library\$(NETStandardPackageVersion)\build\netstandard2.0\ref\netstandard.dll">
6969
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
7070
</Content>
7171
</ItemGroup>

‎src/System.Private.ServiceModel/src/project.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"frameworks": {
33
"netstandard2.0": {
44
"dependencies": {
5-
"NETStandard.Library": "2.0.0-preview2-25309-01",
6-
"System.Security.Principal.Windows": "4.4.0-preview2-25309-01",
7-
"System.Reflection.DispatchProxy": "4.4.0-preview2-25309-01",
5+
"NETStandard.Library": "2.0.0-preview2-25401-01",
6+
"System.Security.Principal.Windows": "4.4.0-preview2-25405-01",
7+
"System.Reflection.DispatchProxy": "4.4.0-preview2-25405-01",
88
"System.Runtime.InteropServices.RuntimeInformation": "4.4.0-preview1-25218-03"
99
}
1010
}

‎src/System.Private.ServiceModel/src/windows/project.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"frameworks": {
44
"netstandard2.0": {
55
"dependencies": {
6-
"NETStandard.Library": "2.0.0-preview2-25309-01",
7-
"System.Security.Principal.Windows": "4.4.0-preview2-25309-01",
8-
"System.Reflection.DispatchProxy": "4.4.0-preview2-25309-01",
9-
"System.Net.Http.WinHttpHandler": "4.4.0-preview2-25309-01",
6+
"NETStandard.Library": "2.0.0-preview2-25401-01",
7+
"System.Security.Principal.Windows": "4.4.0-preview2-25405-01",
8+
"System.Reflection.DispatchProxy": "4.4.0-preview2-25405-01",
9+
"System.Net.Http.WinHttpHandler": "4.4.0-preview2-25405-01",
1010
"System.Runtime.InteropServices.RuntimeInformation": "4.4.0-preview1-25218-03"
1111
}
1212
}

‎src/System.ServiceModel.Duplex/ref/project.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"frameworks": {
33
"netstandard2.0": {
44
"dependencies": {
5-
"NETStandard.Library": "2.0.0-preview2-25309-01",
6-
"System.Security.Principal.Windows": "4.4.0-preview2-25309-01",
5+
"NETStandard.Library": "2.0.0-preview2-25401-01",
6+
"System.Security.Principal.Windows": "4.4.0-preview2-25405-01",
77
"System.ServiceModel.Primitives": "4.4.0-preview1-25302-01",
8-
"System.Reflection.DispatchProxy": "4.4.0-preview2-25309-01",
8+
"System.Reflection.DispatchProxy": "4.4.0-preview2-25405-01",
99
"System.Runtime.InteropServices.RuntimeInformation": "4.4.0-preview1-25218-03"
1010
}
1111
}

‎src/System.ServiceModel.Duplex/src/project.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"frameworks": {
33
"netstandard2.0": {
44
"dependencies": {
5-
"NETStandard.Library": "2.0.0-preview2-25309-01",
6-
"System.Security.Principal.Windows": "4.4.0-preview2-25309-01",
7-
"System.Reflection.DispatchProxy": "4.4.0-preview2-25309-01",
5+
"NETStandard.Library": "2.0.0-preview2-25401-01",
6+
"System.Security.Principal.Windows": "4.4.0-preview2-25405-01",
7+
"System.Reflection.DispatchProxy": "4.4.0-preview2-25405-01",
88
"System.Runtime.InteropServices.RuntimeInformation": "4.4.0-preview1-25218-03"
99
}
1010
},

‎src/System.ServiceModel.Http/ref/project.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"frameworks": {
33
"netstandard2.0": {
44
"dependencies": {
5-
"NETStandard.Library": "2.0.0-preview2-25309-01",
6-
"System.Security.Principal.Windows": "4.4.0-preview2-25309-01",
5+
"NETStandard.Library": "2.0.0-preview2-25401-01",
6+
"System.Security.Principal.Windows": "4.4.0-preview2-25405-01",
77
"System.ServiceModel.Primitives": "4.4.0-preview1-25302-01",
8-
"System.Reflection.DispatchProxy": "4.4.0-preview2-25309-01",
8+
"System.Reflection.DispatchProxy": "4.4.0-preview2-25405-01",
99
"System.Runtime.InteropServices.RuntimeInformation": "4.4.0-preview1-25218-03"
1010
}
1111
}

‎src/System.ServiceModel.Http/src/project.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"frameworks": {
33
"netstandard2.0": {
44
"dependencies": {
5-
"NETStandard.Library": "2.0.0-preview2-25309-01",
6-
"System.Security.Principal.Windows": "4.4.0-preview2-25309-01",
7-
"System.Reflection.DispatchProxy": "4.4.0-preview2-25309-01",
5+
"NETStandard.Library": "2.0.0-preview2-25401-01",
6+
"System.Security.Principal.Windows": "4.4.0-preview2-25405-01",
7+
"System.Reflection.DispatchProxy": "4.4.0-preview2-25405-01",
88
"System.Runtime.InteropServices.RuntimeInformation": "4.4.0-preview1-25218-03"
99
}
1010
},

0 commit comments

Comments
 (0)