Skip to content
This repository has been archived by the owner on May 17, 2024. It is now read-only.

Commit

Permalink
Merge pull request #459 from dotnet/dev/jmarolf/central-package-mange…
Browse files Browse the repository at this point in the history 
…ment

small infra fixes
  • Loading branch information
@jmarolf
jmarolf committed Oct 4, 2022
2 parents 7c7e770 + b1623e5 commit edb2df5
Show file tree
Hide file tree
Showing 5 changed files with 188 additions and 20 deletions.
167 changes: 167 additions & 0 deletions NuGet.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,171 @@
<disabledPackageSources>
<clear />
</disabledPackageSources>
<packageSourceMapping>
<packageSource key="dotnet5">
<package pattern="microsoft.netcore.platforms" />
<package pattern="microsoft.win32.registry" />
<package pattern="microsoft.win32.systemevents" />
<package pattern="system.commandline" />
</packageSource>
<packageSource key="dotnet-tools">
<package pattern="microsoft.build.tasks.git" />
<package pattern="microsoft.codecoverage" />
<package pattern="microsoft.sourcelink.azurerepos.git" />
<package pattern="microsoft.sourcelink.common" />
<package pattern="microsoft.sourcelink.github" />
</packageSource>
<packageSource key="dotnet-eng">
<package pattern="microbuild.core.sentinel" />
<package pattern="microsoft.diasymreader.pdb2pdb" />
<package pattern="microsoft.dotnet.arcade.sdk" />
<package pattern="microsoft.dotnet.build.tasks.feed" />
<package pattern="microsoft.dotnet.signtool" />
<package pattern="microsoft.dotnet.xlifftasks" />
<package pattern="microsoft.symboluploader.build.task" />
<package pattern="xunit" />
<package pattern="xunit.assert" />
<package pattern="xunit.core" />
<package pattern="xunit.extensibility.core" />
<package pattern="xunit.extensibility.execution" />
<package pattern="xunit.runner.console" />
<package pattern="sn" />
</packageSource>
<packageSource key="dotnet-public">
<package pattern="castle.core" />
<package pattern="coverlet.collector" />
<package pattern="microbuild.core" />
<package pattern="microsoft.aspnetcore.app.runtime.win-x64" />
<package pattern="microsoft.aspnetcore.app.runtime.win-x86" />
<package pattern="microsoft.build" />
<package pattern="microsoft.build.framework" />
<package pattern="microsoft.build.locator" />
<package pattern="microsoft.csharp" />
<package pattern="microsoft.net.test.sdk" />
<package pattern="microsoft.netcore.app.runtime.win-x64" />
<package pattern="microsoft.netcore.app.runtime.win-x86" />
<package pattern="microsoft.netcore.platforms" />
<package pattern="microsoft.netcore.targets" />
<package pattern="microsoft.testplatform.objectmodel" />
<package pattern="microsoft.testplatform.testhost" />
<package pattern="microsoft.visualstudio.sdk.embedinteroptypes" />
<package pattern="microsoft.visualstudio.setup.configuration.interop" />
<package pattern="microsoft.win32.primitives" />
<package pattern="microsoft.win32.systemevents" />
<package pattern="microsoft.windowsdesktop.app.runtime.win-x64" />
<package pattern="microsoft.windowsdesktop.app.runtime.win-x86" />
<package pattern="moq" />
<package pattern="netstandard.library" />
<package pattern="newtonsoft.json" />
<package pattern="nuget.frameworks" />
<package pattern="nuget.versioning" />
<package pattern="runtime.any.system.collections" />
<package pattern="runtime.any.system.globalization" />
<package pattern="runtime.any.system.io" />
<package pattern="runtime.any.system.reflection" />
<package pattern="runtime.any.system.reflection.primitives" />
<package pattern="runtime.any.system.resources.resourcemanager" />
<package pattern="runtime.any.system.runtime" />
<package pattern="runtime.any.system.runtime.handles" />
<package pattern="runtime.any.system.runtime.interopservices" />
<package pattern="runtime.any.system.text.encoding" />
<package pattern="runtime.any.system.threading.tasks" />
<package pattern="runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl" />
<package pattern="runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl" />
<package pattern="runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl" />
<package pattern="runtime.native.system" />
<package pattern="runtime.native.system.io.compression" />
<package pattern="runtime.native.system.net.http" />
<package pattern="runtime.native.system.security.cryptography.apple" />
<package pattern="runtime.native.system.security.cryptography.openssl" />
<package pattern="runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl" />
<package pattern="runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl" />
<package pattern="runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple" />
<package pattern="runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl" />
<package pattern="runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl" />
<package pattern="runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl" />
<package pattern="runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl" />
<package pattern="runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl" />
<package pattern="runtime.win.system.runtime.extensions" />
<package pattern="system.appcontext" />
<package pattern="system.buffers" />
<package pattern="system.collections" />
<package pattern="system.collections.concurrent" />
<package pattern="system.collections.immutable" />
<package pattern="system.collections.nongeneric" />
<package pattern="system.collections.specialized" />
<package pattern="system.componentmodel" />
<package pattern="system.componentmodel.primitives" />
<package pattern="system.componentmodel.typeconverter" />
<package pattern="system.configuration.configurationmanager" />
<package pattern="system.console" />
<package pattern="system.diagnostics.debug" />
<package pattern="system.diagnostics.diagnosticsource" />
<package pattern="system.diagnostics.tools" />
<package pattern="system.diagnostics.tracesource" />
<package pattern="system.diagnostics.tracing" />
<package pattern="system.drawing.common" />
<package pattern="system.dynamic.runtime" />
<package pattern="system.globalization" />
<package pattern="system.globalization.calendars" />
<package pattern="system.globalization.extensions" />
<package pattern="system.io" />
<package pattern="system.io.compression" />
<package pattern="system.io.compression.zipfile" />
<package pattern="system.io.filesystem" />
<package pattern="system.io.filesystem.primitives" />
<package pattern="system.linq" />
<package pattern="system.linq.expressions" />
<package pattern="system.memory" />
<package pattern="system.net.http" />
<package pattern="system.net.primitives" />
<package pattern="system.net.sockets" />
<package pattern="system.objectmodel" />
<package pattern="system.private.uri" />
<package pattern="system.reflection" />
<package pattern="system.reflection.emit" />
<package pattern="system.reflection.emit.ilgeneration" />
<package pattern="system.reflection.emit.lightweight" />
<package pattern="system.reflection.extensions" />
<package pattern="system.reflection.metadata" />
<package pattern="system.reflection.primitives" />
<package pattern="system.reflection.typeextensions" />
<package pattern="system.resources.resourcemanager" />
<package pattern="system.runtime" />
<package pattern="system.runtime.extensions" />
<package pattern="system.runtime.handles" />
<package pattern="system.runtime.interopservices" />
<package pattern="system.runtime.interopservices.runtimeinformation" />
<package pattern="system.runtime.numerics" />
<package pattern="system.security.accesscontrol" />
<package pattern="system.security.cryptography.algorithms" />
<package pattern="system.security.cryptography.cng" />
<package pattern="system.security.cryptography.csp" />
<package pattern="system.security.cryptography.encoding" />
<package pattern="system.security.cryptography.openssl" />
<package pattern="system.security.cryptography.primitives" />
<package pattern="system.security.cryptography.protecteddata" />
<package pattern="system.security.cryptography.x509certificates" />
<package pattern="system.security.permissions" />
<package pattern="system.security.principal.windows" />
<package pattern="system.text.encoding" />
<package pattern="system.text.encoding.codepages" />
<package pattern="system.text.encoding.extensions" />
<package pattern="system.text.json" />
<package pattern="system.text.regularexpressions" />
<package pattern="system.threading" />
<package pattern="system.threading.tasks" />
<package pattern="system.threading.tasks.dataflow" />
<package pattern="system.threading.tasks.extensions" />
<package pattern="system.threading.timer" />
<package pattern="system.windows.extensions" />
<package pattern="system.xml.readerwriter" />
<package pattern="system.xml.xdocument" />
<package pattern="system.xml.xmldocument" />
<package pattern="vswhere" />
<package pattern="xunit.abstractions" />
<package pattern="xunit.analyzers" />
<package pattern="xunit.runner.visualstudio" />
</packageSource>
</packageSourceMapping>
</configuration>
10 changes: 5 additions & 5 deletions global.json
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"tools": {
"dotnet": "6.0.100",
"dotnet": "6.0.401",
"runtimes": {
"dotnet": [
"5.0.14",
"3.1.7",
"2.1.11"
"5.0.17",
"3.1.29",
"2.1.30"
]
}
},
"sdk": {
"version": "6.0.100",
"version": "6.0.401",
"rollForward": "major"
},
"msbuild-sdks": {
Expand Down
4 changes: 2 additions & 2 deletions tests/end-to-end/MauiSmoke.Tests/MauiConversions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ public MauiConversions(MauiSolutionPathFixture solutionPathFixture, MauiMSBuildF
solutionPathFixture.SetCurrentDirectory();
}

[Fact]
[Fact(Skip = "Xamarin targets are not available on build machine")]
public void ConvertsXamarinFormsAndroidToMaui()
{
var projectToConvertPath = GetXamarinAndroidProjectPath("SmokeTests.XamarinForms.Android");
var projectBaselinePath = GetXamarinAndroidProjectPath("SmokeTests.XamarinForms.AndroidBaseline");
AssertConversionWorks(projectToConvertPath, projectBaselinePath, "net6.0-android");
}

[Fact]
[Fact(Skip = "Xamarin targets are not available on build machine")]
public void ConvertsXamarinFormsiOSToMaui()
{
var projectToConvertPath = GetXamariniOSProjectPath("SmokeTests.XamarinForms.iOS");
Expand Down
26 changes: 13 additions & 13 deletions tests/end-to-end/Smoke.Tests/BasicConversions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,103 +28,103 @@ public BasicSmokeTests(SolutionPathFixture solutionPathFixture, MSBuildFixture m
solutionPathFixture.SetCurrentDirectory();
}

[Fact]
[Fact(Skip = "Can't find Microsoft.NET.Sdk.ImportWorkloads.props on CI ,machine")]
public void ConvertsLegacyFSharpConsoleToNetCoreApp31()
{
var projectToConvertPath = GetFSharpProjectPath("SmokeTests.LegacyFSharpConsole");
var projectBaselinePath = GetFSharpProjectPath("SmokeTests.FSharpConsoleCoreBaseline");
AssertConversionWorks(projectToConvertPath, projectBaselinePath, "netcoreapp3.1");
}

[Fact]
[Fact(Skip = "Can't find Microsoft.NET.Sdk.ImportWorkloads.props on CI ,machine")]
public void ConvertsLegacyFSharpConsoleToNet50()
{
var projectToConvertPath = GetFSharpProjectPath("SmokeTests.LegacyFSharpConsole");
var projectBaselinePath = GetFSharpProjectPath("SmokeTests.FSharpConsoleNet5Baseline");
AssertConversionWorks(projectToConvertPath, projectBaselinePath, "net5.0");
}

[Fact]
[Fact(Skip = "Can't find Microsoft.CSharp.targets on CI ,machine")]
public void ConvertsWpfFrameworkTemplateForNetCoreApp31()
{
var projectToConvertPath = GetCSharpProjectPath("SmokeTests.WpfFramework");
var projectBaselinePath = GetCSharpProjectPath("SmokeTests.WpfCoreBaseline");
AssertConversionWorks(projectToConvertPath, projectBaselinePath, "netcoreapp3.1");
}

[Fact]
[Fact(Skip = "Can't find Microsoft.CSharp.targets on CI ,machine")]
public void ConvertsWpfFrameworkTemplateForNet50()
{
var projectToConvertPath = GetCSharpProjectPath("SmokeTests.WpfFramework");
var projectBaselinePath = GetCSharpProjectPath("SmokeTests.WpfNet5Baseline");
AssertConversionWorks(projectToConvertPath, projectBaselinePath, "net5.0-windows");
}

[Fact]
[Fact(Skip = "Can't find Microsoft.VisualBasic.targets on CI ,machine")]
public void ConvertsWpfVbFrameworkTemplateForNet50()
{
var projectToConvertPath = GetVisualBasicProjectPath("SmokeTests.WpfVbFramework");
var projectBaselinePath = GetVisualBasicProjectPath("SmokeTests.WpfVbNet5Baseline");
AssertConversionWorks(projectToConvertPath, projectBaselinePath, "net5.0-windows");
}

[Fact]
[Fact(Skip = "Can't find Microsoft.VisualBasic.targets on CI ,machine")]
public void ConvertsWinformsVbFrameworkTemplateAndKeepTargetFrameworkMoniker()
{
var projectToConvertPath = GetVisualBasicProjectPath("SmokeTests.WinformsVbFramework");
var projectBaselinePath = GetVisualBasicProjectPath("SmokeTests.WinformsVbKeepTfm");
AssertConversionWorks(projectToConvertPath, projectBaselinePath, "testdata", keepTargetFramework: true);
}

[Fact]
[Fact(Skip = "Can't find Microsoft.CSharp.targets on CI ,machine")]
public void ConvertsWinformsFrameworkTemplateForNetCoreApp31()
{
var projectToConvertPath = GetCSharpProjectPath("SmokeTests.WinformsFramework");
var projectBaselinePath = GetCSharpProjectPath("SmokeTests.WinformsCoreBaseline");
AssertConversionWorks(projectToConvertPath, projectBaselinePath, "netcoreapp3.1");
}

[Fact]
[Fact(Skip = "Can't find Microsoft.CSharp.targets on CI ,machine")]
public void ConvertsWinformsFrameworkTemplateForNet50()
{
var projectToConvertPath = GetCSharpProjectPath("SmokeTests.WinformsFramework");
var projectBaselinePath = GetCSharpProjectPath("SmokeTests.WinformsNet5Baseline");
AssertConversionWorks(projectToConvertPath, projectBaselinePath, "net5.0-windows");
}

[Fact]
[Fact(Skip = "Can't find Microsoft.CSharp.targets on CI ,machine")]
public void ConvertsWinformsFrameworkTemplateForNet50WithForceRemoveCustomImports()
{
var projectToConvertPath = GetCSharpProjectPath("SmokeTests.WinformsFramework");
var projectBaselinePath = GetCSharpProjectPath("SmokeTests.WinformsNet5Baseline");
AssertConversionWorks(projectToConvertPath, projectBaselinePath, "net5.0-windows", forceRemoveCustomImports : true);
}

[Fact]
[Fact(Skip = "Can't find Microsoft.CSharp.targets on CI ,machine")]
public void ConvertsLegacyMSTest()
{
var projectToConvertPath = GetCSharpProjectPath("SmokeTests.LegacyMSTest");
var projectBaselinePath = GetCSharpProjectPath("SmokeTests.MSTestCoreBaseline");
AssertConversionWorks(projectToConvertPath, projectBaselinePath, "netcoreapp3.1");
}

[Fact]
[Fact(Skip = "Can't find Microsoft.VisualBasic.targets on CI ,machine")]
public void ConvertsLegacyMSTestVB()
{
var projectToConvertPath = GetVisualBasicProjectPath("SmokeTests.LegacyMSTestVB");
var projectBaselinePath = GetVisualBasicProjectPath("SmokeTests.MSTestVbNet5Baseline");
AssertConversionWorks(projectToConvertPath, projectBaselinePath, "net5.0-windows");
}

[Fact]
[Fact(Skip = "Can't find Microsoft.CSharp.targets on CI ,machine")]
public void ConvertsLegacyWebLibraryToNetFx()
{
var projectToConvertPath = GetCSharpProjectPath("SmokeTests.LegacyWebLibrary");
var projectBaselinePath = GetCSharpProjectPath("SmokeTests.WebLibraryNetFxBaseline");
AssertConversionWorks(projectToConvertPath, projectBaselinePath, "net472", true);
}

[Fact]
[Fact(Skip = "Can't find Microsoft.CSharp.targets on CI ,machine")]
public void ConvertsLegacyWebLibraryToNet5()
{
var projectToConvertPath = GetCSharpProjectPath("SmokeTests.LegacyWebLibrary");
Expand Down
1 change: 1 addition & 0 deletions tests/unit/PackageConversion.Tests/PackageConversion.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

<ItemGroup>
<PackageReference Include="coverlet.collector" />
<PackageReference Include="Newtonsoft.Json" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit edb2df5

Please sign in to comment.