Skip to content
代码片段 群组 项目
未验证 提交 3da83bc2 编辑于 作者: dotnet bot's avatar dotnet bot 提交者: GitHub
浏览文件

Merge pull request #61059 from dotnet/merges/release/dev17.1-to-release/dev17.2

Merge release/dev17.1 to release/dev17.2
No related branches found
No related tags found
无相关合并请求
......@@ -36,10 +36,22 @@ function Publish-Nuget($publishData, [string]$packageDir) {
try {
# Retrieve the feed name to source mapping.
$feedData = GetFeedPublishData
# Let packageFeeds default to the default set of feeds
$packageFeeds = "default"
if ($publishData.PSobject.Properties.Name -contains "packageFeeds") {
$packageFeeds = $publishData.packageFeeds
}
# If the configured packageFeeds is arcade, then skip publishing here. Arcade will handle publishing packages to their feeds.
if ($packageFeeds.equals("arcade")) {
Write-Host " Skipping publishing for all packages as they will be published by arcade"
continue
}
# Each branch stores the name of the package to feed map it should use.
# Retrieve the correct map for this particular branch.
$packagesData = GetPackagesPublishData $publishData.packageFeeds
$packagesData = GetPackagesPublishData $packageFeeds
foreach ($package in Get-ChildItem *.nupkg) {
$nupkg = Split-Path -Leaf $package
......
......@@ -398,7 +398,7 @@ public void ClearEmbedInteropTypes()
});
}
[ConditionalFact(typeof(DotNetSdkAvailable))]
[ConditionalFact(typeof(DotNetSdkAvailable), typeof(WindowsOnly), Reason = "https://github.com/dotnet/roslyn/issues/61017")]
public void TestDiscoverEditorConfigFiles()
{
var srcFile = ProjectDir.CreateFile("lib1.cs").WriteAllText("class C { }");
......@@ -428,7 +428,7 @@ public void TestDiscoverEditorConfigFiles()
}));
}
[ConditionalFact(typeof(DotNetSdkAvailable))]
[ConditionalFact(typeof(DotNetSdkAvailable), typeof(WindowsOnly), Reason = "https://github.com/dotnet/roslyn/issues/61017")]
public void TestDiscoverEditorConfigFilesCanBeDisabled()
{
var srcFile = ProjectDir.CreateFile("lib1.cs").WriteAllText("class C { }");
......@@ -456,7 +456,7 @@ public void TestDiscoverEditorConfigFilesCanBeDisabled()
expectedResults: AppendExtraEditorConfigs(new[] { "" }, findEditorConfigs: false));
}
[ConditionalFact(typeof(DotNetSdkAvailable))]
[ConditionalFact(typeof(DotNetSdkAvailable), typeof(WindowsOnly), Reason = "https://github.com/dotnet/roslyn/issues/61017")]
public void TestDiscoverGlobalConfigFiles()
{
var srcFile = ProjectDir.CreateFile("lib1.cs").WriteAllText("class C { }");
......@@ -490,7 +490,7 @@ public void TestDiscoverGlobalConfigFiles()
}));
}
[ConditionalFact(typeof(DotNetSdkAvailable))]
[ConditionalFact(typeof(DotNetSdkAvailable), typeof(WindowsOnly), Reason = "https://github.com/dotnet/roslyn/issues/61017")]
public void TestDiscoverGlobalConfigFilesCanBeDisabled()
{
var srcFile = ProjectDir.CreateFile("lib1.cs").WriteAllText("class C { }");
......@@ -523,7 +523,7 @@ public void TestDiscoverGlobalConfigFilesCanBeDisabled()
}, findGlobalConfigs: false));
}
[ConditionalFact(typeof(DotNetSdkAvailable))]
[ConditionalFact(typeof(DotNetSdkAvailable), typeof(WindowsOnly), Reason = "https://github.com/dotnet/roslyn/issues/61017")]
public void TestDiscoverGlobalConfigFilesWhenEditorConfigDisabled()
{
var srcFile = ProjectDir.CreateFile("lib1.cs").WriteAllText("class C { }");
......@@ -617,7 +617,7 @@ public void TestDiscoverEditorAndGlobalConfigFilesCanBeDisabled()
expectedResults: new[] { "" });
}
[ConditionalFact(typeof(DotNetSdkAvailable))]
[ConditionalFact(typeof(DotNetSdkAvailable), typeof(WindowsOnly), Reason = "https://github.com/dotnet/roslyn/issues/61017")]
public void TestGlobalConfigsCanBeManuallyAdded()
{
var srcFile = ProjectDir.CreateFile("lib1.cs").WriteAllText("class C { }");
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册