diff --git a/build/SharedFx.targets b/build/SharedFx.targets index 9dd5423bf4..fd696721b7 100644 --- a/build/SharedFx.targets +++ b/build/SharedFx.targets @@ -13,9 +13,7 @@ <_MetapackageProject Include="$(RepositoryRoot)src\Microsoft.AspNetCore.All\Microsoft.AspNetCore.All.csproj" /> - <_MetapackageProject Include="$(RepositoryRoot)src\runtime.win.Microsoft.AspNetCore.All\runtime.win.Microsoft.AspNetCore.All.csproj" /> <_MetapackageProject Include="$(RepositoryRoot)src\Microsoft.AspNetCore.App\Microsoft.AspNetCore.App.csproj" /> - <_MetapackageProject Include="$(RepositoryRoot)src\runtime.win.Microsoft.AspNetCore.App\runtime.win.Microsoft.AspNetCore.App.csproj" /> <_MetapackageProject Include="$(RepositoryRoot)src\Microsoft.AspNetCore.Analyzers\Microsoft.AspNetCore.Analyzers.csproj" /> @@ -77,13 +75,6 @@ PackageArtifacts="@(PackageArtifact)" ExternalDependencies="@(ExternalDependency)" /> - - - @@ -96,15 +87,6 @@ MetapackageName=Microsoft.AspNetCore.App; MetapackageReferenceType=AppMetapackage; - LockToExactVersions=true; - ProcessRuntimeJson=true - - - - <_MetapackageBuilderProject Include="$(MSBuildProjectFullPath)"> - - MetapackageName=runtime.win.Microsoft.AspNetCore.App; - MetapackageReferenceType=WinAppMetapackage; LockToExactVersions=true @@ -113,15 +95,6 @@ MetapackageName=Microsoft.AspNetCore.All; MetapackageReferenceType=AllMetapackage; - LockToExactVersions=false; - ProcessRuntimeJson=true - - - - <_MetapackageBuilderProject Include="$(MSBuildProjectFullPath)"> - - MetapackageName=runtime.win.Microsoft.AspNetCore.All; - MetapackageReferenceType=WinAllMetapackage; LockToExactVersions=false diff --git a/build/artifacts.props b/build/artifacts.props index 024a34ff60..b6d04c0dd1 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -6,10 +6,6 @@ false false - - false - - false false @@ -147,7 +143,7 @@ - + @@ -308,8 +304,6 @@ - - diff --git a/build/dependencies.props b/build/dependencies.props index c5ff0a04c4..6afde97bd6 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,90 +1,90 @@  - 4.5.0-preview2-26326-04 - 2.1.0-preview2-26326-03 - 2.1.0-preview2-26326-03 + 4.5.0-preview2-26330-05 + 2.1.0-preview2-26330-03 + 2.1.0-preview2-26330-03 - 2.1.0-preview2-26326-03 - 2.1.0-preview2-26326-03 - 2.1.0-preview2-26326-03 - 2.1.0-preview2-26326-03 - 2.1.0-preview2-26326-04 - 4.5.0-preview2-26326-04 + 2.1.0-preview2-26330-03 + 2.1.0-preview2-26330-03 + 2.1.0-preview2-26330-03 + 2.1.0-preview2-26330-03 + 2.1.0-preview2-26330-05 + 4.5.0-preview2-26330-05 4.7.0-netcore.2.1.preview2.5137 - 2.1.0-preview2-26326-03 - 2.1.0-preview2-26326-03 - 2.1.0-preview2-26326-03 - 2.1.0-preview2-26326-03 - 2.1.0-preview2-26326-03 - 2.1.0-preview2-26326-03 - 2.1.0-preview2-26326-03 - 2.1.0-preview2-26326-03 - 2.1.0-preview2-26326-03 - 2.1.0-preview2-26326-03 - 2.1.0-preview2-26326-03 - 2.1.0-preview2-26326-03 - 2.1.0-preview2-26326-03 - 2.1.0-preview2-26326-03 - 2.1.0-preview2-26326-03 - 2.1.0-preview2-26326-03 - 2.1.0-preview2-26326-03 - 2.1.0-preview2-26326-03 - 2.1.0-preview2-26326-03 - 2.1.0-preview2-26326-03 - 2.1.0-preview2-26326-03 - 2.1.0-preview2-26326-03 - 2.1.0-preview2-26326-03 - 2.1.0-preview2-26326-03 - 2.1.0-preview2-26326-03 - 2.1.0-preview2-26326-03 - 2.1.0-preview2-26326-03 - 2.1.0-preview2-26326-03 - 2.1.0-preview2-26326-03 - 2.1.0-preview2-26326-03 - 4.5.0-preview2-26326-04 - 4.5.0-preview2-26326-04 - 1.5.0-preview2-26326-04 - 4.5.0-preview2-26326-04 - 1.2.0-preview2-26326-04 - 1.2.0-preview2-26326-04 - 1.2.0-preview2-26326-04 - 1.2.0-preview2-26326-04 - 1.2.0-preview2-26326-04 - 1.2.0-preview2-26326-04 - 4.5.0-preview2-26326-04 - 4.5.0-preview2-26326-04 - 4.5.0-preview2-26326-04 - 4.5.0-preview2-26326-04 - 4.5.0-preview2-26326-04 - 4.5.0-preview2-26326-04 - 4.5.0-preview2-26326-04 - 4.5.0-preview2-26326-04 - 4.5.0-preview2-26326-04 - 4.5.0-preview2-26326-04 - 4.5.0-preview2-26326-04 - 4.5.0-preview2-26326-04 - 4.5.0-preview2-26326-04 - 4.5.0-preview2-26326-04 - 4.5.0-preview2-26326-04 - 1.6.0-preview2-26326-04 - 4.5.0-preview2-26326-04 - 4.5.0-preview2-26326-04 - 4.5.0-preview2-26326-04 - 4.5.0-preview2-26326-04 - 4.5.0-preview2-26326-04 - 4.5.0-preview2-26326-04 - 4.5.0-preview2-26326-04 - 4.5.0-preview2-26326-04 - 4.5.0-preview2-26326-04 - 4.5.0-preview2-26326-04 - 4.5.0-preview2-26326-04 - 4.5.0-preview2-26326-04 - 4.5.0-preview2-26326-04 - 4.5.0-preview2-26326-04 - 4.9.0-preview2-26326-04 - 4.5.0-preview2-26326-04 - 4.5.0-preview2-26326-04 + 2.1.0-preview2-26330-03 + 2.1.0-preview2-26330-03 + 2.1.0-preview2-26330-03 + 2.1.0-preview2-26330-03 + 2.1.0-preview2-26330-03 + 2.1.0-preview2-26330-03 + 2.1.0-preview2-26330-03 + 2.1.0-preview2-26330-03 + 2.1.0-preview2-26330-03 + 2.1.0-preview2-26330-03 + 2.1.0-preview2-26330-03 + 2.1.0-preview2-26330-03 + 2.1.0-preview2-26330-03 + 2.1.0-preview2-26330-03 + 2.1.0-preview2-26330-03 + 2.1.0-preview2-26330-03 + 2.1.0-preview2-26330-03 + 2.1.0-preview2-26330-03 + 2.1.0-preview2-26330-03 + 2.1.0-preview2-26330-03 + 2.1.0-preview2-26330-03 + 2.1.0-preview2-26330-03 + 2.1.0-preview2-26330-03 + 2.1.0-preview2-26330-03 + 2.1.0-preview2-26330-03 + 2.1.0-preview2-26330-03 + 2.1.0-preview2-26330-03 + 2.1.0-preview2-26330-03 + 2.1.0-preview2-26330-03 + 2.1.0-preview2-26330-03 + 4.5.0-preview2-26330-05 + 4.5.0-preview2-26330-05 + 1.5.0-preview2-26330-05 + 4.5.0-preview2-26330-05 + 1.2.0-preview2-26330-05 + 1.2.0-preview2-26330-05 + 1.2.0-preview2-26330-05 + 1.2.0-preview2-26330-05 + 1.2.0-preview2-26330-05 + 1.2.0-preview2-26330-05 + 4.5.0-preview2-26330-05 + 4.5.0-preview2-26330-05 + 4.5.0-preview2-26330-05 + 4.5.0-preview2-26330-05 + 4.5.0-preview2-26330-05 + 4.5.0-preview2-26330-05 + 4.5.0-preview2-26330-05 + 4.5.0-preview2-26330-05 + 4.5.0-preview2-26330-05 + 4.5.0-preview2-26330-05 + 4.5.0-preview2-26330-05 + 4.5.0-preview2-26330-05 + 4.5.0-preview2-26330-05 + 4.5.0-preview2-26330-05 + 4.5.0-preview2-26330-05 + 1.6.0-preview2-26330-05 + 4.5.0-preview2-26330-05 + 4.5.0-preview2-26330-05 + 4.5.0-preview2-26330-05 + 4.5.0-preview2-26330-05 + 4.5.0-preview2-26330-05 + 4.5.0-preview2-26330-05 + 4.5.0-preview2-26330-05 + 4.5.0-preview2-26330-05 + 4.5.0-preview2-26330-05 + 4.5.0-preview2-26330-05 + 4.5.0-preview2-26330-05 + 4.5.0-preview2-26330-05 + 4.5.0-preview2-26330-05 + 4.5.0-preview2-26330-05 + 4.9.0-preview2-26330-05 + 4.5.0-preview2-26330-05 + 4.5.0-preview2-26330-05 diff --git a/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj b/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj index 285e42eb7c..6df70d6f22 100644 --- a/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj +++ b/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj @@ -15,7 +15,6 @@ - diff --git a/src/Microsoft.AspNetCore.All/runtime.json.in b/src/Microsoft.AspNetCore.All/runtime.json.in deleted file mode 100644 index 58bf9bf176..0000000000 --- a/src/Microsoft.AspNetCore.All/runtime.json.in +++ /dev/null @@ -1,9 +0,0 @@ -{ - "runtimes": { - "win": { - "${METAPACKAGE_ID}": { - "runtime.win.${METAPACKAGE_ID}": "${PACKAGE_VERSION}" - } - } - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj b/src/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj index dba8a26764..d87e940d0c 100644 --- a/src/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj +++ b/src/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj @@ -15,7 +15,6 @@ - diff --git a/src/Microsoft.AspNetCore.App/runtime.json.in b/src/Microsoft.AspNetCore.App/runtime.json.in deleted file mode 100644 index 58bf9bf176..0000000000 --- a/src/Microsoft.AspNetCore.App/runtime.json.in +++ /dev/null @@ -1,9 +0,0 @@ -{ - "runtimes": { - "win": { - "${METAPACKAGE_ID}": { - "runtime.win.${METAPACKAGE_ID}": "${PACKAGE_VERSION}" - } - } - } -} \ No newline at end of file diff --git a/src/runtime.win.Microsoft.AspNetCore.All/runtime.win.Microsoft.AspNetCore.All.csproj b/src/runtime.win.Microsoft.AspNetCore.All/runtime.win.Microsoft.AspNetCore.All.csproj deleted file mode 100644 index 6345c02e40..0000000000 --- a/src/runtime.win.Microsoft.AspNetCore.All/runtime.win.Microsoft.AspNetCore.All.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - false - false - netcoreapp2.1 - aspnetcore - runtime.win.Microsoft.AspNetCore.All - false - - - diff --git a/src/runtime.win.Microsoft.AspNetCore.App/runtime.win.Microsoft.AspNetCore.App.csproj b/src/runtime.win.Microsoft.AspNetCore.App/runtime.win.Microsoft.AspNetCore.App.csproj deleted file mode 100644 index 53c20bb691..0000000000 --- a/src/runtime.win.Microsoft.AspNetCore.App/runtime.win.Microsoft.AspNetCore.App.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - false - false - netcoreapp2.1 - aspnetcore - runtime.win.Microsoft.AspNetCore.App - false - - -