diff --git a/NuGet.config b/NuGet.config index b004e5cc..e32bddfd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -2,6 +2,6 @@ - + - \ No newline at end of file + diff --git a/build/PackageArchive.targets b/build/PackageArchive.targets index 666cade7..ad5d9ce0 100644 --- a/build/PackageArchive.targets +++ b/build/PackageArchive.targets @@ -46,7 +46,7 @@ + Properties="RestorePackagesPath=$(FallbackStagingDir);RuntimeFrameworkVersion=$(MicrosoftNETCoreApp21PackageVersion);DotNetRestoreSourcePropsPath=$(GeneratedFallbackRestoreSourcesPropsPath);DotNetBuildOffline=true;AspNetUniverseBuildOffline=true" /> diff --git a/build/SharedFx.targets b/build/SharedFx.targets index c536a807..31a7da02 100644 --- a/build/SharedFx.targets +++ b/build/SharedFx.targets @@ -28,7 +28,11 @@ $(_MetapackageSrcRoot)$(MetapackageName)\ $(_WorkRoot)$(MetapackageName)\ - Configuration=$(Configuration);DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath);AspNetUniverseBuildOffline=true + + $(CommonProps);Configuration=$(Configuration) + $(CommonProps);DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath) + $(CommonProps);DotNetBuildOffline=true + $(CommonProps);AspNetUniverseBuildOffline=true $(CommonProps);RuntimeFrameworkVersion=$(MicrosoftNETCoreApp21PackageVersion) $(CommonProps);AppMetapackageVersion=$(PackageVersion) @@ -121,6 +125,7 @@ Configuration=$(Configuration);RuntimeIdentifier=$(SharedFxRestoreRid) $(CommonSharedFxProps);DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath) + $(CommonSharedFxProps);DotNetBuildOffline=true $(CommonSharedFxProps);AspNetUniverseBuildOffline=true diff --git a/build/sources.props b/build/sources.props index 2d82aa8a..2d011505 100644 --- a/build/sources.props +++ b/build/sources.props @@ -1,11 +1,17 @@ + + + - $(DotNetAdditionalRestoreSources) + $(DotNetAdditionalRestoreSources); + $(DotNetRestoreSources); + + $(RestoreSources); https://api.nuget.org/v3/index.json; - + $(RestoreSources); https://dotnet.myget.org/F/dotnet-core/api/v3/index.json; https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json; diff --git a/build/tools/templates/Archive/Archive.csproj b/build/tools/templates/Archive/Archive.csproj index d5d5c940..3d3d608b 100644 --- a/build/tools/templates/Archive/Archive.csproj +++ b/build/tools/templates/Archive/Archive.csproj @@ -6,6 +6,7 @@ netcoreapp2.1 false netcoreapp2.1 + $(RestoreSources);$(DotNetRestoreSources); diff --git a/build/tools/templates/SharedFx/SharedFx.csproj b/build/tools/templates/SharedFx/SharedFx.csproj index 39bc5fb9..24bd3aad 100644 --- a/build/tools/templates/SharedFx/SharedFx.csproj +++ b/build/tools/templates/SharedFx/SharedFx.csproj @@ -6,6 +6,7 @@ netcoreapp2.1 true true + $(RestoreSources);$(DotNetRestoreSources); diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 94f49d1b..79ca86d0 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -2,4 +2,5 @@ +