diff --git a/Directory.Build.Targets b/Directory.Build.Targets index 63aa9ce..f1f8ac8 100644 --- a/Directory.Build.Targets +++ b/Directory.Build.Targets @@ -33,7 +33,7 @@ - + + + + + <_Temporary Remove="@(_Temporary)" /> + <_Temporary Include="@(None->HasMetadata('ReplaceVersion'))"> + None + %(Identity) + $([System.IO.Path]::Combine($(IntermediateOutputPath),%(Identity))) + $([MSBuild]::ValueOrDefault('%(None.PackagePath)', '%(Identity)')) + + <_Temporary Include="@(Content->HasMetadata('ReplaceVersion'))"> + Content + %(Identity) + $([System.IO.Path]::Combine($(IntermediateOutputPath),%(Identity))) + $([MSBuild]::ValueOrDefault('%(Content.PackagePath)', 'content\%(Identity)')) + + + + + + + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index 4d82972..1eea16d 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ When using an MSBuild Project SDK obtained via NuGet (such as the SDKs in this r Either append the version to the package name: ```xml - + ... ``` @@ -50,11 +50,13 @@ Or omit the version from the SDK attribute and specify it in the version in `glo ```json { "msbuild-sdks": { - "MSBuild.SDK.SystemWeb" : "4.0.88" + "MSBuild.SDK.SystemWeb" : "4.0.xx" } } ``` +Where `xx` is the latest release available on [nuget.org](https://nuget.org/packages/MSBuild.SDK.SystemWeb) + Since MSBuild 15.6, SDKs are downloaded as NuGet packages automatically. Earlier versions of MSBuild 15 required SDKs to be installed. For more information, [read the documentation](https://docs.microsoft.com/visualstudio/msbuild/how-to-use-project-sdk). diff --git a/docs/README.md b/docs/README.md index 68dfd9c..6d9c6cc 100644 --- a/docs/README.md +++ b/docs/README.md @@ -36,7 +36,7 @@ When using an MSBuild Project SDK obtained via NuGet (such as the SDKs in this r Either append the version to the package name: ```xml - + ... ``` @@ -45,11 +45,13 @@ Or omit the version from the SDK attribute and specify it in the version in `glo ```json { "msbuild-sdks": { - "MSBuild.SDK.SystemWeb" : "4.0.88" + "MSBuild.SDK.SystemWeb" : "4.0.xx" } } ``` +Where `xx` is the latest release available on [nuget.org](https://nuget.org/packages/MSBuild.SDK.SystemWeb) + Since MSBuild 15.6, SDKs are downloaded as NuGet packages automatically. Earlier versions of MSBuild 15 required SDKs to be installed. For more information, [read the documentation](https://docs.microsoft.com/visualstudio/msbuild/how-to-use-project-sdk). diff --git a/docs/RazorLibrary.md b/docs/RazorLibrary.md index 50df500..0d8e957 100644 --- a/docs/RazorLibrary.md +++ b/docs/RazorLibrary.md @@ -14,7 +14,7 @@ When using an MSBuild Project SDK obtained via NuGet (such as the SDKs in this r Either append the version to the package name: ```xml - + ... ``` @@ -23,11 +23,13 @@ Or omit the version from the SDK attribute and specify it in the version in `glo ```json { "msbuild-sdks": { - "MSBuild.SDK.SystemWeb.RazorLibrary" : "4.0.88" + "MSBuild.SDK.SystemWeb.RazorLibrary" : "4.0.xx" } } ``` +Where `xx` is the latest release available on [nuget.org](https://nuget.org/packages/MSBuild.SDK.SystemWeb.RazorLibrary) + You can also use the [templates](../MSBuild.SDK.SystemWeb.Templates) to easily create new projects. ## Documentation diff --git a/docs/SDK.md b/docs/SDK.md index 81512d3..4870f20 100644 --- a/docs/SDK.md +++ b/docs/SDK.md @@ -13,7 +13,7 @@ When using an MSBuild Project SDK obtained via NuGet (such as the SDKs in this r Either append the version (as shown in the nuget shield above) to the package name: ```xml - + ... ``` @@ -22,13 +22,15 @@ Or omit the version from the SDK attribute and specify it in the version in `glo ```json { "msbuild-sdks": { - "MSBuild.SDK.SystemWeb" : "4.0.88" + "MSBuild.SDK.SystemWeb" : "4.0.xx" } } ``` You can also use the [templates](Templates.md) to easily create new projects. +Where `xx` is the latest release available on [nuget.org](https://nuget.org/packages/MSBuild.SDK.SystemWeb) + ## Properties ### Common Properties diff --git a/src/MSBuild.SDK.SystemWeb.RazorLibrary/README.md b/src/MSBuild.SDK.SystemWeb.RazorLibrary/README.md index 77b40fe..8e296db 100644 --- a/src/MSBuild.SDK.SystemWeb.RazorLibrary/README.md +++ b/src/MSBuild.SDK.SystemWeb.RazorLibrary/README.md @@ -14,7 +14,7 @@ When using an MSBuild Project SDK obtained via NuGet (such as the SDKs in this r Either append the version to the package name: ```xml - + ... ``` @@ -23,7 +23,7 @@ Or omit the version from the SDK attribute and specify it in the version in `glo ```json { "msbuild-sdks": { - "MSBuild.SDK.SystemWeb.RazorLibrary" : "4.0.88" + "MSBuild.SDK.SystemWeb.RazorLibrary" : "$version$" } } ``` diff --git a/src/MSBuild.SDK.SystemWeb.Templates/MSBuild.SDK.SystemWeb.Templates.csproj b/src/MSBuild.SDK.SystemWeb.Templates/MSBuild.SDK.SystemWeb.Templates.csproj index 311e3c0..4c0029b 100644 --- a/src/MSBuild.SDK.SystemWeb.Templates/MSBuild.SDK.SystemWeb.Templates.csproj +++ b/src/MSBuild.SDK.SystemWeb.Templates/MSBuild.SDK.SystemWeb.Templates.csproj @@ -25,13 +25,8 @@ - - - - - - - + + diff --git a/src/MSBuild.SDK.SystemWeb.Templates/templates/Empty.SystemWeb.CS/EmptySystemWeb.csproj b/src/MSBuild.SDK.SystemWeb.Templates/templates/Empty.SystemWeb.CS/EmptySystemWeb.csproj index dd43baa..02d4fa5 100644 --- a/src/MSBuild.SDK.SystemWeb.Templates/templates/Empty.SystemWeb.CS/EmptySystemWeb.csproj +++ b/src/MSBuild.SDK.SystemWeb.Templates/templates/Empty.SystemWeb.CS/EmptySystemWeb.csproj @@ -1,4 +1,4 @@ - + net48 diff --git a/src/MSBuild.SDK.SystemWeb.Templates/templates/Empty.SystemWeb.VB/EmptySystemWeb.vbproj b/src/MSBuild.SDK.SystemWeb.Templates/templates/Empty.SystemWeb.VB/EmptySystemWeb.vbproj index baf69fb..dc7492e 100644 --- a/src/MSBuild.SDK.SystemWeb.Templates/templates/Empty.SystemWeb.VB/EmptySystemWeb.vbproj +++ b/src/MSBuild.SDK.SystemWeb.Templates/templates/Empty.SystemWeb.VB/EmptySystemWeb.vbproj @@ -1,4 +1,4 @@ - + net48 diff --git a/src/MSBuild.SDK.SystemWeb.Templates/templates/Full.SystemWeb.CS/FullSystemWeb.csproj b/src/MSBuild.SDK.SystemWeb.Templates/templates/Full.SystemWeb.CS/FullSystemWeb.csproj index 3864167..b843948 100644 --- a/src/MSBuild.SDK.SystemWeb.Templates/templates/Full.SystemWeb.CS/FullSystemWeb.csproj +++ b/src/MSBuild.SDK.SystemWeb.Templates/templates/Full.SystemWeb.CS/FullSystemWeb.csproj @@ -1,4 +1,4 @@ - + net48 Copyright © (copyrightYear) diff --git a/src/MSBuild.SDK.SystemWeb.Templates/templates/Full.SystemWeb.VB/FullSystemWeb.vbproj b/src/MSBuild.SDK.SystemWeb.Templates/templates/Full.SystemWeb.VB/FullSystemWeb.vbproj index 09090cc..506654b 100644 --- a/src/MSBuild.SDK.SystemWeb.Templates/templates/Full.SystemWeb.VB/FullSystemWeb.vbproj +++ b/src/MSBuild.SDK.SystemWeb.Templates/templates/Full.SystemWeb.VB/FullSystemWeb.vbproj @@ -1,4 +1,4 @@ - + net48 Copyright © (copyrightYear) diff --git a/src/MSBuild.SDK.SystemWeb.Templates/templates/RazorLibrary.SystemWeb.CS/RazorSystemWeb.csproj b/src/MSBuild.SDK.SystemWeb.Templates/templates/RazorLibrary.SystemWeb.CS/RazorSystemWeb.csproj index 8d710c7..a7c8458 100644 --- a/src/MSBuild.SDK.SystemWeb.Templates/templates/RazorLibrary.SystemWeb.CS/RazorSystemWeb.csproj +++ b/src/MSBuild.SDK.SystemWeb.Templates/templates/RazorLibrary.SystemWeb.CS/RazorSystemWeb.csproj @@ -1,4 +1,4 @@ - + net48 diff --git a/src/MSBuild.SDK.SystemWeb.Templates/templates/RazorLibrary.SystemWeb.VB/RazorSystemWeb.vbproj b/src/MSBuild.SDK.SystemWeb.Templates/templates/RazorLibrary.SystemWeb.VB/RazorSystemWeb.vbproj index 3f3d1e6..7b02fa9 100644 --- a/src/MSBuild.SDK.SystemWeb.Templates/templates/RazorLibrary.SystemWeb.VB/RazorSystemWeb.vbproj +++ b/src/MSBuild.SDK.SystemWeb.Templates/templates/RazorLibrary.SystemWeb.VB/RazorSystemWeb.vbproj @@ -1,4 +1,4 @@ - + net48 diff --git a/src/MSBuild.SDK.SystemWeb/README.md b/src/MSBuild.SDK.SystemWeb/README.md index 78b6cc7..83c6473 100644 Binary files a/src/MSBuild.SDK.SystemWeb/README.md and b/src/MSBuild.SDK.SystemWeb/README.md differ