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

Commit edb2df5

Browse files
jmarolfjmarolf
authored
Merge pull request #459 from dotnet/dev/jmarolf/central-package-mangement
small infra fixes
2 parents 7c7e770 + b1623e5 commit edb2df5

5 files changed

Lines changed: 188 additions & 20 deletions

File tree

‎NuGet.config‎

Lines changed: 167 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,171 @@
1616
<disabledPackageSources>
1717
<clear />
1818
</disabledPackageSources>
19+
<packageSourceMapping>
20+
<packageSource key="dotnet5">
21+
<package pattern="microsoft.netcore.platforms" />
22+
<package pattern="microsoft.win32.registry" />
23+
<package pattern="microsoft.win32.systemevents" />
24+
<package pattern="system.commandline" />
25+
</packageSource>
26+
<packageSource key="dotnet-tools">
27+
<package pattern="microsoft.build.tasks.git" />
28+
<package pattern="microsoft.codecoverage" />
29+
<package pattern="microsoft.sourcelink.azurerepos.git" />
30+
<package pattern="microsoft.sourcelink.common" />
31+
<package pattern="microsoft.sourcelink.github" />
32+
</packageSource>
33+
<packageSource key="dotnet-eng">
34+
<package pattern="microbuild.core.sentinel" />
35+
<package pattern="microsoft.diasymreader.pdb2pdb" />
36+
<package pattern="microsoft.dotnet.arcade.sdk" />
37+
<package pattern="microsoft.dotnet.build.tasks.feed" />
38+
<package pattern="microsoft.dotnet.signtool" />
39+
<package pattern="microsoft.dotnet.xlifftasks" />
40+
<package pattern="microsoft.symboluploader.build.task" />
41+
<package pattern="xunit" />
42+
<package pattern="xunit.assert" />
43+
<package pattern="xunit.core" />
44+
<package pattern="xunit.extensibility.core" />
45+
<package pattern="xunit.extensibility.execution" />
46+
<package pattern="xunit.runner.console" />
47+
<package pattern="sn" />
48+
</packageSource>
49+
<packageSource key="dotnet-public">
50+
<package pattern="castle.core" />
51+
<package pattern="coverlet.collector" />
52+
<package pattern="microbuild.core" />
53+
<package pattern="microsoft.aspnetcore.app.runtime.win-x64" />
54+
<package pattern="microsoft.aspnetcore.app.runtime.win-x86" />
55+
<package pattern="microsoft.build" />
56+
<package pattern="microsoft.build.framework" />
57+
<package pattern="microsoft.build.locator" />
58+
<package pattern="microsoft.csharp" />
59+
<package pattern="microsoft.net.test.sdk" />
60+
<package pattern="microsoft.netcore.app.runtime.win-x64" />
61+
<package pattern="microsoft.netcore.app.runtime.win-x86" />
62+
<package pattern="microsoft.netcore.platforms" />
63+
<package pattern="microsoft.netcore.targets" />
64+
<package pattern="microsoft.testplatform.objectmodel" />
65+
<package pattern="microsoft.testplatform.testhost" />
66+
<package pattern="microsoft.visualstudio.sdk.embedinteroptypes" />
67+
<package pattern="microsoft.visualstudio.setup.configuration.interop" />
68+
<package pattern="microsoft.win32.primitives" />
69+
<package pattern="microsoft.win32.systemevents" />
70+
<package pattern="microsoft.windowsdesktop.app.runtime.win-x64" />
71+
<package pattern="microsoft.windowsdesktop.app.runtime.win-x86" />
72+
<package pattern="moq" />
73+
<package pattern="netstandard.library" />
74+
<package pattern="newtonsoft.json" />
75+
<package pattern="nuget.frameworks" />
76+
<package pattern="nuget.versioning" />
77+
<package pattern="runtime.any.system.collections" />
78+
<package pattern="runtime.any.system.globalization" />
79+
<package pattern="runtime.any.system.io" />
80+
<package pattern="runtime.any.system.reflection" />
81+
<package pattern="runtime.any.system.reflection.primitives" />
82+
<package pattern="runtime.any.system.resources.resourcemanager" />
83+
<package pattern="runtime.any.system.runtime" />
84+
<package pattern="runtime.any.system.runtime.handles" />
85+
<package pattern="runtime.any.system.runtime.interopservices" />
86+
<package pattern="runtime.any.system.text.encoding" />
87+
<package pattern="runtime.any.system.threading.tasks" />
88+
<package pattern="runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl" />
89+
<package pattern="runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl" />
90+
<package pattern="runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl" />
91+
<package pattern="runtime.native.system" />
92+
<package pattern="runtime.native.system.io.compression" />
93+
<package pattern="runtime.native.system.net.http" />
94+
<package pattern="runtime.native.system.security.cryptography.apple" />
95+
<package pattern="runtime.native.system.security.cryptography.openssl" />
96+
<package pattern="runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl" />
97+
<package pattern="runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl" />
98+
<package pattern="runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple" />
99+
<package pattern="runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl" />
100+
<package pattern="runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl" />
101+
<package pattern="runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl" />
102+
<package pattern="runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl" />
103+
<package pattern="runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl" />
104+
<package pattern="runtime.win.system.runtime.extensions" />
105+
<package pattern="system.appcontext" />
106+
<package pattern="system.buffers" />
107+
<package pattern="system.collections" />
108+
<package pattern="system.collections.concurrent" />
109+
<package pattern="system.collections.immutable" />
110+
<package pattern="system.collections.nongeneric" />
111+
<package pattern="system.collections.specialized" />
112+
<package pattern="system.componentmodel" />
113+
<package pattern="system.componentmodel.primitives" />
114+
<package pattern="system.componentmodel.typeconverter" />
115+
<package pattern="system.configuration.configurationmanager" />
116+
<package pattern="system.console" />
117+
<package pattern="system.diagnostics.debug" />
118+
<package pattern="system.diagnostics.diagnosticsource" />
119+
<package pattern="system.diagnostics.tools" />
120+
<package pattern="system.diagnostics.tracesource" />
121+
<package pattern="system.diagnostics.tracing" />
122+
<package pattern="system.drawing.common" />
123+
<package pattern="system.dynamic.runtime" />
124+
<package pattern="system.globalization" />
125+
<package pattern="system.globalization.calendars" />
126+
<package pattern="system.globalization.extensions" />
127+
<package pattern="system.io" />
128+
<package pattern="system.io.compression" />
129+
<package pattern="system.io.compression.zipfile" />
130+
<package pattern="system.io.filesystem" />
131+
<package pattern="system.io.filesystem.primitives" />
132+
<package pattern="system.linq" />
133+
<package pattern="system.linq.expressions" />
134+
<package pattern="system.memory" />
135+
<package pattern="system.net.http" />
136+
<package pattern="system.net.primitives" />
137+
<package pattern="system.net.sockets" />
138+
<package pattern="system.objectmodel" />
139+
<package pattern="system.private.uri" />
140+
<package pattern="system.reflection" />
141+
<package pattern="system.reflection.emit" />
142+
<package pattern="system.reflection.emit.ilgeneration" />
143+
<package pattern="system.reflection.emit.lightweight" />
144+
<package pattern="system.reflection.extensions" />
145+
<package pattern="system.reflection.metadata" />
146+
<package pattern="system.reflection.primitives" />
147+
<package pattern="system.reflection.typeextensions" />
148+
<package pattern="system.resources.resourcemanager" />
149+
<package pattern="system.runtime" />
150+
<package pattern="system.runtime.extensions" />
151+
<package pattern="system.runtime.handles" />
152+
<package pattern="system.runtime.interopservices" />
153+
<package pattern="system.runtime.interopservices.runtimeinformation" />
154+
<package pattern="system.runtime.numerics" />
155+
<package pattern="system.security.accesscontrol" />
156+
<package pattern="system.security.cryptography.algorithms" />
157+
<package pattern="system.security.cryptography.cng" />
158+
<package pattern="system.security.cryptography.csp" />
159+
<package pattern="system.security.cryptography.encoding" />
160+
<package pattern="system.security.cryptography.openssl" />
161+
<package pattern="system.security.cryptography.primitives" />
162+
<package pattern="system.security.cryptography.protecteddata" />
163+
<package pattern="system.security.cryptography.x509certificates" />
164+
<package pattern="system.security.permissions" />
165+
<package pattern="system.security.principal.windows" />
166+
<package pattern="system.text.encoding" />
167+
<package pattern="system.text.encoding.codepages" />
168+
<package pattern="system.text.encoding.extensions" />
169+
<package pattern="system.text.json" />
170+
<package pattern="system.text.regularexpressions" />
171+
<package pattern="system.threading" />
172+
<package pattern="system.threading.tasks" />
173+
<package pattern="system.threading.tasks.dataflow" />
174+
<package pattern="system.threading.tasks.extensions" />
175+
<package pattern="system.threading.timer" />
176+
<package pattern="system.windows.extensions" />
177+
<package pattern="system.xml.readerwriter" />
178+
<package pattern="system.xml.xdocument" />
179+
<package pattern="system.xml.xmldocument" />
180+
<package pattern="vswhere" />
181+
<package pattern="xunit.abstractions" />
182+
<package pattern="xunit.analyzers" />
183+
<package pattern="xunit.runner.visualstudio" />
184+
</packageSource>
185+
</packageSourceMapping>
19186
</configuration>

