Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
runtime
提交
c9682e51
R
runtime
项目概览
dotNET Platform
/
runtime
11 个月 前同步成功
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
runtime
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
c9682e51
编写于
11月 30, 2020
作者:
V
Viktor Hofer
提交者:
GitHub
11月 30, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove NETStandard2.2 versions and product dependency (#43304)
* Remove NetStandard2.2 versions and product dependency
上级
d7e25938
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
11 addition
and
16 deletion
+11
-16
eng/Version.Details.xml
eng/Version.Details.xml
+0
-4
eng/Versions.props
eng/Versions.props
+2
-4
eng/testing/xunit/xunit.targets
eng/testing/xunit/xunit.targets
+1
-1
src/libraries/Common/tests/TestUtilities/TestUtilities.csproj
...libraries/Common/tests/TestUtilities/TestUtilities.csproj
+1
-1
src/libraries/shims/ApiCompat.proj
src/libraries/shims/ApiCompat.proj
+4
-3
src/libraries/shims/Directory.Build.props
src/libraries/shims/Directory.Build.props
+1
-1
src/libraries/shims/generated/Directory.Build.props
src/libraries/shims/generated/Directory.Build.props
+2
-2
未找到文件。
eng/Version.Details.xml
浏览文件 @
c9682e51
<Dependencies>
<ProductDependencies>
<Dependency
Name=
"NETStandard.Library"
Version=
"2.2.0-prerelease.19564.1"
>
<Uri>
https://github.com/dotnet/standard
</Uri>
<Sha>
cfe95a23647c7de1fe1a349343115bd7720d6949
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.NETCore.Runtime.ICU.Transport"
Version=
"6.0.0-alpha.1.20573.1"
>
<Uri>
https://github.com/dotnet/icu
</Uri>
<Sha>
f9c78959ceca029309ae76932fb441cacb9650d1
</Sha>
...
...
eng/Versions.props
浏览文件 @
c9682e51
...
...
@@ -115,9 +115,6 @@
<SystemRuntimeTimeZoneDataVersion>5.0.0-beta.20568.1</SystemRuntimeTimeZoneDataVersion>
<SystemSecurityCryptographyX509CertificatesTestDataVersion>5.0.0-beta.20568.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
<SystemWindowsExtensionsTestDataVersion>5.0.0-beta.20568.1</SystemWindowsExtensionsTestDataVersion>
<!-- Standard dependencies -->
<NETStandardLibraryVersion>2.2.0-prerelease.19564.1</NETStandardLibraryVersion>
<NetStandardLibrary20Version>2.0.3</NetStandardLibrary20Version>
<!-- dotnet-optimization dependencies -->
<optimizationwindows_ntx64IBCCoreFxVersion>99.99.99-master-20200806.6</optimizationwindows_ntx64IBCCoreFxVersion>
<optimizationlinuxx64IBCCoreFxVersion>99.99.99-master-20200806.6</optimizationlinuxx64IBCCoreFxVersion>
...
...
@@ -127,6 +124,8 @@
<!-- Not auto-updated. -->
<MicrosoftDiaSymReaderNativeVersion>1.7.0</MicrosoftDiaSymReaderNativeVersion>
<SystemCommandLineVersion>2.0.0-beta1.20253.1</SystemCommandLineVersion>
<NETStandardLibraryRefVersion>2.1.0</NETStandardLibraryRefVersion>
<NetStandardLibraryVersion>2.0.3</NetStandardLibraryVersion>
<!--
These are used as reference assemblies only, so they must not take a ProdCon/source-build
version. Insert "RefOnly" to avoid assignment via PVP.
...
...
@@ -167,7 +166,6 @@
</PropertyGroup>
<!-- Package names -->
<PropertyGroup>
<NETStandardLibraryPackage>netstandard.library</NETStandardLibraryPackage>
<WindowsCoreFxOptimizationDataPackage>optimization.windows_nt-x64.ibc.corefx</WindowsCoreFxOptimizationDataPackage>
<LinuxCoreFxOptimizationDataPackage>optimization.linux-x64.ibc.corefx</LinuxCoreFxOptimizationDataPackage>
<MicrosoftPrivateIntellisensePackage>microsoft.private.intellisense</MicrosoftPrivateIntellisensePackage>
...
...
eng/testing/xunit/xunit.targets
浏览文件 @
c9682e51
...
...
@@ -2,7 +2,7 @@
<ItemGroup>
<!-- Upgrade the NETStandard.Library transitive xunit dependency to avoid transitive 1.x NS dependencies. -->
<PackageReference Include="NETStandard.Library"
Version="$(NetStandardLibrary
20
Version)"
Version="$(NetStandardLibraryVersion)"
Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" />
</ItemGroup>
...
...
src/libraries/Common/tests/TestUtilities/TestUtilities.csproj
浏览文件 @
c9682e51
...
...
@@ -70,7 +70,7 @@
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'">
<!-- Upgrade the NetStandard.Library transitive xunit dependency to avoid 1.x NS dependencies. -->
<PackageReference Include="NETStandard.Library" Version="$(NetStandardLibrary
20
Version)" />
<PackageReference Include="NETStandard.Library" Version="$(NetStandardLibraryVersion)" />
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj" PrivateAssets="all" />
<ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj" PrivateAssets="all" />
</ItemGroup>
...
...
src/libraries/shims/ApiCompat.proj
浏览文件 @
c9682e51
...
...
@@ -19,7 +19,8 @@
<ItemGroup>
<PackageDownload Include="$(PreviousNetCoreAppPackageId)" Version="[$(PreviousNetCoreAppPackageVersion)]" />
<PackageDownload Include="NETStandard.Library" Version="[$(NETStandardLibraryVersion)];[$(NetStandardLibrary20Version)]" />
<PackageDownload Include="NETStandard.Library.Ref" Version="[$(NETStandardLibraryRefVersion)]" />
<PackageDownload Include="NETStandard.Library" Version="[$(NetStandardLibraryVersion)]" />
</ItemGroup>
<!-- Evaluate these properties inside a Target to gain access to TargetFrameworkIdentifier. -->
...
...
@@ -78,8 +79,8 @@
<PropertyGroup>
<UpdateNETStandardBaseline Condition="'$(UpdateNETStandardBaseline)' == ''">False</UpdateNETStandardBaseline>
<UpdateNETStandardBaselineLocally Condition="'$(UpdateNETStandardBaselineLocally)' == ''">False</UpdateNETStandardBaselineLocally>
<_netStandardLibraryRefPath>$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'netstandard.library
', '$(NETStandardLibraryVersion)', 'build', 'netstandard2.1', 'ref
'))</_netStandardLibraryRefPath>
<_netStandardLibrary20RefPath>$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'netstandard.library', '$(NetStandardLibrary
20
Version)', 'build', 'netstandard2.0', 'ref'))</_netStandardLibrary20RefPath>
<_netStandardLibraryRefPath>$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'netstandard.library
.ref', '$(NETStandardLibraryRefVersion)', 'ref', 'netstandard2.1
'))</_netStandardLibraryRefPath>
<_netStandardLibrary20RefPath>$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'netstandard.library', '$(NetStandardLibraryVersion)', 'build', 'netstandard2.0', 'ref'))</_netStandardLibrary20RefPath>
<_netStandard21OnlyRef>$(_netStandardLibraryRefPath)netstandard.dll</_netStandard21OnlyRef>
<_netStandard21OnlyRef Condition="$(UpdateNETStandardBaselineLocally)">$(MSBuildThisFileDirectory)..\..\..\standard\artifacts\bin\ref\netstandard\Debug\netstandard.dll</_netStandard21OnlyRef>
<_netStandard21BaselineModifer>--baseline</_netStandard21BaselineModifer>
...
...
src/libraries/shims/Directory.Build.props
浏览文件 @
c9682e51
...
...
@@ -20,7 +20,7 @@
<HasMatchingContract>true</HasMatchingContract>
<NETFrameworkReferenceAssemblyTFM>net48</NETFrameworkReferenceAssemblyTFM>
<NetFxRefPath>$(NuGetPackageRoot)microsoft.netframework.referenceassemblies.$(NETFrameworkReferenceAssemblyTFM)\$(MicrosoftNetFrameworkReferenceAssembliesVersion)\build\.NETFramework\v4.8\</NetFxRefPath>
<NETStandard21RefPath>$(NuGetPackageRoot)netstandard.library
\$(NETStandardLibraryVersion)\build\netstandard2.1\ref
\</NETStandard21RefPath>
<NETStandard21RefPath>$(NuGetPackageRoot)netstandard.library
.ref\$(NETStandardLibraryRefVersion)\ref\netstandard2.1
\</NETStandard21RefPath>
</PropertyGroup>
<ItemGroup Condition="'$(MSBuildProjectName)' == 'System.Runtime' or '$(MSBuildProjectName)' == 'mscorlib' or '$(MSBuildProjectName)' == 'netstandard'">
...
...
src/libraries/shims/generated/Directory.Build.props
浏览文件 @
c9682e51
...
...
@@ -15,9 +15,9 @@
<!-- Download the .NET Framework RefPack to build against the contract. -->
<ItemGroup>
<PackageDownload Include="NETStandard.Library"
<PackageDownload Include="NETStandard.Library
.Ref
"
Condition="'$(MSBuildProjectName)' == 'netstandard'"
Version="[$(NETStandardLibraryVersion)]" />
Version="[$(NETStandardLibrary
Ref
Version)]" />
<PackageDownload Include="Microsoft.NETFramework.ReferenceAssemblies.$(NETFrameworkReferenceAssemblyTFM)"
Condition="'$(MSBuildProjectName)' != 'netstandard'"
Version="[$(MicrosoftNetFrameworkReferenceAssembliesVersion)]" />
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录