diff --git a/Directory.Build.targets b/Directory.Build.targets
index 78626b773e..7e3f8df92e 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,10 +1,6 @@
- $(MicrosoftNETCoreApp20PackageVersion)
- $(MicrosoftNETCoreApp21PackageVersion)
- $(MicrosoftNETCoreApp22PackageVersion)
+ $(MicrosoftNETCoreAppPackageVersion)
$(NETStandardLibrary20PackageVersion)
-
- 99.9
diff --git a/benchmarkapps/Benchmarks/Benchmarks.csproj b/benchmarkapps/Benchmarks/Benchmarks.csproj
index 3c5753cc64..0db37a19dd 100644
--- a/benchmarkapps/Benchmarks/Benchmarks.csproj
+++ b/benchmarkapps/Benchmarks/Benchmarks.csproj
@@ -1,7 +1,7 @@
- netcoreapp2.2
+ netcoreapp3.0
$(BenchmarksTargetFramework)
true
diff --git a/benchmarks/Microsoft.AspNetCore.Routing.Performance/Microsoft.AspNetCore.Routing.Performance.csproj b/benchmarks/Microsoft.AspNetCore.Routing.Performance/Microsoft.AspNetCore.Routing.Performance.csproj
index 625a26262a..ebe8f50b50 100644
--- a/benchmarks/Microsoft.AspNetCore.Routing.Performance/Microsoft.AspNetCore.Routing.Performance.csproj
+++ b/benchmarks/Microsoft.AspNetCore.Routing.Performance/Microsoft.AspNetCore.Routing.Performance.csproj
@@ -1,7 +1,7 @@
- netcoreapp2.2
+ netcoreapp3.0
Exe
true
true
diff --git a/build/dependencies.props b/build/dependencies.props
index 12ae16b6a4..15eca73927 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -4,43 +4,39 @@
0.10.13
- 3.0.0-alpha1-20181011.3
- 3.0.0-alpha1-10645
- 3.0.0-alpha1-10645
- 3.0.0-alpha1-10645
- 3.0.0-alpha1-10645
- 3.0.0-alpha1-10645
- 3.0.0-alpha1-10645
- 3.0.0-alpha1-10645
- 3.0.0-alpha1-10645
- 3.0.0-alpha1-10645
- 3.0.0-alpha1-10645
- 3.0.0-alpha1-10645
- 3.0.0-alpha1-10645
- 3.0.0-alpha1-10645
- 3.0.0-alpha1-10645
- 3.0.0-alpha1-10645
- 3.0.0-alpha1-10645
- 3.0.0-alpha1-10645
- 3.0.0-alpha1-10645
- 3.0.0-alpha1-10645
- 3.0.0-alpha1-10645
- 3.0.0-alpha1-10645
- 3.0.0-alpha1-10645
- 3.0.0-alpha1-10645
- 3.0.0-alpha1-10645
- 3.0.0-alpha1-10645
- 3.0.0-alpha1-10645
- 3.0.0-alpha1-10645
- 2.0.9
- 2.1.3
- 2.2.0-preview3-27014-02
+ 3.0.0-build-20181114.5
+ 3.0.0-alpha1-10742
+ 3.0.0-preview-181113-11
+ 3.0.0-alpha1-10742
+ 3.0.0-alpha1-10742
+ 3.0.0-alpha1-10742
+ 3.0.0-alpha1-10742
+ 3.0.0-alpha1-10742
+ 3.0.0-alpha1-10742
+ 3.0.0-alpha1-10742
+ 3.0.0-alpha1-10742
+ 3.0.0-alpha1-10742
+ 3.0.0-preview-181113-11
+ 3.0.0-preview-181113-11
+ 3.0.0-preview-181113-11
+ 3.0.0-preview-181113-11
+ 3.0.0-preview-181113-11
+ 3.0.0-preview-181113-11
+ 3.0.0-preview-181113-11
+ 3.0.0-preview-181113-11
+ 3.0.0-preview-181113-11
+ 3.0.0-preview-181113-11
+ 3.0.0-preview-181113-11
+ 3.0.0-preview-181113-11
+ 3.0.0-preview-181113-11
+ 3.0.0-preview-181113-11
+ 3.0.0-preview-181113-11
+ 3.0.0-preview-181113-11
+ 3.0.0-preview1-26907-05
15.6.1
4.10.0
2.0.3
11.0.2
- 4.3.0
- 4.3.0
0.10.0
2.3.1
2.4.0
diff --git a/build/repo.props b/build/repo.props
index 71840e75d1..157a311580 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -8,9 +8,7 @@
-
-
-
+
diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index f7d4e37b32..73613543d0 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +1,2 @@
-version:3.0.0-alpha1-20181011.3
-commithash:e7569d931e994629267ab2646e9926140962b4ac
+version:3.0.0-build-20181114.5
+commithash:880e9a204d4ee4a18dfd83c9fb05a192a28bca60
diff --git a/samples/RoutingSandbox/RoutingSandbox.csproj b/samples/RoutingSandbox/RoutingSandbox.csproj
index c798b5f4e5..eaf327a420 100644
--- a/samples/RoutingSandbox/RoutingSandbox.csproj
+++ b/samples/RoutingSandbox/RoutingSandbox.csproj
@@ -1,8 +1,7 @@
- netcoreapp2.2
- $(TargetFrameworks);net461
+ netcoreapp3.0
diff --git a/src/Microsoft.AspNetCore.Routing.Abstractions/Microsoft.AspNetCore.Routing.Abstractions.csproj b/src/Microsoft.AspNetCore.Routing.Abstractions/Microsoft.AspNetCore.Routing.Abstractions.csproj
index 633a49d503..559550f7ed 100644
--- a/src/Microsoft.AspNetCore.Routing.Abstractions/Microsoft.AspNetCore.Routing.Abstractions.csproj
+++ b/src/Microsoft.AspNetCore.Routing.Abstractions/Microsoft.AspNetCore.Routing.Abstractions.csproj
@@ -5,7 +5,7 @@
Commonly used types:
Microsoft.AspNetCore.Routing.IRouter
Microsoft.AspNetCore.Routing.RouteData
- netstandard2.0
+ netcoreapp3.0
$(NoWarn);CS1591
true
aspnetcore;routing
diff --git a/src/Microsoft.AspNetCore.Routing/Matching/ILEmitTrieFactory.cs b/src/Microsoft.AspNetCore.Routing/Matching/ILEmitTrieFactory.cs
index 3b3528932f..3cb240c2fa 100644
--- a/src/Microsoft.AspNetCore.Routing/Matching/ILEmitTrieFactory.cs
+++ b/src/Microsoft.AspNetCore.Routing/Matching/ILEmitTrieFactory.cs
@@ -1,7 +1,6 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-#if IL_EMIT
using System;
using System.Diagnostics;
using System.Linq;
@@ -596,5 +595,3 @@ namespace Microsoft.AspNetCore.Routing.Matching
}
}
}
-
-#endif
diff --git a/src/Microsoft.AspNetCore.Routing/Matching/ILEmitTrieJumpTable.cs b/src/Microsoft.AspNetCore.Routing/Matching/ILEmitTrieJumpTable.cs
index 3bd29c9695..e59f283435 100644
--- a/src/Microsoft.AspNetCore.Routing/Matching/ILEmitTrieJumpTable.cs
+++ b/src/Microsoft.AspNetCore.Routing/Matching/ILEmitTrieJumpTable.cs
@@ -1,6 +1,5 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-#if IL_EMIT
using System;
using System.Threading;
@@ -101,4 +100,3 @@ namespace Microsoft.AspNetCore.Routing.Matching
}
}
}
-#endif
diff --git a/src/Microsoft.AspNetCore.Routing/Matching/JumpTableBuilder.cs b/src/Microsoft.AspNetCore.Routing/Matching/JumpTableBuilder.cs
index efee38f0f1..4545af9f3b 100644
--- a/src/Microsoft.AspNetCore.Routing/Matching/JumpTableBuilder.cs
+++ b/src/Microsoft.AspNetCore.Routing/Matching/JumpTableBuilder.cs
@@ -84,11 +84,7 @@ namespace Microsoft.AspNetCore.Routing.Matching
fallback = new DictionaryJumpTable(defaultDestination, exitDestination, pathEntries);
}
-#if IL_EMIT
return new ILEmitTrieJumpTable(defaultDestination, exitDestination, pathEntries, vectorize: null, fallback);
-#else
- return fallback;
-#endif
}
}
}
diff --git a/src/Microsoft.AspNetCore.Routing/Microsoft.AspNetCore.Routing.csproj b/src/Microsoft.AspNetCore.Routing/Microsoft.AspNetCore.Routing.csproj
index a2ff4ab1ba..c76afe42c6 100644
--- a/src/Microsoft.AspNetCore.Routing/Microsoft.AspNetCore.Routing.csproj
+++ b/src/Microsoft.AspNetCore.Routing/Microsoft.AspNetCore.Routing.csproj
@@ -4,7 +4,7 @@
Commonly used types:
Microsoft.AspNetCore.Routing.Route
Microsoft.AspNetCore.Routing.RouteCollection
- netstandard2.0;netcoreapp2.2
+ netcoreapp3.0
$(NoWarn);CS1591
true
aspnetcore;routing
@@ -12,14 +12,10 @@ Microsoft.AspNetCore.Routing.RouteCollection
-
- true
false
- IL_EMIT;$(DefineConstants)
IL_EMIT_SAVE_ASSEMBLIES;$(DefineConstants)
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index c126684d3f..20029dfa54 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -1,13 +1,6 @@
-
- netcoreapp2.2
- $(DeveloperBuildTestTfms)
- $(StandardTestTfms)
- $(StandardTestTfms);net461
-
-
false
diff --git a/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.csproj b/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.csproj
index c5fa909119..c6388013e4 100644
--- a/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.csproj
+++ b/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.csproj
@@ -1,7 +1,7 @@
- $(StandardTestTfms)
+ netcoreapp3.0
diff --git a/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests.csproj b/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests.csproj
index 286e462426..21fee51bbf 100644
--- a/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests.csproj
+++ b/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests.csproj
@@ -1,7 +1,7 @@
- $(StandardTestTfms)
+ netcoreapp3.0
diff --git a/test/Microsoft.AspNetCore.Routing.FunctionalTests/Benchmarks/EndpointRoutingBenchmarkTest.cs b/test/Microsoft.AspNetCore.Routing.FunctionalTests/Benchmarks/EndpointRoutingBenchmarkTest.cs
index 2e39f5846c..b40da83fc9 100644
--- a/test/Microsoft.AspNetCore.Routing.FunctionalTests/Benchmarks/EndpointRoutingBenchmarkTest.cs
+++ b/test/Microsoft.AspNetCore.Routing.FunctionalTests/Benchmarks/EndpointRoutingBenchmarkTest.cs
@@ -1,7 +1,6 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-#if NETCOREAPP2_2
using System;
using System.Net;
using System.Net.Http;
@@ -57,4 +56,3 @@ namespace Microsoft.AspNetCore.Routing.FunctionalTests
}
}
}
-#endif
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Routing.FunctionalTests/Benchmarks/RouterBenchmarkTest.cs b/test/Microsoft.AspNetCore.Routing.FunctionalTests/Benchmarks/RouterBenchmarkTest.cs
index bb7300388b..aecbaaab8c 100644
--- a/test/Microsoft.AspNetCore.Routing.FunctionalTests/Benchmarks/RouterBenchmarkTest.cs
+++ b/test/Microsoft.AspNetCore.Routing.FunctionalTests/Benchmarks/RouterBenchmarkTest.cs
@@ -1,7 +1,6 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-#if NETCOREAPP2_2
using System;
using System.Net;
using System.Net.Http;
@@ -56,5 +55,4 @@ namespace Microsoft.AspNetCore.Routing.FunctionalTests
_client.Dispose();
}
}
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Routing.FunctionalTests/Microsoft.AspNetCore.Routing.FunctionalTests.csproj b/test/Microsoft.AspNetCore.Routing.FunctionalTests/Microsoft.AspNetCore.Routing.FunctionalTests.csproj
index 0fecc56388..79adee4f98 100644
--- a/test/Microsoft.AspNetCore.Routing.FunctionalTests/Microsoft.AspNetCore.Routing.FunctionalTests.csproj
+++ b/test/Microsoft.AspNetCore.Routing.FunctionalTests/Microsoft.AspNetCore.Routing.FunctionalTests.csproj
@@ -1,7 +1,7 @@
- $(StandardTestTfms)
+ netcoreapp3.0
@@ -10,7 +10,7 @@
-
+
diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Matching/ILEmitTrieFactoryTest.cs b/test/Microsoft.AspNetCore.Routing.Tests/Matching/ILEmitTrieFactoryTest.cs
index 738646dc11..f2eb13df81 100644
--- a/test/Microsoft.AspNetCore.Routing.Tests/Matching/ILEmitTrieFactoryTest.cs
+++ b/test/Microsoft.AspNetCore.Routing.Tests/Matching/ILEmitTrieFactoryTest.cs
@@ -1,7 +1,6 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-#if IL_EMIT
using System;
using Xunit;
@@ -50,4 +49,3 @@ namespace Microsoft.AspNetCore.Routing.Matching
}
}
}
-#endif
diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Matching/ILEmitTrieJumpTableTest.cs b/test/Microsoft.AspNetCore.Routing.Tests/Matching/ILEmitTrieJumpTableTest.cs
index 5106b40beb..4a435514ab 100644
--- a/test/Microsoft.AspNetCore.Routing.Tests/Matching/ILEmitTrieJumpTableTest.cs
+++ b/test/Microsoft.AspNetCore.Routing.Tests/Matching/ILEmitTrieJumpTableTest.cs
@@ -1,7 +1,6 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-#if IL_EMIT
using Moq;
using System.Threading.Tasks;
using Xunit;
@@ -225,4 +224,3 @@ namespace Microsoft.AspNetCore.Routing.Matching
}
}
}
-#endif
diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Matching/NonVectorizedILEmitTrieJumpTableTest.cs b/test/Microsoft.AspNetCore.Routing.Tests/Matching/NonVectorizedILEmitTrieJumpTableTest.cs
index 3e5b59baf6..36927d0e75 100644
--- a/test/Microsoft.AspNetCore.Routing.Tests/Matching/NonVectorizedILEmitTrieJumpTableTest.cs
+++ b/test/Microsoft.AspNetCore.Routing.Tests/Matching/NonVectorizedILEmitTrieJumpTableTest.cs
@@ -1,7 +1,6 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-#if IL_EMIT
namespace Microsoft.AspNetCore.Routing.Matching
{
public class NonVectorizedILEmitTrieJumpTableTest : ILEmitTreeJumpTableTestBase
@@ -9,4 +8,3 @@ namespace Microsoft.AspNetCore.Routing.Matching
public override bool Vectorize => false;
}
}
-#endif
diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Matching/VectorizedILEmitTrieJumpTableTest.cs b/test/Microsoft.AspNetCore.Routing.Tests/Matching/VectorizedILEmitTrieJumpTableTest.cs
index fc5e7c555a..3661b158ab 100644
--- a/test/Microsoft.AspNetCore.Routing.Tests/Matching/VectorizedILEmitTrieJumpTableTest.cs
+++ b/test/Microsoft.AspNetCore.Routing.Tests/Matching/VectorizedILEmitTrieJumpTableTest.cs
@@ -1,7 +1,6 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-#if IL_EMIT
namespace Microsoft.AspNetCore.Routing.Matching
{
public class VectorizedILEmitTrieJumpTableTest : ILEmitTreeJumpTableTestBase
@@ -11,4 +10,3 @@ namespace Microsoft.AspNetCore.Routing.Matching
public override bool Vectorize => true;
}
}
-#endif
diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Microsoft.AspNetCore.Routing.Tests.csproj b/test/Microsoft.AspNetCore.Routing.Tests/Microsoft.AspNetCore.Routing.Tests.csproj
index 540f151fed..035506e996 100644
--- a/test/Microsoft.AspNetCore.Routing.Tests/Microsoft.AspNetCore.Routing.Tests.csproj
+++ b/test/Microsoft.AspNetCore.Routing.Tests/Microsoft.AspNetCore.Routing.Tests.csproj
@@ -1,23 +1,11 @@
- $(StandardTestTfms)
+ netcoreapp3.0
Microsoft.AspNetCore.Routing
true
-
-
- true
- IL_EMIT;$(DefineConstants)
-
-
-
-
-
diff --git a/test/WebSites/Directory.Build.props b/test/WebSites/Directory.Build.props
index 2ff6b1fb54..c1b2f8c824 100644
--- a/test/WebSites/Directory.Build.props
+++ b/test/WebSites/Directory.Build.props
@@ -1,11 +1,4 @@
-
-
- netcoreapp2.2
- $(DeveloperBuildTestWebsiteTfms)
- netcoreapp2.2
- $(StandardTestWebsiteTfms);net461
-
diff --git a/test/WebSites/RoutingWebSite/RoutingWebSite.csproj b/test/WebSites/RoutingWebSite/RoutingWebSite.csproj
index d462c5fbbc..35ac135e33 100644
--- a/test/WebSites/RoutingWebSite/RoutingWebSite.csproj
+++ b/test/WebSites/RoutingWebSite/RoutingWebSite.csproj
@@ -1,8 +1,7 @@
- netcoreapp2.2
- $(TargetFrameworks);net461
+ netcoreapp3.0
diff --git a/tools/Swaggatherer/Swaggatherer.csproj b/tools/Swaggatherer/Swaggatherer.csproj
index 6874d1d5da..35103913f2 100644
--- a/tools/Swaggatherer/Swaggatherer.csproj
+++ b/tools/Swaggatherer/Swaggatherer.csproj
@@ -2,7 +2,7 @@
Exe
- netcoreapp2.0
+ netcoreapp3.0