‎global.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"tools": {
3-
"dotnet": "6.0.100",
3+
"dotnet": "6.0.401",
44
"runtimes": {
55
"dotnet": [
6-
"5.0.14",
7-
"3.1.7",
8-
"2.1.11"
6+
"5.0.17",
7+
"3.1.29",
8+
"2.1.30"
99
]
1010
}
1111
},
1212
"sdk": {
13-
"version": "6.0.100",
13+
"version": "6.0.401",
1414
"rollForward": "major"
1515
},
1616
"msbuild-sdks": {

‎tests/end-to-end/MauiSmoke.Tests/MauiConversions.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ public MauiConversions(MauiSolutionPathFixture solutionPathFixture, MauiMSBuildF
2525
solutionPathFixture.SetCurrentDirectory();
2626
}
2727

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

36-
[Fact]
36+
[Fact(Skip = "Xamarin targets are not available on build machine")]
3737
public void ConvertsXamarinFormsiOSToMaui()
3838
{
3939
var projectToConvertPath = GetXamariniOSProjectPath("SmokeTests.XamarinForms.iOS");

‎tests/end-to-end/Smoke.Tests/BasicConversions.cs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,103 +28,103 @@ public BasicSmokeTests(SolutionPathFixture solutionPathFixture, MSBuildFixture m
2828
solutionPathFixture.SetCurrentDirectory();
2929
}
3030

31-
[Fact]
31+
[Fact(Skip = "Can't find Microsoft.NET.Sdk.ImportWorkloads.props on CI ,machine")]
3232
public void ConvertsLegacyFSharpConsoleToNetCoreApp31()
3333
{
3434
var projectToConvertPath = GetFSharpProjectPath("SmokeTests.LegacyFSharpConsole");
3535
var projectBaselinePath = GetFSharpProjectPath("SmokeTests.FSharpConsoleCoreBaseline");
3636
AssertConversionWorks(projectToConvertPath, projectBaselinePath, "netcoreapp3.1");
3737
}
3838

39-
[Fact]
39+
[Fact(Skip = "Can't find Microsoft.NET.Sdk.ImportWorkloads.props on CI ,machine")]
4040
public void ConvertsLegacyFSharpConsoleToNet50()
4141
{
4242
var projectToConvertPath = GetFSharpProjectPath("SmokeTests.LegacyFSharpConsole");
4343
var projectBaselinePath = GetFSharpProjectPath("SmokeTests.FSharpConsoleNet5Baseline");
4444
AssertConversionWorks(projectToConvertPath, projectBaselinePath, "net5.0");
4545
}
4646

47-
[Fact]
47+
[Fact(Skip = "Can't find Microsoft.CSharp.targets on CI ,machine")]
4848
public void ConvertsWpfFrameworkTemplateForNetCoreApp31()
4949
{
5050
var projectToConvertPath = GetCSharpProjectPath("SmokeTests.WpfFramework");
5151
var projectBaselinePath = GetCSharpProjectPath("SmokeTests.WpfCoreBaseline");
5252
AssertConversionWorks(projectToConvertPath, projectBaselinePath, "netcoreapp3.1");
5353
}
5454

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

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

71-
[Fact]
71+
[Fact(Skip = "Can't find Microsoft.VisualBasic.targets on CI ,machine")]
7272
public void ConvertsWinformsVbFrameworkTemplateAndKeepTargetFrameworkMoniker()
7373
{
7474
var projectToConvertPath = GetVisualBasicProjectPath("SmokeTests.WinformsVbFramework");
7575
var projectBaselinePath = GetVisualBasicProjectPath("SmokeTests.WinformsVbKeepTfm");
7676
AssertConversionWorks(projectToConvertPath, projectBaselinePath, "testdata", keepTargetFramework: true);
7777
}
7878

79-
[Fact]
79+
[Fact(Skip = "Can't find Microsoft.CSharp.targets on CI ,machine")]
8080
public void ConvertsWinformsFrameworkTemplateForNetCoreApp31()
8181
{
8282
var projectToConvertPath = GetCSharpProjectPath("SmokeTests.WinformsFramework");
8383
var projectBaselinePath = GetCSharpProjectPath("SmokeTests.WinformsCoreBaseline");
8484
AssertConversionWorks(projectToConvertPath, projectBaselinePath, "netcoreapp3.1");
8585
}
8686

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

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

103-
[Fact]
103+
[Fact(Skip = "Can't find Microsoft.CSharp.targets on CI ,machine")]
104104
public void ConvertsLegacyMSTest()
105105
{
106106
var projectToConvertPath = GetCSharpProjectPath("SmokeTests.LegacyMSTest");
107107
var projectBaselinePath = GetCSharpProjectPath("SmokeTests.MSTestCoreBaseline");
108108
AssertConversionWorks(projectToConvertPath, projectBaselinePath, "netcoreapp3.1");
109109
}
110110

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

119-
[Fact]
119+
[Fact(Skip = "Can't find Microsoft.CSharp.targets on CI ,machine")]
120120
public void ConvertsLegacyWebLibraryToNetFx()
121121
{
122122
var projectToConvertPath = GetCSharpProjectPath("SmokeTests.LegacyWebLibrary");
123123
var projectBaselinePath = GetCSharpProjectPath("SmokeTests.WebLibraryNetFxBaseline");
124124
AssertConversionWorks(projectToConvertPath, projectBaselinePath, "net472", true);
125125
}
126126

127-
[Fact]
127+
[Fact(Skip = "Can't find Microsoft.CSharp.targets on CI ,machine")]
128128
public void ConvertsLegacyWebLibraryToNet5()
129129
{
130130
var projectToConvertPath = GetCSharpProjectPath("SmokeTests.LegacyWebLibrary");

‎tests/unit/PackageConversion.Tests/PackageConversion.Tests.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
<ItemGroup>
99
<PackageReference Include="coverlet.collector" />
10+
<PackageReference Include="Newtonsoft.Json" />
1011
</ItemGroup>
1112

1213
<ItemGroup>

0 commit comments

Comments
 (0)